date:20140515

LibreOffice Gerrit News for core on 2014-05-15

2014-05-15 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Patch on bug https://bugs.freedesktop.org/show_bug.cgi?id=39631
  in https://gerrit.libreoffice.org/9358 from Michal Strnad
  about module include
+ Misspelled property in SwAuthenticationSettingsDialog (seperate = separa
  in https://gerrit.libreoffice.org/9357 from Chris Laplante
  about module sw
+ Correct common misspellings, and remove some ASCII art along the way.
  in https://gerrit.libreoffice.org/9356 from Chris Laplante
  about module comphelper, compilerplugins, connectivity, cui, dbaccess, 
drawinglayer, editeng, embeddedobj, filter, framework, helpcompiler, 
i18nlangtag, i18npool, include, odk, offapi, oox, package, reportbuilder, 
reportdesign, sc, scripting, sd, sfx2, solenv, svtools, svx, sw, udkapi, vcl, 
wizards, writerfilter, xmloff
+ care for Java 1.5 support in external packages
  in https://gerrit.libreoffice.org/9312 from Douglas Mencken
  about module build, external, reportbuilder, swext
 End of freshness 

+ libgltf: Update to the new version.
  in https://gerrit.libreoffice.org/9333 from Jan Holesovsky
  about module avmedia, build, external
+ fdo#70474: Random number generation weak with Rnd in BASIC
  in https://gerrit.libreoffice.org/9349 from Thomas Arnhold
  about module basic


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

+ use bundled (non-system) versions of libxml2 and libxslt for OS X 10.6
  in https://gerrit.libreoffice.org/9353 from Douglas Mencken
+ fdo#78599: Fixed for file corruption which contains fields and hyperlink
  in https://gerrit.libreoffice.org/9330 from Priyanka Gaikwad
+ Find places where uno::Sequence is passed by value.
  in https://gerrit.libreoffice.org/9351 from Noel Grandin
+ fdo#78384: Fix for corruption if file contains symbols.
  in https://gerrit.libreoffice.org/9281 from Rohit Deshmukh


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

+ DrawWaveLine/ImplDrawWaveLine fixes:   - try to avoid huge looping due to
  in https://gerrit.libreoffice.org/9174 from Douglas Mencken
+ cppunittest_filter_xslt: fix fdo#77893
  in https://gerrit.libreoffice.org/9177 from Douglas Mencken
+ cppu: add typelib_typedescriptionreference_registerAndNewByAsciiName()
  in https://gerrit.libreoffice.org/9143 from Miklos Vajna
+ Introduce Collada2gltf external library
  in https://gerrit.libreoffice.org/9291 from Matúš Kukan
+ Introduce OpenCollada external library
  in https://gerrit.libreoffice.org/9290 from Matúš Kukan


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

+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ new method INetURLObject::getData() for data urls
  in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#75757 Remove inheritance to std::map from PropertyMap
  in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
  in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ fdo#51525 Fix duplicate Paste Special entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

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

2014-05-15 Thread Miklos Vajna

 chart2/source/view/charttypes/GL3DBarChart.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2cd7cbd9e36683d7429489dc0e4fea626a4cdb47
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu May 15 08:06:00 2014 +0200

no matching function for call to 'scale(const float, const float, int)'

Change-Id: Ia748133cb3bda9d81db8850b7c76ad1a43a5c42e

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 8ceb3d9..d570c72 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -100,7 +100,7 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
 
 
-glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, 0);
+glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, 
static_castfloat(0));
 glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, nVal);
 glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread David Tardon

 Makefile.fetch |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 5409010efc6d7f81d2e87e6156a6bd0604355d24
Author: David Tardon dtar...@redhat.com
Date:   Thu May 15 08:23:15 2014 +0200

fix downloading unowinreg.dll

Change-Id: I24b30ce4f53894796cadd9164f2930523a5f1123

diff --git a/Makefile.fetch b/Makefile.fetch
index 3683fdf..b9f500f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -51,15 +51,19 @@ define fetch_Download__is_checksum
 $(filter 32,$(words $(shell echo $(1) | sed -e 's/./ /g')))
 endef
 
+define fetch_Download__subst_var
+$(subst _DLL,_MD5SUM,$(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(1
+endef
+
 # fetch_Download_item url variable-name
 define fetch_Download_item
 $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty))
-$(if $(filter undefined,$(origin $(subst _TARBALL,_MD5SUM,$(subst 
_PACK,_MD5SUM,$(2),\
+$(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2,\
$(if $(call fetch_Download__is_checksum,$(firstword $(subst -, 
,$($(2),\
$(call fetch__Download_item,$1,$($2),$(firstword $(subst -, 
,$($(2),\
-   $(error fetch_Download_item: no checksum found for $($(2)). 
Please define $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2))) in 
download.lst.) \
+   $(error fetch_Download_item: no checksum found for $($(2)). 
Please define $(call fetch_Download__subst_var,$(2)) in download.lst.) \
),\
-   $(call fetch__Download_item,$(1),$($2),$($(subst 
_TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2) \
+   $(call fetch__Download_item,$(1),$($2),$($(call 
fetch_Download__subst_var,$(2 \
 )
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Chris Laplante

 sw/source/ui/config/mailconfigpage.cxx |2 +-
 sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 618106a1913e2df8df5236bd4b20ea5379cfef33
Author: Chris Laplante mostthings...@gmail.com
Date:   Wed May 14 14:20:24 2014 -0400

Misspelled property in SwAuthenticationSettingsDialog (seperate = separate)

Change-Id: I0cf29711459e5ec185b43cf28716729e659b00b4
Reviewed-on: https://gerrit.libreoffice.org/9357
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index 2c60e5e..aae0529 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -364,7 +364,7 @@ 
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
 , rConfigItem( rItem )
 {
 get(m_pAuthenticationCB,authentication);
-get(m_pSeparateAuthenticationRB,seperateauthentication);
+get(m_pSeparateAuthenticationRB,separateauthentication);
 get(m_pSMTPAfterPOPRB,smtpafterpop);
 get(m_pOutgoingServerFT,label1);
 get(m_pUserNameFT,username_label);
diff --git a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui 
b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
index 78644cb..6785810 100644
--- a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
+++ b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
@@ -99,7 +99,7 @@
   /packing
 /child
 child
-  object class=GtkRadioButton id=seperateauthentication:wrap
+  object class=GtkRadioButton id=separateauthentication:wrap
 property name=label translatable=yesThe outgoing mail 
server (SMTP) requires _separate authentication/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -209,7 +209,7 @@
 property name=xalign0/property
 property name=activeTrue/property
 property name=draw_indicatorTrue/property
-property name=groupseperateauthentication:wrap/property
+property name=groupseparateauthentication:wrap/property
   /object
   packing
 property name=left_attach0/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk

2014-05-15 Thread Tor Lillqvist

 avmedia/Library_avmedia.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eafecb57c91e943f22285d4d579df2932e5c1555
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 09:49:42 2014 +0300

Need zlib because of collada2gltf

Change-Id: I83a48ceb2cb2cf96e4c10d0e17d9076c663530aa

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index fcd4a07..48f36c4 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
glew \
mesa_headers \
+   zlib \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/fdo78300.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |5 +++--
 sw/source/filter/ww8/docxsdrexport.cxx   |9 +
 sw/source/filter/ww8/docxsdrexport.hxx   |2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 350b88c2b7871eb34f945f2ada7b03717f661bdc
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Mon May 12 13:57:35 2014 +0530

fdo#78300 File Corrupt:drawing objects into a text box.

Description :
Docx file corrupt after roundtrip.
LO insert w:drawing inside the wps:txbx under choice after RT,
if the file created in MS word 2007 and contains Word Art inside the text 
box.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/filter/ww8/docxsdrexport.cxx
sw/source/filter/ww8/docxsdrexport.hxx

Change-Id: I7421ed353cd7e9bae17b2447122090a4113f52b5

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78300.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78300.docx
new file mode 100644
index 000..40da091
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78300.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index df265ff..67bd0ca 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3338,6 +3338,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78599,fdo78599.docx)
 assertXPath ( pXmlDoc, 
/w:document/w:body/w:p[1]/w:hyperlink/w:r[6]/w:fldChar, fldCharType, end 
);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo78300,fdo78300.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
+
/w:document/w:body/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing[1]/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p[1]/w:r[1]/w:drawing[1],
+0);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0c00952..aba33a4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4210,8 +4210,9 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
  it != m_postponedDMLDrawing-end();
  ++it )
 {
-if ( IsAlternateContentChoiceOpen() )
-m_rExport.SdrExporter().writeDMLDrawing(it-object, (it-frame), 
m_anchorId++);
+// Avoid w:drawing within another w:drawing.
+if ( IsAlternateContentChoiceOpen()  !( 
m_rExport.SdrExporter().IsDrawingOpen()) )
+   m_rExport.SdrExporter().writeDMLDrawing(it-object, (it-frame), 
m_anchorId++);
 else
 m_rExport.SdrExporter().writeDMLAndVMLDrawing(it-object, 
*(it-frame), *(it-point), m_anchorId++);
 }
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 4f9aa33..dff5310 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -142,6 +142,7 @@ struct DocxSdrExport::Impl
 sax_fastparser::FastAttributeList* m_pTextboxAttrList;
 OStringBuffer m_aTextFrameStyle;
 bool m_bFrameBtLr;
+bool m_bDrawingOpen;
 bool m_bFlyFrameGraphic;
 sax_fastparser::FastAttributeList* m_pFlyFillAttrList;
 sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
@@ -162,6 +163,7 @@ struct DocxSdrExport::Impl
   m_pFlyAttrList(0),
   m_pTextboxAttrList(0),
   m_bFrameBtLr(false),
+  m_bDrawingOpen(false),
   m_bFlyFrameGraphic(false),
   m_pFlyFillAttrList(0),
   m_pFlyWrapAttrList(0),
@@ -239,6 +241,11 @@ bool DocxSdrExport::getFrameBtLr()
 return m_pImpl-m_bFrameBtLr;
 }
 
+bool DocxSdrExport::IsDrawingOpen()
+{
+return m_pImpl-m_bDrawingOpen;
+}
+
 sax_fastparser::FastAttributeList* DocxSdrExport::getFlyFillAttrList()
 {
 return m_pImpl-m_pFlyFillAttrList;
@@ -266,6 +273,7 @@ void 
DocxSdrExport::setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrL
 
 void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size 
rSize)
 {
+m_pImpl-m_bDrawingOpen = true;
 m_pImpl-m_pSerializer-startElementNS(XML_w, XML_drawing, FSEND);
 
 const SvxLRSpaceItem pLRSpaceItem = pFrmFmt-GetLRSpace(false);
@@ -529,6 +537,7 @@ void DocxSdrExport::endDMLAnchorInline(const SwFrmFmt* 
pFrmFmt)
 m_pImpl-m_pSerializer-endElementNS(XML_wp, isAnchor ? XML_anchor : 
XML_inline);
 
 m_pImpl-m_pSerializer-endElementNS(XML_w, XML_drawing);
+m_pImpl-m_bDrawingOpen = false;
 }
 
 void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt 
rFrmFmt,const Point rNdTopLeft)
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx 
b/sw/source/filter/ww8/docxsdrexport.hxx
index 5b0a21d..f8ba56d 100644
---

[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file

2014-05-15 Thread bugzilla-daemon

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

Thorsten Behrens t...@libreoffice.org changed:

   What|Removed |Added

 CC||t...@libreoffice.org

--- Comment #8 from Thorsten Behrens t...@libreoffice.org ---
(In reply to comment #7)
 The above code don't give me any compilation error. But, when I open an
 instance of Impress from my terminal, I could see this messages
 http://pastebin.ca/2679016. And this seems to be the reason behind the
 EmbedMedia() not able to create  store the .mp3 file in Media/ (which is
 vnd.sun.star.Package:Media).
 
That paste is not really helpful, since you can't tell which part of your code
is triggering it. Have you debugged this (both a working call to EmbedMedia,
and your snippets)?

-- 
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: coverity#735354 SQL_ODBC_SQL_CONFORMANCE same on both sides

2014-05-15 Thread Lionel Elie Mamane

On Wed, May 14, 2014 at 09:09:10PM +0100, Caolán McNamara wrote:
 connectivity/source/drivers/odbc/ODatabaseMetaData.cxx:1502 is..
 
 1501 ... SQL_ODBC_SQL_CONFORMANCE ...
 1502 ... SQL_OSC_CORE || ... SQL_OAC_LEVEL1 || ... SQL_OAC_LEVEL2 ...

 and coverity complains that SQL_OAC_LEVEL1 and SQL_OSC_CORE are both 1.
 Looking at external/unixODBC/inc/odbc/sqlext.h I see that...

 /* SQL_ODBC_SQL_CONFORMANCE values */
 #define SQL_OSC_MINIMUM 0x
 #define SQL_OSC_CORE0x0001
 #define SQL_OSC_EXTENDED0x0002

 while...

 /* SQL_ODBC_API_CONFORMANCE values */
 #define SQL_OAC_NONE0x
 #define SQL_OAC_LEVEL1  0x0001
 #define SQL_OAC_LEVEL2  0x0002

 i.e. we're randomly comparing a SQL_ODBC_API_CONFORMANCE value
 against a result from SQL_ODBC_SQL_CONFORMANCE

 so it looks like it should either be...
 SQL_OSC_MINIMUM || SQL_OSC_CORE || SQL_OSC_EXTENDED
 which would be a change in logic, but perhaps the intent, or
 SQL_OSC_CORE || SQL_OSC_EXTENDED
 which would keep the status quo (which is 13 years since
 26f4169ad38df90493149e8c0b2270eb8e47d541).

 Any thoughts on which is preferable?

That's only the first strand of a whole tangle of issues with this
family of functions.

I'll (try to) fix the whole tangle. That's the short version.

The long version:

FYI, the right choice is the latter, since the function is called
supportsCoreSQLGrammar, and Minimum is less than Core (I mean, not
in numeric values, but in conformance level / amount of stuff one
claims to be conformant with). Or maybe it should just be
 return nValue = SQL_OSC_CORE;

Then there is just below the function supportsMinimumSQLGrammar, which
is just wrong. *There* it should be (in the else branch of the if)
 SQL_OSC_MINIMUM || SQL_OSC_CORE || SQL_OSC_EXTENDED
and
 GetInfo (..., SQL_ODBC_SQL_CONFORMANCE)
not
 GetInfo (..., SQL_ODBC_INTERFACE_CONFORMANCE)

And that's just the beginning... The code you mention is a branch in
an if. In the other branch, we have
 GetInfo(... SQL_ODBC_INTERFACE_CONFORMANCE)
which is wrong: this tests the driver's interface (API) conformance,
not the conformance of the SQL language. OTOH, these Minimum, Core
and Extended grammars are a notion from ODBC 2.x, they have
disappeared from ODBC 3.x (replaced by references to the SQL92
standard and levels Entry / Intermediate / Full); Microsoft doesn't
even document anymore what Core and Extended grammars are (only
Minimum, because *all* driver/DBMS *must* implement Minimum). So
actually, except as a deprecated backwards-compatibility feature, an
ODBC3 driver does *not* even say if the ODBC Core/Extended SQL
grammars are supported.

OTOH, JDBC still has these metadata information, and we (SDBC)
inherited it from JDBC. How ironic, JDBC exposes information about an
ODBC conformance level that ODBC does not expose anymore! How the
author of a new JDBC driver is supposed to fathom that information
since IT IS NOT DOCUMENTED ANYMORE AT THE SOURCE OF THE SPECIFICATION
(Microsoft), I'm really not sure.

I think I'll just use the deprecated backwards compatibility stuff and
hope it somehow works out.

Then there is the supportsANSI92* family of functions. Which cleanly
correspond to an ODBC 3.x information value provided by the
driver. Which according to their values and some examples on the
Internet
http://developer.mimer.com/documentation/html_92/Mimer_SQL_Mobile_DocSet/ODBC_API8.html
http://www.databasteknik.se/boken/odbc/odbc-test-05.c
are a *bit* *mask*. But the documentation (and some other examples on
the Internet
http://msdn.microsoft.com/en-us/windows/ms713608%28v=vs.90%29.aspx
) lets one believe they are levels. I'll take my bet for bitmasks.


And the problem with *all* these functions is that they return a
sal_Bool, and should thus be normalised to sal_True or sal_False. But
they are not, and can return any non-zero value (or maybe it is always
1? I think that's how C++ coerces a bool to an integer type) rather
than sal_True (which is -1).

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

[Libreoffice-commits] core.git: 3 commits - basegfx/inc basegfx/Library_basegfx.mk svl/inc svl/Library_svl.mk svl/qa svl/source

2014-05-15 Thread Thomas Arnhold

 basegfx/Library_basegfx.mk|2 
 basegfx/inc/pch/precompiled_basegfx.cxx   |   12 ++
 basegfx/inc/pch/precompiled_basegfx.hxx   |   65 ++
 svl/Library_svl.mk|2 
 svl/inc/pch/precompiled_svl.cxx   |   12 ++
 svl/inc/pch/precompiled_svl.hxx   |  179 ++
 svl/qa/unit/svl.cxx   |8 -
 svl/qa/unit/test_URIHelper.cxx|   60 +-
 svl/qa/unit/test_lngmisc.cxx  |2 
 svl/source/config/asiancfg.cxx|   42 +++
 svl/source/config/cjkoptions.cxx  |2 
 svl/source/config/ctloptions.cxx  |2 
 svl/source/fsstor/fsfactory.cxx   |2 
 svl/source/fsstor/ostreamcontainer.hxx|2 
 svl/source/items/cenumitm.cxx |2 
 svl/source/items/whassert.hxx |4 
 svl/source/misc/getstringresource.cxx |   18 +--
 svl/source/misc/getstringresource.hxx |4 
 svl/source/misc/inethist.cxx  |4 
 svl/source/misc/lngmisc.cxx   |2 
 svl/source/misc/sharedstring.cxx  |2 
 svl/source/misc/sharedstringpool.cxx  |4 
 svl/source/misc/urihelper.cxx |   46 +++
 svl/source/numbers/zformat.cxx|2 
 svl/source/passwordcontainer/syscreds.cxx |2 
 svl/source/passwordcontainer/syscreds.hxx |8 -
 svl/source/uno/pathservice.cxx|4 
 svl/source/uno/registerservices.cxx   |4 
 28 files changed, 385 insertions(+), 113 deletions(-)

New commits:
commit 525f7b280ff46fe9519e555c4a382e83bcfb8c98
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu May 15 09:15:10 2014 +0200

update_pch: add svl

55s - 28s

How to find possible pch candidates:

for i in `git grep -l 'gb_Library_set' -- '*.mk' | sort -u`; do
   if [ $(git grep 'precompiled_' $i | wc -l) == 0 ]; then
  echo missing: $(sed -n -e '/gb_Library_add_exception_objects/,/))/ p' 
$i | wc -l) files in $i
   else
  echo ok: $i
   fi
done | sort -h -t' ' -k2

Change-Id: Ib9fe16c0afb6e6687881c987c3af7bf59b929fd4

diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index a53b223..2b337ff 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_custom_headers,svl,\
officecfg/registry \
 ))
 
+$(eval $(call 
gb_Library_set_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl))
+
 $(eval $(call gb_Library_use_sdk_api,svl))
 
 $(eval $(call gb_Library_add_defs,svl,\
diff --git a/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx
new file mode 100644
index 000..5a04dfa
--- /dev/null
+++ b/svl/inc/pch/precompiled_svl.cxx
@@ -0,0 +1,12 @@
+/* -*- 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 precompiled_svl.hxx
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
new file mode 100644
index 000..91615a8
--- /dev/null
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -0,0 +1,179 @@
+/* -*- 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 has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
+#include officecfg/Office/Common.hxx
+#include algorithm
+#include assert.h
+#include boost/noncopyable.hpp
+#include boost/numeric/conversion/cast.hpp
+#include boost/ptr_container/ptr_map.hpp
+#include boost/scoped_array.hpp
+#include boost/scoped_ptr.hpp
+#include boost/unordered_map.hpp
+#include cassert
+#include cmath
+#include com/sun/star/awt/Point.hpp
+#include com/sun/star/awt/Rectangle.hpp
+#include com/sun/star/awt/Size.hpp
+#include com/sun/star/beans/PropertyAttribute.hpp
+#include com/sun/star/beans/PropertyValue.hpp
+#include com/sun/star/beans/PropertyValues.hpp
+#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/configuration/theDefaultProvider.hpp
+#include com/sun/star/container/ElementExistException.hpp
+#include com/sun/star/container/NoSuchElementException.hpp
+#include com/sun/star/container/XNameAccess.hpp
+#include

[Libreoffice-commits] core.git: bin/findunusedcode unusedcode.easy

2014-05-15 Thread Caolán McNamara

 bin/findunusedcode |   13 +
 unusedcode.easy|   30 +++---
 2 files changed, 16 insertions(+), 27 deletions(-)

New commits:
commit 1dd9c63a3520078e81a4a207060890e23591a41e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 09:24:48 2014 +0100

callcatcher: update unused code

Change-Id: I690c5196ab81178c666ee39dd247fbe0438db80b

diff --git a/bin/findunusedcode b/bin/findunusedcode
index 4e012ae..fa4a64a 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -78,4 +78,17 @@ grep ::.*\( unusedcode.all \
  | grep -v WPX \
  | grep -v ^WSObject \
  | grep -v ^OAuth2Handler \
+ | grep -v ^COLLADABU:: \
+ | grep -v ^COLLADAFW:: \
+ | grep -v ^COLLADASaxFWL14:: \
+ | grep -v ^COLLADASaxFWL15:: \
+ | grep -v ^COLLADASaxFWL:: \
+ | grep -v ^o3dgc:: \
+ | grep -v ^MathML:: \
+ | grep -v ^GeneratedSaxParser:: \
+ | grep -v ^FPSCounter:: \
+ | grep -v ^CPhysicalCamera:: \
+ | grep -v ^RenderScene:: \
+ | grep -v ^ShaderProgram:: \
+ | grep -v ^Texture \
   ../unusedcode.easy
diff --git a/unusedcode.easy b/unusedcode.easy
index 93c564c..5e769ec 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,19 +1,7 @@
 BigInt::BigInt(unsigned int)
-CPhysicalCamera::CPhysicalCamera()
-CPhysicalCamera::GetAngleY()
 CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const)
 
DocumentHandler::DocumentHandler(com::sun::star::uno::Referencecom::sun::star::xml::sax::XDocumentHandler)
 EditEngine::IsIdleFormatterActive() const
-FPSCounter::getGPUTime()
-FPSCounter::gpuAccumulationTimeclear()
-FPSCounter::gpuTimeAccumulation()
-FPSCounter::gpuTimeStampEnd()
-FPSCounter::gpuTimeStampStart()
-FPSCounter::loadFPSShader(ShaderProgram*)
-FPSCounter::printFPS(glTF::glTFViewport*)
-FPSCounter::timeStamp()
-FillAttributes::FillAttributes()
-FillAttributes::getFillGradientAttribute() const
 Font::LoadSystemFont(std::basic_stringchar, std::char_traitschar, 
std::allocatorchar , int)
 Font::deleteFont()
 GDriveDocument::GDriveDocument(GDriveSession*)
@@ -37,9 +25,6 @@ OutputDevice::LogicToPixel(Region const, MapMode const) 
const
 OutputDevice::LogicToPixel(basegfx::B2DPolygon const) const
 OutputDevice::LogicToPixel(basegfx::B2DPolygon const, MapMode const) const
 OutputDevice::PixelToLogic(Region const, MapMode const) const
-RenderScene::loadScene(std::basic_stringchar, std::char_traitschar, 
std::allocatorchar  const, std::basic_stringchar, std::char_traitschar, 
std::allocatorchar  const)
-RenderScene::renderMoveCamera(double, double, double, double)
-RenderScene::renderRotateCamera(double, double, double, double)
 SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const, basegfx::B2DPoint 
const, basegfx::B2DPoint const, SalBitmap const, SalBitmap const*)
 ScDocument::CreateFormatTable() const
 ScExtIButton::GetSelected() const
@@ -52,12 +37,6 @@ SdrItemBrowser::ForceParent()
 SdrItemBrowser::SdrItemBrowser(SdrView)
 SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
 SfxInt64Item::SetValue(long)
-ShaderProgram::createProgram(std::basic_stringchar, std::char_traitschar, 
std::allocatorchar  const, std::basic_stringchar, std::char_traitschar, 
std::allocatorchar  const)
-ShaderProgram::setUniform(unsigned int, char const*, float)
-ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec2float)
-ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec3float)
-ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec4float)
-ShaderProgram::setUniform(unsigned int, char const*, int*)
 StyleSettings::SetActiveColor2(Color const)
 StyleSettings::SetCursorSize(long)
 StyleSettings::SetDeactiveColor2(Color const)
@@ -68,11 +47,11 @@ StyleSettings::SetTitleHeight(long)
 StyleSettings::SetUseFlatBorders(bool)
 StyleSettings::SetUseFlatMenus(bool)
 SvpSalInstance::PostedEventsInQueue()
+SvtLanguageTable::AddLanguageTag(LanguageTag const, rtl::OUString const)
 SvtListener::IsListening(SvtBroadcaster) const
 
SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Referencecom::sun::star::drawing::XShapes)
 SvxNumberFormatShell::IsAdded_Impl(unsigned long)
 TextDoc::IsValidPaM(TextPaM const)
-Texture::greateEmptyTexture(int, int, unsigned int)
 
UnoApiTest::closeDocument(com::sun::star::uno::Referencecom::sun::star::lang::XComponent)
 VCLXGraphics::getFillColor()
 VCLXGraphics::getFont()
@@ -197,13 +176,9 @@ 
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Referencecom::sun::star::un
 
chart::ShapeToolbarController::create(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
 const)
 chart::opengl3D::Camera::zoom(unsigned int)
 chart::opengl3D::OpenGL3DRenderer::GetTime()
-chart::opengl3D::OpenGL3DRenderer::ProcessPickingBox()

[Libreoffice-commits] core.git: helpcontent2

2014-05-15 Thread Caolán McNamara

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

New commits:
commit e4d428459c0108f4758cca725e9f127b1d20fafc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 09:32:15 2014 +0100

Updated core
Project: help  37bfa7d9f018d6e683df285bbf144bfe28078314

diff --git a/helpcontent2 b/helpcontent2
index 43d91a4..37bfa7d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 43d91a4743d30b2e4c194d991c865b7c4be7616c
+Subproject commit 37bfa7d9f018d6e683df285bbf144bfe28078314
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Caolán McNamara

 source/text/shared/optionen/serverauthentication.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37bfa7d9f018d6e683df285bbf144bfe28078314
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 09:32:15 2014 +0100

seperateauthentication - separateauthentication in help too

Change-Id: Ic11fbd6332a75644f7aa77a9e97c7b046cf26afb

diff --git a/source/text/shared/optionen/serverauthentication.xhp 
b/source/text/shared/optionen/serverauthentication.xhp
index 42c27c0..5af20e7 100644
--- a/source/text/shared/optionen/serverauthentication.xhp
+++ b/source/text/shared/optionen/serverauthentication.xhp
@@ -33,7 +33,7 @@
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/authenticationsettingsdialog/authentication 
id=bm_id4849085 localize=false/
 paragraph role=heading id=par_idN10563 xml-lang=en-US level=2 
l10n=NEWThe outgoing mail server (SMTP) requires authentication/paragraph
 paragraph role=paragraph id=par_idN105BE xml-lang=en-US 
l10n=NEWahelp hid=.Enables the authentication that is required to send 
e-mail by SMTP./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/authenticationsettingsdialog/seperateauthentication
 id=bm_id3792535 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/authenticationsettingsdialog/separateauthentication
 id=bm_id3792535 localize=false/
 paragraph role=heading id=par_idN105CD xml-lang=en-US level=3 
l10n=NEWThe outgoing mail server (SMTP) requires separate 
authentication/paragraph
 paragraph role=paragraph id=par_idN105D2 xml-lang=en-US 
l10n=NEWahelp hid=.Select if your SMTP server requires a user name and 
password./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/authenticationsettingsdialog/username 
id=bm_id1043122 localize=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Semi-automated ASCII art removal tool

2014-05-15 Thread Jan Holesovsky

Hi Chris,

mostthingsweb píše v St 14. 05. 2014 v 14:01 -0700:
 I have been working on a tool to semi-automate the process of removing ASCII
 art and pointless comments (ref:
 https://bugs.freedesktop.org/show_bug.cgi?id=62475). Unless someone has an
 alternate suggestion, for the time being I will host it here:
 https://bitbucket.org/MostThingsWeb/asciitool.
 
 Screenshots: http://imgur.com/a/BO0t2

This is cool! :-) -  thanks for that.  Just a small thing; the last
screenshot that removes '/**'

/** something something 
*/

This style of comment has a special meaning for Doxygen which parses
such comments, and adds them to the automatically generated
documentation like

http://docs.libreoffice.org/sw/html/classDocxAttributeOutput.html#a13f211c2bbce84cee1017b3d78c048a3

etc.

I would suggest that your tool should leave the comments like

///
/**
///

untouched.  Of course, /*** does not have any meaning for
Doxygen, and should go away ;-)  But a thing like /*//** should turn
into /** only; etc.

The full list of comments understood by Doxygen is here:

http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html

 I'd be interested in getting some feedback regarding this, whether it's bug
 reports, suggested features, or even just why bother?.

I like it! :-) - thanks again for writing it.

All the best,
Kendy

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

Re: Semi-automated ASCII art removal tool

2014-05-15 Thread Tor Lillqvist

A minimal request: Please handle also *.m, *.mm (Objective-C and
Objective-C++) and *.h files.

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

[Libreoffice-commits] core.git: 10 commits - basic/source chart2/source framework/source i18npool/source sc/source sw/source

2014-05-15 Thread Caolán McNamara

 basic/source/comp/codegen.cxx |6 ++
 chart2/source/view/main/GL3DRenderer.cxx  |2 
 framework/source/uielement/popuptoolbarcontroller.cxx |3 -
 framework/source/uielement/toolbarsmenucontroller.cxx |   13 +++--
 i18npool/source/search/levdis.cxx |   41 ++
 i18npool/source/search/levdis.hxx |   33 ++
 sc/source/core/data/formulacell.cxx   |3 -
 sw/source/core/access/acccontext.cxx  |6 +-
 sw/source/core/crsr/swcrsr.cxx|2 
 sw/source/core/frmedt/tblsel.cxx  |5 +-
 10 files changed, 66 insertions(+), 48 deletions(-)

New commits:
commit 6f019bea96e93c127ccd695d381647b48d06d710
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 13 21:07:39 2014 +0100

coverity#1213254 Out-of-bounds read

surely this was the intent

Change-Id: I78002adebf78674259e6c63e0e3449882accdb5d

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index 686413d..abb41b0 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -823,7 +823,7 @@ void OpenGL3DRenderer::Set3DSenceInfo(sal_uInt32 nColor, 
bool twoSidesLighting)
 
 void OpenGL3DRenderer::SetLightInfo(bool lightOn, sal_uInt32 nColor, const 
glm::vec4 direction)
 {
-if (m_LightsInfo.lightNum  MAX_LIGHT_NUM)
+if (m_LightsInfo.lightNum = MAX_LIGHT_NUM)
 {
 return;
 }
commit bb7dad11e1701c295f6fe9f768f267d094d11ece
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 13 21:03:18 2014 +0100

coverity#1213242 Dereference null return value

Change-Id: I23ce35dbeadca1eea4c67d7d70acbf5ce3a82ac8

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index b324557..4f0c75c 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -436,7 +436,8 @@ throw ( css::uno::RuntimeException, std::exception )
 ( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu );
 
 SolarMutexGuard aSolarMutexGuard;
-PopupMenu* pVCLPopupMenu = dynamic_cast PopupMenu * ( 
pTkPopupMenu-GetMenu() );
+PopupMenu* pVCLPopupMenu = pTkPopupMenu ?
+dynamic_cast PopupMenu * ( pTkPopupMenu-GetMenu() ) : NULL;
 if ( pVCLPopupMenu )
 pMenuAttributes = reinterpret_cast MenuConfiguration::Attributes* 
(
 pVCLPopupMenu-GetUserValue( pVCLPopupMenu-GetCurItemId() ) );
commit 6903b8480956e50a155b42fa42807fb32452bed4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 13 21:02:03 2014 +0100

coverity#1213244 Dereference null return value

Change-Id: I729baf2bec5849a4323550aacb9b789db78e72b3

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 78c847e..ec07bde 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3754,10 +3754,11 @@ bool ScFormulaCell::InterpretInvariantFormulaGroup()
 aTmpPos.SetRow(mxGroup-mpTopCell-aPos.Row() + i);
 ScFormulaCell* pCell = pDocument-GetFormulaCell(aTmpPos);
 assert( pCell != NULL );
+if (!pCell)
+continue;
 
 // FIXME: this set of horrors is unclear to me ... certainly
 // the above GetCell is profoundly nasty  slow ...
-
 // Ensure the cell truly has a result:
 pCell-aResult = aResult;
 pCell-ResetDirty();
commit 5c3eaed8acdd9d9677833547b2ab206574ee45b8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 13 20:58:59 2014 +0100

coverity#705490 Dereference null return value

Change-Id: Iac4178e7f751cba0b4a135dc9d840234d96ccfa2

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index ce5ad30..b4ae800 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1712,7 +1712,8 @@ static void lcl_FindStartEndCol( const SwLayoutFrm 
*rpStart,
 {
 pTmpTab = pTmpTab-GetFollow();
 rpStart = pTmpTab-FirstCell();
-while ( (rpStart-Frm().*fnRect-fnGetLeft)()  nSX 
+while ( rpStart 
+(rpStart-Frm().*fnRect-fnGetLeft)()  nSX 
 (rpStart-Frm().*fnRect-fnGetRight)() nSX2 )
 rpStart = rpStart-GetNextLayoutLeaf();
 }
@@ -1801,7 +1802,7 @@ void MakeSelUnions( SwSelUnions rUnions, const 
SwLayoutFrm *pStart,
 else if( nsSwTblSearchType::TBLSEARCH_COL == 
((~nsSwTblSearchType::TBLSEARCH_PROTECT )  eSearchType ) )
 ::lcl_FindStartEndCol( pStart, pEnd, 
nsSwTblSearchType::TBLSEARCH_PROTECT  eSearchType );
 
-if ( !pEnd ) return; // Made code robust.
+if ( !pEnd || !pStart ) return; // Made code robust.
 
 // retrieve again,

[Libreoffice-commits] core.git: 2 commits - dbaccess/source external/mdds include/unotools sfx2/source

2014-05-15 Thread Stephan Bergmann

 dbaccess/source/ui/misc/TableCopyHelper.cxx |1 
 external/mdds/UnpackedTarball_mdds.mk   |1 
 external/mdds/mdds-c++98.patch.0|   84 
 include/unotools/tempfile.hxx   |7 --
 sfx2/source/doc/docfile.cxx |3 -
 5 files changed, 88 insertions(+), 8 deletions(-)

New commits:
commit 3385b0da3d6ffec25538692d3c49b2e1924dddae
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 15 11:35:38 2014 +0200

Minor utl::TempFile clean up

Change-Id: I20de8b2321d2656d17d25c6343d72c534d47e597

diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx 
b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 8f38214..9906ff5 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -285,7 +285,6 @@ bool OTableCopyHelper::copyTagTable(const 
TransferableDataHelper _aDroppedData
 {
 // now we need to copy the stream
 ::utl::TempFile aTmp;
-aTmp.EnableKillingFile(false);
 _rAsyncDrop.aUrl = aTmp.GetURL();
 SotStorageStreamRef aNew = new SotStorageStream( 
aTmp.GetFileName() );
 _rAsyncDrop.aHtmlRtfStorage-Seek(STREAM_SEEK_TO_BEGIN);
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 67f03fb..0af9aa5 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -74,7 +74,7 @@ public:
 TempFile( const OUString rLeadingChars, bool 
_bStartWithZero=true, const OUString* pExtension=NULL, const OUString* 
pParent=NULL, bool bDirectory=false);
 
 /**
-TempFile will be removed from disk in dtor if 
EnableKillingTempFile was called before.
+TempFile will be removed from disk in dtor if 
EnableKillingFile(true) was called before.
 Temporary directories will be removed recursively in that 
case.
 */
 ~TempFile();
@@ -105,7 +105,7 @@ public:
 /**
 Returns a stream to the tempfiles data; the stream is 
owned by the tempfile object, so you have to keep this
 alive as long as you want to use the stream. If the 
TempFile object is destroyed, it also destroys the
-stream object, the underlying file is only deleted if 
EnableKillingFile( sal_True ) has been called before!
+stream object, the underlying file is only deleted if 
EnableKillingFile(true) has been called before!
 */
 SvStream*   GetStream( StreamMode eMode );
 
@@ -120,9 +120,6 @@ public:
 voidEnableKillingFile( bool bEnable=true )
 { bKillingFileEnabled = bEnable; }
 
-boolIsKillingFileEnabled() const
-{ return bKillingFileEnabled; }
-
 /**
 Only create a physical file name for a temporary file 
that would be valid at that moment.
 Should only be used for 3rd party code with a file name 
interface that wants to create the file by itself.
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 1f0c595..ec0ebbe 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2036,7 +2036,6 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content aOriginalCont
 return; // the backup was done already
 
 ::utl::TempFile aTransactTemp( aPrefix, true, aExtension, aDestDir );
-aTransactTemp.EnableKillingFile( false );
 
 INetURLObject aBackObj( aTransactTemp.GetURL() );
 OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, 
true, INetURLObject::DECODE_WITH_CHARSET );
@@ -2063,7 +2062,7 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content aOriginalCont
 }
 
 if ( pImp-m_aBackupURL.isEmpty() )
-aTransactTemp.EnableKillingFile( true );
+aTransactTemp.EnableKillingFile();
 }
 
 
commit 22aa9fce300f9953dc43fc75f8ced4caab5c3f83
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 15 11:33:44 2014 +0200

Avoid copying of singular iterators

Change-Id: If873d2c369ef6458fdf3289f09802e90dc7367f2

diff --git a/external/mdds/UnpackedTarball_mdds.mk 
b/external/mdds/UnpackedTarball_mdds.mk
index 387b8bc..974a8e1 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/mdds_0.6.0.patch \
+   external/mdds/mdds-c++98.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mdds/mdds-c++98.patch.0 b/external/mdds/mdds-c++98.patch.0
new file mode 100644
index 000..eaf1d60
--- /dev/null
+++ b/external/mdds/mdds-c++98.patch.0
@@ -0,0 +1,84 @@
+--- include/mdds/multi_type_vector_itr.hpp

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - avmedia/source sal/inc sal/osl sal/qa sal/rtl

2014-05-15 Thread Herbert Dürr

 avmedia/source/macavf/macavf_player.cxx |5 
 sal/inc/osl/diagnose.hxx|   14 --
 sal/inc/rtl/allocator.hxx   |  171 
 sal/osl/all/debugbase.cxx   |2 
 sal/osl/w32/path_helper.hxx |1 
 sal/osl/w32/procimpl.cxx|   10 -
 sal/qa/osl/process/osl_process.cxx  |4 
 sal/rtl/source/bootstrap.cxx|   11 --
 sal/rtl/source/hash.cxx |5 
 sal/rtl/source/unload.cxx   |   18 +--
 10 files changed, 20 insertions(+), 221 deletions(-)

New commits:
commit c6e0325df6efce45dbb2616a32b7745c449c6c58
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 09:59:27 2014 +

#i124896# remove obsoleted sal-module-internal custom STL allocator

The SAL module avoided the heavy dependency on the stlport4-libraries by 
using
a custom allocator for its internal STL containers. With stlport4 removed 
these
dependencies are gone and the SAL-internal custom allocator is obsoleted. 
Since
the custom allocator results in build problems with clang=3.4 or 
xcode=5.1 it
is time to remove it for good.

diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 9d887aa..5cab379 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -23,21 +23,10 @@
 #if ! defined(OSL_DIAGNOSE_HXX_INCLUDED)
 #define OSL_DIAGNOSE_HXX_INCLUDED
 
-#if ! defined(_OSL_DIAGNOSE_H_)
 #include osl/diagnose.h
-#endif
-#if ! defined(_OSL_INTERLOCK_H_)
 #include osl/interlck.h
-#endif
-#if ! defined(_OSL_MUTEX_HXX_)
 #include osl/mutex.hxx
-#endif
-#if ! defined(INCLUDED_RTL_ALLOCATOR_HXX)
-#include rtl/allocator.hxx
-#endif
-#if ! defined(_RTL_INSTANCE_HXX_)
 #include rtl/instance.hxx
-#endif
 #include hash_set
 #include functional
 #include typeinfo
@@ -91,8 +80,7 @@ struct VoidPtrHash : ::std::unary_functionvoid const*, 
::std::size_t {
 }
 };
 
-typedef ::std::hash_setvoid const*, VoidPtrHash, ::std::equal_tovoid const*,
-::rtl::Allocatorvoid const*  VoidPointerSet;
+typedef ::std::hash_setvoid const*, VoidPtrHash, ::std::equal_tovoid const* 
 VoidPointerSet;
 
 struct ObjectRegistryData {
 ObjectRegistryData( ::std::type_info const rTypeInfo )
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
deleted file mode 100644
index d4c1d47..000
--- a/sal/inc/rtl/allocator.hxx
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-#if !defined INCLUDED_RTL_ALLOCATOR_HXX
-#define INCLUDED_RTL_ALLOCATOR_HXX
-
-#if ! defined(_SAL_TYPES_H_)
-#include sal/types.h
-#endif
-#if ! defined(_RTL_ALLOC_H_)
-#include rtl/alloc.h
-#endif
-
-#include cstddef
-
-//##
-// This is no general purpose STL allocator but one
-// necessary to use STL for some implementation but
-// avoid linking sal against the STLPort library!!!
-// For more information on when and how to define a
-// custom stl allocator have a look at Scott Meyers:
-// Effective STL, Nicolai M. Josuttis:
-// The C++ Standard Library - A Tutorial and Reference
-// and at http://www.josuttis.com/cppcode/allocator.html
-
-namespace rtl {
-
-/** @internal */
-templateclass T
-class Allocator
-{
-public:
-typedef T value_type;
-typedef T* pointer;
-typedef const T* const_pointer;
-typedef T reference;
-typedef const T const_reference;
-typedef ::std::size_t size_type;
-typedef ::std::ptrdiff_t difference_type;
-
-//-
-templateclass U
-struct rebind
-{
-typedef AllocatorU other;
-};
-
-//-
-pointer address (reference value) const
-{
-return value;
-}
-
-//-
-const_pointer address (const_reference value) const
-{
-return value;
-}
-
-//-
-Allocator() SAL_THROW(())
-{}
-
-//-
-

[Libreoffice-commits] core.git: postprocess/qa

2014-05-15 Thread Stephan Bergmann

 postprocess/qa/services.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4cacc6080e61374fd573fffb3bc2a54968c1b61a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 15 12:19:27 2014 +0200

Make sure to dispose services supporting the XComponent protocol

...to e.g. avoid leftover temp files from instantiating
com.sun.star.comp.report.OReportDefinition.  But dispose all instances only 
at
the very end, to avoid disposing some single-instance services too early.

Change-Id: I71fc50e80f4b5d1a1ca16e392725903b079ce2d1

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index c9d30f4..2d29e91 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -9,7 +9,10 @@
 
 #include sal/config.h
 
+#include vector
+
 #include com/sun/star/container/XHierarchicalNameAccess.hpp
+#include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/reflection/XServiceConstructorDescription.hpp
 #include com/sun/star/reflection/XServiceTypeDescription2.hpp
 #include test/bootstrapfixture.hxx
@@ -37,6 +40,7 @@ void ServicesTest::test()
 
/singletons/com.sun.star.reflection.theTypeDescriptionManager),
 UNO_QUERY_THROW );
 SequenceOUString s = 
m_xContext-getServiceManager()-getAvailableServiceNames();
+std::vector css::uno::Referencecss::lang::XComponent  comps;
 for (sal_Int32 i = 0; i  s.getLength(); i++)
 {
 if (!xTypeManager-hasByHierarchicalName(s[i]))
@@ -54,12 +58,13 @@ void ServicesTest::test()
 Sequence Reference XServiceConstructorDescription   xseq = 
xDesc-getConstructors();
 for (sal_Int32 c = 0; c  xseq.getLength(); c++)
 if (!xseq[c]-getParameters().hasElements())
+{
+Reference XInterface  instance;
 try
 {
 OString message = OUStringToOString(s[i], 
RTL_TEXTENCODING_UTF8);
 bool bDefConstructor = xseq[c]-isDefaultConstructor();
 Reference css::lang::XMultiComponentFactory  
serviceManager = m_xContext-getServiceManager();
-Reference XInterface  instance;
 
 if( bDefConstructor )
 instance = 
serviceManager-createInstanceWithContext(s[i], m_xContext);
@@ -75,6 +80,18 @@ void ServicesTest::test()
 OUStringToOString(s[i] + :  + e.Message, 
RTL_TEXTENCODING_UTF8);
 CPPUNIT_FAIL(exc.getStr());
 }
+css::uno::Referencecss::lang::XComponent comp(
+instance, css::uno::UNO_QUERY);
+if (comp.is()) {
+comps.push_back(comp);
+}
+}
+}
+for (std::vector css::uno::Referencecss::lang::XComponent ::iterator i(
+ comps.begin());
+ i != comps.end(); ++i)
+{
+(*i)-dispose();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Access2Base - New release

2014-05-15 Thread Lionel Elie Mamane

On Wed, May 14, 2014 at 08:18:51AM +0200, Jean-Pierre Ledure wrote:
 On 13/05/2014 10:13, Lionel Elie Mamane wrote:
 I presume it is compliant with the LO release policy to push the same
 patch also to the LO 4.2 branch ?

 I don't think so; no new features, only bugfixes.

 Can't an installation as extension override the bundled one, or
 something like that?

 I don't see how: installing the extension on LO 4.2 makes that 2
 Basic libraries with the same name are present either in My macros
 or in LibreOffice macros.

 To be used a library must first be loaded by giving its (presumably
 unique) name ??

Yes, but one might hope that when loading the library, one source is
always preferred over the other. With some luck, My Macros  Dialogs
will always be preferred to LibreOffice Macros  Dialogs. But maybe
we are unlucky and it is other way round. (I think in general both
ways make sense, as long as the choice is made consistently; some
scenarios favour priority to My Macros, other scenarios favour
priority to LibreOffice. By luck I mean LibreOffice Basic was
designed with the choice that suits our current scenario.)

 The result is LO being unstable or corrupt.

As in you tried and bad things happen?

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

[Libreoffice-commits] core.git: 4 commits - cui/uiconfig include/vcl sc/source vcl/source

2014-05-15 Thread Eike Rathke

 cui/uiconfig/ui/optlanguagespage.ui |4 ++--
 include/vcl/combobox.hxx|3 ++-
 sc/source/ui/app/inputhdl.cxx   |4 
 vcl/source/control/combobox.cxx |8 
 4 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit a4f32eec653596483088c6e5aa37de031278d74c
Author: Eike Rathke er...@redhat.com
Date:   Thu May 15 12:29:11 2014 +0200

resolved fdo#78718 break the indefinite loop when entering =

... introduced with the refactoring of
5a14766061f75e88791dc3134c9ec56e198144e2

Change-Id: Ic322c58cad749d136966cee08ca5a06be59897b7

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index ec22405..8b8d051 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -948,6 +948,10 @@ void ScInputHandler::ShowArgumentsTip( const OUString 
rParagraph, OUString rSe
 break;
 }
 }
+else
+{
+break;
+}
 }
 }
 
commit 848ec62b9ec806c18e0ca7ff2d45f39b4b147c0c
Author: Eike Rathke er...@redhat.com
Date:   Wed May 14 20:47:07 2014 +0200

userinterface and currencylb are just ListBox, so GtkComboBoxText

... and not the bells and whistles SvxLanguageBox.

Change-Id: Icaeaeead0bd58bc05d2a9af4e9b7265de1647936

diff --git a/cui/uiconfig/ui/optlanguagespage.ui 
b/cui/uiconfig/ui/optlanguagespage.ui
index 83129a0..bad3df0 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -110,7 +110,7 @@
   /packing
 /child
 child
-  object class=svxcorelo-SvxLanguageBox id=userinterface
+  object class=GtkComboBoxText id=userinterface
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=halignstart/property
@@ -138,7 +138,7 @@
   /packing
 /child
 child
-  object class=svxcorelo-SvxLanguageBox id=currencylb
+  object class=GtkComboBoxText id=currencylb
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=halignstart/property
commit 1d1a28290a87e2db9e01535792aa0ed3dcbd27b7
Author: Eike Rathke er...@redhat.com
Date:   Tue May 13 19:19:45 2014 +0200

+sal_Int32 ComboBox::GetEntryPos( const void* pData ) const

Change-Id: I9199da366eb70e818e1d85823cd7cf530f70167d

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 85ea06f..3ea2f64 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -138,6 +138,7 @@ public:
 voidClear();
 
 sal_Int32   GetEntryPos( const OUString rStr ) const;
+sal_Int32   GetEntryPos( const void* pData ) const;
 Image   GetEntryImage( sal_Int32  nPos ) const;
 OUStringGetEntry( sal_Int32  nPos ) const;
 sal_Int32   GetEntryCount() const;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index cfd2e8e..a5810f2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -931,6 +931,14 @@ sal_Int32 ComboBox::GetEntryPos( const OUString rStr ) 
const
 return nPos;
 }
 
+sal_Int32 ComboBox::GetEntryPos( const void* pData ) const
+{
+sal_Int32 nPos = mpImplLB-GetEntryList()-FindEntry( pData );
+if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+nPos = nPos - mpImplLB-GetEntryList()-GetMRUCount();
+return nPos;
+}
+
 OUString ComboBox::GetEntry( sal_Int32 nPos ) const
 {
 const sal_Int32 nMRUCount = mpImplLB-GetEntryList()-GetMRUCount();
commit f9a1e9074729d540d29a9ded2b3303373d3a9011
Author: Eike Rathke er...@redhat.com
Date:   Tue May 13 17:15:09 2014 +0200

interface with COMBOBOX_... instead of LISTBOX_...

... even if it is the same value.

Change-Id: I62f81d181f25723cba5ca0fbfb395539385a007a

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 8af4458..85ea06f 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -154,7 +154,7 @@ public:
 voidDrawEntry( const UserDrawEvent rEvt, bool bDrawImage, 
bool bDrawText, bool bDrawTextAtImagePos = false );
 voidSetBorderStyle( sal_uInt16 nBorderStyle );
 
-voidSetSeparatorPos( sal_Int32  n = LISTBOX_ENTRY_NOTFOUND );
+voidSetSeparatorPos( sal_Int32  n = COMBOBOX_ENTRY_NOTFOUND );
 
 voidEnableAutocomplete( bool bEnable, bool bMatchCase = false 
);
 boolIsAutocompleteEnabled() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39631] add optimisation helpers

2014-05-15 Thread bugzilla-daemon

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

Stephan Bergmann sberg...@redhat.com changed:

   What|Removed |Added

 CC||sberg...@redhat.com

--- Comment #5 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #3)
 That header sal/inc/sal/macros.h these days lives in include/sal/macros.h.
 
 BTW, there never was sal/inc/sal/macros.hxx.  It was always
 sal/inc/sal/macros.h.

...and such platform-dependent SAL_LIKELY functionality would more naturally
fit into sal/types.h than sal/macros.h

-- 
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: vcl/quartz

2014-05-15 Thread Herbert Dürr

 vcl/quartz/ctfonts.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f4ea8c2f73034cd43aca4262994e8a9aaa118b0a
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 13:15:37 2014 +0300

AOO: #i124823# fix the calculation of leading metrics for CoreText

tml says: As such, for us the sample document from the above AOO issue
already gets laid out corectly (according to how the bug reporter says
it should be laid out), both in master and 4.2. We already set the
external leading field based on what CTFontGetLeading() says.

Also, our code around here is a little bit different as we don't have
any fFPIY paramter or mfFontScale field, so the change did not apply
directly.

But I adapted it and applied anyway. Effectively, for us the only
change is that the internal leading is now returned as non-zero. No
visible change to the sample document's layout.

Change-Id: I4f8967723e371fa2b695f726ff2f28c0f6d6ae27

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 4382cae..bede546 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -121,10 +121,13 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData 
rMetric ) const
 // TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it 
here?
 CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, 
kCTFontAttributeName );
 
-rMetric.mnAscent   = CTFontGetAscent( aCTFontRef );
+const CGFloat fAscent = CTFontGetAscent( aCTFontRef );
+const CGFloat fCapHeight = CTFontGetCapHeight( aCTFontRef );
+rMetric.mnAscent   = fAscent;
 rMetric.mnDescent  = CTFontGetDescent( aCTFontRef );
 rMetric.mnExtLeading   = CTFontGetLeading( aCTFontRef );
-rMetric.mnIntLeading   = 0;
+rMetric.mnIntLeading   = fAscent - fCapHeight;
+
 // since ImplFontMetricData::mnWidth is only used for stretching/squeezing 
fonts
 // setting this width to the pixel height of the fontsize is good enough
 // it also makes the calculation of the stretch factor simple
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: coverity#735354 SQL_ODBC_SQL_CONFORMANCE same on both sides

2014-05-15 Thread Lionel Elie Mamane

On Thu, May 15, 2014 at 09:39:54AM +0200, Lionel Elie Mamane wrote:

 And the problem with *all* these functions is that they return a
 sal_Bool, and should thus be normalised to sal_True or sal_False. But
 they are not, and can return any non-zero value (or maybe it is always
 1? I think that's how C++ coerces a bool to an integer type) rather
 than sal_True (which is -1).

That's wrong. sal_True is 1, so the C++ bool-to-sal_Bool conversion
does the right thing.

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

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

2014-05-15 Thread Lionel Elie Mamane

 connectivity/source/drivers/odbc/ODatabaseMetaData.cxx |   54 ++---
 1 file changed, 21 insertions(+), 33 deletions(-)

New commits:
commit 94a07be5d726de71315f47d24ef9003991d201ad
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu May 15 12:55:06 2014 +0200

odbc: clean up SQL conformance level tests

Change-Id: I9c96ee389a086c76489f99750c2c86b7504cd393

diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx 
b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index 1b79ffb..ab62346 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -655,14 +655,14 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLExceptio
 {
 SQLUINTEGER nValue;
 
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
-return nValue == SQL_SC_SQL92_FULL;
+return static_castbool(nValue  SQL_SC_SQL92_FULL);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) 
throw(SQLException, RuntimeException, std::exception)
 {
 SQLUINTEGER nValue;
 
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
-return nValue == SQL_SC_SQL92_ENTRY;
+return static_castbool(nValue SQL_SC_SQL92_ENTRY);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) 
throw(SQLException, RuntimeException, std::exception)
@@ -1173,7 +1173,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
 {
 SQLUINTEGER nValue;
 
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
-return nValue == SQL_SC_SQL92_INTERMEDIATE;
+return static_castbool(nValue  SQL_SC_SQL92_INTERMEDIATE);
 }
 
 OUString ODatabaseMetaData::getURLImpl()
@@ -1476,46 +1476,34 @@ OUString SAL_CALL 
ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException,
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) 
throw(SQLException, RuntimeException, std::exception)
 {
 SQLUINTEGER nValue;
-if(m_bOdbc3)
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_INTERFACE_CONFORMANCE,nValue,*this);
-return nValue == SQL_OIC_LEVEL2;
-}
-else
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_INTERFACE_CONFORMANCE,nValue,*this);
-return nValue == SQL_OAC_LEVEL2;
-}
+// SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not 
seem te be any equivalent.
+
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_SQL_CONFORMANCE,nValue,*this);
+SAL_WARN_IF(! (nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || 
nValue == SQL_OSC_EXTENDED),
+connectivity.odbc,
+SQL_ODBC_SQL_CONFORMANCE is neither MINIMAL nor CORE nor 
EXTENDED);
+return nValue == SQL_OSC_EXTENDED;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) 
throw(SQLException, RuntimeException, std::exception)
 {
 SQLUINTEGER nValue;
-if(m_bOdbc3)
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_INTERFACE_CONFORMANCE,nValue,*this);
-return nValue == SQL_OIC_CORE || nValue == SQL_OIC_LEVEL2 || nValue == 
SQL_OIC_LEVEL1;
-}
-else
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_SQL_CONFORMANCE,nValue,*this);
-return nValue == SQL_OSC_CORE || nValue == SQL_OAC_LEVEL1 || nValue == 
SQL_OAC_LEVEL2;
-}
+// SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not 
seem te be any equivalent.
+
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_SQL_CONFORMANCE,nValue,*this);
+SAL_WARN_IF(! (nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || 
nValue == SQL_OSC_EXTENDED),
+connectivity.odbc,
+SQL_ODBC_SQL_CONFORMANCE is neither MINIMAL nor CORE nor 
EXTENDED);
+return nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) 
throw(SQLException, RuntimeException, std::exception)
 {
 SQLUINTEGER nValue;
-if(m_bOdbc3)
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_INTERFACE_CONFORMANCE,nValue,*this);
-return nValue == SQL_OIC_LEVEL1 || nValue == SQL_OIC_LEVEL2;
-}
-else
-{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_INTERFACE_CONFORMANCE,nValue,*this);
-return nValue == SQL_OAC_LEVEL1 || nValue == SQL_OAC_LEVEL2;
-}
+// SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not 
seem te be any equivalent.
+
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ODBC_SQL_CONFORMANCE,nValue,*this);
+SAL_WARN_IF(! (nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || 
nValue == SQL_OSC_EXTENDED),
+connectivity.odbc,
+SQL_ODBC_SQL_CONFORMANCE is

[Libreoffice-commits] core.git: dictionaries

2014-05-15 Thread László Németh

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

New commits:
commit 7dcae3bc041569e9e12c4c7bcd48609ffdd5877a
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Thu May 15 13:03:17 2014 +0200

Updated core
Project: dictionaries  38b1410ca674bd47d218e4e77cf90e6adcc6d87c

diff --git a/dictionaries b/dictionaries
index 117686e..38b1410 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 117686ef79d5a2a42e328dcef8af3969af933700
+Subproject commit 38b1410ca674bd47d218e4e77cf90e6adcc6d87c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: en/pythonpath hu_HU/pythonpath pt_BR/pythonpath

2014-05-15 Thread László Németh

 en/pythonpath/lightproof_impl_en.py   |2 +-
 hu_HU/pythonpath/lightproof_impl_hu_HU.py |2 +-
 pt_BR/pythonpath/lightproof_impl_pt_BR.py |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 38b1410ca674bd47d218e4e77cf90e6adcc6d87c
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Thu May 15 13:03:17 2014 +0200

fix LightProof measurement conversion for Python 3

Change-Id: I6d36bc804271956e1c8649df0832615311fcf5e1

diff --git a/en/pythonpath/lightproof_impl_en.py 
b/en/pythonpath/lightproof_impl_en.py
index 2c7072c..ac668dc 100644
--- a/en/pythonpath/lightproof_impl_en.py
+++ b/en/pythonpath/lightproof_impl_en.py
@@ -328,7 +328,7 @@ def measurement(mnum, min, mout, mstr, decimal, remove):
 mnum = mnum.replace( 1/2, .5).replace(u \xbd, 
.5).replace(u\xbd,.5)
 m = calc(CONVERT_ADD, (float(eval(mnum.replace(remove, 
).replace(decimal, .).replace(u\u2212, -))), min, mout))
 a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), 
str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items
-a.sort(lambda x, y: len(x) - len(y)) # sort by string length
+a.sort(key=lambda x: len(x)) # sort by string length
 return (mstr + \n).join(a).replace(., decimal).replace(-, u\u2212) 
+ mstr
 
 
diff --git a/hu_HU/pythonpath/lightproof_impl_hu_HU.py 
b/hu_HU/pythonpath/lightproof_impl_hu_HU.py
index 62e0025..d88c136 100644
--- a/hu_HU/pythonpath/lightproof_impl_hu_HU.py
+++ b/hu_HU/pythonpath/lightproof_impl_hu_HU.py
@@ -244,7 +244,7 @@ paralcap = 
re.compile(u(?u)^[a-z\xf6\xfc\xf3\u0151\xfa\xe9\xe1\u0171\xed].*[.?!
 def measurement(mnum, min, mout, mstr):
 m = calc(CONVERT_ADD, (float(mnum.replace(,, .).replace(u\u2212, 
-)), min, mout))
 a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), 
str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items
-a.sort(lambda x, y: len(x) - len(y)) # sort by string length
+a.sort(key=lambda x: len(x)) # sort by string length
 return (mstr + |).join(a).replace(., ,).replace(-, u\u2212) + 
mstr
 
 
diff --git a/pt_BR/pythonpath/lightproof_impl_pt_BR.py 
b/pt_BR/pythonpath/lightproof_impl_pt_BR.py
index 8d0100f..8611ee5 100644
--- a/pt_BR/pythonpath/lightproof_impl_pt_BR.py
+++ b/pt_BR/pythonpath/lightproof_impl_pt_BR.py
@@ -24417,7 +24417,7 @@ def measurement(mnum, min, mout, mstr, decimal, remove):
 mnum = mnum.replace( 1/2, .5).replace(u \xbd, 
.5).replace(u\xbd,.5)
 m = calc(CONVERT_ADD, (float(eval(mnum.replace(remove, 
).replace(decimal, .).replace(u\u2212, -))), min, mout))
 a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), 
str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items
-a.sort(lambda x, y: len(x) - len(y)) # sort by string length
+a.sort(key=lambda x: len(x)) # sort by string length
 return (mstr + \n).join(a).replace(., decimal).replace(-, u\u2212) 
+ mstr
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Caolán McNamara

 sw/inc/EnhancedPDFExportHelper.hxx  |   11 ++
 sw/source/core/text/EnhancedPDFExportHelper.cxx |  108 
 sw/source/core/uibase/uno/unotxdoc.cxx  |9 +-
 3 files changed, 106 insertions(+), 22 deletions(-)

New commits:
commit c1cad9bbc3d2721304e7ac592b5d7396ad1a7c98
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 12:38:10 2014 +0100

Resolves: fdo#78204 adjust note icons on comments-in-margins case

the page has been scaled by 75% and vertically centered so the page 
positions
need to be also adjusted.

Change-Id: I7ab6b4956933ba41c857e78aee8e5c1cf97a

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index d8c4ef4..d236317 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -36,6 +36,8 @@ namespace vcl
 class OutputDevice;
 class SwFrm;
 class SwLinePortion;
+class SwPageFrm;
+class SwPrintData;
 class SwTxtPainter;
 class SwEditShell;
 class StringRangeEnumerator;
@@ -207,6 +209,8 @@ class SwEnhancedPDFExportHelper
 bool mbSkipEmptyPages;
 bool mbEditEngineOnly;
 
+const SwPrintData mrPrintData;
+
 static TableColumnsMap aTableColumnsMap;
 static LinkIdMap aLinkIdMap;
 static NumListIdMap aNumListIdMap;
@@ -229,7 +233,8 @@ class SwEnhancedPDFExportHelper
OutputDevice rOut,
const OUString rPageRange,
bool bSkipEmptyPages,
-   bool bEditEngineOnly );
+   bool bEditEngineOnly,
+   const SwPrintData rPrintData );
 
 ~SwEnhancedPDFExportHelper();
 
@@ -240,6 +245,10 @@ class SwEnhancedPDFExportHelper
 static FrmTagIdMap GetFrmTagIdMap() { return aFrmTagIdMap; }
 
 static LanguageType GetDefaultLanguage() {return eLanguageDefault; }
+
+//scale and position rRectangle if we're scaling due to notes in margins.
+Rectangle SwRectToPDFRect(const SwPageFrm* pCurrPage,
+const Rectangle rRectangle) const;
 };
 
 #endif
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index f310c5f..6afa51d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -69,6 +69,7 @@
 #include itrpaint.hxx
 #include i18nlangtag/languagetag.hxx
 #include IMark.hxx
+#include printdata.hxx
 #include SwNodeNum.hxx
 #include switerator.hxx
 #include stack
@@ -677,7 +678,9 @@ void SwTaggedPDFHelper::SetAttributes( 
vcl::PDFWriter::StructElement eType )
  ( pFrm-IsTabFrm() 
!static_castconst SwTabFrm*(pFrm)-IsFollow() 
!static_castconst SwTabFrm*(pFrm)-HasFollow() ) )
-mpPDFExtOutDevData-SetStructureBoundingBox( 
pFrm-Frm().SVRect() );
+{
+
mpPDFExtOutDevData-SetStructureBoundingBox(pFrm-Frm().SVRect());
+}
 }
 
 if ( bRowSpan )
@@ -1447,12 +1450,14 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( 
SwEditShell rSh,
   OutputDevice rOut,
   const OUString 
rPageRange,
   bool bSkipEmptyPages,
-  bool bEditEngineOnly )
+  bool bEditEngineOnly,
+  const SwPrintData 
rPrintData )
 : mrSh( rSh ),
   mrOut( rOut ),
   mpRangeEnum( 0 ),
   mbSkipEmptyPages( bSkipEmptyPages ),
-  mbEditEngineOnly( bEditEngineOnly )
+  mbEditEngineOnly( bEditEngineOnly ),
+  mrPrintData( rPrintData )
 {
 if ( !rPageRange.isEmpty() )
 mpRangeEnum = new StringRangeEnumerator( rPageRange, 0, 
mrSh.GetPageCount()-1 );
@@ -1502,6 +1507,29 @@ SwEnhancedPDFExportHelper::~SwEnhancedPDFExportHelper()
 delete mpRangeEnum;
 }
 
+Rectangle SwEnhancedPDFExportHelper::SwRectToPDFRect(const SwPageFrm* 
pCurrPage,
+const Rectangle rRectangle) const
+{
+sal_Int16 nPostItMode = mrPrintData.GetPrintPostIts();
+if (nPostItMode != POSTITS_INMARGINS)
+return rRectangle;
+//the page has been scaled by 75% and vertically centered, so adjust these
+//rectangles equivalently
+Rectangle aRect(rRectangle);
+Size aRectSize(aRect.GetSize());
+double fScale = 0.75;
+aRectSize.Width() = (aRectSize.Width() * fScale);
+aRectSize.Height() = (aRectSize.Height() * fScale);
+long nOrigHeight = pCurrPage-Frm().Height();
+long nNewHeight = nOrigHeight*fScale;
+long nShiftY = (nOrigHeight-nNewHeight)/2;
+aRect.Left() = (aRect.Left() * fScale);
+aRect.Top() = (aRect.Top() * fScale);
+aRect.Move(0, nShiftY);
+aRect.SetSize(aRectSize);
+return

[Libreoffice-commits] core.git: odk/docs

2014-05-15 Thread David Tardon

 odk/docs/cpp/Doxyfile |1 +
 odk/docs/idl/Doxyfile |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 2e9a77aa2d8e83f6296cd9204759d18b0ec5f0b5
Author: David Tardon dtar...@redhat.com
Date:   Thu May 15 13:41:16 2014 +0200

fix for doxygen 1.8.7

Earlier versions apparently used HTML as default if no output format was
specified. 1.8.7 no longer does that.

Change-Id: Ia8f908f54b344530e1b50e8800c032f782fb36e9

diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
index 30346e0..2519f1b 100644
--- a/odk/docs/cpp/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
@@ -24,6 +24,7 @@ WARN_FORMAT = $file:$line: $text
 INPUT = %
 RECURSIVE = YES
 
+GENERATE_HTML = YES
 HTML_OUTPUT = .
 
 GENERATE_LATEX = NO
diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
index 6eead54..c065b33 100644
--- a/odk/docs/idl/Doxyfile
+++ b/odk/docs/idl/Doxyfile
@@ -13,6 +13,7 @@ STRIP_FROM_PATH = %
 INPUT = %
 RECURSIVE = YES
 
+GENERATE_HTML = YES
 HTML_OUTPUT = .
 GENERATE_LATEX = NO
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries

2014-05-15 Thread Andras Timar

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

New commits:
commit 8c0ffde754d4ce8b23e412d3fdc858791c91e0ea
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed May 14 15:51:49 2014 +0200

Updated core
Project: dictionaries  3961ccdbad0844ddd7e624c5622015e6ba09b63d

updated Breton dictionary to version 0.12

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

diff --git a/dictionaries b/dictionaries
index 5666484..3961ccd 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 5666484298c4252e56d32fa630ecde93e44d54d3
+Subproject commit 3961ccdbad0844ddd7e624c5622015e6ba09b63d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-2' - hu_HU/hu_HU.aff hu_HU/hu_HU.dic

2014-05-15 Thread Andras Timar

 hu_HU/hu_HU.aff |3 ++-
 hu_HU/hu_HU.dic |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 246dddb6ce55587bdbdbf05163b294bb72fa
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed May 14 15:44:14 2014 +0200

hu dict: do not suggest this word

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

diff --git a/hu_HU/hu_HU.aff b/hu_HU/hu_HU.aff
index f146d0c..7174397 100644
--- a/hu_HU/hu_HU.aff
+++ b/hu_HU/hu_HU.aff
@@ -1,4 +1,4 @@
-AF 1262
+AF 1263
 AF VË¯j×LnÓéè³ÄäTtYc¸¼l # 1
 AF UmÒyiYcÇ # 2
 AF ÕCWRÌ¯jÞÔíyÈÁÿYc½ # 3
@@ -1261,6 +1261,7 @@ AF DRT # 1259
 AF DQS # 1260
 AF @ # 1261
 AF % # 1262
+AF VË¯j×LnÓéè³ÄäTtYc¸¼l= # 1263
 AM 22805
 AM po:noun ts:NOM
 AM po:noun ts:NOM al:Ã¼zletÃ¡gak
diff --git a/hu_HU/hu_HU.dic b/hu_HU/hu_HU.dic
index a0ef0ff..6b4b2bb 100644
--- a/hu_HU/hu_HU.dic
+++ b/hu_HU/hu_HU.dic
@@ -17426,7 +17426,7 @@ nikkel/21   1
 nihilizmus/30  1
 nihil/16   1
 night/266  1
-nigger/1   1
+nigger/12631
 niamey-i/225   4145
 niacin/259 1
 ni 33
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries

2014-05-15 Thread Andras Timar

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

New commits:
commit e4ff080af614845134c391cedcd92cbac7673c54
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed May 14 15:44:14 2014 +0200

Updated core
Project: dictionaries  246dddb6ce55587bdbdbf05163b294bb72fa

hu dict: do not suggest this word

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

diff --git a/dictionaries b/dictionaries
index 3961ccd..246dddb 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 3961ccdbad0844ddd7e624c5622015e6ba09b63d
+Subproject commit 246dddb6ce55587bdbdbf05163b294bb72fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread David Tardon

 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 88c9939515efe8d7ef459e7b36df99282d437a48
Author: David Tardon dtar...@redhat.com
Date:   Sat May 10 10:13:44 2014 +0200

Related: rhbz#1071604 don't paint anim. effect icon

... unless the slide does have custom animations. This drops dep of Draw
on libanimcore, which is in module impress, so it might not be present.
If it is not present, the Pages panel is not drawn.

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

diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx 
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 0eafa0b..60c51fa 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -94,7 +94,8 @@ void PageObjectPainter::PaintPageObject (
 PaintPreview(rDevice, rpDescriptor);
 PaintPageNumber(rDevice, rpDescriptor);
 PaintTransitionEffect(rDevice, rpDescriptor);
-PaintCustomAnimationEffect(rDevice, rpDescriptor);
+if (rpDescriptor-GetPage()-hasAnimationNode())
+PaintCustomAnimationEffect(rDevice, rpDescriptor);
 rDevice.SetAntialiasing(nSavedAntialiasingMode);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Miklos Vajna

 sw/qa/extras/rtfimport/data/font-override.rtf |   28 ++
 sw/qa/extras/rtfimport/rtfimport.cxx  |6 +
 writerfilter/source/rtftok/rtfsprm.cxx|9 
 writerfilter/source/rtftok/rtfsprm.hxx|1 
 writerfilter/source/rtftok/rtfvalue.cxx   |   12 ++-
 5 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit c0fee7f70f4c7d97cd911c987d0b6dd57c6795e5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Mar 3 18:54:01 2014 +0100

fdo#78313 RTF import: retain font colors

This is a cherry-pick of two master commits:

RTFValue::equals: consider the number of attributes/sprms as well

(cherry picked from commit 4452fa9a2e741834a19c9b322fc8d9c8b06450de)

Related: fdo#77600 RTF import: RTFValue::equals: compare attribute content

Previously only the number of nested sprms / attributes was compared.
With this, the font of the bugdoc is correctly Arial, not Times.

(cherry picked from commit 8e8f9388c323ad3c32cef3f91609ad19386b7d56)

Conflicts:
writerfilter/source/rtftok/rtfsprm.hxx

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

diff --git a/sw/qa/extras/rtfimport/data/font-override.rtf 
b/sw/qa/extras/rtfimport/data/font-override.rtf
new file mode 100644
index 000..a41d2ab
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/font-override.rtf
@@ -0,0 +1,28 @@
+{\rtf1\ansi\deff4\adeflang1025
+{\fonttbl
+{\f0\froman\fprq2\fcharset0 Times New Roman;}
+{\f1\froman\fprq2\fcharset2 Symbol;}
+{\f2\fswiss\fprq2\fcharset0 Arial;}
+{\f3\froman\fprq2\fcharset0 Liberation Serif
+{\*\falt Times New Roman}
+;}
+{\f4\froman\fprq2\fcharset0 Times New Roman;}
+{\f5\fswiss\fprq2\fcharset0 Liberation Sans
+{\*\falt Arial}
+;}
+{\f6\froman\fprq2\fcharset0 Tahoma;}
+{\f7\froman\fprq2\fcharset0 Arial;}
+{\f8\fnil\fprq2\fcharset0 Droid Sans Fallback;}
+{\f9\fnil\fprq2\fcharset0 Lucida Sans;}
+{\f10\fswiss\fprq0\fcharset1 Lucida Sans;}
+{\f11\fnil\fprq2\fcharset0 Arial;}
+}
+{\colortbl;\red0\green0\blue0;\red5\green99\blue193;\red128\green128\blue128;\red0\green0\blue10;}
+{\stylesheet
+{\s0\snext0\ql\widctlpar\ltrpar
+\cf0\kerning1\dbch\af12\langfe1033\dbch\af12\afs20\alang1025\fs24\loch\f4\lang1033
 Normal;}
+}
+\pard\plain\s0
+{\af11\f7
+This should be Arial.}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 908178f..562b9df 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1635,6 +1635,12 @@ DECLARE_RTFIMPORT_TEST(testFdo75735, fdo75735.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty 
uno::Sequencestyle::TabStop (getParagraph(2), ParaTabStops).getLength());
 }
 
+DECLARE_RTFIMPORT_TEST(testFontOverride, font-override.rtf)
+{
+// This was Times New Roman.
+CPPUNIT_ASSERT_EQUAL(OUString(Arial), 
getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx 
b/writerfilter/source/rtftok/rtfsprm.cxx
index c6d9172..c79c6e2 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -143,6 +143,15 @@ void RTFSprms::deduplicate(RTFSprms rReference)
 }
 }
 
+bool RTFSprms::equals(RTFValue rOther)
+{
+RTFSprms::Iterator_t i = m_pSprms-begin();
+while (i != m_pSprms-end())
+if (!i-second-equals(rOther))
+return false;
+return true;
+}
+
 void RTFSprms::ensureCopyBeforeWrite()
 {
 if (m_pSprms-m_nRefCount  1) {
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx 
b/writerfilter/source/rtftok/rtfsprm.hxx
index 19f0514..a889207 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -60,6 +60,7 @@ namespace writerfilter {
 Iterator_t begin() { return m_pSprms-begin(); }
 Iterator_t end() { return m_pSprms-end(); }
 void clear();
+bool equals(RTFValue rOther);
 private:
 void ensureCopyBeforeWrite();
 boost::intrusive_ptrRTFSprmsImpl m_pSprms;
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx 
b/writerfilter/source/rtftok/rtfvalue.cxx
index 7af638f..132233c 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -210,7 +210,17 @@ RTFValue* RTFValue::Clone()
 
 bool RTFValue::equals(RTFValue rOther)
 {
-return m_nValue == rOther.m_nValue;
+if (m_nValue != rOther.m_nValue)
+return false;
+if (m_pAttributes-size() != rOther.m_pAttributes-size())
+return false;
+else if (!m_pAttributes-equals(rOther))
+return false;
+if (m_pSprms-size() != rOther.m_pSprms-size())
+

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

2014-05-15 Thread Vort

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a050856a670db629336681cdf4e5f36c4efefa57
Author: Vort vv...@yandex.ru
Date:   Sun May 11 10:38:04 2014 +0300

fdo#78549 PDF Import: fix incorrect transformation matrix writing

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

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index c5b9aa1..c5096ad 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -605,8 +605,8 @@ void PDFOutDev::setDefaultCTM(double *pMat)
 
 printf( updateCtm %f %f %f %f %f %f\n,
 normalize(pMat[0]),
-normalize(pMat[2]),
 normalize(pMat[1]),
+normalize(pMat[2]),
 normalize(pMat[3]),
 normalize(pMat[4]),
 normalize(pMat[5]) );
@@ -624,8 +624,8 @@ void PDFOutDev::updateCTM(GfxState* state,
 
 printf( updateCtm %f %f %f %f %f %f\n,
 normalize(pMat[0]),
-normalize(pMat[2]),
 normalize(pMat[1]),
+normalize(pMat[2]),
 normalize(pMat[3]),
 normalize(pMat[4]),
 normalize(pMat[5]) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - odk/docs

2014-05-15 Thread David Tardon

 odk/docs/cpp/Doxyfile |1 +
 odk/docs/idl/Doxyfile |1 +
 2 files changed, 2 insertions(+)

New commits:
commit df4877382c19042e267d6a8ed7b9a93f75509bdd
Author: David Tardon dtar...@redhat.com
Date:   Thu May 15 13:41:16 2014 +0200

fix for doxygen 1.8.7

Earlier versions apparently used HTML as default if no output format was
specified. 1.8.7 no longer does that.

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

diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
index 26c8893..c34915a 100644
--- a/odk/docs/cpp/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
@@ -24,6 +24,7 @@ WARN_FORMAT = $file:$line: $text
 INPUT = %
 RECURSIVE = YES
 
+GENERATE_HTML = YES
 HTML_OUTPUT = .
 
 GENERATE_LATEX = NO
diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
index 6eead54..c065b33 100644
--- a/odk/docs/idl/Doxyfile
+++ b/odk/docs/idl/Doxyfile
@@ -13,6 +13,7 @@ STRIP_FROM_PATH = %
 INPUT = %
 RECURSIVE = YES
 
+GENERATE_HTML = YES
 HTML_OUTPUT = .
 GENERATE_LATEX = NO
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Andras Timar

 sd/source/ui/view/sdview2.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1677cffc602e15968ffb76ee0d5fd0ebcdac6b3c
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri May 9 22:38:52 2014 +0200

Revert fdo#45260: Objects having line thickness misplaced while pasting.

This reverts commit c35c4769d8cabe0f01ef9911056d7a9d1d2f4b04.
Fixes fdo#78413

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

diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index cc6229f..2572576 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -112,9 +112,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
 
 // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect 
to get
 // fat lines correctly
-// This seems to be broken on LibreOffice. So reverted this temporarily
-// to fix fdo#45260
-const Rectangle aMarkRect( GetAllMarkedRect() );
+const Rectangle aMarkRect( GetAllMarkedBoundRect() );
 TransferableObjectDescriptoraObjDesc;
 SdrOle2Obj* pSdrOleObj = NULL;
 SdrPageView*pPgView = GetSdrPageView();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - filter/source sc/source sd/source shell/source sw/inc sw/source

2014-05-15 Thread Herbert Dürr

 filter/source/graphicfilter/ipbm/ipbm.cxx  |9 ++---
 filter/source/graphicfilter/ipcd/ipcd.cxx  |3 ++-
 filter/source/graphicfilter/ipcx/ipcx.cxx  |3 ++-
 filter/source/graphicfilter/iras/iras.cxx  |3 ++-
 filter/source/graphicfilter/itga/itga.cxx  |2 +-
 sc/source/ui/view/drawview.cxx |2 +-
 sd/source/ui/view/DocumentRenderer.cxx |2 +-
 shell/source/backends/macbe/macbackend.cxx |2 +-
 sw/inc/unotbl.hxx  |7 ---
 sw/inc/viewsh.hxx  |5 ++---
 sw/source/core/inc/frame.hxx   |6 --
 sw/source/core/view/vprint.cxx |9 ++---
 12 files changed, 28 insertions(+), 25 deletions(-)

New commits:
commit 9915536a74bb1a4e821537015a641f88f701e32b
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 11:31:37 2014 +

#i124422# fix default arguments in friend declarations

chapter 8.3.6.4 of the C++11 standard requests that friend declarations 
must not
specify default unless these declarations are also definitions. Older 
compilers
still tolerate such constructs that were still undecided until
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#136
but clang=3.4 or xcode=5.1 now report errors for such code. The errors 
break the
build and so they have to be fixed. Cleaner alternatives to the fixes are 
possible
but for now they are intended to allow the build while being minimally 
invasive.

diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 56d0aea..d9fdf8b 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -58,11 +58,12 @@ class SwTableCursor;
 class SwTableBoxFmt;
 class SwChartDataProvider;
 class SwFrmFmt;
+class SwXCell;
 
+void lcl_setString( SwXCell, const rtl::OUString rTxt, sal_Bool 
bKeepNumberFmt = sal_True );
 
-/* -22.09.00 11:10
+// ---
 
- ---*/
 class SwChartEventListenerContainer : public SwEventListenerContainer
 {
 public:
@@ -87,7 +88,7 @@ class SwXCell : public SwXCellBaseClass,
 public SwClient
 {
 friend void   lcl_setString( SwXCell rCell, const rtl::OUString rTxt,
- sal_Bool bKeepNumberFmt = sal_False );
+ sal_Bool bKeepNumberFmt );
 friend double lcl_getValue( SwXCell rCell );
 friend void   lcl_setValue( SwXCell rCell, double nVal );
 
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index e67b9a0..62ed7e8 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -110,9 +110,8 @@ class SW_DLLPUBLIC ViewShell : public Ring
 // OD 12.12.2002 #103492# - for setting visible area for page preview paint
 friend class SwPagePreviewLayout;
 
-//Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert
-//werden kann.
-friend void SetSwVisArea( ViewShell *pSh, const SwRect , sal_Bool 
bPDFExport = sal_False );
+// setting the SwVisArea is used to get a clean formatting before printing
+friend void SetSwVisArea( ViewShell*, const SwRect /*, sal_Bool 
bPDFExport = sal_False */ );
 
 // -- PB 2007-05-30 #146850#
 static BitmapEx*pReplaceBmp;// replaced display of still loaded 
images
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 861b8d7..7c4d2b0 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -142,6 +142,8 @@ typedef void (SwFrm:: *SwFrmMakePos)( const SwFrm*, const 
SwFrm*, sal_Bool );
 typedef long (*SwOperator)( long, long );
 typedef void (SwFrm:: *SwFrmSet)( long, long );
 
+SwFrm* SaveCntnt( SwLayoutFrm*, SwFrm* pStart = NULL );
+
 struct SwRectFnCollection
 {
 SwRectGet fnGetTop;
@@ -279,8 +281,8 @@ class SwFrm: public SwClient, public SfxBroadcaster
 friend class SwLooping; // LoopControlling  (layouter.cxx)
 
 //Hebt die Lower waehrend eines Spaltenumbaus auf.
-friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
-friend void   RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool 
bGrow );
+friend SwFrm *SaveCntnt( SwLayoutFrm*, SwFrm* pStart );
+friend void   RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, 
bool bGrow );
 
 #if OSL_DEBUG_LEVEL  1
 //entfernt leere SwSectionFrms aus einer Kette
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 0f63ebf..83cd7b1 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -190,14 +190,9 @@ void SwPaintQueue::Remove( ViewShell *pSh )
 }
 }
 
-/**
- *  Methode :   void SetSwVisArea( ViewShell *pSh, Point aPrtOffset, ...
- *  Beschreibung:
- *  Erstellt:   OK 04.11.94 16:27
- *  Aenderung   :
-

LibreOffice 4.3~alpha1 bibisect

2014-05-15 Thread Bjoern Michaelsen

Hi all,

I just uploaded an update for the Canonical LibreOffice bibisect build on
Ubuntu 12.04 LTS (precise) repo for the range from LibreOffice 4.2 branchpoint
to LibreOffice 4.3 alpha1 and uploaded the builds to people.canonical.com. You
find link and the usual info at:

 https://wiki.documentfoundation.org/QA/HowToBibisect#Versions

When we hit LibreOffice 4.3 branchpoint (around the beta), I plan to update
again and merge the stuff into a 43all repository, but for now you should be
able to do a good amount of bibisecting on master with this already.

@Cloph: I seem to have lost my creds for dev-downloads.libreoffice.org again,
could you mirror the file there and add those links to the wiki too?

Best,

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

[Libreoffice-commits] core.git: 7 commits - avmedia/source slideshow/source

2014-05-15 Thread Zolnai Tamás

 avmedia/source/opengl/oglplayer.cxx   |1 
 avmedia/source/opengl/oglwindow.cxx   |   93 ++
 avmedia/source/opengl/oglwindow.hxx   |1 
 slideshow/source/engine/shapes/viewmediashape.cxx |   33 +--
 slideshow/source/engine/shapes/viewmediashape.hxx |5 -
 5 files changed, 91 insertions(+), 42 deletions(-)

New commits:
commit 3efddb093e72c100bc609ec691effb4563af2c20
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu May 15 12:54:57 2014 +0200

OGLWindow: First try to rotate camera

For now its too slow to render by mousemove so
use mousebuttonup instead.
It seems gltf_renderer_rotate_camera() method does not rotate
the camera but set the new position of it.

Change-Id: I0fe7895720dbf95acb0963a5ba6dd2a5840d8f6b

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index f32070a..ca2ffbf 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -20,6 +20,7 @@ OGLWindow::OGLWindow( glTFHandle* pHandle, OpenGLContext* 
pContext, SystemChildW
 , m_pEventHandler( pChildWindow-GetParent() )
 , m_bVisible ( false )
 , meZoomLevel( media::ZoomLevel_ORIGINAL )
+, m_aLastMousePos(Point())
 {
 }
 
@@ -276,12 +277,34 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 if(nCode == KEY_W)vMoveBy -= vMup*(0.1f*fModelSize);
 if(nCode == KEY_S)vMoveBy += vMup*(0.1f*fModelSize);
 }
-
 gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,10.0);
 update();
 }
 }
 }
+else if( pEvent-GetId() == VCLEVENT_WINDOW_MOUSEBUTTONDOWN )
+{
+MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
+if(pMouseEvt  pMouseEvt-IsLeft()  pMouseEvt-GetClicks() == 1)
+{
+m_aLastMousePos = pMouseEvt-GetPosPixel();
+}
+}
+else if( pEvent-GetId() == VCLEVENT_WINDOW_MOUSEBUTTONUP )
+{
+MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
+if(pMouseEvt  pMouseEvt-IsLeft())
+{
+const Point aCurPos = pMouseEvt-GetPosPixel();
+
+long nDeltaX = m_aLastMousePos.X()-aCurPos.X();
+long nDeltaY = aCurPos.Y()-m_aLastMousePos.Y();
+static const float fSensitivity = 4.0;
+// TODO: It seems this method just moves the camera but not rotate 
it.
+
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,10.0);
+update();
+}
+}
 return 0;
 }
 
diff --git a/avmedia/source/opengl/oglwindow.hxx 
b/avmedia/source/opengl/oglwindow.hxx
index e7b0d3a..ba510e4 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -70,6 +70,7 @@ private:
 Window* m_pEventHandler;
 bool m_bVisible;
 com::sun::star::media::ZoomLevel meZoomLevel;
+Point m_aLastMousePos;
 };
 
 } // namespace ogl
commit 882e1bb2db4d84d8349657153cfe14363d5d9da4
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed May 14 10:49:10 2014 +0200

OGLWindow: use update function for redrawing.

Change-Id: Icca39a44d6a4437f20d120b4032a39f7e74ac066

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index f798718..f32070a 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -250,8 +250,6 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 nCode == KEY_A || nCode == KEY_D ||
 nCode == KEY_W || nCode == KEY_S )
 {
-m_pContext-makeCurrent();
-
 // Calculate movement
 glm::vec3 vMoveBy;
 {
@@ -280,10 +278,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 }
 
 gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,10.0);
-gltf_prepare_renderer(m_pHandle);
-gltf_renderer(m_pHandle);
-gltf_complete_renderer();
-m_pContext-swapBuffers();
+update();
 }
 }
 }
commit 9ba99cbfcf793539f47f34fd637a48f97a249920
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu May 15 12:51:13 2014 +0200

OGLWindow: move camera only when one of the key candidates is pressed

Change-Id: I52b3d100512cad569a53d10c9dc819e4548ba928

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index 8f9eefa..f798718 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -246,40 +246,45 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 if(pKeyEvt)
 {
 const sal_uInt16 nCode = pKeyEvt-GetKeyCode().GetCode();
-m_pContext-makeCurrent();
-
-// Calculate

[Bug 58989] Transfer Localization info to EXTENSIONSWEBSITE

2014-05-15 Thread bugzilla-daemon

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

Bug 58989 depends on bug 51932, which changed state.

Bug 51932 Summary: EXTENSIONSWEBSITE: Localization very incomplete
https://bugs.freedesktop.org/show_bug.cgi?id=51932

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

-- 
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: Installation dependency bug reports

2014-05-15 Thread Christian Lohmaier

Hi Joren,

On Fri, May 9, 2014 at 11:55 PM, Joren DC jore...@libreoffice.org wrote:
 Hi,

 Can a developer please have a look to:
 * bug 77293 (https://bugs.freedesktop.org/show_bug.cgi?id=77293)

likely a broken download. This is not a dependency problem, but a
broken file. Either bitswap when extracting or ran out of diskspace
when extracting or similar, anyway: Old version, thus of no
interest/if it would be general problem, ~no user would have been able
to install it.

 * bug 78234 (https://bugs.freedesktop.org/show_bug.cgi?id=78234)

duplicate, although it lacks the interesting details, but master
wasn't adapted yet.

 Both reports are about a failing installation. As far I can see it looks
 like they fail both on the same error (failing installation of libobasis4.2
 or lodevbasis4.3).

Nope, those are not related. dependency problem is a bug with the
addtional version info that the debian packages don't take into
account properly.  Pointers are in the relevant bug (flagged it as
dupe)

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

[Libreoffice-commits] core.git: dictionaries

2014-05-15 Thread David Tardon

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

New commits:
commit 29abc8981d9bf564754e334b1ec81ddc3ecbebaa
Author: David Tardon dtar...@redhat.com
Date:   Thu May 15 14:49:42 2014 +0200

Updated core
Project: dictionaries  b31244205066114f5721beef118be7f9e518cd22

diff --git a/dictionaries b/dictionaries
index 38b1410..b312442 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 38b1410ca674bd47d218e4e77cf90e6adcc6d87c
+Subproject commit b31244205066114f5721beef118be7f9e518cd22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

2014-05-15 Thread David Tardon

 readlicense_oo/license/LICENSE  |   24 +---
 readlicense_oo/license/LICENSE.fodt |6 ++
 readlicense_oo/license/LICENSE.html |   26 +-
 3 files changed, 12 insertions(+), 44 deletions(-)

New commits:
commit 723b88f72420459cc22a851f7d882b8574745d2d
Author: David Tardon dtar...@redhat.com
Date:   Thu May 15 15:00:05 2014 +0200

fix license for Czech thesaurus

Change-Id: I103d114442131add6644d01d47bf705aa57685dd

diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index a82e6b6..33c9a13 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -3508,26 +3508,12 @@ Czech
thesaurus. Use of any of this software is governed by the terms of the
license below:
 
-   Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz,
-   NLPlab, Faculty of Informatics, Masaryk University
+   Copyright (c) 1994,2008 Karel Pala, Jan VÅ¡ianskÃ½
+   p...@fi.muni.cz
 
-   Permission is hereby granted, free of charge, to any person obtaining a
-   copy of this data (the Data), to deal in the Data without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies of
-   the Data, and to permit persons to whom the Data is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Data.
-
-   THE DATA ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA
-   OR THE USE OR OTHER DEALINGS IN THE DATA.
+   You can freely use the thesaurus in OpenOffice.org (or its derivatives).
+   You can not modify it or use for commercial purposes without the author's
+   approval.
 
 Croatian
 
diff --git a/readlicense_oo/license/LICENSE.fodt 
b/readlicense_oo/license/LICENSE.fodt
index c3c8dd5..8b7d54b 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -4490,10 +4490,8 @@
text:h text:style-name=Heading_20_2 text:outline-level=2Czech/text:h
text:h text:style-name=Heading_20_3 
text:outline-level=3Thesaurus/text:h
text:p text:style-name=StandardThe following software may be included 
in this product: Czech thesaurus. Use of any of this software is governed by 
the terms of the license below:/text:p
-   text:p text:style-name=StandardCopyright (c) 2002 Pavel Rychly, Pavel 
Smrz, {pary,smrz}@fi.muni.cz, text:s text:c=10/NLPlab, Faculty of 
Informatics, Masaryk University/text:p
-   text:p text:style-name=StandardPermission is hereby granted, free of 
charge, to any person obtaining a copy of this data (the quot;Dataquot;), to 
deal in the Data without restriction, including without limitation the rights 
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
copies of the Data, and to permit persons to whom the Data is furnished to do 
so, subject to the following conditions:/text:p
-   text:p text:style-name=StandardThe above copyright notice and this 
permission notice shall be included in all copies or substantial portions of 
the Data./text:p
-   text:p text:style-name=StandardTHE DATA ARE PROVIDED quot;AS ISquot;, 
WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO 
THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE 
USE OR OTHER DEALINGS IN THE DATA./text:p
+   text:p text:style-name=StandardCopyright (c) 1994,2008 Karel Pala, Jan 
VÅ¡ianskÃ½text:line-break/p...@fi.muni.cz/text:p
+   text:p text:style-name=StandardYou can freely use the thesaurus in 
OpenOffice.org (or its derivatives). You can not modify it or use for 
commercial purposes without the author's approval./text:p
text:h text:style-name=Heading_20_2 
text:outline-level=2text:soft-page-break/Croatian/text:h
text:h text:style-name=Heading_20_3 text:outline-level=3Spelling 
dictionary/text:h
text:p text:style-name=StandardThe following software may be included 
in this product: Croatian spelling dictionary. Use of any of this software is 
governed by the terms of the license below:/text:p
diff --git a/readlicense_oo/license/LICENSE.html 
b/readlicense_oo/license/LICENSE.html
index 56d1809..6ee0b12 100644
--- a/readlicense_oo/license/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
@@ -3530,27 +3530,11 @@ to LGPL

patchview in gerrit - everyone happy or needs some bigger revamp?

2014-05-15 Thread Christian Lohmaier

Hi *,

is there still demand for a customized patchset view on gerrit?

a list lists the following items:

have important things on that page without JavaScript clicking
the commit message on top
the Review, Abandon, Rebase buttons right below that (removing the two
useless Diff-Buttons)
comments against the latest patch expanded (latest comment first)
older comments collapsed (thus taking no space)
the latest patchset including a full diff and all inline comments
delegate everything else to a 300px right-hand sidebar (a la
launchpads bugview layout1):
Owner, Branch, Topic, Dates, Reviewers, older versions of the change ...
= This should allow ideally to review the change with one view, as
commit message, diff, relevant comments (if any) are all on one page
and visible from the start.

Is there demand, or are people happy with using the combination of
gitweb and gerrit's own patchview?

Any burning topics that you hate about gerrit's interface?

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

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

2014-05-15 Thread Stephan Bergmann

 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx |   65 
+-
 1 file changed, 38 insertions(+), 27 deletions(-)

New commits:
commit 08947735f9cc4b7bd69676c9dd4d1700e8e3b15b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 15 15:13:54 2014 +0200

Work around Clang -fsanitize=address inline asm error

Change-Id: Ia37b21af217af9b24522da28e817b4cb6ca2f8c9

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
index 47b8f13..084d5e5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
@@ -57,10 +57,27 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 if ( nGPR  x86_64::MAX_GPR_REGS )
 nGPR = x86_64::MAX_GPR_REGS;
 
+// Work around Clang -fsanitize=address inline assembly requires more
+// registers than available error:
+struct Data {
+sal_uInt64 pMethod;
+sal_uInt64 * pGPR;
+double * pFPR;
+sal_uInt64 nFPR;
+// Return values:
+sal_uInt64 rax;
+sal_uInt64 rdx;
+double xmm0;
+double xmm1;
+} data;
+data.pGPR = pGPR;
+data.pFPR = pFPR;
+data.nFPR = nFPR;
+
 // Get pointer to method
 sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
 pMethod += 8 * nVtableIndex;
-pMethod = *((sal_uInt64 *)pMethod);
+data.pMethod = *((sal_uInt64 *)pMethod);
 
 // Load parameters to stack, if necessary
 sal_uInt64* pCallStack = NULL;
@@ -72,16 +89,10 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 std::memcpy( pCallStack, pStack, nStackBytes );
 }
 
-// Return values
-sal_uInt64 rax;
-sal_uInt64 rdx;
-double xmm0;
-double xmm1;
-
 asm volatile (
 
 // Fill the xmm registers
-movq %6, %%rax\n\t
+movq 16%0, %%rax\n\t
 
 movsd   (%%rax), %%xmm0\n\t
 movsd  8(%%rax), %%xmm1\n\t
@@ -93,7 +104,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 movsd 56(%%rax), %%xmm7\n\t
 
 // Fill the general purpose registers
-movq %5, %%rax\n\t
+movq 8%0, %%rax\n\t
 
 movq(%%rax), %%rdi\n\t
 movq   8(%%rax), %%rsi\n\t
@@ -103,46 +114,46 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 movq  40(%%rax), %%r9\n\t
 
 // Perform the call
-movq %4, %%r11\n\t
-movq %7, %%rax\n\t
+movq 0%0, %%r11\n\t
+movq 24%0, %%rax\n\t
 call *%%r11\n\t
 
 // Fill the return values
-movq   %%rax, %0\n\t
-movq   %%rdx, %1\n\t
-movsd %%xmm0, %2\n\t
-movsd %%xmm1, %3\n\t
-: =m ( rax ), =m ( rdx ), =m ( xmm0 ), =m ( xmm1 )
-: m ( pMethod ), m ( pGPR ), m ( pFPR ), m ( nFPR ),
+movq   %%rax, 32%0\n\t
+movq   %%rdx, 40%0\n\t
+movsd %%xmm0, 48%0\n\t
+movsd %%xmm1, 56%0\n\t
+:: o (data),
   m ( pCallStack ) // dummy input to prevent the compiler from 
optimizing the alloca out
 : rax, rdi, rsi, rdx, rcx, r8, r9, r10, r11,
   xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-  xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
+  xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
+  memory
 );
 
 switch (pReturnTypeRef-eTypeClass)
 {
 case typelib_TypeClass_HYPER:
 case typelib_TypeClass_UNSIGNED_HYPER:
-*reinterpret_castsal_uInt64 *( pRegisterReturn ) = rax;
+*reinterpret_castsal_uInt64 *( pRegisterReturn ) = data.rax;
 break;
 case typelib_TypeClass_LONG:
 case typelib_TypeClass_UNSIGNED_LONG:
 case typelib_TypeClass_ENUM:
-*reinterpret_castsal_uInt32 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt32*( rax );
+*reinterpret_castsal_uInt32 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt32*( data.rax );
 break;
 case typelib_TypeClass_CHAR:
 case typelib_TypeClass_SHORT:
 case typelib_TypeClass_UNSIGNED_SHORT:
-*reinterpret_castsal_uInt16 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt16*( rax );
+*reinterpret_castsal_uInt16 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt16*( data.rax );
 break;
 case typelib_TypeClass_BOOLEAN:
 case typelib_TypeClass_BYTE:
-*reinterpret_castsal_uInt8 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt8*( rax );
+*reinterpret_castsal_uInt8 *( pRegisterReturn ) = 
*reinterpret_castsal_uInt8*( data.rax );
 break;
 case typelib_TypeClass_FLOAT:
 case typelib_TypeClass_DOUBLE:
-*reinterpret_castdouble *( pRegisterReturn ) = xmm0;
+*reinterpret_castdouble *( pRegisterReturn ) = data.xmm0;
 break;
 default:
 {
@@ -150,12 +161,12 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 if (bSimpleReturn  nRetSize = 16  nRetSize  0)
 {

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

2014-05-15 Thread Markus Mohrhard

 external/nss/UnpackedTarball_nss.mk |6 ++
 external/nss/asan.patch.1   |   12 
 2 files changed, 18 insertions(+)

New commits:
commit 3c5bc3128f8ade4e52069204df2da6c00ffb3806
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue May 13 02:12:17 2014 +0200

-fsanitize=address does not like -z defs

Change-Id: Id2a5c3009b46f9f91706b433411ca9f9c3cb7e39
Reviewed-on: https://gerrit.libreoffice.org/9334
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 17eb436..9ac8241 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,4 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.mingw.patch.3) \
 ))
 
+ifeq ($(COM_GCC_IS_CLANG)$(filter 
-fsanitize=address,$(CC)),TRUE-fsanitize=address)
+$(eval $(call gb_UnpackedTarball_add_patches,nss,\
+   external/nss/asan.patch.1 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
new file mode 100644
index 000..3b64aa6
--- /dev/null
+++ b/external/nss/asan.patch.1
@@ -0,0 +1,12 @@
+diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
+--- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
+@@ -145,7 +145,7 @@
+ # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
+-ZDEFS_FLAG= -Wl,-z,defs
++ZDEFS_FLAG=
+ DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ LDFLAGS   += $(ARCHFLAG)
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Problems in the Make

2014-05-15 Thread Klaibson Ribeiro



Good Morning.

I have the problem in the compilation of make

cd /home/klaibson/libreoffice/external/tarballs/tmp  wget 
--progress=dot:mega -Q 0 -P . -l 0 -nd -nH -N 
http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll 
21 | tee -a /home/klaibson/libreoffice/external/tarballs/fetch.log  
[ $PIPESTATUS -eq 0 ]  SUM=`md5sum 
185d60944ea767075d27247c3162b3bc-unowinreg.dll | sed s/ .*//`  if 
test $SUM != 185d60944ea767075d27247c3162b3bc-unowinreg.dll; then 
echo ERROR: expected checksum for 
185d60944ea767075d27247c3162b3bc-unowinreg.dll is 
185d60944ea767075d27247c3162b3bc-unowinreg.dll 21 | tee -a 
/home/klaibson/libreoffice/external/tarballs/fetch.log; false; fi  mv 
185d60944ea767075d27247c3162b3bc-unowinreg.dll ../
--2014-05-15 10:03:54--  
http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Resolvendo dev-www.libreoffice.org (dev-www.libreoffice.org)... 
195.135.221.70, 2001:67c:2178:7::70
Conectando-se a dev-www.libreoffice.org 
(dev-www.libreoffice.org)|195.135.221.70|:80... conectado.

A requisição HTTP foi enviada, aguardando resposta... 200 OK
Tamanho: 12288 (12K) [text/plain]
O arquivo no servidor não é mais novo que o local 
“./185d60944ea767075d27247c3162b3bc-unowinreg.dll” -- ignorando.


ERROR: expected checksum for 
185d60944ea767075d27247c3162b3bc-unowinreg.dll is 
185d60944ea767075d27247c3162b3bc-unowinreg.dll

make: ** [/home/klaibson/libreoffice/workdir/download] Erro 1


Someone help me?

Good week.


--
KLAIBSON RIBEIRO
Graduado em Administração de Empresas - UNISUL
Currículo Lattes - http://lattes.cnpq.br/4254300895959474
Pós-graduando em Educação Tecnológica e Profissional - CETIQT/Senai
Membro da Associação Software Livre de Santa Catarina - SOLISC -
www.solisc.org.br
Membro da Comunidade LibreOffice - pt-br.libreoffice.org
Membro da The Document Foundation -
www.documentfoundation.org/foundation/members/
Usuário Linux: 559705 - Registre-se é de graça - http://counter.li.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Problems in the Make

2014-05-15 Thread Markus Mohrhard

Hey,

this has been fixed already. You need to pull again and I had to remove the
tarballs in external/tarballs as well.

Regards,
Markus


2014-05-15 15:39 GMT+02:00 Klaibson Ribeiro klaib...@libreoffice.org:


 Good Morning.

 I have the problem in the compilation of make

 cd /home/klaibson/libreoffice/external/tarballs/tmp  wget
 --progress=dot:mega -Q 0 -P . -l 0 -nd -nH -N
 http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3
 bc-unowinreg.dll 21 | tee -a 
 /home/klaibson/libreoffice/external/tarballs/fetch.log
  [ $PIPESTATUS -eq 0 ]  SUM=`md5sum 
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 | sed s/ .*//`  if test $SUM != 
 185d60944ea767075d27247c3162b3bc-unowinreg.dll;
 then echo ERROR: expected checksum for 
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 is 185d60944ea767075d27247c3162b3bc-unowinreg.dll 21 | tee -a
 /home/klaibson/libreoffice/external/tarballs/fetch.log; false; fi  mv
 185d60944ea767075d27247c3162b3bc-unowinreg.dll ../
 --2014-05-15 10:03:54--  http://dev-www.libreoffice.org/extern/
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 Resolvendo dev-www.libreoffice.org (dev-www.libreoffice.org)...
 195.135.221.70, 2001:67c:2178:7::70
 Conectando-se a dev-www.libreoffice.org (dev-www.libreoffice.org)|
 195.135.221.70|:80... conectado.
 A requisição HTTP foi enviada, aguardando resposta... 200 OK
 Tamanho: 12288 (12K) [text/plain]
 O arquivo no servidor não é mais novo que o local “./
 185d60944ea767075d27247c3162b3bc-unowinreg.dll” -- ignorando.

 ERROR: expected checksum for 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 is 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 make: ** [/home/klaibson/libreoffice/workdir/download] Erro 1


 Someone help me?

 Good week.


 --
 KLAIBSON RIBEIRO
 Graduado em Administração de Empresas - UNISUL
 Currículo Lattes - http://lattes.cnpq.br/4254300895959474
 Pós-graduando em Educação Tecnológica e Profissional - CETIQT/Senai
 Membro da Associação Software Livre de Santa Catarina - SOLISC -
 www.solisc.org.br
 Membro da Comunidade LibreOffice - pt-br.libreoffice.org
 Membro da The Document Foundation -
 www.documentfoundation.org/foundation/members/
 Usuário Linux: 559705 - Registre-se é de graça - http://counter.li.org
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

2014-05-15 Thread Stephan Bergmann

 chart2/source/view/charttypes/GL3DBarChart.cxx |1 -
 chart2/source/view/inc/GL3DBarChart.hxx|1 -
 2 files changed, 2 deletions(-)

New commits:
commit a994503f23ae3f1d88afbdb8146cdc93453fdc85
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 15 15:44:31 2014 +0200

-Werror,-Wunused-private-field

Change-Id: Iede16b58830e9605943b87528b3f5569035b8449

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 98f015b..68c9093 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -26,7 +26,6 @@ namespace chart {
 GL3DBarChart::GL3DBarChart(
 const css::uno::Referencecss::chart2::XChartType xChartType,
 OpenGLWindow rWindow) :
-mbPickingMode(false),
 mxChartType(xChartType),
 mpRenderer(new opengl3D::OpenGL3DRenderer()),
 mrWindow(rWindow),
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index bd09caa..cc252cf 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -49,7 +49,6 @@ public:
 virtual void clickedAt(const Point rPos) SAL_OVERRIDE;
 
 private:
-bool mbPickingMode;
 css::uno::Referencecss::chart2::XChartType mxChartType;
 boost::ptr_vectoropengl3D::Renderable3DObject maShapes;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice 4.3~alpha1 bibisect

2014-05-15 Thread Christian Lohmaier

Bi Björn, *,

On Thu, May 15, 2014 at 2:12 PM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:
 [...]
 @Cloph: I seem to have lost my creds for dev-downloads.libreoffice.org again,
 could you mirror the file there and add those links to the wiki too?

In progress - you likely just forgot to use a non-default portnumber (2223)?

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

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

2014-05-15 Thread Kohei Yoshida

 svtools/source/contnr/treelist.cxx |   53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

New commits:
commit b79b8d2c613588f6a0175160c7f0a1161ea84b35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu May 15 09:55:49 2014 -0400

Sort ptr_vector using its own sort() method.

This also fixes memory leak via nested calls of release().

Change-Id: I3ba90901366319bb3ee870903130042b375f733c

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 0d92afd..a64c1e0 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1509,6 +1509,23 @@ void SvTreeList::Resort()
 Broadcast( LISTACTION_RESORTED );
 }
 
+namespace {
+
+class SortComparator : public 
std::binary_functionSvTreeListEntry,SvTreeListEntry,bool
+{
+SvTreeList mrList;
+public:
+
+SortComparator( SvTreeList rList ) : mrList(rList) {}
+
+bool operator() ( const SvTreeListEntry pLeft, const SvTreeListEntry 
pRight ) const
+{
+return mrList.Compare(pLeft, pRight)  0;
+}
+};
+
+}
+
 void SvTreeList::ResortChildren( SvTreeListEntry* pParent )
 {
 DBG_ASSERT(pParent,Parent not set);
@@ -1516,38 +1533,18 @@ void SvTreeList::ResortChildren( SvTreeListEntry* 
pParent )
 if (pParent-maChildren.empty())
 return;
 
-// TODO: Re-implement this using ptr_vector's sort method.
-
-std::vectorSvTreeListEntry* aStore; // Temporarily store entries.
-aStore.reserve(pParent-maChildren.size());
-{
-SvTreeListEntries::iterator it = pParent-maChildren.begin(), itEnd = 
pParent-maChildren.end();
-for (; it != itEnd; ++it)
-{
-SvTreeListEntry* p = (*it);
-aStore.push_back(p);
-}
-}
-pParent-maChildren.release().release(); // Release all stored entries and 
empty the container.
+SortComparator aComp(*this);
+pParent-maChildren.sort(aComp);
 
-std::vectorSvTreeListEntry*::iterator it = aStore.begin(), itEnd = 
aStore.end();
+// Recursively sort child entries.
+SvTreeListEntries::iterator it = pParent-maChildren.begin(), itEnd = 
pParent-maChildren.end();
 for (; it != itEnd; ++it)
 {
-SvTreeListEntry* p = *it;
-sal_uLong nListPos = TREELIST_APPEND;
-GetInsertionPos(p, pParent, nListPos);
-if (nListPos  pParent-maChildren.size())
-{
-SvTreeListEntries::iterator itPos = pParent-maChildren.begin();
-std::advance(itPos, nListPos);
-pParent-maChildren.insert(itPos, p);
-}
-else
-pParent-maChildren.push_back(p);
-if (!p-maChildren.empty())
-// Recursively sort child entries.
-ResortChildren(p);
+SvTreeListEntry r = *it;
+if (!r.maChildren.empty())
+ResortChildren(r);
 }
+
 SetListPositions(pParent-maChildren); // correct list position in target 
list
 }
 
___
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' - c6/e0325df6efce45dbb2616a32b7745c449c6c58

2014-05-15 Thread Caolán McNamara

 c6/e0325df6efce45dbb2616a32b7745c449c6c58 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f2c3ad39ba765cd271e84cbf9960328fe8b5a758
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:04:22 2014 +0100

Notes added by 'git notes add'

diff --git a/c6/e0325df6efce45dbb2616a32b7745c449c6c58 
b/c6/e0325df6efce45dbb2616a32b7745c449c6c58
new file mode 100644
index 000..552152d
--- /dev/null
+++ b/c6/e0325df6efce45dbb2616a32b7745c449c6c58
@@ -0,0 +1 @@
+merged as: a908e4eb41b83d051232f9e551e779e77c9a9c4f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source include/osl include/rtl odk/Package_odk_headers.mk sal/inc sal/osl sal/qa sal/rtl

2014-05-15 Thread Caolán McNamara

 connectivity/source/drivers/postgresql/pq_allocator.hxx   |  190 
--
 connectivity/source/drivers/postgresql/pq_connection.cxx  |6 
 connectivity/source/drivers/postgresql/pq_connection.hxx  |9 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx|6 
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx   |2 
 connectivity/source/drivers/postgresql/pq_statics.hxx |7 
 connectivity/source/drivers/postgresql/pq_tools.cxx   |7 
 connectivity/source/drivers/postgresql/pq_tools.hxx   |5 
 connectivity/source/drivers/postgresql/pq_updateableresultset.hxx |2 
 connectivity/source/drivers/postgresql/pq_xcontainer.hxx  |3 
 include/osl/diagnose.hxx  |4 
 include/rtl/allocator.hxx |  175 
-
 odk/Package_odk_headers.mk|1 
 sal/inc/pch/precompiled_sal.hxx   |1 
 sal/osl/all/debugbase.cxx |2 
 sal/osl/w32/path_helper.hxx   |1 
 sal/osl/w32/procimpl.cxx  |2 
 sal/qa/osl/process/osl_process.cxx|4 
 sal/rtl/bootstrap.cxx |9 
 19 files changed, 22 insertions(+), 414 deletions(-)

New commits:
commit 73d4d9a5834bf5eb92c2643e30bec9d307d00175
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 14:23:18 2014 +0100

Related: #i124896# remove obsoleted pq_allocator.hxx

Change-Id: I8a2b54c97f20e581b9703bf33dbba537c2f603c2

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx 
b/connectivity/source/drivers/postgresql/pq_allocator.hxx
deleted file mode 100644
index e48d164..000
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- *  Effective License of whole file:
- *
- *This library is free software; you can redistribute it and/or
- *modify it under the terms of the GNU Lesser General Public
- *License version 2.1, as published by the Free Software Foundation.
- *
- *This library is distributed in the hope that it will be useful,
- *but WITHOUT ANY WARRANTY; without even the implied warranty of
- *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *Lesser General Public License for more details.
- *
- *You should have received a copy of the GNU Lesser General Public
- *License along with this library; if not, write to the Free Software
- *Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *MA  02111-1307  USA
- *
- *  Parts Copyright by Sun Microsystems, Inc prior to August 2011:
- *
- *The Contents of this file are made available subject to the terms of
- *the GNU Lesser General Public License Version 2.1
- *
- *Copyright: 2002 by Sun Microsystems, Inc.
- *
- *  All parts contributed on or after August 2011:
- *
- *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/.
- *
- /
-
-#ifndef _PQ_ALLOCATOR_
-#define _PQ_ALLOCATOR_
-
-#include cstddef
-#include sal/types.h
-
-/** jbu: This source has been copied from sal/inc/internal/allocator.hxx,
- because it is not a public interface. Thx a lot for figuring this
- out.
- */
-
-
-// This is no general purpose STL allocator but one
-// necessary to use STL for some implementation but
-// avoid linking sal against the STLPort library!!!
-// For more information on when and how to define a
-// custom stl allocator have a look at Scott Meyers:
-// Effective STL, Nicolai M. Josuttis:
-// The C++ Standard Library - A Tutorial and Reference
-// and at http://www.josuttis.com/cppcode/allocator.html
-
-namespace pq_sdbc_driver {
-
-templateclass T
-class Allocator
-{
-public:
-typedef T value_type;
-typedef T* pointer;
-typedef const T* const_pointer;
-typedef T reference;
-typedef const T const_reference;
-typedef ::std::size_t size_type;
-typedef ::std::ptrdiff_t difference_type;
-
-
-templateclass U
-struct rebind
-{
-typedef AllocatorU other;
-};
-
-
-pointer address (reference value) const
-{
-return value;
-}
-
-
-const_pointer address (const_reference value) const
-{
-return value;
-}
-
-
-Allocator() SAL_THROW(())
-{}
-
-
-templateclass U
-Allocator (const AllocatorU) SAL_THROW(())
-{}
-
-
-

Re: Problems in the Make

2014-05-15 Thread David Tardon

Hi,

On Thu, May 15, 2014 at 03:42:41PM +0200, Markus Mohrhard wrote:
 Hey,
 
 this has been fixed already. You need to pull again and I had to remove the
 tarballs in external/tarballs as well.

Touching download.lst or Makefile.fetch should be enough to force make
to retry the downloads.

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||77891

-- 
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 75025] LibreOffice 4.3 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|77891   |

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl

2014-05-15 Thread Herbert Dürr

 stlport/systemstl/hash_map |   18 --
 stlport/systemstl/hash_set |   18 --
 stlport/systemstl/slist|6 +++---
 3 files changed, 19 insertions(+), 23 deletions(-)

New commits:
commit 5d3e7996df43efe1f5fa8e584d60ad0a30775d5d
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 12:16:43 2014 +

#i124908# remove custom allocator support in stlport-replacement headers

with the sal-internal custom allocator removed AOO no longer needs the
stlport-replacement headers to support the complexity of containers with
non-default allocators. Xcode=5.1's libc++ runs into build problems with
such custom allocator support in the stlport-replacement headers because
of constness mismatches.

diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 5c2777f..812a51a 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -55,40 +55,38 @@ template
typename __K,
typename __T,
typename __H = hash__K,
-   typename __E = equal_to__K,
-   typename __A = allocatorpair__K,__T  
+   typename __E = equal_to__K 
 class hash_map
-:  public unordered_map__K,__T,__H,__E,__A
+:  public unordered_map__K,__T,__H,__E
 {
 public:
-   typedef unordered_map__K,__T,__H,__E,__A _super;
+   typedef unordered_map__K,__T,__H,__E _super;
 
hash_map( void) {}
hash_map( size_t n) : _super( n) {}
 
 private:
// setting the hasher dynamically is not supported in the emulation!
-   hash_map( size_t, const __H, const __E rE=__E(), const __A 
rA=__A()); // not implemented
+   hash_map( size_t, const __H, const __E rE=__E()); // not implemented
 };
 
 template
typename __K,
typename __T,
typename __H = hash__K,
-   typename __E = equal_to__K,
-   typename __A = allocatorpair__K,__T  
+   typename __E = equal_to__K 
 class hash_multimap
-:  public unordered_multimap__K,__T,__H,__E,__A
+:  public unordered_multimap__K,__T,__H,__E
 {
 public:
-   typedef unordered_multimap__K,__T,__H,__E,__A _super;
+   typedef unordered_multimap__K,__T,__H,__E _super;
 
hash_multimap( void) {}
hash_multimap( size_t n) : _super( n) {}
 
 private:
// setting the hasher dynamically is not supported in the emulation!
-   hash_multimap( size_t, const __H, const __E rE=__E(), const __A 
rA=__A()); // not implemented
+   hash_multimap( size_t, const __H, const __E rE=__E()); // not 
implemented
 };
 
 } // namespace std
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index a6bc33c..5435ee9 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -51,37 +51,35 @@ namespace std
 template
typename __K,
typename __H = hash__K,
-   typename __E = equal_to__K,
-   typename __A = allocator__K 
+   typename __E = equal_to__K 
 class hash_set
-:  public unordered_set__K,__H,__E,__A
+:  public unordered_set__K,__H,__E
 {
-   typedef unordered_set__K,__H,__E,__A _super;
+   typedef unordered_set__K,__H,__E _super;
 public:
hash_set( void) {}
hash_set( size_t n) : _super(n) {}
 
 private:
// setting the hasher dynamically is not supported in the emulation!
-   hash_set( size_t, const __H, const __E rE=__E(), const __A 
rA=__A()); // not implemented
+   hash_set( size_t, const __H, const __E rE=__E()); // not implemented
 };
 
 template
typename __K,
typename __H = hash__K,
-   typename __E = equal_to__K,
-   typename __A = allocator__K 
+   typename __E = equal_to__K 
 class hash_multiset
-:  public unordered_multiset__K,__H,__E,__A
+:  public unordered_multiset__K,__H,__E
 {
-   typedef unordered_multiset__K,__H,__E,__A _super;
+   typedef unordered_multiset__K,__H,__E _super;
 public:
hash_multiset( void) {}
hash_multiset( size_t n) : _super( n) {}
 
 private:
// setting the hasher dynamically is not supported in the emulation!
-   hash_multiset( size_t, const __H, const __E rE=__E(), const __A 
rA=__A()); // not implemented
+   hash_multiset( size_t, const __H, const __E rE=__E()); // not 
implemented
 };
 
 } // namespace std
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index a51fc24..4ff1514 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -57,11 +57,11 @@ namespace std
 using STLP4_SLIST_EMUBASE;
 
 // lame emulation of the pre-C++11 slist using the std::forward_list (or 
std::list)
-template typename T, class A=allocatorT 
-class slist : public STLP4_SLIST_EMUBASET,A
+template typename T 
+class slist : public STLP4_SLIST_EMUBASET
 {
 public:
-   typedef typename STLP4_SLIST_EMUBASET,A _super;
+   typedef typename STLP4_SLIST_EMUBASET _super;
typedef typename _super::iterator slist_mit;
typedef typename _super::const_iterator slist_cit;

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 27/6ee5d5d31e40fc0fa97465091811a2d3a91e50

2014-05-15 Thread Caolán McNamara

 27/6ee5d5d31e40fc0fa97465091811a2d3a91e50 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b6355378fc213f820b991cae7c008a3cc61ce8a6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:06:35 2014 +0100

Notes added by 'git notes add'

diff --git a/27/6ee5d5d31e40fc0fa97465091811a2d3a91e50 
b/27/6ee5d5d31e40fc0fa97465091811a2d3a91e50
new file mode 100644
index 000..ca91e61
--- /dev/null
+++ b/27/6ee5d5d31e40fc0fa97465091811a2d3a91e50
@@ -0,0 +1 @@
+prefer: b63524d269a792e20777a91e4ed7e8ceae7ff55f
___
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' - ea/26e7c8dc51192aff7cd89ae5f12669d0f1ef4a

2014-05-15 Thread Caolán McNamara

 ea/26e7c8dc51192aff7cd89ae5f12669d0f1ef4a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 99ccc2fdbbd2f191c010b72e88bc174f3d6bd4ee
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:10:19 2014 +0100

Notes added by 'git notes add'

diff --git a/ea/26e7c8dc51192aff7cd89ae5f12669d0f1ef4a 
b/ea/26e7c8dc51192aff7cd89ae5f12669d0f1ef4a
new file mode 100644
index 000..4c22eae
--- /dev/null
+++ b/ea/26e7c8dc51192aff7cd89ae5f12669d0f1ef4a
@@ -0,0 +1 @@
+prefer: 99c2a1c64b3517a4cbbc0ddcf9acd3e190188d1e
___
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' - 99/15536a74bb1a4e821537015a641f88f701e32b

2014-05-15 Thread Caolán McNamara

 99/15536a74bb1a4e821537015a641f88f701e32b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3ab20484ab9506751c0adf5e12928af36fbe1993
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:12:00 2014 +0100

Notes added by 'git notes add'

diff --git a/99/15536a74bb1a4e821537015a641f88f701e32b 
b/99/15536a74bb1a4e821537015a641f88f701e32b
new file mode 100644
index 000..59f1489
--- /dev/null
+++ b/99/15536a74bb1a4e821537015a641f88f701e32b
@@ -0,0 +1 @@
+prefer: 39f42b0b03489459540404dd218c38709853c021
___
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' - 5d/3e7996df43efe1f5fa8e584d60ad0a30775d5d

2014-05-15 Thread Caolán McNamara

 5d/3e7996df43efe1f5fa8e584d60ad0a30775d5d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fbc5b03f2003ec01c1feb351ff2984358f4d14e7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:13:05 2014 +0100

Notes added by 'git notes add'

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

Re: Problems in the Make

2014-05-15 Thread Klaibson Ribeiro


Hi.

Remove all tarballs the file download.lst or Makefile.fetch?

Good week.


Em 15.05.2014 11:04, David Tardon escreveu:

Hi,

On Thu, May 15, 2014 at 03:42:41PM +0200, Markus Mohrhard wrote:

Hey,

this has been fixed already. You need to pull again and I had to 
remove the

tarballs in external/tarballs as well.


Touching download.lst or Makefile.fetch should be enough to force make
to retry the downloads.

D.


--
KLAIBSON RIBEIRO
Graduado em Administração de Empresas - UNISUL
Currículo Lattes - http://lattes.cnpq.br/4254300895959474
Pós-graduando em Educação Tecnológica e Profissional - CETIQT/Senai
Membro da Associação Software Livre de Santa Catarina - SOLISC -
www.solisc.org.br
Membro da Comunidade LibreOffice - pt-br.libreoffice.org
Membro da The Document Foundation -
www.documentfoundation.org/foundation/members/
Usuário Linux: 559705 - Registre-se é de graça - http://counter.li.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/e124496ac74172f41ed2e116fd554130036824

2014-05-15 Thread Caolán McNamara

 0e/e124496ac74172f41ed2e116fd554130036824 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 63c8524842ce8462d118f3f3588abb6c1f1a74b5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 15:19:57 2014 +0100

Notes added by 'git notes add'

diff --git a/0e/e124496ac74172f41ed2e116fd554130036824 
b/0e/e124496ac74172f41ed2e116fd554130036824
new file mode 100644
index 000..fa4548f
--- /dev/null
+++ b/0e/e124496ac74172f41ed2e116fd554130036824
@@ -0,0 +1 @@
+merged as: f4ea8c2f73034cd43aca4262994e8a9aaa118b0a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Problems in the Make

2014-05-15 Thread David Tardon

Hi,

On Thu, May 15, 2014 at 11:16:03AM -0300, Klaibson Ribeiro wrote:
 Hi.
 
 Remove all tarballs the file download.lst or Makefile.fetch?

I do not understand your question :-) But to clarify what I said: make
fetch creates a guard file when it has finished downloading so it does
not try to download anything again on the next run. Unless something has
changed. Touching either download.lst or Makefile.fetch supplies that
something has changed event :-)

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||77891

--- Comment #9 from tommy27 ba...@quipo.it ---
added Bug 77891 - LibO crashes as soon as one enters text in a module

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

2014-05-15 Thread Takeshi Abe

 sc/source/ui/dbgui/pvfundlg.cxx   |4 ++--
 sc/source/ui/docshell/docsh3.cxx  |6 ++
 sc/source/ui/docshell/docsh4.cxx  |   22 ++
 sc/source/ui/drawfunc/drawsh.cxx  |   30 ++
 sc/source/ui/drawfunc/drawsh5.cxx |9 +++--
 5 files changed, 27 insertions(+), 44 deletions(-)

New commits:
commit e9c5f63f80ea54aea9963a6c268ed03881d7b734
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu May 15 23:32:47 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I7dc862794f7f0973bd4de7b54f7a1fb15235bc3e

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 59cf31e..7aca31e 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -39,6 +39,7 @@
 #include dputil.hxx
 
 #include vector
+#include boost/scoped_ptr.hpp
 
 using namespace ::com::sun::star::sheet;
 
@@ -499,10 +500,9 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn )
 {
 if (pBtn == mpBtnOptions)
 {
-ScDPSubtotalOptDlg* pDlg = new ScDPSubtotalOptDlg( this, mrDPObj, 
maLabelData, mrDataFields, mbEnableLayout );
+boost::scoped_ptrScDPSubtotalOptDlg pDlg(new ScDPSubtotalOptDlg( 
this, mrDPObj, maLabelData, mrDataFields, mbEnableLayout ));
 if( pDlg-Execute() == RET_OK )
 pDlg-FillLabelData( maLabelData );
-delete pDlg;
 }
 return 0;
 }
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 33bb671..f297c53 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -61,7 +61,7 @@
 #include conflictsdlg.hxx
 #include globstr.hrc
 #include markdata.hxx
-
+#include boost/scoped_ptr.hpp
 
 //  Redraw - Benachrichtigungen
 
@@ -653,11 +653,9 @@ void ScDocShell::ExecuteChangeCommentDialog( 
ScChangeAction* pAction, Window* pP
 aSet.Put( SvxPostItAuthorItem( aAuthor,  SID_ATTR_POSTIT_AUTHOR ) );
 aSet.Put( SvxPostItDateItem  ( aDate,SID_ATTR_POSTIT_DATE ) );
 
-ScRedComDialog* pDlg = new ScRedComDialog( pParent, 
aSet,this,pAction,bPrevNext);
+boost::scoped_ptrScRedComDialog pDlg(new ScRedComDialog( pParent, 
aSet,this,pAction,bPrevNext));
 
 pDlg-Execute();
-
-delete pDlg;
 }
 
 void ScDocShell::CompareDocument( ScDocument rOtherDoc )
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 3212694..dd9eaf8 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -97,6 +97,7 @@ using namespace ::com::sun::star;
 #include conditio.hxx
 #include sheetevents.hxx
 #include documentlinkmgr.hxx
+#include boost/scoped_ptr.hpp
 
 #define IS_SHARE_HEADER(set) \
 ((SfxBoolItem) \
@@ -328,7 +329,7 @@ void ScDocShell::Execute( SfxRequest rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, ScAbstractFactory create fail!);
 
-AbstractScColRowLabelDlg* pDlg = 
pFact-CreateScColRowLabelDlg(pParent, bRowHeaders, bColHeaders);
+boost::scoped_ptrAbstractScColRowLabelDlg 
pDlg(pFact-CreateScColRowLabelDlg(pParent, bRowHeaders, bColHeaders));
 OSL_ENSURE(pDlg, Dialog create fail!);
 if ( pDlg-Execute() == RET_OK )
 {
@@ -340,7 +341,6 @@ void ScDocShell::Execute( SfxRequest rReq )
 }
 else
 bOk = false;
-delete pDlg;
 }
 
 if (bOk)// ausfuehren
@@ -865,7 +865,7 @@ void ScDocShell::Execute( SfxRequest rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, ScAbstractFactory create 
fail!);
 
-AbstractScNewScenarioDlg* pNewDlg = 
pFact-CreateScNewScenarioDlg(GetActiveDialogParent(), aName, true, 
bSheetProtected);
+boost::scoped_ptrAbstractScNewScenarioDlg 
pNewDlg(pFact-CreateScNewScenarioDlg(GetActiveDialogParent(), aName, true, 
bSheetProtected));
 OSL_ENSURE(pNewDlg, Dialog create fail!);
 pNewDlg-SetScenarioData( aName, aComment, 
aColor, nFlags );
 if ( pNewDlg-Execute() == RET_OK )
@@ -874,7 +874,6 @@ void ScDocShell::Execute( SfxRequest rReq )
 ModifyScenario( nTab, aName, aComment, 
aColor, nFlags );
 rReq.Done();
 }
-delete pNewDlg;
 }
 }
 }
@@ -1137,8 +1136,8 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* 
_pParent, bool bJustQuer
 OUString aText( ScResId(

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

2014-05-15 Thread Thomas Arnhold

 sal/osl/w32/module.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 71e5b1ba256bd472e99118c1730fa89cc2b64dbd
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu May 15 16:55:58 2014 +0200

Related: #i124896# Remove Allocator from sal, too

Change-Id: I3b1c7ccb523232433421def6622e2fc75348ec5f

diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 0fd486c..86a8c4b 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -69,7 +69,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, 
sal_Int32 /*nRtldM
 //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
 if (h == NULL  Module-length  260)
 {
-std::vectorWCHAR, rtl::AllocatorWCHAR  vec(Module-length + 1);
+std::vectorWCHAR vec(Module-length + 1);
 DWORD len = 
GetShortPathNameW(reinterpret_castLPCWSTR(Module-buffer),
   reinterpret_castLPWSTR(vec[0]), 
Module-length + 1);
 if (len )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Kohei Yoshida

 svtools/source/contnr/treelist.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 71417f2b7236f6ab8d40153e30b89e69123140c5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu May 15 11:23:33 2014 -0400

Actually this empty() check here is redundant.

ResortChildren() does that at the very beginning.

Change-Id: I696c9d796cc6631048fb3d9409d6eda1085a7612

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index a64c1e0..e8f6608 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1541,8 +1541,7 @@ void SvTreeList::ResortChildren( SvTreeListEntry* pParent 
)
 for (; it != itEnd; ++it)
 {
 SvTreeListEntry r = *it;
-if (!r.maChildren.empty())
-ResortChildren(r);
+ResortChildren(r);
 }
 
 SetListPositions(pParent-maChildren); // correct list position in target 
list
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ITOMIG GmbH - license statement

2014-05-15 Thread David M. Gümbel

Hi,

for the record, here's our license statement.

  All past and present contributions to LibreOffice from ITOMIG GmbH
  are available under LGPLv3+/MPL.  Until further notice, all
  future contributions to LibreOffice from ITOMIG GmbH are available
  under LGPLv3+/MPL.

Cheers,


David
-- 
Dipl.-Inform. David M. Gümbel . . . . . . . . david.guem...@itomig.de
ITOMIG GmbH . . . . . . . . . . . . . . . . .Tel.: +49 7031 389 25 06
Otto-Lilienthal-Str. 36  . .  . . . . . . . . . http://www.itomig.de/
D-71034 Böblingen. . .  . . . . . . . . . . . http://www.itomig.de/fr
Geschäftsführer: David Gümbel. . . . HRB 728519 Amtsgericht Stuttgart
Sitz der Gesellschaft: Böblingen. . . . . . . . . . . . . . . . . . .
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Mac 10.6 support for future version

2014-05-15 Thread Norbert Thiebaud

As discussed recently wrt to c++11 support, it is desirable to
eventually drop 10.6 support.

With 10.9 release and Apple policy to allow free upgrade to 10.9 from
10.6/7/8, the market share
are switched dramatically in the last 6 months...
Today 10.9 + 10.8 represent about 80% of the = 10.6 market.
by the time the version _after_ 4.3 goes GA that number is going to be
much higher.

So I would recommend that we declare 10.6 and 10.7 'deprecated' as we
announce 4.3.. with the intent to switch our baseline to 10.8/64 bits
by the release after that... (tentatively 4.4)

Norbert

PS: there is other reasons to move the baseline beside c++1 support.
first and foremost is that we have only 1 box that is still a native
10.6... so we are one hardware failure away from not being able to
build it at all with the current resources.
otoh we do have 3 or 4 mac that can do 10.8 64 bits build.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-05-15 Thread Thomas Arnhold

 basctl/source/basicide/basicbox.hxx |1 
 basctl/source/basicide/baside2.hxx  |2 -
 basctl/source/basicide/bastype3.hxx |1 
 basctl/source/basicide/brkdlg.hxx   |1 
 basctl/source/basicide/iderdll.cxx  |1 
 basctl/source/basicide/macrodlg.hxx |2 -
 basctl/source/basicide/moduldlg.hxx |2 -
 basctl/source/basicide/objdlg.hxx   |1 
 basctl/source/inc/svheader.hxx  |   57 
 9 files changed, 68 deletions(-)

New commits:
commit 70895b691eb6bc0ab8d22d9b992b243562660bab
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu May 15 17:09:19 2014 +0200

remove legacy svheader.hxx

none of the corresponding headers is included...

Change-Id: I85061dc159ace0fd727e3d32e52b14c123690584

diff --git a/basctl/source/basicide/basicbox.hxx 
b/basctl/source/basicide/basicbox.hxx
index 559cc15..ea71b72 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -22,7 +22,6 @@
 
 #include doceventnotifier.hxx
 #include svl/stritem.hxx
-#include svheader.hxx
 #include sfx2/tbxctrl.hxx
 #include vcl/lstbox.hxx
 
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 7aa365e..41f1af8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -27,8 +27,6 @@
 #include breakpoint.hxx
 #include linenumberwindow.hxx
 
-#include svheader.hxx
-
 class ExtTextEngine;
 class ExtTextView;
 class SvxSearchItem;
diff --git a/basctl/source/basicide/bastype3.hxx 
b/basctl/source/basicide/bastype3.hxx
index 3c6307e..cf732b1 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE3_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE3_HXX
 
-#include svheader.hxx
 #include svtools/svmedit.hxx
 #include iderid.hxx
 #include vcl/accel.hxx
diff --git a/basctl/source/basicide/brkdlg.hxx 
b/basctl/source/basicide/brkdlg.hxx
index e58371f..da61756 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
 
-#include svheader.hxx
 #include bastypes.hxx
 #include vcl/dialog.hxx
 
diff --git a/basctl/source/basicide/iderdll.cxx 
b/basctl/source/basicide/iderdll.cxx
index d76f353..4e2b604 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -20,7 +20,6 @@
 #include comphelper/scoped_disposing_ptr.hxx
 #include comphelper/processfactory.hxx
 
-#include svheader.hxx
 #include sfx2/app.hxx
 #include sfx2/dispatch.hxx
 #include sfx2/genlink.hxx
diff --git a/basctl/source/basicide/macrodlg.hxx 
b/basctl/source/basicide/macrodlg.hxx
index 7adba53..7efa94d 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_MACRODLG_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_MACRODLG_HXX
 
-#include svheader.hxx
-
 #include bastype2.hxx
 #include bastype3.hxx
 #include sfx2/basedlgs.hxx
diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index cdf92b5..e57f6e8 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_MODULDLG_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_MODULDLG_HXX
 
-#include svheader.hxx
-
 #include bastype2.hxx
 #include svtools/svtabbx.hxx
 #include vcl/button.hxx
diff --git a/basctl/source/basicide/objdlg.hxx 
b/basctl/source/basicide/objdlg.hxx
index 972ec96..f91eaa4 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -23,7 +23,6 @@
 #include bastype2.hxx
 #include bastypes.hxx
 
-#include svheader.hxx
 #include vcl/floatwin.hxx
 #include vcl/toolbox.hxx
 #include vcl/fixed.hxx
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx
deleted file mode 100644
index 34eab3f..000
--- a/basctl/source/inc/svheader.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at

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

2014-05-15 Thread Caolán McNamara

 accessibility/source/extended/textwindowaccessibility.cxx |   15 +++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit f5dae84979db977febaa06acaf5e6c5afbf8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:49:40 2014 +0100

fix cut and paste into macro editor crash

e.g. select all in macro editor in virtualbox and paste
into Linux macro editor and explode in debugging iterator
land.

regression due to IA2 integration of
efb23f29983f87104a684e7fab00b84fc59d131d

Change-Id: Ic7a4e9f5455f4ba3eaf0afd38fd5e445d6dc28e6

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index ad19eaf..052aac6 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2219,15 +2219,24 @@ void Document::handleParagraphNotifications()
 
 void Document::sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 
nEventId)
 {
- Paragraphs::iterator aEnd = ::std::min(m_xParagraphs-begin() + end + 1, 
m_aVisibleEnd);
-for (Paragraphs::iterator aIt = ::std::max(m_xParagraphs-begin() + start, 
m_aVisibleBegin);
- aIt  aEnd; ++aIt)
+size_t nAvailDistance = std::distance(m_xParagraphs-begin(), 
m_aVisibleEnd);
+
+Paragraphs::iterator aEnd(m_xParagraphs-begin());
+size_t nEndDistance = std::minsize_t(end + 1, nAvailDistance);
+std::advance(aEnd, nEndDistance);
+
+Paragraphs::iterator aIt(m_xParagraphs-begin());
+size_t nStartDistance = std::minsize_t(start, nAvailDistance);
+std::advance(aIt, nStartDistance);
+
+while (aIt  aEnd)
 {
 ::rtl::Reference Paragraph  xParagraph(getParagraph(aIt));
 if (xParagraph.is())
 xParagraph-notifyEvent(
 nEventId,
 ::css::uno::Any(), ::css::uno::Any());
+++aIt;
 }
 }
 
___
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' - 97/6e787f6b33389ea9dcd35ff7680dedeace47ac

2014-05-15 Thread Caolán McNamara

 97/6e787f6b33389ea9dcd35ff7680dedeace47ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a911809c91546850092cb1d4ca6c454934cf398d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:52:58 2014 +0100

Notes added by 'git notes add'

diff --git a/97/6e787f6b33389ea9dcd35ff7680dedeace47ac 
b/97/6e787f6b33389ea9dcd35ff7680dedeace47ac
new file mode 100644
index 000..24972d5
--- /dev/null
+++ b/97/6e787f6b33389ea9dcd35ff7680dedeace47ac
@@ -0,0 +1 @@
+merged as: 754380524d6b9f3b5f49629ac8b3ad392cc5173c
___
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' - df/2912101f3db24aa18ab1a04fabfca5657ba5bd

2014-05-15 Thread Caolán McNamara

 df/2912101f3db24aa18ab1a04fabfca5657ba5bd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 762b902ad6158c7d57d14bbac6445b1bbdab3de6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:53:18 2014 +0100

Notes added by 'git notes add'

diff --git a/df/2912101f3db24aa18ab1a04fabfca5657ba5bd 
b/df/2912101f3db24aa18ab1a04fabfca5657ba5bd
new file mode 100644
index 000..7d1bd90
--- /dev/null
+++ b/df/2912101f3db24aa18ab1a04fabfca5657ba5bd
@@ -0,0 +1 @@
+merged as: f3b314413336eb60e66886f48b56149bb586d830
___
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' - db/742b838d3eae07436b27f1619e2b7f2da12f44

2014-05-15 Thread Caolán McNamara

 db/742b838d3eae07436b27f1619e2b7f2da12f44 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 10d4989c6101b0b4b9e851edf789678b4247c451
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:53:58 2014 +0100

Notes added by 'git notes add'

diff --git a/db/742b838d3eae07436b27f1619e2b7f2da12f44 
b/db/742b838d3eae07436b27f1619e2b7f2da12f44
new file mode 100644
index 000..d3ad0da
--- /dev/null
+++ b/db/742b838d3eae07436b27f1619e2b7f2da12f44
@@ -0,0 +1 @@
+merged as: bdb3f642973b7c7b9ce8bdae1344e4ab520f942a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

Bug 65675 depends on bug 38635, which changed state.

Bug 38635 Summary: Gaps and jaggies in borders, affecting normal view and 
printing
https://bugs.freedesktop.org/show_bug.cgi?id=38635

   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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c8/ae4566ddb961775f35952dff52233faa0a0668

2014-05-15 Thread Caolán McNamara

 c8/ae4566ddb961775f35952dff52233faa0a0668 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9ae81147aa19f9a5a3367946f12534f38fb522e3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:55:51 2014 +0100

Notes added by 'git notes add'

diff --git a/c8/ae4566ddb961775f35952dff52233faa0a0668 
b/c8/ae4566ddb961775f35952dff52233faa0a0668
new file mode 100644
index 000..a81f07e
--- /dev/null
+++ b/c8/ae4566ddb961775f35952dff52233faa0a0668
@@ -0,0 +1 @@
+reject: this duplication is to allow dmake to build things that have the same 
filename
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Thomas Arnhold

 include/sfx2/doctempl.hxx|6 +++---
 include/sfx2/mgetempl.hxx|4 ++--
 include/sfx2/mnumgr.hxx  |6 +++---
 include/sfx2/msgpool.hxx |4 ++--
 include/sfx2/new.hxx |4 ++--
 include/sfx2/newstyle.hxx|4 ++--
 include/sfx2/prnmon.hxx  |4 ++--
 include/sfx2/styledlg.hxx|4 ++--
 include/sfx2/templdlg.hxx|4 ++--
 include/sfx2/tplpitem.hxx|4 ++--
 include/svtools/ctrlbox.hxx  |6 +++---
 include/svtools/ctrltool.hxx |6 +++---
 include/svtools/ruler.hxx|6 +++---
 include/svtools/scrwin.hxx   |4 ++--
 include/svtools/stdmenu.hxx  |6 +++---
 include/svtools/valueset.hxx |6 +++---
 include/tools/config.hxx |4 ++--
 17 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit ec08cb1f81d47e8f41778bf519ead43bfb90e67c
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu May 15 17:52:21 2014 +0200

fixincludeguards.pl: now we can fix those

Change-Id: I8f29f6344592c2bb1ae0d03304cf6e18b6df3a29

diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index 6ba3a18..0d01210 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXDOCTEMPL_HXX
-#define _SFXDOCTEMPL_HXX
+#ifndef INCLUDED_SFX2_DOCTEMPL_HXX
+#define INCLUDED_SFX2_DOCTEMPL_HXX
 
 #include rtl/ustring.hxx
 #include sal/config.h
@@ -133,7 +133,7 @@ public:
 voidUpdate( bool _bSmart = true );
 };
 
-#endif // #ifndef _SFXDOCTEMPL_HXX
+#endif // INCLUDED_SFX2_DOCTEMPL_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 65ba711..6082fbe 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFX_MGETEMPL_HXX
-#define _SFX_MGETEMPL_HXX
+#ifndef INCLUDED_SFX2_MGETEMPL_HXX
+#define INCLUDED_SFX2_MGETEMPL_HXX
 
 #include vcl/edit.hxx
 #include vcl/fixed.hxx
diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx
index 88dd9e2..66c9d6f 100644
--- a/include/sfx2/mnumgr.hxx
+++ b/include/sfx2/mnumgr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXMNUMGR_HXX
-#define _SFXMNUMGR_HXX
+#ifndef INCLUDED_SFX2_MNUMGR_HXX
+#define INCLUDED_SFX2_MNUMGR_HXX
 
 #include vcl/menu.hxx
 #include tools/wintypes.hxx
@@ -105,6 +105,6 @@ public:
 Menu*   GetSVMenu();
 };
 
-#endif // #ifndef _SFXMNUMGR_HXX
+#endif // INCLUDED_SFX2_MNUMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index be61a4cf..f21277e 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXMSGPOOL_HXX
-#define _SFXMSGPOOL_HXX
+#ifndef INCLUDED_SFX2_MSGPOOL_HXX
+#define INCLUDED_SFX2_MSGPOOL_HXX
 
 #include rtl/ustring.hxx
 #include sal/config.h
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index bc1a452..c817282 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXNEW_HXX
-#define _SFXNEW_HXX
+#ifndef INCLUDED_SFX2_NEW_HXX
+#define INCLUDED_SFX2_NEW_HXX
 
 #include sal/config.h
 #include sfx2/dllapi.h
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 6ced44b..1a646e6 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _NEWSTYLE_HXX
-#define _NEWSTYLE_HXX
+#ifndef INCLUDED_SFX2_NEWSTYLE_HXX
+#define INCLUDED_SFX2_NEWSTYLE_HXX
 
 #include comphelper/string.hxx
 #include sal/config.h
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 0a6b635..eead7a3 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFX_PRNMON_HXX
-#define _SFX_PRNMON_HXX
+#ifndef INCLUDED_SFX2_PRNMON_HXX
+#define INCLUDED_SFX2_PRNMON_HXX
 
 #include sal/config.h
 #include sfx2/dllapi.h
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index fec8446..eb6d152 100644
--- a/include/sfx2/styledlg.hxx
+++

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a4/773fde20d4be3caa815a409a144aa7003cb25d

2014-05-15 Thread Caolán McNamara

 a4/773fde20d4be3caa815a409a144aa7003cb25d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d926cc8463ef401cdfb04fcd37207fc93ef06922
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:58:58 2014 +0100

Notes added by 'git notes add'

diff --git a/a4/773fde20d4be3caa815a409a144aa7003cb25d 
b/a4/773fde20d4be3caa815a409a144aa7003cb25d
new file mode 100644
index 000..ed70742
--- /dev/null
+++ b/a4/773fde20d4be3caa815a409a144aa7003cb25d
@@ -0,0 +1 @@
+prefer: fd792b7a2942951d3f4c87e45d8e760a15f66474
___
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' - c1/498d1638bb563017230b324a31a59cea476cb6

2014-05-15 Thread Caolán McNamara

 c1/498d1638bb563017230b324a31a59cea476cb6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55ea4aabe28ee8447bc8d32669e9322699481972
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 16:59:31 2014 +0100

Notes added by 'git notes add'

diff --git a/c1/498d1638bb563017230b324a31a59cea476cb6 
b/c1/498d1638bb563017230b324a31a59cea476cb6
new file mode 100644
index 000..beeb216
--- /dev/null
+++ b/c1/498d1638bb563017230b324a31a59cea476cb6
@@ -0,0 +1 @@
+prefer: 1d065071361400b1cb614248e2f414678518a971
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Module_avmedia.mk postprocess/Rdb_services.mk

2014-05-15 Thread Tor Lillqvist

 avmedia/Module_avmedia.mk   |7 ++-
 postprocess/Rdb_services.mk |2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c0a3bc0570439bad6f2e105cb38b4bd073839e05
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 18:57:31 2014 +0300

The AVMedia framework is not deprecated

So no reason to avoid it when building for the Mac App Store
(i.e. when building a sandboxed LibreOffice). (At least I assume it
was because of the deprecatedness of QuickTime that it was conditional
on not building a sandboxed LibreOffice.)

Change-Id: I9d50490aa878ba5e40594b39eac88f23df3ef0a6

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 6046ab5..f0108e5 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -38,12 +38,17 @@ endif
 ifeq ($(OS),MACOSX)
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
-   Library_avmediaMacAVF \
Library_avmediaQuickTime \
 ))
 endif
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,avmedia,\
+   Library_avmediaMacAVF \
+))
+endif
+
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediawin \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index b22a9d7..5470902 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -121,8 +121,8 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/impress/wpftimpress \
writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
+   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
-   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
$(call 
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
) \
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Herbert Dürr

 avmedia/source/macavf/player.mm |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 75c804c1be8acf4c3fc9935b81e696918f33fd9d
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 09:46:26 2014 +

AOO: #i124875# use AVAsset's best guess duration if AVPlayerItem isn't 
ready yet

in AV Foundation the most accurate media asset duration is available when 
the
AVPlayerItem's status changes to AVPlayerItemStatusReadyToPlay. There 
already
is an observer for this, but the upper layers expect getDuration() to be
synchronous and to return within a reasonable time. Since returning an
approximation is sufficient using the AVAsset's duration as fallback is 
fine.

diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 404083b..751dbed 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -216,7 +216,10 @@ double SAL_CALL Player::getDuration()
 if( mpPlayer )
 {
 AVPlayerItem* pItem = [mpPlayer currentItem];
-duration = CMTimeGetSeconds( [pItem duration] );
+if( [pItem status] == AVPlayerItemStatusReadyToPlay )
+duration = CMTimeGetSeconds( [pItem duration] );
+else // fall back to AVAsset's best guess
+duration = CMTimeGetSeconds( [[pItem asset] duration] );
 }
 
 return duration;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2014-05-15 Thread Herbert Dürr

 cui/source/options/optcolor.hrc |8 
 cui/source/options/optcolor.src |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4df4135e32f950925088acd7920af3861c6f3675
Author: Herbert DÃ¼rr h...@apache.org
Date:   Thu May 15 15:45:20 2014 +

#i124796# fix Preferences-OpenOffice-Appearance tabpage listbox column 
width

Patch-by: Thorsten Wagner thorsten.wagne...@gmail.com

diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc
index 809f04f..0e0cbd5 100644
--- a/cui/source/options/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
@@ -187,16 +187,16 @@
 
 
 #define _FT_WIDTH   120
-#define _LINE_HEIGHT15
+#define _LINE_HEIGHT16
 #define _FT_HEIGHT  10
 #define _CB_WIDTH   130
 #define _FT_XPOS14
 #define _CB_XPOS6
-#define _LB_XPOS139
-#define _LB_WIDTH   50
+#define _LB_XPOS119
+#define _LB_WIDTH   70
 #define _LB_HEIGHT  50
 #define _WN_WIDTH   30
-#define _WN_HEIGHT  12
+#define _WN_HEIGHT  14
 #define _WN_XPOS195
 
 #define FT_SMARTTAGS168
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 4983f1f..04f0c7a 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -49,7 +49,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 ListBox LB_COLORSCHEME
 {
 HelpID = cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME;
-Pos = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 65 , 13 ) ;
 Size = MAP_APPFONT ( 77 , 58 ) ;
 Border = TRUE;
 Sort = TRUE;
@@ -79,14 +79,14 @@ TabPage RID_SVXPAGE_COLORCONFIG
 Control CT_COLORCONFIG
 {
 Pos = MAP_APPFONT ( 12 , 45 ) ;
-Size = MAP_APPFONT ( 236 , 134 ) ;
+Size = MAP_APPFONT ( 236 , 138 ) ;
 Border = TRUE;
 DialogControl = TRUE;
 OutputSize = TRUE ;
 ScrollBar VB_VSCROLL
 {
 Pos = MAP_APPFONT ( 228 , 10 ) ;
-Size = MAP_APPFONT ( 8 , 124 ) ;
+Size = MAP_APPFONT ( 8 , 128 ) ;
 VScroll = TRUE;
 };
 String ST_ON
@@ -131,7 +131,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
 OutputSize = TRUE ;
 Pos = MAP_APPFONT ( 0 , 10 ) ;
-Size = MAP_APPFONT ( 228 , 124 ) ;
+Size = MAP_APPFONT ( 228 , 128 ) ;
 DialogControl = TRUE;
 
 FixedText FT_GENERAL
___
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' - d3/ebac9e8edd91dd3248cd210cba7220414f501a

2014-05-15 Thread Caolán McNamara

 d3/ebac9e8edd91dd3248cd210cba7220414f501a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3c77593bc1836828bbf7413de96a96eba3b0063
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 17:09:20 2014 +0100

Notes added by 'git notes add'

diff --git a/d3/ebac9e8edd91dd3248cd210cba7220414f501a 
b/d3/ebac9e8edd91dd3248cd210cba7220414f501a
new file mode 100644
index 000..c907147
--- /dev/null
+++ b/d3/ebac9e8edd91dd3248cd210cba7220414f501a
@@ -0,0 +1 @@
+merged as: 75c804c1be8acf4c3fc9935b81e696918f33fd9d
___
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' - 4d/f4135e32f950925088acd7920af3861c6f3675

2014-05-15 Thread Caolán McNamara

 4d/f4135e32f950925088acd7920af3861c6f3675 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7869b291aa3f04de3646dc98d416584269b4dc47
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 15 17:10:27 2014 +0100

Notes added by 'git notes add'

diff --git a/4d/f4135e32f950925088acd7920af3861c6f3675 
b/4d/f4135e32f950925088acd7920af3861c6f3675
new file mode 100644
index 000..cb0f0b7
--- /dev/null
+++ b/4d/f4135e32f950925088acd7920af3861c6f3675
@@ -0,0 +1 @@
+prefer: aa4ef13a517d4eee4db9d36283eca3240bdd873f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of the ESC call ...

2014-05-15 Thread Bjoern Michaelsen

* Present:
+ Kendy, Bjoern, Stephan, cloph, Lionel, Eike, Miklos, Norbert, Markus,
  Cedric. Eilidh, David, Michael S., Andras, Astron, Jacobo

* Completed Action Items
+ add HackFest hardware / Amazon VMs to Board budget planning (Michael)
+ poke Sophie to check updating is checked in MozTrap (Cloph)
+ added bibisect repo (Miklos)
 
* Dropped Action Items:
+ chasing build / test intermittency:
+ turn the SAL_WARN into a fprintf  send to Cloph ? (Kendy)
+ run the 'make slowcheck' 20x from the top-level  report (Cloph)
= seems to be fixed by commits on master meanwhile
+ will try filing a lot of small string changes as easy hacks (Astron)

* Pending Action Items:
+ crashtest box - more research (Moggi/Cloph)
[ calc is working, writer problems can't easily be nailed down,
  have to use multiple processes ]
[ calc numbers increased a bit - but not as bad as expected ]
+ encourage icon authors to put them into git (Astron)
+ fix the Java bridge for MSVC2012 for 4.3 (Stephan/Michael S.)
+ Add StarOffice OOoXML export removal to 4.2 release notes (Cloph)

* Release Engineering update (Christian)
+ 4.3 status
   + failing unit tests oddness - the hunt ...
   + investigating Windows test failures (spellchecking)
+ 4.3.0 feature freeze:
   + next week May, 19th -- release date overlap with OSCON
   + take that to QA (Bjoern)
+ 4.2.5 RC1 - when ?
+ freeze in two weeks
+ no trouble expected
+ Android / iOS remote
+ no news
+ Credits:
+ punted until mmmeks is back
http://www.libreoffice.org/about-us/credits/
+ bit out of date: worth updating for 4.3 ?
+ 'Contributors to Bundled Templates' - oddly coloured heading.
+ can we separate rows better for readability ?
   + embolden bold name perhaps ?
+ tracking tags in Redmine a stupid idea? (Bjoern)

* LibreOffice 4.3.0 alpha1 bibisect:
+ see https://wiki.documentfoundation.org/QA/HowToBibisect#Versions
+ 182 new builds
+ Cloph did some Windows bibisect builds for Florian UI stuff
 
* 4.3 Features Page (Michael)
+ https://wiki.documentfoundation.org/ReleaseNotes/4.3
+ please update it !
 
* Address  Leak Sanitizer (Moggi/Sberg)
+ gcc/clang compiler stuff from GOOG for tracking buffer overruns etc.
+ works mostly out of the box
+ distribute build to the QA team?
+ runtime thing/instrumented build that spits out leaks etc. found during a 
run
+ enable for development/make check? (mst)
+ some junit/java trickiness here (libjpipe.so)
+ QA guys reporting back on bugzilla?
   + sure (sberg)
AI: + send example (Markus)
+ http://lists.freedesktop.org/archives/libreoffice/2014-May/061142.html

* FISL Brazil Update (Fridrich)
+ punted -- no Fridrich

* UX update (Astron)
+ start menu bug updated -- not too good an idea
+ vendor spamming etc.
+ discussion at http://wordpress.com/my-stats/
+ autotext stuff?

* GSoC update (Fridrich/Cedric?)
+ where are we supposed to be at as of now ?
+ coding starts next week
+ add students with commit accounts [ for their branches ]
AI: + add them to commiter group (Norbert)

* Distro branches  commits (Michael)
punted -- no Michael

* unit test documents bloating up git repo: (Michael)
+ might be mine (Miklos)
+ automated task?
+ test fail on too big file?
+ these docs are not commited with evil intend, they are sneaking in 
(Bjoern)
+ test failure on big docs might hurt local testing (Bjoern)
+ git-hook would prevent pushing unsuited docs though (Bjoern)
+ even easier (Miklos)
+ gerrit doesnt show how big a binary is (mst)
+ git hook would handle that too (Norbert)
+ people would evade that (Norbert)
+ external repo? (Norbert)
+ raising awareness should be enough for now (Bjoern)
AI: + update git hook (Miklos)
 
* Crashtest update (Markus)
+ new data ?
  
http://dev-builds.libreoffice.org/crashtest/91821848a3a50229b8b96e91e9eb053a8ebc5d9a/
 
* Certification Committee (Stephan/Bjoern/Kendy)
  
* Gerrit review request (Caolan)
+ lots of stuff building up there that needs review; help appreciated.
+ better shape than last week
+ we need to be more vicious on abandoning old ones 
AI: + walk through old changes, nag people, abandon changes (Bjoern)
 
* Coverity Update (Caolan/Markus)
+ seems like a lot going on there, how are the stats ?
AI: + needs a new build scheduled (moggi)

* collect all bibisects at dev-downloads (Bjoern)
+ AFAIK e.g. Miklos has a bibisect repo somewhere
+ suggesting to have all bibisects with a copy at 
http://dev-downloads.libreoffice.org/bibisect/ too
+ more importantly: have all available bibisects listed at 
https://wiki.documentfoundation.org/Bibisect
   + done by now (Miklos)

* C++11 for

Re: Semi-automated ASCII art removal tool

2014-05-15 Thread Chris Laplante

Added support for .m, .mm, and .h. Thanks for the suggestion.
Chris



--
View this message in context: 
http://nabble.documentfoundation.org/Semi-automated-ASCII-art-removal-tool-tp4108832p4108938.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: avmedia/Module_avmedia.mk postprocess/Rdb_services.mk

2014-05-15 Thread Tor Lillqvist

 avmedia/Module_avmedia.mk   |2 ++
 postprocess/Rdb_services.mk |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0a829b062ce710e75aff89543d88898a1733f8fd
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:24:19 2014 +0300

The AVFoundation framework appeared in OS X 10.7

Change-Id: I76eb213ff4cb93196ea81dd43a465da61c0cdee2

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index f0108e5..bd0382d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,10 +44,12 @@ endif
 endif
 
 ifeq ($(OS),MACOSX)
+ifneq (1060,$(MACOSX_SDK_VERSION))
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \
 ))
 endif
+endif
 
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5470902..9ebe6d2 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -121,7 +121,9 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/impress/wpftimpress \
writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
-   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+   $(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \
+   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+   ) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(call 
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Tor Lillqvist

 avmedia/source/macavf/player.mm |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2e6d79799bc616addc5c6359179326b8f493a5a7
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:31:18 2014 +0300

Use std::hash:map when building against libstdc++ (and not libc++)

Change-Id: I7873d99e5982170551ba0ff7b4f383af5935c25b

diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 751dbed..1e2c882 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -25,8 +25,13 @@
 
 using namespace ::com::sun::star;
 
+#ifdef _LIBCPP_VERSION
 #include unordered_map
 typedef std::unordered_mapNSObject*,avmedia::macavf::MacAVObserverHandler* 
HandlersForObject;
+#else
+#include hash_map
+typedef std::hash_mapNSObject*,avmedia::macavf::MacAVObserverHandler* 
HandlersForObject;
+#endif
 
 @implementation MacAVObserverObject
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

Bug 65675 depends on bug 38635, which changed state.

Bug 38635 Summary: Gaps and jaggies in borders, affecting normal view and 
printing
https://bugs.freedesktop.org/show_bug.cgi?id=38635

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

2014-05-15 Thread Tor Lillqvist

 avmedia/source/macavf/player.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be1913aa1f5b5af19dfdbf4093e443001abf9195
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:37:57 2014 +0300

Argh, it's ext/hash_map apparently

Change-Id: Ide91e3302aa17052eb4deb3ddd16ff1ef83401fe

diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 1e2c882..343f562 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 #include unordered_map
 typedef std::unordered_mapNSObject*,avmedia::macavf::MacAVObserverHandler* 
HandlersForObject;
 #else
-#include hash_map
+#include ext/hash_map
 typedef std::hash_mapNSObject*,avmedia::macavf::MacAVObserverHandler* 
HandlersForObject;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Module_avmedia.mk postprocess/Rdb_services.mk

2014-05-15 Thread Tor Lillqvist

 avmedia/Module_avmedia.mk   |3 +++
 postprocess/Rdb_services.mk |4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2a9018b9f52bd90396912a8cb49925646eeb3485
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:45:13 2014 +0300

The macavf code doesn't compile as 32-bit, sigh

Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index bd0382d..06bbef7 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,12 +44,15 @@ endif
 endif
 
 ifeq ($(OS),MACOSX)
+ifeq ($(CPUNAME),X86_64)
+# The macavf code is a bit x86_64 dependent...
 ifneq (1060,$(MACOSX_SDK_VERSION))
 $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaMacAVF \
 ))
 endif
 endif
+endif
 
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 9ebe6d2..750fafe 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,7 +122,9 @@ $(eval $(call gb_Rdb_add_components,services,\
writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter 1060,$(MACOSX_SDK_VERSION)),, \
-   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+   $(if $(filter X86_64,$(CPUNAME)), \
+   $(call 
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
+   ) \
) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
$(call 
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source

2014-05-15 Thread Tor Lillqvist

 scp2/InstallModule_ooo.mk|3 +++
 scp2/source/ooo/file_library_ooo.scp |5 +
 2 files changed, 8 insertions(+)

New commits:
commit 9986f236d6b56ad773adfbc2107bfc1c6bd181d0
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 15 19:53:07 2014 +0300

Don't reference the avmediaMacAVF library if not built

Change-Id: If4f5c51e986b51f5795012b9535ab7a7ea51337b

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4396ef4..4564c72 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -69,6 +69,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(SYSTEM_HSQLDB),\
-DHSQLDB_JAR=\$(call gb_Helper_make_path,$(HSQLDB_JAR))\ \
) \
+   $(if $(MACOSX_SDK_VERSION),\
+   -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
+   ) \
$(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \
 ))
 
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 81ad4de..fa61087 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -107,11 +107,16 @@ File gid_File_Lib_avmediaQuickTime
Name = LIBNAME(avmediaQuickTime);
 End
 
+#if MAXOSX_SDK_VERSION = 1070
+#ifdef X86_64
 File gid_File_Lib_avmediaMacAVF
PACKED_LIB_FILE_BODY;
Name = LIBNAME(avmediaMacAVF);
 End
 #endif
+#endif
+
+#endif
 
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-15 Thread Kohei Yoshida

 svtools/source/contnr/treelist.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 177903cf0f0d5c6bf00f6bd732eff8efab235f5e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu May 15 12:57:21 2014 -0400

p is for pointers.

Change-Id: I7df56e7549e8dfa9ca1b88f85e8c81e4a946

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index e8f6608..f60b1c9 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1518,9 +1518,9 @@ public:
 
 SortComparator( SvTreeList rList ) : mrList(rList) {}
 
-bool operator() ( const SvTreeListEntry pLeft, const SvTreeListEntry 
pRight ) const
+bool operator() ( const SvTreeListEntry rLeft, const SvTreeListEntry 
rRight ) const
 {
-return mrList.Compare(pLeft, pRight)  0;
+return mrList.Compare(rLeft, rRight)  0;
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Semi-automated ASCII art removal tool

2014-05-15 Thread Chris Laplante

Hi Kendy - thanks for the suggestions!

Now that you mention it, I think the tool should have been more careful with
http://i.imgur.com/VwHYt83.png as well. In that case it should be safe to
collapse the leading /*** into just /**, right? 

I think I'll take a peek at how Doxygen itself parses comments for some
inspiration. I suppose as a quick heuristic I can just look for things like
@param and @return, or \brief and if found treat blocks as Doxygen
comments. Though the single line /// format makes things trickier... Anyway,
I'll play around with it today.

Thanks again!
Chris



--
View this message in context: 
http://nabble.documentfoundation.org/Semi-automated-ASCII-art-removal-tool-tp4108832p4108942.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-05-15 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/chart-size.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   10 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 
 3 files changed, 14 insertions(+)

New commits:
commit 8bfbfc06fefb418269734cfb17c70a5ae5a42d2a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu May 15 18:34:35 2014 +0200

DOCX import: fix chart size when it's inside a TextFrame

Change-Id: I3edb253238db182054b7688061916a2432b687b5

diff --git a/sw/qa/extras/ooxmlimport/data/chart-size.docx 
b/sw/qa/extras/ooxmlimport/data/chart-size.docx
new file mode 100644
index 000..da5d144
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/chart-size.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7c4e14b..3ffe132 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -37,6 +37,7 @@
 #include com/sun/star/text/XTextFieldsSupplier.hpp
 #include com/sun/star/text/XTextFrame.hpp
 #include com/sun/star/text/XTextFramesSupplier.hpp
+#include com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp
 #include com/sun/star/text/XTextViewCursorSupplier.hpp
 #include com/sun/star/style/BreakType.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
@@ -2108,6 +2109,15 @@ DECLARE_OOXMLIMPORT_TEST(testMsoBrightnessContrast, 
msobrightnesscontrast.docx
 CPPUNIT_ASSERT_EQUAL( -50, int(data[0x6e4]));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testChartSize, chart-size.docx)
+{
+// When chart was in a TextFrame, its size was too large.
+uno::Referencetext::XTextEmbeddedObjectsSupplier 
xTextEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xEmbeddedObjects(xTextEmbeddedObjectsSupplier-getEmbeddedObjects(), 
uno::UNO_QUERY);
+// This was 10954.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(6008), 
getPropertysal_Int32(xEmbeddedObjects-getByIndex(0), Width));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f3eb595..4a5b8a4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4341,6 +4341,10 @@ void  
DomainMapper_Impl::ImportGraphic(writerfilter::Reference Properties ::Po
 if( xTextContent.is())
 appendTextContent( xTextContent, uno::Sequence beans::PropertyValue 
() );
 
+// Clear the reference, so in case the embedded object is inside a
+// TextFrame, we won't try to resize it (to match the size of the
+// TextFrame) here.
+m_xEmbedded.clear();
 m_pGraphicImport.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-2' - sc/source

2014-05-15 Thread Kohei Yoshida

 sc/source/ui/view/output2.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5caa2548f837c54aac44fde0fdbb145145b60091
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon May 12 20:59:29 2014 -0400

fdo#78391: When numbers are auto-fit, reset clipping parameters.

Else it would get processed further to a surprising result.

Change-Id: I3d6f0d680e0c4c3ffe1d28dcbaf51a156f569359
(cherry picked from commit 162029e55af8f681966497ab7f20277888eac478)
Reviewed-on: https://gerrit.libreoffice.org/9335
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 75739d4..d14c901 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1850,7 +1850,11 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 (long) ( aVars.GetLeftTotal() * mnPPTX ) +
 (long) ( 
aVars.GetMargin()-GetRightMargin() * mnPPTX );
 if ( nNeededWidth = aAreaParam.maClipRect.GetWidth() )
+{
+// Cell value is no longer clipped.  Reset 
relevant parameters.
 aAreaParam.mbLeftClip = aAreaParam.mbRightClip = 
false;
+aAreaParam.mnLeftClipLength = 
aAreaParam.mnRightClipLength = 0;
+}
 
 //  If the ### replacement doesn't fit into the 
cells, no clip marks
 //  are shown, as the ### already denotes too little 
space.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

2014-05-15 Thread Michael Meeks

 scripts/esc-bug-stats.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99053ffcc1c246d9dddc8d42c1bd447dbcb196f5
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue May 13 15:08:09 2014 +0100

Fix calculation bug.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 9c04230..586bdd0 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -420,7 +420,7 @@ print  EOF
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.1'} calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.2'} calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.3'} calcext:value-type=float/
- table:table-cell table:formula=of:=[.B2]+[.D2]+[.F2]+[.H2]+[.L2] 
office:value-type=float/
+ table:table-cell table:formula=of:=[.B2]+[.D2]+[.F2]+[.H2]+[.J2]+[.L2] 
office:value-type=float/
  table:table-cell table:formula=of:=SUM([.N2:.S2])-[.T2] 
office:value-type=float/
 /table:table-row
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-05-15 Thread bugzilla-daemon

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

Bug 65675 depends on bug 38635, which changed state.

Bug 38635 Summary: Gaps and jaggies in borders, affecting normal view and 
printing
https://bugs.freedesktop.org/show_bug.cgi?id=38635

   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

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

2014-05-15 Thread Zolnai Tamás

 avmedia/source/opengl/oglwindow.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 684b0a11040a4f46d9a4971583c21350b6395d18
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu May 15 20:50:30 2014 +0200

OGLWindow: improve camera movement, make it faster

By now there is no a timer which rerender the
scene all the time so we need to move camera
without setting time.

Change-Id: Iba1bfd9b9dc87309cf83d5dcd6832f0e4cb2cd92

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index ca2ffbf..90e32ed 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -270,14 +270,14 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 vMup = glm::normalize(vMup);
 vMup *= 25.0f;
 
-if(nCode == KEY_Q)vMoveBy += vMove*(0.1f*fModelSize);
-if(nCode == KEY_E)vMoveBy -= vMove*(0.1f*fModelSize);
-if(nCode == KEY_A)vMoveBy -= vStrafe*(0.1f*fModelSize);
-if(nCode == KEY_D)vMoveBy += vStrafe*(0.1f*fModelSize);
-if(nCode == KEY_W)vMoveBy -= vMup*(0.1f*fModelSize);
-if(nCode == KEY_S)vMoveBy += vMup*(0.1f*fModelSize);
+if(nCode == KEY_Q)vMoveBy += vMove*(0.001f*fModelSize);
+if(nCode == KEY_E)vMoveBy -= vMove*(0.001f*fModelSize);
+if(nCode == KEY_A)vMoveBy -= vStrafe*(0.001f*fModelSize);
+if(nCode == KEY_D)vMoveBy += vStrafe*(0.001f*fModelSize);
+if(nCode == KEY_W)vMoveBy -= vMup*(0.001f*fModelSize);
+if(nCode == KEY_S)vMoveBy += vMup*(0.001f*fModelSize);
 }
-gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,10.0);
+gltf_renderer_move_camera(vMoveBy.x,vMoveBy.y,vMoveBy.z,0.0);
 update();
 }
 }
@@ -290,7 +290,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 m_aLastMousePos = pMouseEvt-GetPosPixel();
 }
 }
-else if( pEvent-GetId() == VCLEVENT_WINDOW_MOUSEBUTTONUP )
+else if( pEvent-GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
 {
 MouseEvent* pMouseEvt = (MouseEvent*)pEvent-GetData();
 if(pMouseEvt  pMouseEvt-IsLeft())
@@ -299,9 +299,9 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 
 long nDeltaX = m_aLastMousePos.X()-aCurPos.X();
 long nDeltaY = aCurPos.Y()-m_aLastMousePos.Y();
-static const float fSensitivity = 4.0;
+static const float fSensitivity = 1.0;
 // TODO: It seems this method just moves the camera but not rotate 
it.
-
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,10.0);
+
gltf_renderer_rotate_camera((float)nDeltaX*fSensitivity,(float)nDeltaY*fSensitivity,0.0,0.0);
 update();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 >

1 - 100 of 348 matches

Mail list logo