LibreOffice Gerrit News for core on 2014-06-27

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ OS X: PYTHON_CFLAGS  PYTHON_LIBS (--enable-python=system)
  in https://gerrit.libreoffice.org/9926 from Robert Antoni Buj i Gelonch
  about module build
+ fdo#80522  fdo#80523:Embedded Macro-Enabled objects are not preserved
  in https://gerrit.libreoffice.org/9917 from Priyanka Gaikwad
  about module sw
+ Force --std=gnu89 for clang.
  in https://gerrit.libreoffice.org/9904 from Andrzej Hunt
  about module build
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
  about module sw, writerfilter
 End of freshness 

+ fdo#80536 - UI: Menu option for 'Edit File' toolbar entry
  in https://gerrit.libreoffice.org/9913 from Joren De Cuyper
  about module sc, sd, sw


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

+ fdo#39111 - UI inconsistent concerning suppression of output for empty pa
  in https://gerrit.libreoffice.org/9907 from Joren De Cuyper
+ fdo#48673 - UI: No keyboard shortcut for Ignore All on misspelled word
  in https://gerrit.libreoffice.org/9908 from Joren De Cuyper
+ fdo#62879 Changed wording of protected section dialog
  in https://gerrit.libreoffice.org/9905 from Joel Madero
+ fdo#79940 LO crashes on opening; tries to remove a para with bookmarks
  in https://gerrit.libreoffice.org/9764 from Vinaya Mandke


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

+ OS X: PYTHON_CFLAGS
  in https://gerrit.libreoffice.org/9903 from Robert Antoni Buj i Gelonch
+ OS X: JDK headers must exist with -isystem foo
  in https://gerrit.libreoffice.org/9924 from Robert Antoni Buj i Gelonch


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

+ fix build error AVFoundation/AVFoundation.h: no such file or directory
  in https://gerrit.libreoffice.org/9769 from Douglas Mencken
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ configure, gbuild: remove Cygwin paths from make environment
  in https://gerrit.libreoffice.org/9698 from Michael Stahl
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

LibreOffice Gerrit News for submodules on 2014-06-27

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

+ Fix fdo#80432. Help entries for NORM functions
  in https://gerrit.libreoffice.org/9925 from Olivier Hallot


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

+ Fix bug fdo#80431 Help entries for GAMMA functions
  in https://gerrit.libreoffice.org/9916 from Olivier Hallot
+ fdo#63274 clarify hexadecimal argument in HEX2DEC and similar functions
  in https://gerrit.libreoffice.org/9906 from Stanislav Horáček


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

None

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

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

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

[Charu Tyagi]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   26 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 +++-
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 9b04093e9ab67428276f27a5819d45675a8b3f9a
Author: Charu Tyagi charu.ty...@ericsson.com
Date:   Wed Jun 25 15:51:10 2014 +0530

fdo#74745: (DOCX) Number formatting for custom document properties.

Change-Id: Ifb9ef14180cac84fd111d81b9535266476d5f04f
Reviewed-on: https://gerrit.libreoffice.org/9896
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 89edfc4..1cf35e2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -52,7 +52,9 @@
 #include com/sun/star/text/XRedline.hpp
 #include com/sun/star/text/XTextFieldsSupplier.hpp
 #include com/sun/star/style/DropCapFormat.hpp
+#include com/sun/star/util/NumberFormatter.hpp
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
+#include com/sun/star/util/XNumberFormatter.hpp
 #include com/sun/star/document/XViewDataSupplier.hpp
 #include com/sun/star/container/XIndexContainer.hpp
 #include com/sun/star/awt/XControlModel.hpp
@@ -2215,7 +2217,7 @@ void DomainMapper_Impl::GetCurrentLocale(lang::Locale 
rLocale)
 format to the XPropertySet
   ---*/
 void DomainMapper_Impl::SetNumberFormat( const OUString rCommand,
-uno::Reference beans::XPropertySet  
xPropertySet )
+uno::Reference beans::XPropertySet  
xPropertySet, bool bDetectFormat )
 {
 OUString sFormatString = lcl_ParseFormat( rCommand );
 // find \h - hijri/luna calendar todo: what about saka/era calendar?
@@ -2231,8 +2233,18 @@ void DomainMapper_Impl::SetNumberFormat( const OUString 
rCommand,
 //get the number formatter and convert the string to a format value
 try
 {
+sal_Int32 nKey = 0;
 uno::Reference util::XNumberFormatsSupplier  xNumberSupplier( 
m_xTextDocument, uno::UNO_QUERY_THROW );
-sal_Int32 nKey = xNumberSupplier-getNumberFormats()-addNewConverted( 
sFormat, aUSLocale, aCurrentLocale );
+if( bDetectFormat )
+{
+uno::Reference util::XNumberFormatter xFormatter( 
::com::sun::star::util::NumberFormatter::create( m_xComponentContext ), 
uno::UNO_QUERY_THROW );
+xFormatter-attachNumberFormatsSupplier( xNumberSupplier );
+nKey = xFormatter-detectNumberFormat( 0, rCommand );
+ }
+else
+{
+nKey = xNumberSupplier-getNumberFormats()-addNewConverted( 
sFormat, aUSLocale, aCurrentLocale );
+}
 xPropertySet-setPropertyValue(
 
PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT),
 uno::makeAny( nKey ));
@@ -2797,8 +2809,11 @@ void DomainMapper_Impl::handleAuthor
 uno::Reference beans::XPropertySet ( xFieldInterface,
 uno::UNO_QUERY_THROW);
 if( bIsCustomField )
+{
 xFieldProperties-setPropertyValue(
 rPropNameSupplier.GetName(PROP_NAME), 
uno::makeAny(rFirstParam));
+pContext-SetCustomField( xFieldProperties );
+}
 else
 {
 if(0 != (aDocProperties[nMap].nFlags  SET_ARABIC))
@@ -4036,7 +4051,12 @@ void DomainMapper_Impl::PopFieldContext()
 CloseFieldCommand();
 
 if (!pContext-GetResult().isEmpty())
-SetFieldResult(pContext-GetResult());
+{
+   uno::Reference beans::XPropertySet  xFieldProperties = 
pContext-GetCustomField();
+   if(xFieldProperites.is())
+  SetNumberFormat( pContext-GetResult(), xFieldProperties, true );
+   SetFieldResult( pContext-GetResult() );
+ }
 
 //insert the field, TC or TOC
 uno::Reference text::XTextAppend   xTextAppend;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 97b2e1e..a09e8b9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -128,6 +128,7 @@ class FieldContext
 ::com::sun::star::uno::Reference ::com::sun::star::text::XFormField  
 m_xFormField;
 ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet   
 m_xTOC;//TOX
 ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet   
 m_xTC;//TOX entry
+::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet   
 m_xCustomField;
 OUString 
m_sHyperlinkURL;
 FFDataHandler::Pointer_t   
 

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

[Stephan Bergmann]

 jvmfwk/source/fwkbase.hxx |2 --
 jvmfwk/source/fwkutil.hxx |2 --
 2 files changed, 4 deletions(-)

New commits:
commit e4b7da8da851371bd09f4d0e1721626667e56605
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 08:59:59 2014 +0200

Dead declarations

Change-Id: I43e388df118b9e08ab8c05cad31871ef0af35164

diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 86fde79..89e7b57 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -120,8 +120,6 @@ OString getSharedSettingsPath();
  */
 OString getVendorSettingsPath();
 
-OUString buildClassPathFromDirectory(const OUString  relPath);
-
 /** Called from writeJavaInfoData. It sets the process identifier. When
 java is to be started, then the current id is compared to the one set by
 this function. If they are identical then the Java was selected in the
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index e786943..8bd3466 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -122,8 +122,6 @@ FileStatus checkFileURL(const OUString  path);
 
 bool isAccessibilitySupportDesired();
 
-OUString buildClassPathFromDirectory(const OUString  relPath);
-
 OUString retrieveClassPath( OUString const  macro );
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

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

New commits:
commit ffd9c70da13aae4d9c806ae5b1c0947a2fcc26b5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 27 09:05:02 2014 +0200

error: 'xFieldProperites' was not declared in this scope

Change-Id: Id50cc01ca9726a24da38d4952a30cf7343e8bdfc

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1cf35e2..20fcbfc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4053,7 +4053,7 @@ void DomainMapper_Impl::PopFieldContext()
 if (!pContext-GetResult().isEmpty())
 {
uno::Reference beans::XPropertySet  xFieldProperties = 
pContext-GetCustomField();
-   if(xFieldProperites.is())
+   if(xFieldProperties.is())
   SetNumberFormat( pContext-GetResult(), xFieldProperties, true );
SetFieldResult( pContext-GetResult() );
  }
___
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

[Ravindra Vidhate]

 sw/qa/extras/ooxmlexport/data/fdo80097.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   51 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |5 ++
 3 files changed, 56 insertions(+)

New commits:
commit 6bd609d8451c08504c47c86196c508a7022dd4b7
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date:   Tue Jun 24 17:54:59 2014 +0530

fdo#80097 : tblBorders and tcBorders are not preserved for the table.

When we have multiple tables inside a table, the tblBorders and
tcBorders of the inside tables are not getting preserved.

The issue is m_aTableStyleConf is not clear when the LO starts
writing the properties of the inside table.

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

diff --git a/sw/qa/extras/ooxmlexport/data/fdo80097.docx 
b/sw/qa/extras/ooxmlexport/data/fdo80097.docx
new file mode 100644
index 000..3f8ba9f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80097.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 35986b3..8683d56 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3615,6 +3615,57 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb, 
fdo79969_xlsb.docx)
 /word/embeddings/oleObject1.xlsb);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo80097, fdo80097.docx)
+{
+//fdo#76635 : Table borders are not getting preserved.
+
+xmlDocPtr pXmlDocument = parseExport(word/document.xml);
+if (!pXmlDocument)
+return;
+
+//Table Borders
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:color
 = '0A'], 1);
+
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:color
 = '0A'], 1);
+
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:color
 = '0A'], 1);
+
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:color
 = '0A'], 1);
+
+//Table Cell Borders
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:color
 = '0A'], 1);
+
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:val
 = 'single'],1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:sz
 = 4], 1);
+assertXPath(pXmlDocument, 
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:space
 = 0], 1);
+assertXPath(pXmlDocument, 

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

[Stephan Bergmann]

 vcl/source/glyphs/graphite_layout.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 03d4d4b3f2a5309f3eb6b2bd9073f016e08fd3df
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 09:13:00 2014 +0200

loplugin:unreffun

Change-Id: I2afc1cd5ed813f768f06ad0db651fb9e8e81d844

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 5343577..b365eb3 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -95,16 +95,6 @@ namespace
 return !(b  i)  i  e;
 }
 
-templatetypename T
-inline bool is_subrange(const T sb, const T se, const T b, const T e) {
-return !(b  sb || se  e);
-}
-
-templatetypename T
-inline bool is_subrange(const std::pairT, T s, const T b, const T e) {
-return is_subrange(s.first, s.second, b, e);
-}
-
 int findSameDirLimit(const sal_Unicode* buffer, int charCount, bool rtl)
 {
 UErrorCode status = U_ZERO_ERROR;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/Module_libreofficekit.mk

[Andrzej Hunt]

 libreofficekit/Module_libreofficekit.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2709ff61d38db36d494b850a53968ca8bb2878a4
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Thu Jun 26 10:13:23 2014 +0100

libreofficekitgtk requires ENABLE_GTK.

Change-Id: I2ba47edc457e310548c8a62747a6a152ee5e1314

diff --git a/libreofficekit/Module_libreofficekit.mk 
b/libreofficekit/Module_libreofficekit.mk
index 55136a4..b349a5d 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -13,11 +13,11 @@ ifeq ($(OS),LINUX)
 
 $(eval $(call gb_Module_add_targets,libreofficekit,\
 StaticLibrary_libreofficekit \
-Library_libreofficekitgtk \
 ))
 
 ifneq ($(ENABLE_GTK),)
 $(eval $(call gb_Module_add_targets,libreofficekit,\
+Library_libreofficekitgtk \
 Executable_gtktiledviewer \
 ))
 endif # ($(ENABLE_GTK),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrzej Hunt]

 include/LibreOfficeKit/LibreOfficeKit.h |4 
 1 file changed, 4 deletions(-)

New commits:
commit 822cf7cb24eaa11ed3aa8d243370fba5bf6af889
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Fri Jun 27 09:28:17 2014 +0200

Kill saveAsWithOptions again. (merge error/oversight)

The declaration sneaked in again when merging the libreofficekit
tiled rendering changes, there's no actual implementation or use
of this anywhere though.

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 77a8d0f..ba4319f 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -72,10 +72,6 @@ struct _LibreOfficeKitDocumentClass
  const char *pUrl,
  const char *pFormat,
  const char *pFilterOptions);
-  int (*saveAsWithOptions) (LibreOfficeKitDocument* pThis,
-const char *pUrl,
-const char *pFormat,
-const char *pFilterOptions);
 #ifdef LOK_USE_UNSTABLE_API
   LibreOfficeKitDocumentType (*getDocumentType) (LibreOfficeKitDocument* 
pThis);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 svx/source/sdr/contact/objectcontactofobjlistpainter.cxx |7 +++
 svx/source/sdr/contact/objectcontactofpageview.cxx   |6 +++---
 svx/source/sdr/contact/viewcontactofe3dcube.cxx  |7 ++-
 svx/source/sdr/contact/viewcontactofe3dextrude.cxx   |7 ++-
 svx/source/sdr/contact/viewcontactofe3dlathe.cxx |7 ++-
 svx/source/sdr/contact/viewcontactofe3dpolygon.cxx   |7 ++-
 svx/source/sdr/contact/viewcontactofe3dsphere.cxx|7 ++-
 svx/source/sdr/overlay/overlaymanager.cxx|8 
 svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx |   10 +-
 9 files changed, 25 insertions(+), 41 deletions(-)

New commits:
commit c60f6227f826968f1c937758130ff1d18459d553
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Jun 27 16:04:18 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I1d703da6c0f9fd1a7e2423cc609fb504bb553382

diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx 
b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 493ad02..eadd8a7 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -27,7 +27,7 @@
 #include basegfx/matrix/b2dhommatrix.hxx
 #include drawinglayer/processor2d/processor2dtools.hxx
 #include svx/unoapi.hxx
-
+#include boost/scoped_ptr.hpp
 
 
 namespace sdr
@@ -127,14 +127,13 @@ namespace sdr
 // if there is something to show, use a vclProcessor to 
render it
 if(xPrimitiveSequence.hasElements())
 {
-drawinglayer::processor2d::BaseProcessor2D* 
pProcessor2D = drawinglayer::processor2d::createProcessor2DFromOutputDevice(
+
boost::scoped_ptrdrawinglayer::processor2d::BaseProcessor2D 
pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
 *pTargetDevice,
-getViewInformation2D());
+getViewInformation2D()));
 
 if(pProcessor2D)
 {
 pProcessor2D-process(xPrimitiveSequence);
-delete pProcessor2D;
 }
 }
 }
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx 
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 864e730..dbd43d3 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -37,6 +37,7 @@
 #include svx/unoapi.hxx
 
 #include eventhandler.hxx
+#include boost/scoped_ptr.hpp
 
 using namespace com::sun::star;
 
@@ -284,14 +285,13 @@ namespace sdr
 pOutDev-SetLayoutMode(0); // reset, default is no BiDi/RTL
 
 // create renderer
-drawinglayer::processor2d::BaseProcessor2D* pProcessor2D =
+boost::scoped_ptrdrawinglayer::processor2d::BaseProcessor2D 
pProcessor2D(
 
drawinglayer::processor2d::createProcessor2DFromOutputDevice(
-rTargetOutDev, getViewInformation2D());
+rTargetOutDev, getViewInformation2D()));
 
 if(pProcessor2D)
 {
 pProcessor2D-process(xPrimitiveSequence);
-delete pProcessor2D;
 }
 }
 
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx 
b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index 94c9776..c717c04 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
@@ -24,7 +24,7 @@
 #include svx/sdr/primitive2d/sdrattributecreator.hxx
 #include sdr/primitive3d/sdrattributecreator3d.hxx
 #include basegfx/range/b3drange.hxx
-
+#include boost/scoped_ptr.hpp
 
 
 namespace sdr
@@ -71,7 +71,7 @@ namespace sdr
 aWorldTransform.translate(aCubeRange.getMinX(), 
aCubeRange.getMinY(), aCubeRange.getMinZ());
 
 // get 3D Object Attributes
-drawinglayer::attribute::Sdr3DObjectAttribute* 
pSdr3DObjectAttribute = 
drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet);
+boost::scoped_ptrdrawinglayer::attribute::Sdr3DObjectAttribute 
pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
 
 // calculate texture size to get a perfect mapping for
 // the front/back sides
@@ -83,9 +83,6 @@ namespace sdr
 aWorldTransform, aTextureSize, aAttribute, 
*pSdr3DObjectAttribute));
 xRetval = 
drawinglayer::primitive3d::Primitive3DSequence(xReference, 1);
 
-// delete 3D Object Attributes
-delete pSdr3DObjectAttribute;
-
 return xRetval;
 }
 } // end of namespace contact
diff --git 

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

[Olivier Hallot]

 source/text/scalc/01/04060183.xhp |   43 +-
 source/text/scalc/01/04060184.xhp |   39 ++
 source/text/scalc/01/04060185.xhp |   36 ++-
 3 files changed, 116 insertions(+), 2 deletions(-)

New commits:
commit f4ae6be5fabc4f86cffacb5b6d4fd5eb6568a02f
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Thu Jun 26 18:46:18 2014 -0300

Fix fdo#80432. Help entries for NORM functions

Write help pages for LOGNORM.DIST, LOGNORM.INV, NORM.DIST, NORM.INV, 
NORM.S.DIST and NORM.S.INV spreadsheet functions

Change-Id: I00f92dd339c6485f2f7b809f2e441241cde5a9d7
Reviewed-on: https://gerrit.libreoffice.org/9925
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index 3dc2ffd..0e617b9 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -164,7 +164,27 @@
 emphStDev/emph is the standard deviation of the standard logarithmic 
distribution./paragraph
 paragraph role=heading id=hd_id3148768 xml-lang=en-US level=3 
l10n=U oldref=73Example/paragraph
 paragraph role=paragraph id=par_id3155623 xml-lang=en-US l10n=U 
oldref=74
-item type=input=LOGINV(0.05;0;1)/item returns 0.19./paragraph
+item type=input=LOGINV(0.05;0;1)/item returns 0.1930408167./paragraph
+/section
+section id=lognormdotinv
+bookmark xml-lang=en-US branch=index 
id=bm_id2901928bookmark_valueLOGNORM.INV function/bookmark_value
+bookmark_valueinverse of lognormal distribution/bookmark_value
+/bookmarkcommentmw added one entry/comment
+bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_LOGINV_MS 
id=bm_id2901062 localize=false/
+paragraph role=heading id=hd_id2901928 xml-lang=en-US level=2 
l10n=U oldref=66LOGNORM.INV/paragraph
+paragraph role=paragraph id=par_id2901297 xml-lang=en-US l10n=U 
oldref=67ahelp hid=HID_FUNC_LOGINV_MSReturns the inverse of the 
lognormal distribution./ahelp/paragraph
+paragraph id=par_id290122405814 role=paragraph xml-lang=en-USThis 
function is identical to LOGINV and was introduced for interoperability with 
other office suites./paragraph
+paragraph role=heading id=hd_id2901016 xml-lang=en-US level=3 
l10n=U oldref=68Syntax/paragraph
+paragraph role=code id=par_id2901049 xml-lang=en-US l10n=U 
oldref=69LOGNORM.INV(Number; Mean; StDev)/paragraph
+paragraph role=paragraph id=par_id2901390 xml-lang=en-US l10n=U 
oldref=70
+emphNumber/emph (required) is the probability value for which the inverse 
standard logarithmic distribution is to be calculated./paragraph
+paragraph role=paragraph id=par_id2901538 xml-lang=en-US l10n=U 
oldref=71
+emphMean/emph (required) is the arithmetic mean of the standard 
logarithmic distribution./paragraph
+paragraph role=paragraph id=par_id2901355 xml-lang=en-US l10n=U 
oldref=72
+emphStDev/emph (required) is the standard deviation of the standard 
logarithmic distribution./paragraph
+paragraph role=heading id=hd_id2901768 xml-lang=en-US level=3 
l10n=U oldref=73Example/paragraph
+paragraph role=paragraph id=par_id2901623 xml-lang=en-US l10n=U 
oldref=74
+item type=input=LOGNORM.INV(0.05;0;1)/item returns 
0.1930408167./paragraph
 /section
 section id=lognormdist
 bookmark xml-lang=en-US branch=index 
id=bm_id3158417bookmark_valueLOGNORMDIST function/bookmark_value
@@ -187,6 +207,27 @@
 paragraph role=paragraph id=par_id3149778 xml-lang=en-US l10n=U 
oldref=84
 item type=input=LOGNORMDIST(0.1;0;1)/item returns 0.01./paragraph
 /section
+section id=lognormdotdist
+bookmark xml-lang=en-US branch=index 
id=bm_id2901417bookmark_valueLOGNORM.DIST function/bookmark_value
+bookmark_valuelognormal distribution/bookmark_value
+/bookmarkcommentmw added one entry/comment
+bookmark xml-lang=en-US branch=hid/SC_HID_FUNC_NORMDIST_MS 
id=bm_id2901366 localize=false/
+paragraph role=heading id=hd_id2908417 xml-lang=en-US level=2 
l10n=U oldref=76LOGNORM.DIST/paragraph
+paragraph role=paragraph id=par_id2904953 xml-lang=en-US l10n=U 
oldref=77ahelp hid=HID_FUNC_NORMDIST_MSReturns the values of a lognormal 
distribution./ahelp/paragraph
+paragraph role=heading id=hd_id2900474 xml-lang=en-US level=3 
l10n=U oldref=78Syntax/paragraph
+paragraph role=code id=par_id2900686 xml-lang=en-US l10n=U 
oldref=79LOGNORM.DIST(Number; Mean; StDev; Cumulative)/paragraph
+paragraph role=paragraph id=par_id2904871 xml-lang=en-US l10n=U 
oldref=80
+emphNumber/emph (required) is the probability value for which the standard 
logarithmic distribution is to be calculated./paragraph
+paragraph role=paragraph id=par_id2905820 xml-lang=en-US l10n=U 
oldref=81
+emphMean/emph (required) is the mean value of the standard logarithmic 
distribution./paragraph
+paragraph role=paragraph id=par_id2905991 xml-lang=en-US l10n=U 
oldref=82
+emphStDev/emph (required) is the standard deviation of the standard 
logarithmic distribution./paragraph
+paragraph role=paragraph 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basic/source comphelper/source dbaccess/source filter/source forms/source framework/source scripting/source sd/source svx/source ucb/source u

[Noel Grandin]

 basic/source/basmgr/basicmanagerrepository.cxx|3 -
 basic/source/uno/dlgcont.cxx  |2 
 basic/source/uno/namecont.cxx |   10 ++--
 comphelper/source/processfactory/processfactory.cxx   |4 -
 dbaccess/source/core/dataaccess/connection.cxx|2 
 filter/source/svg/svgexport.cxx   |6 +-
 filter/source/svg/svgwriter.cxx   |   10 ++--
 forms/source/misc/InterfaceContainer.cxx  |2 
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |   23 
++
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |   17 
---
 framework/source/uifactory/menubarfactory.cxx |2 
 framework/source/uifactory/uielementfactorymanager.cxx|2 
 scripting/source/dlgprov/dlgprov.cxx  |4 -
 scripting/source/stringresource/stringresource.cxx|4 -
 sd/source/core/sdpage2.cxx|4 -
 sd/source/ui/view/ViewShellBase.cxx   |2 
 svx/source/form/fmobj.cxx |2 
 svx/source/form/fmshimp.cxx   |4 -
 svx/source/form/fmtools.cxx   |2 
 svx/source/form/fmundo.cxx|4 -
 svx/source/form/fmvwimp.cxx   |2 
 svx/source/form/formcontroller.cxx|6 +-
 svx/source/form/navigatortree.cxx |2 
 ucb/source/ucp/file/bc.cxx|2 
 ucb/source/ucp/file/filglob.cxx   |8 +--
 ucb/source/ucp/ftp/ftpcontent.cxx |2 
 unotools/source/config/configitem.cxx |2 
 xmloff/source/text/txtparai.cxx   |2 
 28 files changed, 73 insertions(+), 62 deletions(-)

New commits:
commit b0c1ad45408de8d328ce4c6d707ec7ab3b62dbc6
Author: Noel Grandin n...@peralex.com
Date:   Wed Jun 25 08:43:20 2014 +0200

fixes for up-casting to ReferenceXInterface

Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 Use the new type-checking
Reference constructor to reduce code noise

Signed-off-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4)

Conflicts:
framework/source/uifactory/menubarfactory.cxx

Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Reviewed-on: https://gerrit.libreoffice.org/9921
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index 4aece49..7228b8b 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -381,9 +381,10 @@ namespace basic
 //
 BasicManagerPointer ImplRepository::impl_getLocationForModel( const 
Reference XModel  _rxDocumentModel )
 {
+Reference XInterface  xNormalized( _rxDocumentModel, UNO_QUERY );
 DBG_ASSERT( _rxDocumentModel.is(), 
ImplRepository::impl_getLocationForModel: invalid model! );
 
-BasicManagerPointer location = m_aStore[ _rxDocumentModel ];
+BasicManagerPointer location = m_aStore[ xNormalized ];
 return location;
 }
 
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 1190f2d..c3ee643 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -240,7 +240,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( 
const uno::Reference e
 UNO_QUERY );
 ::xmlscript::importDialogModel( xInput, xDialogModel, 
mxContext, mxOwnerDocument );
 std::vector OUString  vEmbeddedImageURLs;
-GraphicObject::InspectForGraphicObjectImageURL( 
xDialogModel,  vEmbeddedImageURLs );
+GraphicObject::InspectForGraphicObjectImageURL( 
ReferenceXInterface(xDialogModel, UNO_QUERY),  vEmbeddedImageURLs );
 if ( !vEmbeddedImageURLs.empty() )
 {
 // Export the images to the storage
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 28efa64..dfdb2c9 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -297,7 +297,7 @@ void SAL_CALL NameContainer::addContainerListener( const 
Reference XContainerLi
 throw RuntimeException(addContainerListener 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit c6bd06cb6dfa755dfb953329c8eeaa1f4c11fc1b
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Thu Jun 26 18:46:18 2014 -0300

Updated core
Project: help  f4ae6be5fabc4f86cffacb5b6d4fd5eb6568a02f

Fix fdo#80432. Help entries for NORM functions

Write help pages for LOGNORM.DIST, LOGNORM.INV, NORM.DIST, NORM.INV, 
NORM.S.DIST and NORM.S.INV spreadsheet functions

Change-Id: I00f92dd339c6485f2f7b809f2e441241cde5a9d7
Reviewed-on: https://gerrit.libreoffice.org/9925
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index d2e055f..f4ae6be 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2e055fb50d07664c8b90456c07c2d39d49e62df
+Subproject commit f4ae6be5fabc4f86cffacb5b6d4fd5eb6568a02f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 cppu/source/typelib/typelib.cxx|4 +++-
 libreofficekit/source/gtk/lokdocview.c |   22 +++---
 2 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit ab0b8a95ef9ede3d41289593b8fbf68800ff9278
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Jun 24 16:12:08 2014 +0100

fix comment and tiny optimisation for shutdown.

Change-Id: I94e0f55f7fc38529a9ab165786efaf7ac649a9d3

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 583b737..8533578 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -270,7 +270,9 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
 if( pWeakMap )
 {
 std::vector typelib_TypeDescriptionReference *  ppTDR;
-// save al weak references
+ppTDR.reserve( pWeakMap-size() );
+
+// save all weak references
 WeakMap_Impl::const_iterator aIt = pWeakMap-begin();
 while( aIt != pWeakMap-end() )
 {
commit 3c440aad56cdaf3e0c05af6c7967a3d15b183034
Author: Michael Meeks michael.me...@collabora.com
Date:   Thu Jun 26 11:14:50 2014 +0100

LOK DocView: handle document load failure without crashing.

Change-Id: Icd668b3a7ec3ac58322a6af3f1da6008837d0b6b

diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 49aaf2e..f813e68 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -22,8 +22,9 @@ static void lok_docview_init( LOKDocView* pDocView );
 void lcl_onDestroy( LOKDocView* pDocView, gpointer pData )
 {
 (void) pData;
-pDocView-pDocument-pClass-destroy( pDocView-pDocument );
-pDocView-pDocument = 0;
+if ( pDocView-pDocument )
+pDocView-pDocument-pClass-destroy( pDocView-pDocument );
+pDocView-pDocument = NULL;
 }
 
 SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
@@ -139,15 +140,22 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( 
LOKDocView* pDocView, c
 if ( pDocView-pDocument )
 {
 pDocView-pDocument-pClass-destroy( pDocView-pDocument );
-pDocView-pDocument = 0;
+pDocView-pDocument = NULL;
 }
 
 pDocView-pDocument = pDocView-pOffice-pClass-documentLoad( 
pDocView-pOffice,
-   pPath );
-
-renderDocument( pDocView );
+   pPath );
+if ( !pDocView-pDocument )
+{
+// FIXME: should have a GError parameter and populate it.
+char *pError = pDocView-pOffice-pClass-getError( pDocView-pOffice 
);
+fprintf( stderr, Error opening document '%s'\n, pError );
+return FALSE;
+}
+else
+renderDocument( pDocView );
 
-return FALSE;
+return TRUE;
 }
 
 SAL_DLLPUBLIC_EXPORT void lok_docview_set_zoom ( LOKDocView* pDocView, float 
fZoom )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/basegfx lotuswordpro/source oox/source reportdesign/source svl/source svx/source sw/source unoidl/source unotools/source vcl/source vcl/unx xmloff/s

[Caolán McNamara]

 include/basegfx/raster/bpixelraster.hxx   |4 -
 lotuswordpro/source/filter/lwpparastyle.cxx   |2 
 lotuswordpro/source/filter/xfilter/xfdrawline.cxx |2 
 lotuswordpro/source/filter/xfilter/xfdrawobj.cxx  |2 
 lotuswordpro/source/filter/xfilter/xfframe.cxx|2 
 lotuswordpro/source/filter/xfilter/xfimage.cxx|2 
 oox/source/export/chartexport.cxx |2 
 reportdesign/source/core/api/Section.cxx  |2 
 svl/source/items/itemset.cxx  |6 --
 svx/source/svdraw/svdpntv.cxx |2 
 sw/source/core/docnode/ndtbl.cxx  |4 -
 sw/source/core/text/itratr.cxx|4 -
 unoidl/source/sourceprovider-parser.y |   20 
 unoidl/source/unoidl-check.cxx|4 -
 unoidl/source/unoidl-read.cxx |4 -
 unotools/source/ucbhelper/ucbhelper.cxx   |   20 
 vcl/source/app/svapp.cxx  |2 
 vcl/source/fontsubset/cff.cxx |2 
 vcl/source/gdi/bmpfast.cxx|2 
 vcl/source/window/dialog.cxx  |2 
 vcl/unx/generic/gdi/salgdi2.cxx   |   50 --
 vcl/unx/gtk/a11y/atklistener.cxx  |2 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx  |2 
 xmloff/source/text/txtparae.cxx   |3 -
 24 files changed, 74 insertions(+), 73 deletions(-)

New commits:
commit 986c0451d05e7bb6ff7edd9f27d0e45532bcd22c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jun 26 21:06:35 2014 +0100

Resolves: fdo#80160 PNG with 1-bit colormap only show black and white

Change-Id: If0c9950c18e6091fafea47954a4654db436a3a44

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index ef76996..be722c5 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -440,6 +440,32 @@ void X11SalGraphics::copyArea ( long nDestX,long 
nDestY,
 copyBits ( aPosAry, 0 );
 }
 
+namespace
+{
+void setForeBack(XGCValues rValues, const SalColormap rColMap, const 
SalBitmap rSalBitmap)
+{
+rValues.foreground = rColMap.GetWhitePixel();
+rValues.background = rColMap.GetBlackPixel();
+
+//fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
+//to set fore/back colors
+SalBitmap rBitmap = const_castSalBitmap(rSalBitmap);
+if (const BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
+{
+const BitmapPalette rPalette = pBitmapBuffer-maPalette;
+if (rPalette.GetEntryCount() == 2)
+{
+const BitmapColor 
aWhite(rPalette[rPalette.GetBestIndex(Color(COL_WHITE))]);
+rValues.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
+
+const BitmapColor 
aBlack(rPalette[rPalette.GetBestIndex(Color(COL_BLACK))]);
+rValues.background = rColMap.GetPixel(ImplColorToSal(aBlack));
+}
+rBitmap.ReleaseBuffer(pBitmapBuffer, true);
+}
+}
+}
+
 void X11SalGraphics::drawBitmap( const SalTwoRect rPosAry, const SalBitmap 
rSalBitmap )
 {
 const SalDisplay*   pSalDisp = GetDisplay();
@@ -455,24 +481,7 @@ void X11SalGraphics::drawBitmap( const SalTwoRect 
rPosAry, const SalBitmap rSa
 {
 // set foreground/background values for 1Bit bitmaps
 XGetGCValues( pXDisp, aGC, nValues, aOldVal );
-
-aNewVal.foreground = rColMap.GetWhitePixel();
-aNewVal.background = rColMap.GetBlackPixel();
-
-//fdo#33455 handle 1 bit depth pngs with palette entries
-//to set fore/back colors
-if (const BitmapBuffer* pBitmapBuffer = 
const_castSalBitmap(rSalBitmap).AcquireBuffer(true))
-{
-const BitmapPalette rPalette = pBitmapBuffer-maPalette;
-if (rPalette.GetEntryCount() == 2)
-{
-const BitmapColor aBlack( rPalette[rPalette.GetBestIndex( 
Color( COL_BLACK ) )] );
-const BitmapColor aWhite( rPalette[rPalette.GetBestIndex( 
Color( COL_WHITE ) )] );
-aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
-aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
-}
-}
-
+setForeBack(aNewVal, rColMap, rSalBitmap);
 XChangeGC( pXDisp, aGC, nValues, aNewVal );
 }
 
@@ -525,13 +534,12 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect 
rPosAry,
 {
 GC  aTmpGC;
 XGCValues   aValues;
-const SalColormap  rColMap = pSalDisp-GetColormap( m_nXScreen );
-const int   nBlack = rColMap.GetBlackPixel(), nWhite = 
rColMap.GetWhitePixel();
+setForeBack(aValues, pSalDisp-GetColormap(m_nXScreen), rSalBitmap);
 const int   nValues = GCFunction | GCForeground | 

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

[Caolán McNamara]

 include/sfx2/sfxbasemodel.hxx|2 -
 sfx2/source/doc/sfxbasemodel.cxx |   16 +---
 vcl/unx/generic/gdi/salgdi2.cxx  |   50 ++-
 3 files changed, 42 insertions(+), 26 deletions(-)

New commits:
commit c1df0c41b602ac144fdde4efcf546549443afa86
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jun 26 21:06:35 2014 +0100

Resolves: fdo#80160 PNG with 1-bit colormap only show black and white

Change-Id: If0c9950c18e6091fafea47954a4654db436a3a44
(cherry picked from commit 986c0451d05e7bb6ff7edd9f27d0e45532bcd22c)

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index ef76996..be722c5 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -440,6 +440,32 @@ void X11SalGraphics::copyArea ( long nDestX,long 
nDestY,
 copyBits ( aPosAry, 0 );
 }
 
+namespace
+{
+void setForeBack(XGCValues rValues, const SalColormap rColMap, const 
SalBitmap rSalBitmap)
+{
+rValues.foreground = rColMap.GetWhitePixel();
+rValues.background = rColMap.GetBlackPixel();
+
+//fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
+//to set fore/back colors
+SalBitmap rBitmap = const_castSalBitmap(rSalBitmap);
+if (const BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
+{
+const BitmapPalette rPalette = pBitmapBuffer-maPalette;
+if (rPalette.GetEntryCount() == 2)
+{
+const BitmapColor 
aWhite(rPalette[rPalette.GetBestIndex(Color(COL_WHITE))]);
+rValues.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
+
+const BitmapColor 
aBlack(rPalette[rPalette.GetBestIndex(Color(COL_BLACK))]);
+rValues.background = rColMap.GetPixel(ImplColorToSal(aBlack));
+}
+rBitmap.ReleaseBuffer(pBitmapBuffer, true);
+}
+}
+}
+
 void X11SalGraphics::drawBitmap( const SalTwoRect rPosAry, const SalBitmap 
rSalBitmap )
 {
 const SalDisplay*   pSalDisp = GetDisplay();
@@ -455,24 +481,7 @@ void X11SalGraphics::drawBitmap( const SalTwoRect 
rPosAry, const SalBitmap rSa
 {
 // set foreground/background values for 1Bit bitmaps
 XGetGCValues( pXDisp, aGC, nValues, aOldVal );
-
-aNewVal.foreground = rColMap.GetWhitePixel();
-aNewVal.background = rColMap.GetBlackPixel();
-
-//fdo#33455 handle 1 bit depth pngs with palette entries
-//to set fore/back colors
-if (const BitmapBuffer* pBitmapBuffer = 
const_castSalBitmap(rSalBitmap).AcquireBuffer(true))
-{
-const BitmapPalette rPalette = pBitmapBuffer-maPalette;
-if (rPalette.GetEntryCount() == 2)
-{
-const BitmapColor aBlack( rPalette[rPalette.GetBestIndex( 
Color( COL_BLACK ) )] );
-const BitmapColor aWhite( rPalette[rPalette.GetBestIndex( 
Color( COL_WHITE ) )] );
-aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
-aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
-}
-}
-
+setForeBack(aNewVal, rColMap, rSalBitmap);
 XChangeGC( pXDisp, aGC, nValues, aNewVal );
 }
 
@@ -525,13 +534,12 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect 
rPosAry,
 {
 GC  aTmpGC;
 XGCValues   aValues;
-const SalColormap  rColMap = pSalDisp-GetColormap( m_nXScreen );
-const int   nBlack = rColMap.GetBlackPixel(), nWhite = 
rColMap.GetWhitePixel();
+setForeBack(aValues, pSalDisp-GetColormap(m_nXScreen), rSalBitmap);
 const int   nValues = GCFunction | GCForeground | GCBackground;
 SalTwoRect  aTmpRect( rPosAry ); aTmpRect.mnDestX = 
aTmpRect.mnDestY = 0;
 
 // draw paint bitmap in pixmap #1
-aValues.function = GXcopy, aValues.foreground = nWhite, 
aValues.background = nBlack;
+aValues.function = GXcopy;
 aTmpGC = XCreateGC( pXDisp, aFG, nValues, aValues );
 static_castconst X11SalBitmap(rSalBitmap).ImplDraw( aFG, 
m_nXScreen, nDepth, aTmpRect, aTmpGC );
 DBG_TESTTRANS( aFG );
commit e7161741d186e7edfbaaaf405f157e1cdfccdb5c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jun 26 09:50:18 2014 +0100

clang: Use-after-free

Change-Id: I5dd857dbf39c8cd62df8b8cd0323b873a79976ae
(cherry picked from commit 112645f75816c4902ccf8a2a97ef57e8f13429b8)

diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index fd33b2d..c5c5a87 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -879,7 +879,7 @@ private:
 
 SAL_DLLPRIVATE void loadCmisProperties();
 
-SAL_DLLPRIVATE void handleLoadError( sal_uInt32 nError, SfxMedium* pMedium 
);
+SAL_DLLPRIVATE SfxMedium* handleLoadError( sal_uInt32 nError, SfxMedium* 
pMedium );
 
 
 // 

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

[Michael Stahl]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   41 -
 1 file changed, 27 insertions(+), 14 deletions(-)

New commits:
commit 35314e0a499602936df0062ae9e7ce074d39f801
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jun 18 00:45:50 2014 +0200

writerfilter: RTF import: fix handling of associated char properties

These are all dependent on the active \lrtch \rtlch \loch \hich \dbch.

There does not appear to be a SPRM Id for CJK bold / italic / fontsize.

Change-Id: I055ac29700ccd3b32b02c3f7685629254a6c3fd6
(cherry picked from commit fc49c052dbdbb5ab3b0a02a13143705f769b9662)
Reviewed-on: https://gerrit.libreoffice.org/9915
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9d9805f..d05ac5b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3368,10 +3368,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 switch (nKeyword)
 {
 case RTF_FS:
-nSprm = NS_ooxml::LN_EG_RPrBase_sz;
-break;
 case RTF_AFS:
-nSprm = NS_ooxml::LN_EG_RPrBase_szCs;
+nSprm = (m_aStates.top().isRightToLeft
+|| m_aStates.top().eRunType == RTFParserState::HICH)
+? NS_ooxml::LN_EG_RPrBase_szCs
+: NS_ooxml::LN_EG_RPrBase_sz;
 break;
 case RTF_ANIMTEXT:
 nSprm = NS_ooxml::LN_EG_RPrBase_effect;
@@ -3397,14 +3398,24 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 switch (nKeyword)
 {
 case RTF_LANG:
-nSprm = NS_ooxml::LN_CT_Language_val;
+case RTF_ALANG:
+if (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == 
RTFParserState::HICH)
+{
+nSprm = NS_ooxml::LN_CT_Language_bidi;
+}
+else if (m_aStates.top().eRunType == RTFParserState::DBCH)
+{
+nSprm = NS_ooxml::LN_CT_Language_eastAsia;
+}
+else
+{
+assert(m_aStates.top().eRunType == RTFParserState::LOCH);
+nSprm = NS_ooxml::LN_CT_Language_val;
+}
 break;
-case RTF_LANGFE:
+case RTF_LANGFE: // this one is always CJK apparently
 nSprm = NS_ooxml::LN_CT_Language_eastAsia;
 break;
-case RTF_ALANG:
-nSprm = NS_ooxml::LN_CT_Language_bidi;
-break;
 default:
 break;
 }
@@ -4608,16 +4619,18 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword 
nKeyword, bool bParam, int nParam
 switch (nKeyword)
 {
 case RTF_B:
-nSprm = NS_ooxml::LN_EG_RPrBase_b;
-break;
 case RTF_AB:
-nSprm = NS_ooxml::LN_EG_RPrBase_bCs;
+nSprm = (m_aStates.top().isRightToLeft
+|| m_aStates.top().eRunType == RTFParserState::HICH)
+? NS_ooxml::LN_EG_RPrBase_bCs
+: NS_ooxml::LN_EG_RPrBase_b;
 break;
 case RTF_I:
-nSprm = NS_ooxml::LN_EG_RPrBase_i;
-break;
 case RTF_AI:
-nSprm = NS_ooxml::LN_EG_RPrBase_iCs;
+nSprm = (m_aStates.top().isRightToLeft
+|| m_aStates.top().eRunType == RTFParserState::HICH)
+? NS_ooxml::LN_EG_RPrBase_iCs
+: NS_ooxml::LN_EG_RPrBase_i;
 break;
 case RTF_OUTL:
 nSprm = NS_ooxml::LN_EG_RPrBase_outline;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/generic/gdi/salgdi2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d781e874e018988d26b558ae1e4d6a1303b14cc1
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 09:05:53 2014 +0100

bah, const issue

Change-Id: If7fd95287ba1a28e7b5f5440776859b912d6ad6e

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index be722c5..4af97a5 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -450,7 +450,7 @@ namespace
 //fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
 //to set fore/back colors
 SalBitmap rBitmap = const_castSalBitmap(rSalBitmap);
-if (const BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
+if (BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
 {
 const BitmapPalette rPalette = pBitmapBuffer-maPalette;
 if (rPalette.GetEntryCount() == 2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/unx

[Caolán McNamara]

 vcl/unx/generic/gdi/salgdi2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c22fcb268cad9e0394f6af01f10a327f7e2ff5bd
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 09:05:53 2014 +0100

bah, const issue

Change-Id: If7fd95287ba1a28e7b5f5440776859b912d6ad6e
(cherry picked from commit d781e874e018988d26b558ae1e4d6a1303b14cc1)

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index be722c5..4af97a5 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -450,7 +450,7 @@ namespace
 //fdo#33455 and fdo#80160 handle 1 bit depth pngs with palette entries
 //to set fore/back colors
 SalBitmap rBitmap = const_castSalBitmap(rSalBitmap);
-if (const BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
+if (BitmapBuffer* pBitmapBuffer = rBitmap.AcquireBuffer(true))
 {
 const BitmapPalette rPalette = pBitmapBuffer-maPalette;
 if (rPalette.GetEntryCount() == 2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/inc/ChartView.hxx|1 
 chart2/source/model/main/ChartModel.cxx |2 +
 chart2/source/view/main/ChartView.cxx   |   37 
 sc/inc/document.hxx |1 
 sc/source/core/data/document.cxx|   26 ++
 5 files changed, 63 insertions(+), 4 deletions(-)

New commits:
commit ce05c5e4b0b0b9e910b4d90013a993395dd9ed8c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jun 26 14:19:28 2014 +0200

fix incorrect ScAnnotationsObj UNO API, fdo#80551

The used index was a sheet local index but the returned position was
from a global container.

Change-Id: I0b9e9e7e9618c72daf8e6417bca9d3a1cb23abb1

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 00649b7..d7f8752 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -951,6 +951,7 @@ public:
 void ForgetNoteCaptions( const ScRangeList rRanges );
 
 ScAddress GetNotePosition( size_t nIndex ) const;
+ScAddress GetNotePosition( size_t nIndex, SCTAB nTab ) const;
 SCROW GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) const;
 
 SC_DLLPUBLIC void GetAllNoteEntries( std::vectorsc::NoteEntry rNotes ) 
const;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 30b9a75..e68758c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6097,6 +6097,32 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex ) 
const
 return ScAddress(ScAddress::INITIALIZE_INVALID);
 }
 
+ScAddress ScDocument::GetNotePosition( size_t nIndex, SCTAB nTab ) const
+{
+for (SCCOL nCol=0; nColMAXCOLCOUNT; nCol++)
+{
+size_t nColNoteCount = GetNoteCount(nTab, nCol);
+if (!nColNoteCount)
+continue;
+
+if (nIndex = nColNoteCount)
+{
+nIndex -= nColNoteCount;
+continue;
+}
+
+SCROW nRow = GetNotePosition(nTab, nCol, nIndex);
+if (nRow = 0)
+return ScAddress(nCol, nRow, nTab);
+
+OSL_FAIL(note not found);
+return ScAddress(ScAddress::INITIALIZE_INVALID);
+}
+
+OSL_FAIL(note not found);
+return ScAddress(ScAddress::INITIALIZE_INVALID);
+}
+
 SCROW ScDocument::GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) 
const
 {
 const ScTable* pTab = FetchTable(nTab);
commit 355c3cbb16b0bab705050dd24205878bcecd5687
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jun 26 13:47:38 2014 +0200

fix invalid memory access in chart tests

Change-Id: I056101d146c939ff958c83efc57fd110e8d52509

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index d69aa9f8..4f2b961 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -197,6 +197,7 @@ public:
   std::exception) SAL_OVERRIDE;
 
 void setViewDirty();
+void updateOpenGLWindow();
 
 private: //methods
 ChartView();
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index 02c12347..e127cf3 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1429,6 +1429,8 @@ void ChartModel::update()
 
 mpChartView-setViewDirty();
 mpChartView-update();
+if(mpChartView)
+mpChartView-updateOpenGLWindow();
 }
 
 
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 9142b3e..116791a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -165,22 +165,25 @@ public:
 virtual void mouseDragMove(const Point rBegin, const Point rEnd, 
sal_uInt16 nButton) SAL_OVERRIDE;
 virtual void scroll(long nDelta) SAL_OVERRIDE;
 virtual void contextDestroyed() SAL_OVERRIDE;
+
+void updateOpenGLWindow();
 private:
 ChartView* mpView;
 bool mbContextDestroyed;
+OpenGLWindow* mpWindow;
 };
 
 GL2DRenderer::GL2DRenderer(ChartView* pView):
 mpView(pView),
-mbContextDestroyed(false)
+mbContextDestroyed(false),
+mpWindow(mpView-mrChartModel.getOpenGLWindow())
 {
 }
 
 GL2DRenderer::~GL2DRenderer()
 {
-OpenGLWindow* pWindow = mpView-mrChartModel.getOpenGLWindow();
-if(!mbContextDestroyed pWindow)
-pWindow-setRenderer(NULL);
+if(!mbContextDestroyed  mpWindow)
+mpWindow-setRenderer(NULL);
 }
 
 void GL2DRenderer::update()
@@ -205,6 +208,27 @@ void GL2DRenderer::contextDestroyed()
 mbContextDestroyed = true;
 }
 
+void GL2DRenderer::updateOpenGLWindow()
+{
+if(mbContextDestroyed)
+return;
+
+OpenGLWindow* pWindow = mpView-mrChartModel.getOpenGLWindow();
+if(pWindow != mpWindow)
+{
+if(mpWindow)
+{
+mpWindow-setRenderer(NULL);
+}
+
+if(pWindow)
+{
+pWindow-setRenderer(this);
+}
+}
+mpWindow = pWindow;
+}
+
 const uno::Sequencesal_Int8 

[Libreoffice-commits] core.git: download.lst external/mythes

[Caolán McNamara]

 download.lst   |2 +-
 external/mythes/UnpackedTarball_mythes.mk  |2 --
 external/mythes/mythes-1.2.0-android.patch |   20 
 external/mythes/mythes-ssizet.patch|   20 
 4 files changed, 1 insertion(+), 43 deletions(-)

New commits:
commit 0751477a375e0b6bb82c5aa47c9e666d6dc2ba8c
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 09:33:58 2014 +0100

upgrade mythes to 1.2.4

Change-Id: I79b658fc737ef3dd65039c3b43705505a45fb1fd

diff --git a/download.lst b/download.lst
index 2f45c35..28f2df3 100644
--- a/download.lst
+++ b/download.lst
@@ -100,7 +100,7 @@ export MSPUB_TARBALL := libmspub-0.1.0.tar.bz2
 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
 export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
+export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
 export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
diff --git a/external/mythes/UnpackedTarball_mythes.mk 
b/external/mythes/UnpackedTarball_mythes.mk
index 7571c34..42e6524 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -13,8 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
-   external/mythes/mythes-1.2.0-android.patch \
-   external/mythes/mythes-ssizet.patch \
external/mythes/mythes-fdo48017-wfopen.patch \
 ))
 
diff --git a/external/mythes/mythes-1.2.0-android.patch 
b/external/mythes/mythes-1.2.0-android.patch
deleted file mode 100644
index 9b52938..000
--- a/external/mythes/mythes-1.2.0-android.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/mythes-1.2.3/config.sub   2010-02-27 16:52:52.0 +0100
-+++ misc/build/mythes-1.2.3/config.sub 2011-09-26 23:39:04.0 +0200
-@@ -123,7 +123,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1294,7 +1294,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/external/mythes/mythes-ssizet.patch 
b/external/mythes/mythes-ssizet.patch
deleted file mode 100644
index 25d9516..000
--- a/external/mythes/mythes-ssizet.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/mythes-1.2.3/mythes.cxx   2012-06-29 13:16:55.812939142 +0100
-+++ misc/build/mythes-1.2.3/mythes.cxx 2012-06-29 13:17:21.159198507 +0100
-@@ -48,7 +48,7 @@
- len = readLine(pifile,wrd,MAX_WD_LEN);
- int idxsz = atoi(wrd); 
-
--if (idxsz = 0 || idxsz  std::numeric_limitsssize_t::max() / 
sizeof(sizeof(char*))) {
-+if (idxsz = 0 || idxsz  std::numeric_limitsint::max() / 
sizeof(sizeof(char*))) {
-fprintf(stderr,Error - bad index %d\n, idxsz);
-fclose(pifile);
-return 0;
-@@ -176,7 +176,7 @@
-  return 0;
- }  
- int nmeanings = atoi(buf+np+1);
--if (nmeanings  0 || nmeanings  std::numeric_limitsssize_t::max() / 
sizeof(mentry))
-+if (nmeanings  0 || nmeanings  std::numeric_limitsint::max() / 
sizeof(mentry))
- nmeanings = 0;
- *pme = (mentry*)(nmeanings ? malloc(nmeanings * sizeof(mentry)) : NULL);
- if (!(*pme)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/get-bugzilla-attachments-by-mimetype config_host.mk.in configure.ac download.lst external/libpagemaker external/Module_external.mk filter/Configuration_

[David Tardon]

 RepositoryExternal.mk|   33 +++
 bin/get-bugzilla-attachments-by-mimetype |   15 -
 config_host.mk.in|3 
 configure.ac |5 
 download.lst |2 
 external/Module_external.mk  |1 
 external/libpagemaker/ExternalProject_libpagemaker.mk|   41 
 external/libpagemaker/Makefile   |7 
 external/libpagemaker/Module_libpagemaker.mk |   17 ++
 external/libpagemaker/README |1 
 external/libpagemaker/UnpackedTarball_libpagemaker.mk|   14 +
 filter/Configuration_filter.mk   |2 
 filter/source/config/fragments/filters/PageMakerDocument.xcu |   13 +
 filter/source/config/fragments/types/draw_PageMaker_Document.xcu |   12 +
 writerperfect/Library_wpftdraw.mk|2 
 writerperfect/qa/unit/data/draw/libpagemaker/pass/shapes.pmd |binary
 writerperfect/source/draw/PageMakerImportFilter.cxx  |   83 
++
 writerperfect/source/draw/PageMakerImportFilter.hxx  |   49 +
 writerperfect/source/draw/wpftdraw.component |4 
 writerperfect/source/draw/wpftdraw_genericfilter.cxx |5 
 20 files changed, 302 insertions(+), 7 deletions(-)

New commits:
commit bba28baf8bbf9749b94d63f1f23c2e32353394b4
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 26 21:26:35 2014 +0200

download PageMaker files

Change-Id: I739f5f9b6f0e6a97832136812b289ae27cfaae37

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 31ba07d..c48bbc8 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -398,6 +398,7 @@ mimetypes = {
 'application/x-t602': '602',
 'application/x-fictionbook+xml': 'fb2',
 'application/x-abiword': 'abw',
+'application/x-pagemaker': 'pmd',
 # binfilter
 'application/x-starcalc': 'sdc',
 'application/vnd.stardivision.calc': 'sdc5',
commit 516fb340b1842a5deec3de61e47bb5a7ec5c1980
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 26 21:26:11 2014 +0200

integrate libpagemaker

Change-Id: I077d7c9a41793abdf5f001386f44ac407f94a6d3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e69f625..39ca2d85 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1910,6 +1910,39 @@ endef
 endif # SYSTEM_MSPUB
 
 
+ifneq ($(SYSTEM_PAGEMAKER),)
+
+define gb_LinkTarget__use_pagemaker
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(PAGEMAKER_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(PAGEMAKER_LIBS))
+
+endef
+gb_ExternalProject__use_pagemaker :=
+
+else # !SYSTEM_PAGEMAKER
+
+define gb_LinkTarget__use_pagemaker
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,libpagemaker)/inc \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,libpagemaker)/src/lib/.libs/libpagemaker-0.0$(gb_StaticLibrary_PLAINEXT)
 \
+)
+$(call gb_LinkTarget_use_external_project,$(1),libpagemaker)
+
+endef
+define gb_ExternalProject__use_pagemaker
+$(call gb_ExternalProject_use_external_project,$(1),libpagemaker)
+
+endef
+
+endif # SYSTEM_PAGEMAKER
+
+
 ifneq ($(SYSTEM_VISIO),)
 
 define gb_LinkTarget__use_visio
diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index ce967e2..31ba07d 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -29,20 +29,20 @@ import stat
 import sys
 import threading, Queue
 try:
-from urllib.request import urlopen
+from urllib.request import urlopen
 except:
-from urllib import urlopen
+from urllib import urlopen
 try:
-import xmlrpc.client as xmlrpclib
+import xmlrpc.client as xmlrpclib
 except:
-import xmlrpclib
+import xmlrpclib
 from xml.dom import minidom
 from xml.sax.saxutils import escape
 
 def urlopen_retry(url):
-maxretries = 3
-for i in range(maxretries + 1):
-try:
+maxretries = 3
+for i in range(maxretries + 1):
+try:
 return urlopen(url)
 except IOError as e:
 print(caught IOError:  + str(e))
diff --git a/config_host.mk.in b/config_host.mk.in
index b7e5b6c..72e1f8c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -434,6 +434,8 @@ export OS_FOR_BUILD=@OS_FOR_BUILD@
 export OUTPATH=@OUTPATH@
 export PATH=@LO_PATH@
 export LIBO_PATH_SEPARATOR=@P_SEP@
+export PAGEMAKER_CFLAGS=$(gb_SPACE)@PAGEMAKER_CFLAGS@
+export PAGEMAKER_LIBS=$(gb_SPACE)@PAGEMAKER_LIBS@
 export PERL=@PERL@
 export PKGFORMAT=@PKGFORMAT@
 export PKGMK=@PKGMK@
@@ -551,6 +553,7 

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

[David Tardon]

 sysui/desktop/menus/draw.desktop |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 657d4d5430cd95e99c7037f31b18f96c77a83d7f
Author: David Tardon dtar...@redhat.com
Date:   Fri Jun 27 10:42:39 2014 +0200

add PageMaker to the list of supported formats

Change-Id: I8e13b3516786c817165654190b08cf904c9a4454

diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index e28c597..ae57504 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -22,7 +22,7 @@ Icon=draw
 Type=Application
 
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
 Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts and logos by using Draw.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/hyphen

[Caolán McNamara]

 download.lst |2 +-
 external/hyphen/UnpackedTarball_hyphen.mk|4 
 external/hyphen/hyphen-android.patch |   20 
 external/hyphen/hyphen-fdo43931.patch|   15 ---
 external/hyphen/hyphen-fdo48017-wfopen.patch |   10 --
 external/hyphen/hyphen-lenwaswrong.patch |   11 ---
 external/hyphen/hyphen-rhmin.patch   |   27 ---
 7 files changed, 5 insertions(+), 84 deletions(-)

New commits:
commit 77af6cd18c2df43b75cd2c973a5267647de2f6e5
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 09:59:03 2014 +0100

update hyphen 2.8.7

Change-Id: Icbe95429903dd3605acfd659c46f001d838b52c3

diff --git a/download.lst b/download.lst
index 3614789..2e74282 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,7 @@ export HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
+export HYPHEN_TARBALL := ecaf645cb09bd7b6ad0497b8a91fbd22-hyphen-2.8.7.tar.gz
 export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk 
b/external/hyphen/UnpackedTarball_hyphen.mk
index c112b35..0f41367 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -12,10 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen))
 $(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
-   external/hyphen/hyphen-lenwaswrong.patch \
-   external/hyphen/hyphen-fdo43931.patch \
-   external/hyphen/hyphen-android.patch \
-   external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
 ))
diff --git a/external/hyphen/hyphen-android.patch 
b/external/hyphen/hyphen-android.patch
deleted file mode 100644
index d092d78..000
--- a/external/hyphen/hyphen-android.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/hyphen-2.8.4/config.sub
-+++ misc/build/hyphen-2.8.4/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1215,7 +1215,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/external/hyphen/hyphen-fdo43931.patch 
b/external/hyphen/hyphen-fdo43931.patch
deleted file mode 100644
index 0a1f0b9..000
--- a/external/hyphen/hyphen-fdo43931.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 misc//hyphen-2.8.4/hyphen.c2011-10-10 15:49:33.0 +0200
-+++ misc/build/hyphen-2.8.4/hyphen.c   2011-12-27 13:49:07.568283812 +0100
-@@ -436,9 +436,9 @@
- }
-   } else if (k == 1) {
- /* default first level: hyphen and ASCII apostrophe */
--if (!dict[0]-utf8) hnj_hyphen_load_line(NOHYPHEN '\n, dict[k], 
hashtab);
--else hnj_hyphen_load_line(NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n, 
dict[k], hashtab);
--strncpy(buf, 1-1/=,1,1\n, MAX_CHARS-1); // buf rewritten by 
hnj_hyphen_load here
-+if (!dict[0]-utf8) hnj_hyphen_load_line(NOHYPHEN ',-\n, dict[k], 
hashtab);
-+else hnj_hyphen_load_line(NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99,-\n, 
dict[k], hashtab);
-+strncpy(buf, 1-1\n, MAX_CHARS-1); // buf rewritten by hnj_hyphen_load 
here
- buf[MAX_CHARS-1] = '\0';
- hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
- hnj_hyphen_load_line(1'1\n, dict[k], hashtab); /* ASCII apostrophe */
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch 
b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 27cffa0..4bcf633 100644
--- 

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

[David Tardon]

 Makefile.fetch |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2c0e024d6466c991330a77b20be5334cb31b716
Author: David Tardon dtar...@redhat.com
Date:   Fri Jun 27 11:07:06 2014 +0200

download libpagemaker tarball

Change-Id: Ib0ad5408078308bf790cbffe10ff1399c6c95dbe

diff --git a/Makefile.fetch b/Makefile.fetch
index 204c8f8..1c0d53e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -189,6 +189,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \
$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \
+   $(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/ak.lm  |  400 
 langclass/ShortTexts/ak.txt |  215 +++
 langclass/fpdb.conf |1 
 src/Makefile.am |4 
 4 files changed, 618 insertions(+), 2 deletions(-)

New commits:
commit a91e1f867ba027a510221ca4c085341301b158a1
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:12:56 2014 +0100

add Akan

diff --git a/langclass/LM/ak.lm b/langclass/LM/ak.lm
new file mode 100644
index 000..212860d
--- /dev/null
+++ b/langclass/LM/ak.lm
@@ -0,0 +1,400 @@
+_
+a
+n
+a_
+e
+o
+ɛ
+m
+i
+_n
+_a
+w
+ɔ
+s
+y
+e_
+b
+k
+h
+r
+an
+ɛ_
+u
+o_
+d
+f
+ne
+yɛ
+wɔ
+_w
+ma
+na
+ne_
+_wɔ
+_s
+sɛ
+_ne
+_m
+ho
+i_
+bi
+ra
+ɔ_
+_ne_
+n_
+sɛ_
+ar
+ia
+_b
+de
+ra_
+aa
+_k
+ara
+_h
+fa
+_sɛ
+ara_
+_ɔ
+_sɛ_
+t
+.
+._
+aa_
+,
+,_
+_ho
+wɔ_
+yi
+p
+_an
+bia
+iara
+_a_
+iar
+an_
+biara
+no
+biar
+mu
+naa
+ky
+so
+am
+iara_
+as
+_o
+de_
+m_
+ana
+ny
+_no
+no_
+naa_
+fa_
+ni
+_wɔ_
+ɛf
+u_
+_ana
+ad
+hy
+man
+_no_
+A
+anaa
+_anaa
+ɛfa
+ma_
+yɛf
+_bi
+anaa_
+_mu
+_ky
+ɔn
+yɛfa
+yɛ_
+wa
+kyɛ
+pa
+ɛfa_
+_kyɛf
+hyɛ
+_A
+kyɛf
+kyɛfa
+_kyɛ
+_ɛ
+yɛfa_
+w_
+ho_
+kw
+kwa
+di
+re
+ah
+mm
+ye
+su
+_ho_
+ab
+na_
+mu_
+en
+fo
+so_
+_y
+_ah
+om
+ob
+ka
+ns
+_mu_
+ɛd
+or
+ua
+ɛde
+man_
+wan
+kwan
+di_
+ɛde_
+_ny
+O
+of
+ba
+aho
+bɔ
+_aho
+ɔd
+ya
+_ad
+sa
+_ob
+ama
+yɛd
+yɛde_
+bi_
+_O
+yɛde
+in
+_na
+hyɛd
+_mm
+Ahy
+_Ah
+Ahyɛ
+nn
+hyɛde
+_Ahyɛ
+Ah
+Ahyɛd
+_Ahy
+on
+ip
+wan_
+kwan_
+nip
+ipa
+ko
+nipa
+nk
+pa_
+_so
+nya
+yin
+_ma
+obi
+_obi
+ro
+_na_
+_bia
+at
+oro
+se
+_as
+_ama
+_Obi
+_Obia
+Obia
+Obiar
+Obi
+_Ob
+Ob
+er
+ɔde
+mma
+_am
+_ns
+nipa_
+_biar
+ipa_
+nyi
+wɔn
+_wɔn
+g
+te
+sua
+o.
+o._
+ok
+ina
+yina
+ɔn_
+dw
+_yi
+em
+uw
+_on
+om_
+im
+ak
+ku
+ase
+ɛm
+_d
+ea
+_bi_
+_nn
+a._
+adi
+_f
+_so_
+aman
+_mma
+es
+a.
+hw
+ya_
+ea_
+_nyi
+fo_
+gy
+re_
+oni
+nya_
+bɔ_
+_ab
+ade
+ow
+bu
+okwa
+yi_
+af
+wɔn_
+okwan
+nni
+_hok
+hok
+ɛs
+hokwa
+nyin
+_wɔn_
+ua_
+si
+ɔm
+nam
+hokw
+okw
+us
+we
+_hokw
+ofa
+pɛ
+ow_
+ka_
+_p
+ɛn
+a,_
+a,
+Ɛ
+_e
+obiar
+_obia
+usu
+_kwa
+_kw
+am_
+obia
+ay
+adi_
+nea
+nea_
+_oni
+ye_
+_yi_
+wu
+mf
+mar
+um
+be
+M
+som
+ɔman
+ofadi
+ti
+wum
+fad
+_ɔman
+nyina
+_ahof
+_Ɛ
+dwu
+ahof
+hof
+ɔde_
+ɔma
+uma
+_ma_
+adw
+dwuma
+_ɔma
+ofad
+ahofa
+_ɔm
+wo
+hofa
+dwum
+hofad
+wuma
+uw_
+fadi
+bo
+n'
+mmar
+_mmar
+'
+ta
+_n'a
+_bɔ
+_n'
+_t
+nh
+_aman
+et
+'a
+eh
+n'a
+asɛ
+mara
+_ade
+ere
+_yɛ
+_nk
+horo
+row_
+N
+_nni
+horow
+to
+_kwan
+aso
+onip
+row
+ɔne
+hor
+mfa
+onipa
+ro_
+orow
diff --git a/langclass/ShortTexts/ak.txt b/langclass/ShortTexts/ak.txt
new file mode 100644
index 000..5f0f2f5
--- /dev/null
+++ b/langclass/ShortTexts/ak.txt
@@ -0,0 +1,215 @@
+AMANSAN MPAEMUKA A ƐFA ONIPA BIARA KYƐFA HO
+  NHYƐNMU
+  Esiane sɛ nidi ne biakoyɛ ne hokwan a adesamma abusua no wɔ no ne 
ahofadi, atɛntrenee ne asomdwoe a ewɔ wiase no nhyɛase,
+  Esiane sɛ obu a wommu ne animtiaa a wɔde bu onipa biara Kyɛfa no 
akowie atirimɔdenne ahorow mu no apusuw wiase no ahonim, ne ɔhwɛ a yɛhwɛ 
kwan sɛ wiase bi reba a adesamma benya ahofadi wɔ ɔkasa ne gyidi ho, na 
wɔabɔ dawuru sɛ osuro ne ohia jo ahofadi ne ɔmanfo botae,
+  Esiane sɛ nea ɛbɛyɛ na ɔmanfo remfa atuatew kwan so sɛ nea etwa to 
de atu atirimɔden ne nhyɛso agu, nti, ɛsɛ sɛ yɛde mmara sodi bɔ onipa 
biara kyɛfa ho ban,
+  Esiane sɛ ɛho hia sɛ yɛbɛma ayɔnkofa abɛda aman horow ntam,
+  Esiane sɛ nnipa a wɔwɔ Amanaman Nkabom no Mmara no mu no agye sɛ 
wogye onipa biara kyɛfa tom, na wogye tom sɛ onipa desani biara nya ne 
kyɛfa, nidi ne ɔsom a wɔsom bo; afei wogye mmarima ne mmea Kyɛfa tom, na 
wɔbɔ mmɔden sɛ wɔbɛma ɔmanfo atu mpɔn wɔ asetena pa mu wɔ ahofadi 
bebree mu,
+  Esiane sɛ Kuw Mma ahyɛ bɔ sɛ wɔne Amanaman Nkabom mo bɛyɛ biako 
de ama aman nyinaa anya obu ama onipa biara kyɛfa ne ahofadi ahorow no
+  Esiane sɛ Kyɛfa ne ahofadi ahorow ho hia sen biara na ama bɔhyɛ yi 
aba mu koraa nti,
+  Ɛnde, Afei,
+  Kuw Kɛse No
+  Pae mu ka
+  Amansan Mpaemuka a ɛfa Onipa Biara Kyɛfa ho no
+  Sɛ mmɔdenbɔ gyinapɛn ma nkurɔfɔ ne aman nyinaa, a yɛn botae ne 
sɛ nnipa nkorɛnkorɛ ne aman nyinaa bɛkae saa Mpaemuka yi bere nyinaa, na 
wɔnam ɔkyerɛkyerɛ ne nhomasua so akyerɛ obu ama saa kyɛfa ne ahofadi 
ahorow yi, na wɔde nkakrankakra ama nnipa a wɔwɔ wɔn a wɔwɔ amannɔne ate 
ase, agye atom, adi so pɛpɛɛpɛ wɔ nnipa a wɔwɔ Kuw Mma no ankasa man mu, 
ne ɔmanfo a wɔtete wɔn nsasesin mu.
+   
+  Ahyɛde 1
+  Wɔawo adesamma nyinaa sɛ nnipa a wɔwɔ ahofadi. Wɔn nyinaa wɔ nidi 
ne kyɛfa koro. Wɔwɔ adwene ne ahonim, na ɛsɛ sɛ wobu wɔn ho wɔn ho sɛ 
anuanom.
+   
+  Ahyɛde 2
+  Ɛsɛ sɛ obiara nya kyɛfa ne ahofadi ahorow a wɔaka ho asɛm wɔ 
Mpaemuka yi mu no a nnipa animhwɛ anaa nyiyim nni mu, te sɛ ebia abusua a ofi 

[Libreoffice-commits] core.git: Changes to 'distro/capgemini/cg-4.1'

[Christian Lohmaier]

New branch 'distro/capgemini/cg-4.1' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/ckb.lm  |  400 +++
 langclass/ShortTexts/ckb.txt |  211 ++
 langclass/fpdb.conf  |1 
 src/Makefile.am  |4 
 4 files changed, 614 insertions(+), 2 deletions(-)

New commits:
commit 8e488379e74a5164392aa826dd534db7f05a3261
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:22:32 2014 +0100

add Kurdish, Central

diff --git a/langclass/LM/ckb.lm b/langclass/LM/ckb.lm
new file mode 100644
index 000..38492a6
--- /dev/null
+++ b/langclass/LM/ckb.lm
@@ -0,0 +1,400 @@
+_
+e
+a
+i
+n
+r
+ê
+k
+î
+d
+b
+y
+t
+m
+n_
+w
+h
+_b
+û
+î_
+a_
+e_
+s
+ê_
+an
+i_
+in
+er
+_d
+û_
+l
+v
+we
+_m
+bi
+ên
+_h
+_û
+_û_
+ên_
+_k
+na
+_bi
+ma
+u
+he
+,
+,_
+iy
+ke
+di
+_a
+ek
+f
+o
+x
+ir
+ya
+j
+_he
+ne
+_n
+ar
+_ma
+de
+z
+_w
+es
+na_
+ey
+yê
+g
+en
+af
+_t
+be
+u_
+_j
+ye
+te
+ri
+maf
+_maf
+._
+.
+r_
+_di
+_x
+ew
+an_
+et
+c
+ku_
+_ku
+ku
+ti
+_ku_
+nd
+_de
+xw
+em
+ki
+ş
+st
+ji
+_ji
+xwe
+_xw
+iya
+ya_
+_xwe
+în
+_y
+kes
+_e
+rin
+ra
+kir
+za
+end
+iri
+in_
+irin
+kiri
+p
+nê
+kirin
+_ji_
+ji_
+yên
+v_
+afê
+fê
+d_
+He
+_He
+_H
+_bi_
+yên_
+H
+bi_
+_s
+re
+tê
+me
+_ne
+tin
+mafê
+ad
+_Her
+_mafê
+iyê
+at
+Her
+nd_
+_p
+rî
+da
+_B
+rk
+_we
+B
+end_
+s_
+li
+ta
+Be
+ûn
+Bend
+_Be
+Ben
+_Ben
+_Bend
+ke_
+Bend_
+es_
+kes_
+_c
+ci
+_di_
+er_
+di_
+e._
+_be
+_r
+erk
+ev
+_an
+kî
+q
+e.
+am
+ge
+ina
+yî
+nê_
+se
+ik
+diy
+rke
+as
+bê
+wa
+eye
+_an_
+_na
+ete
+ka
+erke
+el
+_l
+_g
+we_
+ina_
+ba
+az
+de_
+_Herk
+ber
+yê_
+le
+wek
+eh
+eke_
+Herke
+Herk
+kî_
+eke
+hey
+afê_
+wî
+_hey
+erkes
+e,_
+fê_
+e,
+av
+_li
+iya_
+_bê
+f_
+rkes
+xwe_
+_ci
+li_
+heye
+_xwe_
+_se
+ih
+_heye
+î,
+î,_
+_li_
+maf_
+af_
+_te
+etew
+iv
+_maf_
+tew
+hî
+_de_
+sti
+ro
+hev
+dî
+hem
+tî
+_kir
+yan
+_ki
+al
+mafê_
+_kiri
+kar
+mi
+t_
+la
+rkes_
+_hem
+ay
+aza
+bû
+ha
+ov
+ni
+rî_
+ng
+n,_
+_az
+azad
+rov
+ed
+n,
+zad
+ekî_
+iyê_
+_wî
+irov
+_aza
+ekî
+_azad
+iro
+_z
+nî
+_v
+est
+mirov
+ara
+etewe
+adi
+tewe
+va
+miro
+nav
+_ya
+bin
+ser
+anê
+_mi
+_nav
+o_
+yî_
+ewe
+_wek
+mir
+_ya_
+net
+_ser
+ast
+emû_
+_mir
+netew
+nete
+mû_
+yek
+mû
+bo
+ta_
+wl
+_miro
+ewl
+pê
+_yê
+emû
+wle
+_bo
+wey
+_bo_
+tewey
+ewle
+_bin
+ewey
+_D
+vî
+diyê
+D
+iyan
+_tê
+ak
+_ber
+kê
+_ew
+stin
+bo_
+n._
+ç
+n.
+re_
+tê_
+rast
+_yên
+azadi
+ras
+zadi
+ye_
+eş
+rb
+ij
+_yên_
+din
+zadiy
+adiy
+wî_
+ev_
+ar_
+_xwed
+her
+wed
+l_
+in,_
+eb
+_pê
+kh
+cih
+ema
+bat
+îna
+qa
+mê
diff --git a/langclass/ShortTexts/ckb.txt b/langclass/ShortTexts/ckb.txt
new file mode 100644
index 000..728036d
--- /dev/null
+++ b/langclass/ShortTexts/ckb.txt
@@ -0,0 +1,211 @@
+Danezana gerdûnî ya mafên mirov
+Dîbaçe
+Herwekî nasîna weqara pêgirê hemû endamên malbata mirovî û mafên 
wan ên wekhev û (jênager) bingehe azadî, dad û aşitiya cihanê pêk tîne,
+Herwekî nenasîn û piçûkdîtina mafên mirov rê dan barbar ku wijdana 
mirovhiyê didin isyanê û avakirina cihaneke ku tê de ewê heyinên mirovî 
di peyivîn û bawerkirinê de serbest bin, ji xof û belengaziyê rizgar bin 
wek xweziya bilindtirîn a mirov hate îlan kirin,
+Herweki bingehî ye ku mafên mirov ji alî rejîmeke hiqûqî bên 
parastin ji bo ku mirov mecbûr nemîne, wek çara dawîn, li dijî zorkarî û 
zulmê rabe,
+Herkekî teşwîqa pêşvebirina peywendiyên dostaniyê di navbera 
neteweyan de bingehî ye,
+Herwekî gelên Neteweyen Yekbûyî di Destûrê de ji nû ve baweriya xwe 
ya bi mafên bingehî yên mirov, di nav weqar û rûmeta kesê mirovî de û 
di wekheviya mafên mêr û jinan de, dane zanîn û diyar kirin ku ew 
biryardar in ku arîkarî bidin pêşveçûna çivakî û bicihkirina mecalên 
çêtir ên jiyanê di nav serbestiyeke mestir de,
+Herwekî dewletên endam qewl dane, ku bi hevkariya Teşkîlata Neteweyên 
Yekbûyî, riayeta gerdûnî û fiîlî ya mafên mirovî û azadiyên bingehî 
ewle bikin,
+Herwekî têgihiştineke hevbeş a van maf û azadiyan ji bo bi temamî 
bicîhanîna vê teahudê ji giringiya bilindtirîn e, Civîna Gelemperî vê 
Danezana Gerdûnî ya Mafên Mirovî
+wekî îdeala hevbeş a ku hemû gel û hemû netewe dixwazin bighênê ji 
bo ku hemû kes û hemû organên civakê, ev Danezan timî di bîr de, bi 
hînkirin û hêvotinê bixebitin ku riayeta van maf û azadiyan pêşve bibin 
û bi tedbîrên berebereyî yên neteweyî û navneteweyî, nasîn û 
bicihanîna gerdûnî û fiîlî yên wan him di nav gelên dewletên endam bi 
xwe him di nav yên erdên ku li jêr hukmê wan de ne ewle bikin.
+  
+Bend 1
+Hemû mirov azad û di weqar û mafan de wekhev tên dinyayê. Ew xwedî 
hiş û şuûr in û divê li hember hev bi zihniyeteke bratiyê bilivin.
+  
+Bend 2
+Heryek, bê tu cihêyî, nemaze ya nijad, reng, zayend (cisn), ziman, ol, 
ramana siyasî an her ramana din, eslê neteweyî 

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/emk-Latn.lm  |  400 ++
 langclass/ShortTexts/emk-Latn.txt |  212 
 langclass/fpdb.conf   |1 
 src/Makefile.am   |2 
 4 files changed, 614 insertions(+), 1 deletion(-)

New commits:
commit 30e0b8b4681469d62fdf6df3010a8a43786c2fbc
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:32:41 2014 +0100

add Maninkakan, Eastern (Latn)

diff --git a/langclass/LM/emk-Latn.lm b/langclass/LM/emk-Latn.lm
new file mode 100644
index 000..ae13eaf
--- /dev/null
+++ b/langclass/LM/emk-Latn.lm
@@ -0,0 +1,400 @@
+_
+a
+n
+a_
+i
+k
+l
+ɛ
+d
+ɔ
+_k
+an
+ka
+m
+n_
+_ka
+i_
+e
+b
+u
+y
+s
+la
+ma
+_d
+_a
+r
+na
+_m
+,
+,_
+_s
+_l
+ya
+ɛ_
+ka_
+an_
+ar
+o
+_ka_
+_b
+t
+_la
+ya_
+u_
+_a_
+la_
+_n
+ni
+iya
+iy
+da
+kan
+ri
+._
+.
+_ma
+am
+di
+ama
+e_
+iya_
+j
+lu
+riya
+bɛ
+al
+riy
+en
+ɔ_
+ni_
+riya_
+lu_
+f
+ari
+ɛɛ
+ariya
+_di
+ariy
+na_
+ak
+_t
+ɲ
+dɔ
+_j
+ɛɛ_
+ana
+_bɛ
+aka
+ɔɔ
+sa
+ɔn
+ba
+_na
+man
+o_
+ad
+kan_
+ɛn
+bɛɛ
+a,
+si
+aman
+bɛɛ_
+a,_
+_bɛɛ
+ja
+ra
+_ja
+ara
+_bɛɛ_
+w
+alu
+_y
+alu_
+_f
+tɛ
+_la_
+mana
+_si
+amana
+akan
+il
+nn
+nan
+_S
+S
+_ye
+in
+ye
+le
+_dɔ
+_tɛ
+_jam
+_jama
+_sa
+jam
+ani
+en_
+jama
+Sari
+ana_
+Sar
+nan_
+_Sa
+Sariy
+_Sari
+_Sar
+Sa
+_kan
+jaman
+di_
+de
+kɛ
+_nan
+den
+ol
+_w
+ɔɔ_
+_nan_
+_al
+_kɛ
+aa
+_di_
+mana_
+sar
+ɔ,
+ila
+_sar
+ani_
+ɔ,_
+_alu
+_alu_
+tɛ_
+a._
+fa
+a.
+ye_
+A
+_ni
+_ɲ
+_i_
+_ye_
+_i
+at
+da_
+ila_
+h
+_tɛ_
+ɲa
+_ni_
+dɔ,
+ra_
+ara_
+dɔ,_
+sari
+akan_
+wa
+_kaka
+sariy
+_kak
+ɲa_
+kaka
+_kan_
+kak
+kakan
+_sari
+ma_
+_dɔ,
+ɛn_
+_ba
+_mɔ
+_dɔ,_
+bo
+mɔɔ
+len
+_mɔɔ
+mɔ
+i,_
+nd
+i,
+kɔ
+ko
+su
+se
+ɛd
+el
+nk
+ada
+ele
+nna
+elen
+sila
+lo
+sil
+_h
+_sila
+ade
+_sil
+olo
+aden
+sila_
+_se
+ɔd
+_bo
+_A
+_B
+M
+ta
+aar
+_ma_
+B
+fan
+aara
+mi
+ank
+mɛ
+_kɔ
+_fa
+ɔdɔ
+len_
+dɛ
+un
+ke
+ti
+ha
+ki
+kele
+kel
+lak
+kelen
+ab
+den_
+_kel
+elen_
+Mɔ
+_M
+mɛn
+di,_
+aya
+wo
+dam
+sɔ
+bolo
+_bol
+_mi
+dama
+_kele
+_bolo
+_Mɔ
+se_
+_Mɔɔ_
+bi
+Mɔɔ
+ay
+nu
+_ke
+ma,
+Mɔɔ_
+ma,_
+and
+di,
+ɔnɔ
+bol
+nda
+ala
+li
+_Mɔɔ
+nɔ
+_da
+_ma,_
+_ma,
+_di,_
+_di,
+ko_
+_ko
+_sɔ
+_wo
+_wa
+ɔy
+_se_
+ma._
+ma.
+af
+aya_
+_mɛn
+ii
+_mɛ
+te
+_le
+ina
+A_
+ɔya
+fɛ
+mad
+mɔɔ_
+_mɔɔ_
+le_
+li_
+as
+ku
+_fan
+_le_
+ji
+_ma.
+N
+ɔdɔn
+dɔn
+_laka
+kɛ_
+_lak
+aba
+lo_
+du
+ɔn_
+lɔ
+nb
+ɔya_
+nɲa
+mɛn_
+nɲa_
+_kɛ_
+laka
+nɲ
+anda
+_ma._
+kɔn
+kand
+_de
+_su
+baa
+g
+made
+ɔ.
+_ad
+sɔd
+dɔ_
+amade
+kɛd
+maden
+amad
+nu_
+akand
+nnu_
+_kɛda
+on
+ɛda
+Ba
+in_
+ata
+adama
+_den
+adam
+kɛda_
+gb
+_ada
+kanda
+ɲɛ
+nnu
+ɔ._
diff --git a/langclass/ShortTexts/emk-Latn.txt 
b/langclass/ShortTexts/emk-Latn.txt
new file mode 100644
index 000..bd397ac
--- /dev/null
+++ b/langclass/ShortTexts/emk-Latn.txt
@@ -0,0 +1,212 @@
+DUNUƝA BƐNMAKAN KA A BƐN
+Adamadenɲa Lasabati ni a la wuriki Sariyalu ma
+  
+KALAMA DANTƐƐLI
+Bani fabadenɲa tɔmasere le ye, hɔrɔya ni telen ani jususuma di dunuɲa 
dɔ,
+Bani adamaya lasabati lɔnbaliya ni a la gboyaɲɛ le nanin benkanni di 
mɛn ka mɔɔlu lamuriti, ka kɛ sababu di fana ka mɔɔlu kunna fulen, ka alu 
lɔ hɔrɔya ɲinina ka alu bɔ misikinaya dɔ,
+Bani adamaya lakanda ye wajibi le di, fo jamana ye kɛ jamana dafani le di 
sariya bolo ma, wole ye a kɛla mɔɔlu tɛ muriti ka don jɛdɛ makadan waa la,
+Bani jamanalu la tɛɛbɛn ni alu la kaninteya ye fen ne di mɛn kakan ka 
sɛnbɛnteya,
+Bani jamana mɛnnu ye ONU dɛkuruba kɔnɔ, wolu bara alu kan di ko alu 
di adamaden nakadan, ka a lawuriki ka ban ka cɛ ni muno lakaɲa ko bɛɛ dɔ,
+Bani alu bara alu kan di fana, ko alu di adamaya lafasa, ka adamaden la 
hɔrɔya dafa sila bɛɛ kan,
+Bani, bɛɛ bɛnni miriya kelen ma, ka a lɔ adamaya lasabati ma, wo ye 
wajibi le di bɛɛ ɲɛ, walako miriya wo ye se lataamala sila bɛɛ kan, ONU 
gbaraba bara a kandi: ko adamaden lakanda sariya ɲin bara kɛ dunuɲa bɛɛ ye 
wajibi di, sa bɛɛ ye a to i hankili la, ka i tɛsidi, ka mɔɔlu karan a la, 
ka alu jodon a la, ka a latinma jamanala tɛ.
+  
+Sariya 1
+Adamadennu bɛɛ sɔdɔnɲa kakan, hɔrɔya dɔ, fabadenɲa dɔ ani sariya 
ta fan dɔ. Hankili ni sɔnɔmɛ ye alu bɛɛ ma, a kakan wo dɔ alu ye 
bakelenɲa sila lataaman alu ɲɔɔn tɛ.
+  
+Sariya 2 nan
+Mɔɔ kelen kelenna bɛɛ ni adamaden lakadan sariya kakan, i kɛda mɔɔ 
suusu di, i sii tɛ mafɛnɛ nna, i fadikolo tɛ mafɛnɛnna, i kan tɛ 
mafɛnɛnna, i la dina tɛ mafɛnɛnna, i la jamana mara hankili tɛ 
mafɛnɛnna, i sɔdɔndiya tɛ mafɛnɛnna.
+Ani fana jamanalu suuya tɛ danbɔla ka a bɛn sariya wolu ma, alu mara 
hankili kɛda a suusu di, alu ma kɛ jamanalu hɔrɔyani di, alu kɛda mara 
suusu kɔnɔ.
+  
+Sariya 3 nan
+Adamaden kelen kelenna bɛɛ nii kakan ka lakanda, ka a la hɔrɔya 
lakanda, ka a kun nakanda.
+  
+

Icons/themes selection broken on 4.3.0.1

[Tomáš Chvátal]

Heya,

Seems I have weird problem wrt iconselection and further on with themes on
4.3.0.1 build in opensuse.

When I launch libreoffice it searches only for images_tango.zip file and if
not found shows no icons. Regardless wether it should use oxygen as it is
launched on KDE.

Other problem is while I tried to debug this when I clicked on Tools -
Options - View  I got warning Could not find theme id in theme vector.
and when I clicked ok whole app closed (it didn't crash tho as the exit
value was 0 and no backtrace to show).

Any help appreciated.

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

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

[David Tardon]

 external/libpagemaker/0001-define-M_PI-if-not-available.patch  |   35 
+
 external/libpagemaker/0002-add-missing-typedef-on-windows.patch|   24 
++
 external/libpagemaker/0003-round-is-not-available-on-windows.patch |   37 
++
 external/libpagemaker/UnpackedTarball_libpagemaker.mk  |8 ++
 4 files changed, 104 insertions(+)

New commits:
commit 1e735d9394e7154250188046e14b9e21aa99eb09
Author: David Tardon dtar...@redhat.com
Date:   Fri Jun 27 11:36:04 2014 +0200

fix build of libpagemaker on windows

Change-Id: Iac9920b9886fda514e6db35dc89facefeebe4d68

diff --git a/external/libpagemaker/0001-define-M_PI-if-not-available.patch 
b/external/libpagemaker/0001-define-M_PI-if-not-available.patch
new file mode 100644
index 000..0fe043e
--- /dev/null
+++ b/external/libpagemaker/0001-define-M_PI-if-not-available.patch
@@ -0,0 +1,35 @@
+From ae6e41e1026a2a84641bb42aa7fb89a9a30a9114 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Fri, 27 Jun 2014 11:30:38 +0200
+Subject: [PATCH 1/3] define M_PI if not available
+
+---
+ src/lib/libpagemaker_utils.h | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lib/libpagemaker_utils.h b/src/lib/libpagemaker_utils.h
+index fed5f3d..ab070b5 100644
+--- a/src/lib/libpagemaker_utils.h
 b/src/lib/libpagemaker_utils.h
+@@ -10,6 +10,7 @@
+ #ifndef __LIBPAGEMAKER_UTILS_H__
+ #define __LIBPAGEMAKER_UTILS_H__
+ 
++#include cmath
+ #include cstdio
+ 
+ #include string
+@@ -19,6 +20,10 @@
+ #include librevenge-stream/librevenge-stream.h
+ #include librevenge/librevenge.h
+ 
++#ifndef M_PI
++#define M_PI 3.14159265358979323846
++#endif
++
+ #ifdef _MSC_VER
+ 
+ typedef unsigned char uint8_t;
+-- 
+1.9.3
+
diff --git a/external/libpagemaker/0002-add-missing-typedef-on-windows.patch 
b/external/libpagemaker/0002-add-missing-typedef-on-windows.patch
new file mode 100644
index 000..7f566b9
--- /dev/null
+++ b/external/libpagemaker/0002-add-missing-typedef-on-windows.patch
@@ -0,0 +1,24 @@
+From 7c9cc06fecd69e88428ee5b0cf5a3a3cf40db44b Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Fri, 27 Jun 2014 11:30:50 +0200
+Subject: [PATCH 2/3] add missing typedef on windows
+
+---
+ src/lib/libpagemaker_utils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/libpagemaker_utils.h b/src/lib/libpagemaker_utils.h
+index ab070b5..73d2a59 100644
+--- a/src/lib/libpagemaker_utils.h
 b/src/lib/libpagemaker_utils.h
+@@ -27,6 +27,7 @@
+ #ifdef _MSC_VER
+ 
+ typedef unsigned char uint8_t;
++typedef signed char int8_t;
+ typedef unsigned short uint16_t;
+ typedef short int16_t;
+ typedef unsigned uint32_t;
+-- 
+1.9.3
+
diff --git a/external/libpagemaker/0003-round-is-not-available-on-windows.patch 
b/external/libpagemaker/0003-round-is-not-available-on-windows.patch
new file mode 100644
index 000..e13d705
--- /dev/null
+++ b/external/libpagemaker/0003-round-is-not-available-on-windows.patch
@@ -0,0 +1,37 @@
+From e5700eff3f09a6c0b78663b397c141f677c5b16b Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Fri, 27 Jun 2014 11:33:09 +0200
+Subject: [PATCH 3/3] round is not available on windows
+
+---
+ src/lib/PMDParser.cpp | 7 +++
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/PMDParser.cpp b/src/lib/PMDParser.cpp
+index 7c9ff2d..736ea1c 100644
+--- a/src/lib/PMDParser.cpp
 b/src/lib/PMDParser.cpp
+@@ -12,7 +12,6 @@
+ #include cassert
+ #include vector
+ #include limits
+-#include math.h
+ #include librevenge/librevenge.h
+ #include boost/optional.hpp
+ #include boost/shared_ptr.hpp
+@@ -608,9 +607,9 @@ void PMDParser::parseColors(const PMDRecordContainer 
container)
+ 
+   uint16_t max = (std::numeric_limitsuint16_t::max)();
+ 
+-  red = 255* round((1 - std::min(1.0, (double)cyan/max + 
(double)black/max)));
+-  green = 255*round((1 - std::min(1.0, (double)magenta/max + 
(double)black/max)));
+-  blue = 255*round((1 - std::min(1.0, (double)yellow/max + 
(double)black/max)));
++  red = 255* std::floor((1 - std::min(1.0, (double)cyan/max + 
(double)black/max) + 0.5));
++  green = 255*std::floor((1 - std::min(1.0, (double)magenta/max + 
(double)black/max) + 0.5));
++  blue = 255*std::floor((1 - std::min(1.0, (double)yellow/max + 
(double)black/max) + 0.5));
+ }
+ else if (colorModel == HLS)
+ { }
+-- 
+1.9.3
+
diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk 
b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
index fec1c03..5a66397 100644
--- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk
+++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
@@ -11,4 +11,12 @@ $(eval $(call 
gb_UnpackedTarball_UnpackedTarball,libpagemaker))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker,\
+

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/kng.lm  |  400 +++
 langclass/ShortTexts/kng.txt |  213 ++
 langclass/fpdb.conf  |1 
 src/Makefile.am  |2 
 4 files changed, 615 insertions(+), 1 deletion(-)

New commits:
commit f7734ca42c673ddd0507290e25eb5441f88c08a7
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:39:42 2014 +0100

add Koongo

diff --git a/langclass/LM/kng.lm b/langclass/LM/kng.lm
new file mode 100644
index 000..c85028b
--- /dev/null
+++ b/langclass/LM/kng.lm
@@ -0,0 +1,400 @@
+_
+a
+n
+a_
+u
+i
+k
+y
+m
+_y
+ya
+e
+_ya
+l
+s
+t
+b
+o
+_k
+_m
+na
+_n
+u_
+an
+d
+ya_
+na_
+_ya_
+e_
+ku
+w
+nd
+i_
+ka
+lu
+_na
+_na_
+_b
+in
+ba
+_ku
+v
+wa
+z
+yi
+sa
+p
+mu
+di
+o_
+mp
+la
+bu
+al
+tu
+ns
+nt
+un
+ak
+am
+_ba
+_l
+uk
+,
+and
+,_
+si
+ki
+ma
+_mu
+wan
+yin
+g
+ng
+aka
+on
+ta
+tu_
+ve
+pe
+ka_
+ke
+so
+_mp
+da
+ntu
+ut
+.
+_lu
+ve_
+_yi
+ti
+mpe
+._
+is
+_ki
+_yin
+_mpe
+nda
+mpe_
+_mpe_
+pe_
+ntu_
+nz
+mb
+us
+za
+uv
+f
+la_
+yan
+ana
+im
+ul
+_yan
+_ke
+ons
+ndi
+nso
+onso
+da_
+nda_
+unt
+alu
+untu
+K
+so_
+_K
+andi
+mun
+ina
+onso_
+nso_
+munt
+ana_
+ik
+muntu
+si_
+_yand
+untu_
+_munt
+yand
+en
+_mun
+di_
+yandi
+ala
+luv
+uve
+uve_
+luve
+nza
+ina_
+lu_
+luve_
+du
+ay
+aka_
+ayi
+ke_
+_ma
+_ke_
+_t
+sal
+ndi_
+_yina
+yina
+andi_
+ndu
+yina_
+uz
+ib
+bi
+a,
+a,_
+isa
+il
+ulu
+_v
+kan
+ibu
+amb
+ban
+nza_
+_d
+anda
+za_
+ab
+wana
+uku
+yo
+ny
+fw
+me
+ku_
+at
+fwa
+to
+fwan
+fwana
+os
+_ny
+nyo
+_nyo
+yons
+yon
+ama
+mo
+kim
+yonso
+ma_
+anz
+nyon
+buk
+_nyon
+nyons
+ta_
+ang
+_me
+anza
+kus
+ol
+Ki
+_Ki
+ti_
+um
+ins
+_kus
+ndu_
+nsi
+usa
+du_
+_kim
+_mo
+anda_
+uta
+buku
+end
+mbu
+uka
+yins
+wana_
+Kib
+_ve
+insi
+to_
+_Kibu
+su
+anza_
+Kibu
+enda
+yinsi
+_Kib
+mos
+Kibuk
+ibuku
+_mos
+buku_
+ika
+fu
+enda_
+ibuk
+_mosi
+_ban
+osi
+uku_
+mosi
+vw
+_luv
+imp
+uti
+ni
+_s
+sa_
+ko
+_bi
+kuz
+le
+ulu_
+ad
+und
+_f
+_kuz
+ila
+impw
+pwanz
+mpwan
+wanz
+impwa
+pwa
+_to_
+mpwa
+_fwan
+wanza
+_fwa
+_fw
+wa_
+_to
+mpw
+pw
+pwan
+ind
+_luve
+mu_
+sala
+gu
+indu
+ama_
+mba
+a.
+lo
+ila_
+zi
+ngu
+_ve_
+len
+_Ko
+Ko
+nsi_
+Konso
+a._
+nk
+Kons
+mab
+insi_
+Kon
+sam
+_bal
+kuk
+adi
+lenda
+_Kons
+sik
+_sa
+lend
+bal
+_Kon
+vwa
+_kuk
+tin
+kusa
+_yayi
+aluve
+_yay
+_mab
+balu
+_balu
+ant
+_kusa
+yayi
+yay
+aluv
+olo
+indu_
+ambu
+kis
+i.
+_le
+_ka
+mv
+i._
+baluv
+isi
+_di
+osi_
+isa_
+tind
+mosi_
+tindu
+_lend
+_len
+aw
+vu
+antu_
+salu
+ala_
+_mut
+bu_
+ula
+utind
+u,_
+it
+mut
+utin
+antu
+u,
+muti
+usal
+vwan
+_bu
+_muti
+mutin
+amu
+gi
+_yins
+wand
+angu
+amu_
+_samu
+vwand
diff --git a/langclass/ShortTexts/kng.txt b/langclass/ShortTexts/kng.txt
new file mode 100644
index 000..f4e59ca
--- /dev/null
+++ b/langclass/ShortTexts/kng.txt
@@ -0,0 +1,213 @@
+Luzayisu ya yinza muvimba ya baluve ya muntu
+Dyambu ya ntete
+Nakutalaka ti kutambula ngenda ya binama nyonso ya dikanda na ya baluve ya 
bawu a kudedakana mpe yina balenda kuyimina bawu ve ke lufulu ya kimpwanza, ya 
budedede mpe ya ngemba na kati ya yinza muvimba.
+Nakutalaka ti bunzimbu mpe mvwezolo baluve ya muntu metumia kusala mavanga 
ya bunyama, yina ke dasukisaka bantu mpe na kutalaka dyaka ti nkwizulu ya 
yinza, sika bantu kevwandaka na kimpwanza ya kuzonza mpe ya kukwikila, sika 
bantu kekuluka na boma mpe na bumputu ya kulutila zababakana mutindu dikani 
mosi yanene ya muntu.
+Nakutalaka ti ya ke mfumu samu ti baluve ya muntu fwana kukengidilwa na 
luyalu yina kezitisaka misiku samu na kusala ti muntu fwana kutombuka ve ntangu 
nyonso na luyalu yina kezitisaka ve misiku.
+Nakutalaka ti ya ke mfumu na kukindisa nkudusulu ya kinkundi kati ya 
bayinsi.
+Nakutalaka ti na kati ya Mukanda ya Misiku, makamba ya Bayinsi ya Yinza 
zabisaka dyaka kiminu ya bawu na baluve ya mfumu ya muntu, na ngenda mpe buzitu 
ya muntu na budedede va baluve ya babakala na ua bakento, dyaka mpe yayi mebaka 
lukanu ya kuzangula, ya babakala na ya bakento, dyaka mpe makamba yai mebaka 
lukanu nya kuzangula mabuta mpe kukotisa luzingu ya kulutila mbote na kati ya 
kimpwanza mosi ya nene.
+Nakutalaka ti bayinsi-binama kwizaka kubaka lukanu samu na kunwanina 
kisika mosi na kimvuka ya Bayinsi ya Yinza nzitusulu, na bantu nyonso ya yizo, 
ya baluve ya muntu mpe ya bimvuka ya mfumu.
+Nakutalaka ti kuvwanda na ngwilu na ngwilu na mutindu mosi na yina 
metadila baluve mpe bimpwanza yayi ke mfumu samu na kunungisa lakanu yayi.
+Lukutakanu ya Nene
+ke na kuzabisa
+Luzayisu yayi ya baluve ya muntu na yinza Mutindu dikani ya kintwadi yina 
fwana kulandama na makamda nyonso mpe na bayinsi nonso samu ti bantu nyonso mpe 
binama nyonso ya dibundu mabuta, kana babambukila moyo ntangu ni ntangu 
Luzayisu yayi, basadila ngolo, na nzila ya ndongokolo mpe ngyundululu, na 
kusadila ti balue mpe bimpwanza yayi kuzituswa dyaka mpe samu na kusyamisa 
fyoti-fyoti ntambulu mpe nsalulu ya baluve yina na bantu nyonso kati ya bawa 
mosi bantu ya 

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/nds.lm  |  400 +++
 langclass/ShortTexts/nds.txt |  211 ++
 langclass/fpdb.conf  |1 
 src/Makefile.am  |2 
 4 files changed, 613 insertions(+), 1 deletion(-)

New commits:
commit 09f005940b68a062cd1a2d30b03c3c54f48fcc35
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:45:24 2014 +0100

add Saxon, Low

diff --git a/langclass/LM/nds.lm b/langclass/LM/nds.lm
new file mode 100644
index 000..39c8e98
--- /dev/null
+++ b/langclass/LM/nds.lm
@@ -0,0 +1,400 @@
+_
+e
+n
+t
+n_
+r
+a
+en
+d
+i
+h
+t_
+l
+s
+en_
+u
+_d
+o
+un
+c
+ch
+k
+at
+e_
+un_
+de
+at_
+er
+_u
+,_
+,
+ee
+_de
+g
+da
+_un
+_da
+een
+_un_
+w
+v
+he
+f
+de_
+_de_
+_s
+_dat
+dat
+dat_
+_dat_
+ö
+_w
+r_
+ie
+een_
+_e
+ht
+ü
+m
+el
+.
+re
+._
+te
+cht
+_h
+l_
+ge
+b
+_v
+ar
+_een
+p
+_ee
+aa
+k_
+nn
+ll
+sc
+_he
+wa
+sch
+ne
+_een_
+an
+_wa
+vu
+ke
+vun
+_vu
+_vun
+ec
+ech
+echt
+ten
+_a
+rt
+tt
+et
+in
+er_
+A
+_A
+_S
+S
+vun_
+ör
+_t
+_i
+to
+_vun_
+n,
+rr
+n,_
+it
+t,_
+t,
+_f
+R
+_R
+ns
+_G
+_to
+si
+ik
+nne
+ten_
+G
+_si
+se
+o_
+E
+lk
+ei
+Re
+ett
+_Re
+_E
+_Rech
+Rec
+Rech
+Recht
+n._
+tt_
+n.
+_Rec
+ve
+_m
+lk_
+gen
+li
+fö
+_g
+nd
+ri
+D
+al
+_D
+M
+up
+_M
+oo
+ht_
+el_
+ien
+on
+d_
+ti
+wat
+en,
+_wat_
+to_
+st
+_wat
+wat_
+rn
+en,_
+ien_
+h_
+_sie
+sie
+_sien
+_o
+sien
+Ar
+_b
+_het
+cht_
+hett
+s_
+_hett
+het
+p_
+sien_
+_Ar
+war
+ett_
+_to_
+or
+_war
+ner
+ann
+_V
+eh
+V
+nner
+chte
+hte
+F
+ch_
+we
+_fö
+gen_
+ör_
+chten
+hten
+orr
+le
+_F
+för
+me
+eg
+ic
+eit
+hett_
+ich
+Elk
+den
+_in
+El
+nsch
+ts
+rie
+tik
+Elk_
+_Elk
+_El
+_n
+_Elk_
+nsc
+echt_
+Arti
+rtike
+för_
+ikel
+Artik
+is
+ike
+tikel
+lt
+_Art
+_Arti
+rtik
+kel
+tike
+Art
+rti
+_k
+Ve
+_Ver
+kel_
+na
+_Ve
+rer_
+rer
+ikel_
+Ver
+_is
+_orre
+rd
+rre
+orrer
+rrer_
+_orr
+orre
+_or
+rrer
+it_
+hu
+chu
+hr
+aar
+en._
+es
+_ge
+ün
+en.
+ed
+_för_
+che
+_för
+_an
+ru
+be
+ins
+sche
+_up
+se_
+up_
+den_
+hten_
+oon
+g_
+rrn
+rt_
+Ge
+insc
+insch
+_W
+rec
+W
+_up_
+_Ge
+ege
+ah
+_Mi
+ell
+recht
+ll_
+ig
+mi
+rech
+len
+la
+Mi
+ver
+sü
+egen
+echte
+Min
+St
+_Min
+in_
+ra
+il
+t._
+ht,_
+nen
+_in_
+hei
+ht,
+t.
+_St
+Fr
+ut
+rn_
+ss
+nt
+ren
+ken
+heit
+ven
+ho
+sse
+ff
+aat
+_sü
+rk
+L
+_Fr
+hen
+ers
+all
+rs
+egen_
+ka
+f_
+lt_
+uu
+warr
+Da
+_daar
+arr
+daar
+ta
+arrn
+lle
+dr
+warrn
+_L
+eb
+_daa
+_Da
+nen_
+_warr
+ek
+daa
+Mins
+anne
+bb
+d,
+len_
+heb
+hebb
+üs
+ebb
+_Mins
+d,_
+so
+Minsc
diff --git a/langclass/ShortTexts/nds.txt b/langclass/ShortTexts/nds.txt
new file mode 100644
index 000..fd46bd0
--- /dev/null
+++ b/langclass/ShortTexts/nds.txt
@@ -0,0 +1,211 @@
+Allgemeen Verklaren vun de Minschenrechten
+  PRÄAMBEL
+  Vunwegen wat dat Anerkennen vun de Wüürd, mit de all Minschen baren 
sünd, un de Rechten, de all Maten vun de Gemeenschupp vun de Minschen hebbt un 
de gliek un nich to verköpen sünd, de Grundlaag vun Frieheit un Freden in de 
Welt is, un wat dat recht und billig togeiht,
+  vunwegen wat dat Verkennen un Minnachten vun de Minschen rechten to 
unminschlich Doon föhrt hett, un dat Geweten vun de Minschen daarvun vull is 
vun Schann, is dat vör nehmste Wark vun de Minschen dat Buen vun een Welt, wo 
elk un een seggen un gloven dröff, wat he will un he frie is vun Bang sien un 
Noot,
+  vunwegen wat dat nödig is, de Minschenrechten dörch dat Regeern 
vun’t Recht Schuul  geven, dat de Minsch nich dwungen  as lest Middel 
Wedderpart to hollen Tyrannei un Ünnerdrücken,
+  vunwegen wat dat nödig is, dat mang de Natschonen föddert ward, wat se 
fründlich mit eenanner ümgaht,
+  vunwegen wat de Völker vun de Vereenten Natschonen mit düsse Charta 
noch mehr daar up ruut wüllt un dat so besloten hebbt: dat se fastholen an de 
Minschenrechten vun elk un een, fastholen an de Wüürd un den Weert vun elk un 
een, un wat Mannslüüd un Fruunslüüd de sülvigen Rechten hebben schüllt, 
un wat dat Wiederkamen vun de Gemeenschupp un een beter Leven in mehr aFrieheit 
föddert warrn schall,
+  vunwegen wat de Matenlänner toplicht hebbt, tosamen mit de Vereenten 
Natschonen allns daarför to doon, dat de Minschenrechten  de Frieheit vun elk 
un een samt un sünners acht un estimeert ward,
+  vunwegen wat dat mit düsse Verplichten wat ward, is dat vun gröttste 
Bedüden, wat  sülvige meent ward, wat düsse Rechten un Frieheiten angeiht,
+  un so gifft de Generalversammeln Bott: Düsse Allgemeen Verklaren vun de 
Minschenrechten is dat, wat för all de Völker  Natschonen as Wiespahl gellen 
schall. Elk un een un all Inrichten vun de Sellschupp schüllt düsse Verklaren 
jümmers praat hebben un daarför wat doon. Dörch Ünnerrichten un Uptrecken 
schall dat Estimeern vun düsse Rechten un Frieheiten föddert warrn. Dörch 
natschonaal un internatschonaal Doon schall dat mehr warrn mit dat allgemeen un 
rejell Annerkennen un Ümsetten vun düsse Verklaren bi all de 

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/quz.lm  |  400 +++
 langclass/ShortTexts/quz.txt |  212 ++
 langclass/fpdb.conf  |3 
 src/Makefile.am  |8 
 4 files changed, 618 insertions(+), 5 deletions(-)

New commits:
commit 2fa72a4a4d9e43bbacc102c3568487f3f0724df9
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:51:15 2014 +0100

add Quechua, Cusco

diff --git a/langclass/LM/quz.lm b/langclass/LM/quz.lm
new file mode 100644
index 000..e1be182
--- /dev/null
+++ b/langclass/LM/quz.lm
@@ -0,0 +1,400 @@
+a
+_
+n
+i
+u
+an
+s
+p
+q
+k
+na
+y
+pa
+t
+l
+m
+c
+h
+a_
+un
+ch
+as
+r
+ta
+aq
+ay
+una
+ku
+ma
+,
+,_
+in
+n_
+
+qa
+ka
+_k
+ap
+nan
+ha
+_ka
+ana
+cha
+apa
+pas
+la
+ll
+_r
+an_
+ac
+j
+o
+e
+.
+._
+A
+N
+w
+nt
+sq
+man
+sqa
+wa
+ru
+I
+at
+_a
+pi
+_ru
+_
+kun
+run
+i_
+lla
+_m
+ach
+runa
+Q
+_run
+np
+_runa
+mi
+_j
+uy
+ak
+kuna
+paq
+is
+ti
+s_
+y_
+q_
+anan
+nta
+K
+hi
+npa
+nc
+us
+nch
+chi
+ni
+ya
+_p
+aku
+anp
+_
+_l
+ta_
+pa_
+na_
+anpa
+am
+aq_
+sa
+ant
+ri
+as_
+hay
+H
+'
+_ll
+taq
+sp
+a,_
+al
+pas_
+_y
+a,
+_ma
+ama
+asqa
+_lla
+asq
+im
+acha
+unan
+ay_
+_ch
+hu
+_c
+nk
+qan
+tin
+chay
+ar
+U
+chu
+nan_
+anta
+sqan
+apas
+ip
+kuy
+lap
+_s
+mi_
+Y
+S
+C
+KA
+yt
+qa_
+lapa
+yta
+s,
+on
+ata
+si
+_t
+in_
+wan
+s,_
+spa
+ima
+ik
+N_
+npaq
+apa_
+nanp
+_w
+all
+akun
+d
+mana
+anpaq
+nanpa
+qm
+as,_
+pas,_
+li
+ipa
+pas,
+as,
+his
+au
+nin
+qmi
+ju
+ina
+aqm
+n,_
+aqmi
+_wa
+E
+Ñ
+lapa_
+n,
+qt
+_Ñ
+_ya
+chis
+IQEN
+ci
+QEN_
+anch
+EN_
+ÑI
+mu
+_ÑIQ
+ÑIQE
+)_
+_ÑI
+IQ
+(_
+)
+(
+_)
+_ÑIQE
+IQEN_
+_(_
+anc
+ÑIQ
+EN
+QEN
+ÑIQEN
+_)_
+_(
+IQE
+CH
+nap
+QE
+_ju
+aus
+akuna
+nm
+yk
+'a
+ausa
+usa
+ipas
+kausa
+yp
+pan
+_kau
+_ja
+kaus
+_kaus
+kau
+A_
+ja
+a
+nak
+_kan
+UN
+unaq
+aqt
+_q
+aqa
+iku
+_cha
+kan
+naq
+aqmi_
+tu
+qmi_
+_man
+L
+nchi
+napa
+yn
+ñ
+nku
+ank
+uk
+kus
+yku
+O
+ati
+naku
+qta
+_mana
+taqm
+kunan
+ayta
+achi
+taqmi
+ayt
+oq
+kam
+isq
+ayn
+nchis
+isqa
+unap
+may
+uku
+_L
+lin
+apas_
+asqan
+;_
+lli
+ayk
+yu
+llin
+;
+aci
+ra
+IS
+aqta
+Q_
+nta_
+ur
+kama
+alli
+_ati
+_al
+a_
+io
+allin
+qa,
+kay
+_alli
+_pi
+ki
+_pa
+_all
+una_
+qa,_
+_ri
+_at
+iy
+Ll
+Lla
+ncha
+CHUN
+kanan
+HUN
+npas
+pipas
+_K
+UNK
+KA_
+NKA_
+CHU
+UNKA_
+ananp
+re
+pip
+CHUNK
+HU
+_kama
+qp
+NKA
+_Ll
+_kana
+_Lla
+ion
+pi_
+kana
+_mu
+_kam
+HUNKA
+ataq
+AY
+NK
+UNKA
+OQ
+ayku
+HUNK
+yach
+yac
+pipa
+_yac
+mana_
+chan
+Llap
+ana_
+_Llap
+_C
+an,_
+_yach
+han
+qpa
+yacha
+Llapa
+a.
+a._
+yni
diff --git a/langclass/ShortTexts/quz.txt b/langclass/ShortTexts/quz.txt
new file mode 100644
index 000..7a7d5d6
--- /dev/null
+++ b/langclass/ShortTexts/quz.txt
@@ -0,0 +1,212 @@
+PACHATIN LLAQTAKUNAPI RUNAQ ALLIN KANANPAQ JATUN KAMACHIKUY
+Pachantin ayllu wawaq allin kausaypi kananta yuyaykuspan, kay kamachikuy 
paqarin. Runaq kausay qasi kusi kausaypi kananpaq, tukuy llakipi kaspapas 
justicia taripananpaq. Kikin runakayninta runa masinkunawan reqsichispa 
kausananpaq.
+Runaq runa kayninta sarunchasqata rikuspan, wakin ima mil lay salqa 
runakunaq runa masinta ku'muchisqanta, waqachisqanta rikuspan, kay ancha sut'i 
kamachikuykuna rikhurin, ashwan allin, ashwan sumaq kausay runaq taripananpaq; 
mana imamanta manchakuspa, mana yarqayta muchuspa, sut'i simipi rimarispa qasi 
kausaypi kananpaq.
+Runapaqpuni tukuy ima allinkunapas kamasqa karqan. Chay kamasqa kasqanta 
reqsispan; derechon kasqanta yachaspan kay simikuna kamakun qharipas warmipas 
kushkachasqalla kausanankupaq, sapa p'unchay ashwanta jananchakuspa. 
Kausanankupaq: paykuna ukhupipas, llapa ayllu runa uldiupipas, sapanka 
runataqmi tukuy llakimanta qespisqalla purikunan, llapa mundo pachantinman 
qasi kausay mast'arikunanpaq.
+Teqse muyuntin munduq estadonkuna juñuykunakuspan, ancha allinta 
rimanakunku Organización de las Naciones Unidas sutita churaykukuspa. Jina 
sumaqta, allinta yuyayukuspataq, ruwaspataq, juq sonqolla kamachinakunku 
yanapanakunankupaq, runaq runakayninta, qespesqa kayninta, tukuy derechunta 
junt'achinankupaq.
+Chay rimasqanku junt'akunanpaqtaqmi, jatun Asamblea nisqa, ancha 
sut'inta qowanchis kay Declaración Universal de los Derechos Humanos 
qelqapi, llapa llaqtakuna ch'ullallata yuyaykuspa runaq allinkayninta 
tajyachinanpaq, chay allin kamachikuy simikuna junt 'akunanpaq.
+Kaqllataqmi reqsichina, yachachina qhipa wiñay runamanpas, 
waynakunamanpas ashwan allinta paykuna junt'achinanpaq ashwan allin 
yuyaytawanpas yapanankupaq, kikin nacion-ninkupipas, pachantin 
nacionkunapipas.
+JATUN RIMANAKUYPI CHANINCHASQA KAMACHIKUY
+  
+JUQ ÑIQEN (1)
+Llapa runan kay pachapi paqarin qispisqa, libre flisqa, allin kausaypi, 
chaninchasqa kausaypi kananpaq, yuyayniyoq, yachayniyoq runa kasqanman jina. 
Llapa runamasinwantaqmi wauqentin jina munanakunan.
+  
+ISHKAY ÑIQEN (2)
+Kay jatun kamachikuyqa llapa runapaqmi, qasilla qespisqalla purikunanpaq, 
pipas kachun, mistipas, runapas, yuraqpas 

[Libreoffice-commits] core.git: Changes to 'distro/mimo/mimo-4-1-4-2'

[Christian Lohmaier]

New branch 'distro/mimo/mimo-4-1-4-2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/tzm-Latn.lm  |  400 ++
 langclass/ShortTexts/tzm-Latn.txt |  214 
 langclass/fpdb.conf   |1 
 src/Makefile.am   |2 
 4 files changed, 616 insertions(+), 1 deletion(-)

New commits:
commit 042ab3487c4c0380c2c0626fc1ff13202a2ebd22
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 10:58:34 2014 +0100

add Tamazight (Latn)

diff --git a/langclass/LM/tzm-Latn.lm b/langclass/LM/tzm-Latn.lm
new file mode 100644
index 000..cb9d51e
--- /dev/null
+++ b/langclass/LM/tzm-Latn.lm
@@ -0,0 +1,400 @@
+_
+a
+e
+n
+d
+i
+t
+l
+n_
+m
+r
+s
+h
+u
+g
+w
+_a
+y
+_t
+k
+a_
+_i
+Ì£
+d_
+_d
+en
+i_
+an
+_n
+q
+_y
+_l
+gh
+ad
+ye
+en_
+s_
+t_
+da
+an_
+_ye
+dd
+am
+ḥ
+ma
+f
+_n_
+ll
+la
+Ì£e
+wa
+er
+ur
+na
+_d_
+ag
+r_
+el
+z
+ra
+ar
+-
+b
+_w
+ta
+_g
+_s
+le
+_u
+se
+,
+,_
+eq
+_ad
+tt
+we
+ad_
+.
+l_
+._
+agh
+di
+em
+de
+ḥe
+ed
+et
+_i_
+dan
+lh
+he
+_ad_
+hu
+ti
+_lh
+ak
+kk
+lḥ
+es
+in
+ell
+_gh
+_lḥ
+me
+te
+q_
+h_
+md
+dan_
+ra_
+Ì£eq
+ḥeq
+ett
+qq
+is
+as
+mda
+eqq
+_ta
+ḥeqq
+ne
+Ì£eqq
+mdan
+im
+li
+lḥe
+mad
+_lḥe
+akk
+qq_
+lḥeq
+Ì£eqq_
+eqq_
+aw
+il
+hur
+dda
+_di
+id
+ghu
+gh_
+al
+T
+di_
+ghur
+ul
+_na
+_ghu
+_T
+ama
+ya
+_di_
+eg
+nag
+nagh
+_ghur
+_is
+_am
+mdan_
+nagh_
+_nagh
+_nag
+agh_
+tu
+la_
+_yet
+yet
+ll_
+_ti
+_te
+in_
+c
+da_
+-s
+add
+ara
+yett
+sa
+fa
+_m
+_yett
+_Ta
+ur_
+Ta
+it
+madda
+_we
+w_
+ghe
+adda
+madd
+adda_
+ze
+m_
+dda_
+ay
+ud
+-s_
+wi
+mi
+_wa
+:
+ss
+Tamad
+_s_
+yi
+Tam
+amadd
+Tama
+_Tama
+at
+j
+_:_
+ma_
+:_
+_:
+amad
+_Tam
+du
+sen
+d-
+ara_
+ga
+ch
+kw
+edd
+ef
+r-s
+r-
+â
+dd_
+ur-s_
+_ak
+ur-s
+rf
+r-s_
+ghur-
+hur-
+ni
+hur-s
+ur-
+mu
+_ar
+ḍ
+eh
+_le
+_akk
+ull
+lla
+rfa
+li_
+erf
+ull_
+u_
+nt
+_id
+tl
+g_
+ṛ
+ek
+K
+zer
+zerf
+si
+erfa
+_K
+lli
+_se
+-_
+lell
+is_
+lel
+kh
+men
+zerfa
+it_
+kkw_
+_ma
+eb
+kkw
+erfan
+iz
+_yi
+rfan
+fan
+kw_
+iy
+amd
+_d-
+fan_
+_is_
+_amda
+_Ku
+_amd
+_Kul
+_Kull
+Ku
+Kull
+rt
+_ara
+Kull_
+amda
+rfan_
+ke
+_ara_
+Kul
+_de
+emd
+_ag
+_akkw
+_ma_
+emda
+un
+akkw_
+n,_
+akkw
+gar
+amdan
+dj
+n,
+emdan
+lan
+ize
+n.
+izerf
+n._
+us
+elli
+_ur_
+as_
+_ur
+ken
+_sen
+izer
+_tl
+tm
+deg
+ir
+gi
+lli_
+wak
+re
+eg_
+rt_
+tta
+_tm
+ar_
+wem
+nt_
+sen_
+iw
+ella
+ddu
+tlel
+_b
+_wem
+tle
+_wemd
+tlell
+wemd
+ken_
+uk
+mur
+wemda
+sse
+I
+_tu
+ms
+_tle
+ṭ
+mm
+_as
+elli_
+ig
+_tlel
+ez
+ṣ
+tam
+qa
+at_
+_wak
+k_
+wakk
+Ì£a
+wan
+tw
+nn
+be
+yes
+tim
+_yes
+nen
+es_
+kke
+er_
+fe
+twa
+A
+_tt
+ella_
diff --git a/langclass/ShortTexts/tzm-Latn.txt 
b/langclass/ShortTexts/tzm-Latn.txt
new file mode 100644
index 000..f0ec59d
--- /dev/null
+++ b/langclass/ShortTexts/tzm-Latn.txt
@@ -0,0 +1,214 @@
+TISÌ£ERRIHÌ£T TAGRAGHLANT IZERFAN N WEMDAN
+Yesbudan d yesse ran deg wegraw amatu seg use ti-s 217 A. (III) di 10 
dujember 1948
+  
+ANAKCHAM
+Imi asmussen n lḥwerma i ttalasen akkw yâggalen n twachult talsawt d 
yizerfan n sen yemsawan, d nitni i d llsas n tlelli, taghdemt akkw d- tifrat 
deg wmadal (di ddunit).
+Imi kra n widn nesmussun ara izerfan n wemdan d widn iḥeqqren s lkhwedm 
n lewḥuch yesserfayen tamsakwit n talsa akkw d- tlilin umadal and'ara hedren 
u and'ara yamnen yemdanen s tlelli idg ur yelli la aseṛheb la lmizirya, d 
nettat i d asirem âlayan n wemdan.
+Imi tebbwi - dd nnig kra yellan ad ttuḥudden izerfan n wemdan s nnidam 
azerfan i wakkn ur yettuḥerrs ara wemdan di taggara alamma yughal d amnafeg 
ḍadd temḥeqranit akkw d unaghur.
+Imi yessefk ad tennerni tegmi d wassaghen n tmidwa d lemḥibba gar 
yeghlanen.
+Imi di lqanun izerfan n wemdan imudan n ledjnas yedduklen berrḥen i 
tikkelt tajḍidt laman n sen deg zerfan ilsasiyen n wemdan di ccherf akkw d 
wazal n bnadem di tugdut izerfan n tulawin d yergazen u berrḥen belli 
qeṣden ad snernin aqeddem amgarwan u ad sbed'den tigwnatin timenyafin n 
tudert di tlelli yettimghuren.
+Imi, timura yetteskin di ledjnas yedduklen lezment iman n sent ad myallent 
(ad mmâwanent) i wakken ad demnent nitenti d-tuddsa n ledjnas yedduklen, di 
mkull timura leqder aheqqani izerfan n wemdan akkw tlella tilsasiyin.
+Imi afham amechruk n tlella d yizerfan agi degs lqima tameqwrant i wakken 
ad uqment leqder tmura leqder i lâhd n sent.
+Tajmâit tamatawt
+Tberreḥ belli tiṣerriḥt agi tagraghlant izerfan n wemdan d anawad 
amechruk igher ssaramen imudan d yeghlanen akken ma llan i wakken akkw yemdanen 
d yâggaln n temgarwa i glan (i ges an) dima tiṣerriḥt agi di lbal n sen, 
ad skhedmen akkw lmedjhud n sen, s leqraya d ttṛebga i wakkn ad senernin 
aqader n tlella d yizerfan agi u ad demnen s ttawilat idd iteddun s lâqel, (wa 
deffir wa) deg wennar aghelnaw d ugraghlan asmussen d usnefḍes igraghlanen 
iḥeqqaniyen gar imezdaghen n ddulat tâggalin s timmad n sent nagh gar 
yimezdaghen n tmizar i gellan ddaw lhwekm n sent aghedman.
+  
+Tamadda 1:
+Imdanen, akken 

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/uz-Cyrl.lm  |  400 +++
 langclass/ShortTexts/uz-Cyrl.txt |  214 
 langclass/fpdb.conf  |1 
 src/Makefile.am  |4 
 4 files changed, 617 insertions(+), 2 deletions(-)

New commits:
commit d49cb2b363f29eddea28ed17fab58b06d254a0e1
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:09:52 2014 +0100

add Uzbek (Cyrillic)

diff --git a/langclass/LM/uz-Cyrl.lm b/langclass/LM/uz-Cyrl.lm
new file mode 100644
index 000..ef7b2d6
--- /dev/null
+++ b/langclass/LM/uz-Cyrl.lm
@@ -0,0 +1,400 @@
+_
+а
+и
+л
+н
+р
+о
+д
+у
+а_
+т
+м
+г
+б
+қ
+ла
+к
+ар
+ш
+с
+ин
+и_
+да
+га
+ли
+_б
+н_
+ан
+Ò³
+р_
+ни
+в
+лар
+ир
+уқ
+ил
+иш
+_Ò³
+ў
+з
+ан_
+да_
+ти
+э
+_э
+_в
+й
+иг
+га_
+ва
+ки
+ма
+_ва
+би
+_т
+,
+,_
+ри
+е
+_м
+ат
+ар_
+қи
+си
+_би
+ва_
+_ва_
+_қ
+ҳу
+_ҳу
+_и
+ди
+он
+нг
+ига
+қу
+та
+ам
+ад
+ик
+уқу
+со
+ши
+ҳуқу
+қуқ
+_ҳуқу
+ҳуқуқ
+уқуқ
+_ҳуқ
+ҳуқ
+ган
+ш_
+ра
+.
+._
+ч
+бир
+ал
+ини
+ига_
+_бир
+ё
+г_
+ид
+нг_
+‐
+од
+қа
+ол
+мо
+я
+ас
+ир_
+_о
+ж
+инг
+лик
+ўл
+лиш
+ида
+или
+ари
+ни_
+й_
+нин
+_а
+иши
+им
+нинг
+нс
+ий
+ган_
+инг_
+иш_
+нинг_
+_бир_
+лар_
+бир_
+_к
+лари
+ҳа
+_та
+ги
+ади
+му
+иб
+нсон
+сон
+нсо
+_ин
+_ў
+ун
+лан
+ий_
+кин
+ъ
+дир
+_с
+инс
+х
+_бў
+_инс
+бў
+_инсо
+инсон
+_ма
+инсо
+бўл
+он_
+_му
+_бўл
+уқуқи
+дан
+уқи
+қуқи
+бо
+_д
+ила
+Ò²
+_ҳа
+ши_
+аш
+нл
+_Ò²
+қл
+иши_
+ка
+ур
+дан_
+ф
+ини_
+қиг
+қуқиг
+б_
+уқиг
+_ё
+қла
+уқига
+қига
+ми
+сон_
+ро
+лг
+дд
+ўз
+нсон_
+р.
+р._
+қига_
+эг
+_эг
+т_
+кл
+эга
+дда
+_ўз
+рк
+_эга
+эр
+кла
+ай
+одд
+м_
+бу
+_эрк
+эрк
+оли
+_эр
+мод
+қил
+_у
+модд
+гад
+эгад
+модда
+‐мод
+ак
+‐м
+адир
+дда_
+лга
+гади
+на
+одда_
+_‐мо
+_‐мод
+нли
+_‐
+_‐м
+‐мо
+‐модд
+ор
+эгади
+одда
+_эгад
+гадир
+_ол
+тл
+_эрки
+ба
+эрки
+рки
+ки_
+ёки_
+_ёк
+_Ҳа
+_Ҳар_
+_Ҳар
+лиги
+аз
+ёк
+лиг
+иги
+эркин
+илиш
+Ҳа
+Ҳар
+ёки
+_қа
+ркин
+Ҳар_
+_ёки_
+_ёки
+зи
+лган
+қлар
+са
+ида_
+ақ
+_қи
+ош
+к_
+ло
+ир._
+атл
+дир.
+лиши
+ия
+ара
+ос
+дир._
+ир.
+ри_
+адир.
+лл
+з_
+ум
+ари_
+клар
+ҳам
+_ш
+лат
+лари_
+бил
+_қил
+рл
+ала
+_бил
+лаш
+_х
+_ҳам
+эт
+қили
+илан
+_оли
+_ба
+била
+_била
+_эт
+ят
+инл
+ча
+билан
+и,
+_бо
+эти
+тлар
+мас
+тил
+_қили
+аъ
+лан_
+и,_
+_эти
+илан_
+за
+ик_
+тла
+ниш
+лиши_
+фа
+лган_
+_ж
+лик_
+ин_
+аб
+ер
+нлик
+кинли
+ларн
+ркинл
+арни
+рни
+рн
+уқуқл
+ларни
+ани
+бош
+арн
+а,
+қар
+қуқл
+а,_
+инли
+атлар
+уқл
+оси
+атла
+кинл
+_н
+ша
+қуқла
+мл
+ат_
+қо
+ўли
+уқлар
+_да
+уқла
+иб_
+ги_
+мла
+до
+риш
+ту
+аг
+лиш_
+у_
+ав
+рч
diff --git a/langclass/ShortTexts/uz-Cyrl.txt b/langclass/ShortTexts/uz-Cyrl.txt
new file mode 100644
index 000..cb9a442
--- /dev/null
+++ b/langclass/ShortTexts/uz-Cyrl.txt
@@ -0,0 +1,214 @@
+ИНСОН ҲУҚУҚЛАРИ УМУМЖАҲОН ДЕКЛАРАЦИЯСИ
+1948 йил, 10 декабрда Бирлашган Миллатлар 
Ташкилоти Бош Ассамблеясининг 217 A (III) 
кўрсатмаси орқали қабул қилинган ва эълон 
қилинган.
+  
+Преамбула
+  Инсон оиласи барча аъзоларига ҳос 
бўлган қадр‐қиммат ҳамда уларнинг тенг ва 
ажралмас ҳуқуқларини тан олиш эркинлик, 
адолат ва ялпи тинчликнинг асоси бўлишини 
эътиборга олиб,
+  Инсон ҳуқуқларини менсимаслик ва 
оёқ‐ости қилиш одамзод виждонини 
ўртаётган ваҳшийларча қилмишларга олиб 
келганини ҳамда кишилар сўз ва маслак 
эркинлиги соҳиби бўлиб, қўрқув ва 
муҳтожликдан ҳоли бўлиб яшайдиган дунёни 
бунёд этиш одамларнинг нуфузли интилиши, 
деб эълон қилинганлигини эътиборга олиб,
+  

Re: Icons/themes selection broken on 4.3.0.1

[Regina Henschel]

Hi Tomáš,

Tomáš Chvátal schrieb:

Heya,

Seems I have weird problem wrt iconselection and further on with themes
on 4.3.0.1 build in opensuse.

When I launch libreoffice it searches only for images_tango.zip file and
if not found shows no icons. Regardless wether it should use oxygen as
it is launched on KDE.

Other problem is while I tried to debug this when I clicked on Tools -
Options - View  I got warning Could not find theme id in theme
vector. and when I clicked ok whole app closed (it didn't crash tho as
the exit value was 0 and no backtrace to show).

Any help appreciated.


We received the same error description on the German ask.libreoffice. 
http://ask.libreoffice.org/de/question/36123/icons-have-changed-after-update-cannot-be-changed-back/ 
The question is in English, my answer in German. I think, the behavior 
is a bug, but I've got no version 4.3 to test it on Windows. Version 4.4 
on Windows does not show that behavior. It might be a problem on OpenSuse.


Kind regards
Regina



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

[Libreoffice-commits] libexttextcat.git: langclass/fpdb.conf langclass/LM langclass/ShortTexts src/Makefile.am

[Caolán McNamara]

 langclass/LM/vep.lm  |  400 +++
 langclass/ShortTexts/vep.txt |  212 ++
 langclass/fpdb.conf  |1 
 src/Makefile.am  |2 
 4 files changed, 614 insertions(+), 1 deletion(-)

New commits:
commit bd20ed146e9766c551b15d77f3b22d1b768ed28f
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:15:10 2014 +0100

add Veps

diff --git a/langclass/LM/vep.lm b/langclass/LM/vep.lm
new file mode 100644
index 000..10ad280
--- /dev/null
+++ b/langclass/LM/vep.lm
@@ -0,0 +1,400 @@
+_
+i
+e
+a
+o
+n
+t
+d
+u
+h
+k
+l
+s
+m
+n_
+en
+r
+v
+z
+_o
+oi
+ž
+da
+i_
+_m
+_k
+iž
+tu
+el
+a_
+id
+en_
+,_
+,
+ah
+e_
+de
+nd
+ik
+ä
+va
+ta
+j
+_i
+an
+te
+eh
+g
+p
+he
+_t
+al
+ai
+l_
+om
+_i_
+._
+.
+_v
+d_
+us
+den
+ud
+že
+iže
+ehe
+kt
+b
+den_
+’
+ide
+ikt
+oikt
+_va
+ht
+oik
+ktu
+uz
+iden
+hi
+iktu
+me
+_oi
+oiktu
+le
+_oikt
+_oik
+ü
+̈
+iden_
+Å¡
+it
+iš
+_me
+ad
+_s
+_om
+nda
+an_
+ma
+ku
+el_
+es
+se
+č
+ra
+ka
+ne
+tuz
+ez
+li
+mi
+_e
+da_
+_p
+s_
+iktuz
+ktuz
+ut
+to
+use
+_u
+_om_
+as
+om_
+ld
+m_
+z’
+_a
+hiž
+ar
+ko
+ga
+on
+_h
+meh
+ki
+’_
+ha
+_meh
+ke
+_ka
+c
+ja
+ed
+val
+z’_
+ič
+uz’
+ol
+mu
+end
+_r
+z_
+uz’_
+st
+un
+aha
+mehe
+ži
+_mehe
+_ü
+in
+ele
+tus
+tuz’
+ir
+ižel
+žel
+du
+tuz’_
+iži
+̈h
+üht
+̈ht
+ktuz’
+vald
+ald
+üh
+_te
+če
+dan
+_üh
+_üht
+ahi
+le_
+si
+rj
+ude
+og
+und
+hiže
+dan_
+_val
+ju
+ei
+ndan
+na
+ahiž
+sk
+gah
+žel_
+ahiže
+kirj
+ižel_
+vo
+irj
+_ra
+am
+än
+ali
+kir
+jutez
+kirju
+ez_
+jute
+ute
+_kirj
+ahv
+jut
+gahiž
+rju
+rjute
+ogahi
+_ki
+irjut
+gahi
+rjut
+ogah
+utez_
+_.
+il
+hižel
+hv
+oid
+irju
+_kir
+utez
+tez_
+_._
+ndan_
+oga
+tez
+_ku
+hel
+ehel
+do
+oma
+mehel
+kai
+_mi
+_mu
+Joga
+kun
+_vald
+_n
+Jo
+ci
+_J
+_Joga
+_ta
+_Jo
+_Jog
+Jog
+Jogah
+_kai
+J
+hva
+uda
+he_
+_vai
+ahva
+vai
+ho
+rahva
+liž
+kund
+go
+sa
+ndu
+es_
+tuse
+zi
+rahv
+toi
+rah
+d,_
+ai_
+id_
+kon
+lda
+tud
+d,
+tt
+vai_
+th
+_vai_
+_ko
+e,_
+ni
+tad
+e,
+ba
+_ol
+ug
+ele_
+pä
+dus
+iče
+hth
+hel_
+kunda
+ehel_
+itu
+vah
+ri
+as_
+ada
+at
+unda
+äne
+thi
+aliž
+aik
+Å¡t
+ada_
+ij
+ed_
+hthi
+ndus
+pe
+išt
+_l
+_hän
+eg
+_hä
+mb
+hä
+hän
+t_
+ija
+os
+nen
+ita
+ta_
+teg
+_sa
+sta
+_ei
+sel
+uzi
+duse
+usel
+ahvah
+er
+hvah
+l’
+oide
+_mug
+_ei_
+miš
+mug
+hu
+nduse
+oiden
+lo
+il_
+ižid
+äi
+ha_
+žid
+ei_
+ge
+_rahv
+kaik
+pi
+he,_
+oiž
+_rah
+iše
+ti
+_to
+ac
+Å¡e
+undan
+_kaik
+häne
+nz
+rv
+ehe_
+_häne
+_teg
+pid
+endu
+he,
+ud_
+thiž
+änen
+dam
+Å¡e_
diff --git a/langclass/ShortTexts/vep.txt b/langclass/ShortTexts/vep.txt
new file mode 100644
index 000..a005aa8
--- /dev/null
+++ b/langclass/ShortTexts/vep.txt
@@ -0,0 +1,212 @@
+Mehen oiktuziden ühthine deklaracii
+  Preambul
+  Ottes homaitusehe, miše mez’kundan kaikiden ühtnikoiden arvokahuden 
i ühthižiden oiktuziden tundustamine oma valdan, oiktuden, mirun alandusen; i
+  ottes homaitusehe, miše hondostamine i kacmatomuz’ mehen oiktuzihe 
tob varvaroiden tegoid, kudambad käregoitas mez’kundan mel’tundod, i 
mehiden suren tahton i takaindan om mugoman mirun tegend, kudambas mehil linneb 
sanavald, kacmusiden vald, ei linne varaidust i mairišt; i
+  ottes homaitusehe, miše tarbiž mehiden oiktuded kaita zakonan valdal, 
sen täht, miše mehele ei pidaiži lopuks libuda tiranijan i ahthištusen 
vasthapäi; i
+  ottes homaitusehe, miše tarbiž abutada sebrmeližiden kosketusiden 
kehitoitusele rahvahiden keskes; i
+  ottes homaitusehe, miše Ühthižrahvahiže mülüjad rahvahad 
vahvištoitiba käskkirjas ičeze uskondan mehiden päoiktuzihe, mehen personan 
arvokahudehe i mužikoiden da naižiden tazooiktudehe i pätiba abutada 
socialižele progressale i elon oloiden paremboitusele oldes surembas valdas; i
+  ottes homaitusehe, miše valdkundad-ühtnikad toivotiba abutada ühtes 
Ühthižrahvazkundanke ühthižes arvostandas i mehen oiktuziden i 
pävaldoiden kaičendas, tegendas; i
+  ottes homaitusehe, miše neniden oiktuziden ühthine el’genduz om 
lujas tärged niid täudes pidämižes,
+  Sur’ Assamblei,
+  ezitab necen mehen oiktuziden ühthižen deklaracijan kut tegend, 
kaikile rahvahile i valdkundoile, miše kaikutte mez’ i kaikutte 
ühthižkundan azjmehišt, kaiken pidädes meles necen deklaracijan, 
abutaižiba tedotelendal i opendusel arvostada nenid oiktuzid i valdoid i 
tegižiba rahvahaližil i keskrahvahaližil progressivižil tegoil ühthišt i 
effektivišt arvostust i pidäižiba kut Ühthižrahvazkundan 
valdoiden-ühtnikoiden, muga i toižiden tahoiden rahvahiden keskes, kudambad 
oma niiden jurisdikcijan al.
+   
+  1. kirjutez
+  Kaik mehed sünduba joudajin i kohtaižin, ühtejiččin ičeze 
arvokahudes i oiktusiš. Heile om anttud mel’ i huiktusentund i heile tariž 
kožuda toine toiženke kut vel’l’kundad.
+   
+  2. kirjutez
+  

[Libreoffice-commits] libexttextcat.git: configure.ac src/exttextcat-version.h src/win32_config.h

[Caolán McNamara]

 configure.ac |2 +-
 src/exttextcat-version.h |4 ++--
 src/win32_config.h   |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bb89734b9839cbbe4fa8fe7ed38b8afa2af0ce04
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:18:32 2014 +0100

bump release number

diff --git a/configure.ac b/configure.ac
index a412a42..708dd9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([exttextcat_version_major],[3])
 m4_define([exttextcat_version_minor],[4])
-m4_define([exttextcat_version_micro],[3])
+m4_define([exttextcat_version_micro],[4])
 
m4_define([exttextcat_version],[exttextcat_version_major.exttextcat_version_minor.exttextcat_version_micro])
 
 AC_PREREQ([2.68])
diff --git a/src/exttextcat-version.h b/src/exttextcat-version.h
index a54fe26..fc49a70 100644
--- a/src/exttextcat-version.h
+++ b/src/exttextcat-version.h
@@ -1,9 +1,9 @@
 #ifndef EXTTEXTCAT_VERSION_H
 #define EXTTEXTCAT_VERSION_H
 
-#define EXTTEXTCAT_VERSION 3.4.3
+#define EXTTEXTCAT_VERSION 3.4.4
 #define EXTTEXTCAT_VERSION_MAJOR 3
 #define EXTTEXTCAT_VERSION_MINOR 4
-#define EXTTEXTCAT_VERSION_MICRO 3
+#define EXTTEXTCAT_VERSION_MICRO 4
 
 #endif
diff --git a/src/win32_config.h b/src/win32_config.h
index 7a70af8..1b60822 100644
--- a/src/win32_config.h
+++ b/src/win32_config.h
@@ -57,7 +57,7 @@
 #define PACKAGE_NAME libexttextcat
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING libexttextcat 3.4.3
+#define PACKAGE_STRING libexttextcat 3.4.4
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME libexttextcat
@@ -72,6 +72,6 @@
 #define TIME_WITH_SYS_TIME 1
 
 /* Version number of package */
-#define VERSION 3.4.3
+#define VERSION 3.4.4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libexttextcat

[Caolán McNamara]

 download.lst  |2 -
 external/libexttextcat/ExternalPackage_fingerprint.mk |9 +++
 external/libexttextcat/UnpackedTarball_exttextcat.mk  |4 ---
 external/libexttextcat/exttextcat-msvc-stdint.patch   |   21 --
 4 files changed, 10 insertions(+), 26 deletions(-)

New commits:
commit e8b753910b2c4867ee5723a313a902c8ca4ac841
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:32:43 2014 +0100

update to latest libexttextcat

Change-Id: I18cb4d6939c5fcf765ff3033c67583048b55e4a1

diff --git a/download.lst b/download.lst
index 2e74282..e80870e 100644
--- a/download.lst
+++ b/download.lst
@@ -86,7 +86,7 @@ export LIBATOMIC_OPS_MD5SUM := 
c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
-export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 export LIBGLTF_TARBALL := 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
diff --git a/external/libexttextcat/ExternalPackage_fingerprint.mk 
b/external/libexttextcat/ExternalPackage_fingerprint.mk
index 38bff25..68d4d24 100644
--- a/external/libexttextcat/ExternalPackage_fingerprint.mk
+++ b/external/libexttextcat/ExternalPackage_fingerprint.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/ace.lm \
langclass/LM/ada.lm \
langclass/LM/af.lm \
+   langclass/LM/ak.lm \
langclass/LM/alt.lm \
langclass/LM/am.lm \
langclass/LM/ar.lm \
@@ -36,6 +37,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/br.lm \
langclass/LM/bs.lm \
langclass/LM/ca.lm \
+   langclass/LM/ckb.lm \
langclass/LM/cs.lm \
langclass/LM/cy.lm \
langclass/LM/da.lm \
@@ -43,6 +45,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/dv.lm \
langclass/LM/ee.lm \
langclass/LM/el.lm \
+   langclass/LM/emk-Latn.lm \
langclass/LM/en.lm \
langclass/LM/eo.lm \
langclass/LM/es.lm \
@@ -82,6 +85,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/kl.lm \
langclass/LM/km.lm \
langclass/LM/kn.lm \
+   langclass/LM/kng.lm \
langclass/LM/ko.lm \
langclass/LM/ktu.lm \
langclass/LM/ky.lm \
@@ -103,6 +107,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/mt.lm \
langclass/LM/my.lm \
langclass/LM/nb.lm \
+   langclass/LM/nds.lm \
langclass/LM/ne.lm \
langclass/LM/nl.lm \
langclass/LM/nn.lm \
@@ -115,6 +120,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/pl.lm \
langclass/LM/plt.lm \
langclass/LM/pt.lm \
+   langclass/LM/quz.lm \
langclass/LM/qxa.lm \
langclass/LM/rm.lm \
langclass/LM/ro.lm \
@@ -152,11 +158,14 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(
langclass/LM/ts.lm \
langclass/LM/tt.lm \
langclass/LM/ty.lm \
+   langclass/LM/tzm-Latn.lm \
langclass/LM/ug.lm \
langclass/LM/uk.lm \
langclass/LM/ur.lm \
+   langclass/LM/uz-Cyrl.lm \
langclass/LM/uz.lm \
langclass/LM/ve.lm \
+   langclass/LM/vep.lm \
langclass/LM/vi.lm \
langclass/LM/wa.lm \
langclass/LM/xh.lm \
diff --git a/external/libexttextcat/UnpackedTarball_exttextcat.mk 
b/external/libexttextcat/UnpackedTarball_exttextcat.mk
index 66bad27..9a272b5 100644
--- a/external/libexttextcat/UnpackedTarball_exttextcat.mk
+++ b/external/libexttextcat/UnpackedTarball_exttextcat.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
-external/libexttextcat/exttextcat-msvc-stdint.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libexttextcat/exttextcat-msvc-stdint.patch 
b/external/libexttextcat/exttextcat-msvc-stdint.patch
deleted file mode 100644
index 09da3e3..000
--- a/external/libexttextcat/exttextcat-msvc-stdint.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 foo/foo/src/common.h
-+++ foo/foo/src/common.h
-@@ -45,18 +45,7 @@
- {
- #endif
- 
--#ifdef _MSC_VER
--typedef __int8 int8_t;
--

Re: Which source files / documentatio - line routing - connecting edges between nodes?

[Caolán McNamara]

On Thu, 2014-06-19 at 09:39 +0100, Rob Collins wrote:
 Folks,
 
 I am new to the LibraOffice code base. I am trying to find the source
 code files / documentation for routing  connectors in drawings
 (LibraOffice Impress). I would like to understand the algorithm /
 design.
...
 Any suggestions for:
 
 (1) Actual source file names? 
 
 (2) Method / Function names?
 
 (3) Good key words to search for (Nodes, Edges)?

I believe you're looking for SdrEdgeObj (svx/source/svdraw/svdoedge.cxx)
and SdrGluePoint

C.

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

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

[Jacobo Aragunde Pérez]

 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |   16 +++-
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 091eeeab04807795a8bc8cd78b9adb369a207ee6
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Mon Jun 16 17:28:55 2014 +0200

fdo#74681: quick help may be used as accessible text

In case a tool box item does not contain some text to be used as the
accessible item name, use the quick help text.

Change-Id: I9caadb0989729787d8572f4007652bcab02b0412
(cherry picked from commit 9b2582064882bb1a1caea72fe7754b8872a16413)
Reviewed-on: https://gerrit.libreoffice.org/9900
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx 
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index ff903d1..7b7cf59 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -130,13 +130,17 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool 
_bAsName )
 sRet = m_pToolBox-GetItemText( m_nItemId );
 if (sRet.isEmpty())
 {
-Window* pItemWindow = m_pToolBox-GetItemWindow( m_nItemId );
-if ( m_nRole == AccessibleRole::PANEL  pItemWindow  
pItemWindow-GetAccessible().is() 
- pItemWindow-GetAccessible()-getAccessibleContext().is() )
+sRet = m_pToolBox-GetQuickHelpText( m_nItemId );
+if (sRet.isEmpty())
 {
-OUString sWinText = 
pItemWindow-GetAccessible()-getAccessibleContext()-getAccessibleName();
-if (!sWinText.isEmpty())
-sRet = sWinText;
+Window* pItemWindow = m_pToolBox-GetItemWindow( m_nItemId );
+if ( m_nRole == AccessibleRole::PANEL  pItemWindow  
pItemWindow-GetAccessible().is() 
+ pItemWindow-GetAccessible()-getAccessibleContext().is() 
)
+{
+OUString sWinText = 
pItemWindow-GetAccessible()-getAccessibleContext()-getAccessibleName();
+if (!sWinText.isEmpty())
+sRet = sWinText;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: how to cope with Calc functions that have an optional argument, which is mandatory in Excel?

[Winfried Donkers]

Hi,

Currently I am looking at fdo#40835, which mentions the problem that Excel 
function F.DIST has 4 required arguments and that ODF1.2 function FDIST has 
the same arguments, only the last argument is optional.

Is there code that handles my case? Otherwise I may have to introduce an extra 
function to Calc, just because of this optional/required argument difference.

I found core/sc/source/filter/excel/xeformula.cxx that seems to do what I need 
in XclExpFmlaCompImpl::AppendTrailingParam(),
and /core/formula/source/core/api/token.cxx with 
FormulaMissingContext::AddMoreArgs().
That doesn't seem to work as it should, at least for ocGammaDist.

So I've got more digging to do.
Anyone familiar with these files and its code and willing to provide me with 
background information is welcome, though.

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

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

[Stephan Bergmann]

 configure.ac |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ae19cfde67fce2e873a649930fd17dd3274d3e74
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 11:19:21 2014 +0200

Assume $FRAMEWORKSHOME/JavaVM/Headers is junk

(What I have on OS X 10.9 $FRAMEWORKSHOME/JavaVM.framework/Headers, but that
should already be covered by the preceding
$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers.)

Also, fix up 359ba1dfdf8de1f2cff185f16ec21b6dc88feac9 OS X: JDK include 
path
for JDK 1.8 to not set JAVAINC twice.

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

diff --git a/configure.ac b/configure.ac
index 108cb14..2f58380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7241,9 +7241,10 @@ if test -n $ENABLE_JAVA -a -z $JAVAINC; then
 ;;
 
 darwin*)
-
JAVAINC=${ISYSTEM}$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers 
${ISYSTEM}$FRAMEWORKSHOME/JavaVM/Headers
 if test -d $JAVA_HOME/include/darwin; then
 JAVAINC=-I$JAVA_HOME/include  -I$JAVA_HOME/include/darwin
+else
+
JAVAINC=${ISYSTEM}$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers
 fi
 ;;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: ca/description.xml ca/dictionaries.xcu

[Caolán McNamara]

 ca/description.xml  |2 +-
 ca/dictionaries.xcu |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b310c7910565cb1a4beea309ce404bb533ac6f44
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Resolves: fdo#79012 wrong path to dictionaries

Change-Id: Ie865a386dc537947f85130b036bbadcc0ef19a60

diff --git a/ca/description.xml b/ca/description.xml
index 34f4116..00d2c99 100644
--- a/ca/description.xml
+++ b/ca/description.xml
@@ -19,7 +19,7 @@
 !-- The version of your extension. NOT the one of OpenOffice.org...
  It will also be used to automatically check if there are updates for 
this
  extension available. Newer versions should have higher values. --
-version value=2.5.1 /
+version value=2.5.1.1 /
 
 !-- A unique identifier for your extension.
 In order to avoid name clashes with other extensions it should 
probably hold
diff --git a/ca/dictionaries.xcu b/ca/dictionaries.xcu
index 4dba211..2939195 100644
--- a/ca/dictionaries.xcu
+++ b/ca/dictionaries.xcu
@@ -4,7 +4,7 @@
 node oor:name=Dictionaries
 node oor:name=HunSpellDic_catalan_general oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca.aff 
%origin%/dictionaries/ca.dic/value
+value%origin%/ca.aff %origin%/ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -15,7 +15,7 @@
 /node
 node oor:name=HunSpellDic_catalan_valencia oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca-valencia.aff 
%origin%/dictionaries/ca-valencia.dic/value
+value%origin%/ca-valencia.aff 
%origin%/ca-valencia.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -28,7 +28,7 @@
 
 node oor:name=hyph_ca_ANY oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/hyph_ca.dic/value
+value%origin%/hyph_ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_HYPH/value/prop
@@ -38,7 +38,7 @@
 /node
 node oor:name=ThesDic_ca-ES oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/th_ca_ES_v3.dat 
%origin%/dictionaries/th_ca_ES_v3.idx/value
+value%origin%/th_ca_ES_v3.dat 
%origin%/th_ca_ES_v3.idx/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_THES/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Caolán McNamara]

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

New commits:
commit be13df63e08fad9fb23038e09d741457738c24d3
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Updated core
Project: dictionaries  b310c7910565cb1a4beea309ce404bb533ac6f44

diff --git a/dictionaries b/dictionaries
index ad4dea4..b310c79 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit ad4dea48c420f123afa083ac5cc4b12287c9c17f
+Subproject commit b310c7910565cb1a4beea309ce404bb533ac6f44
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 86b7f932487c0372180f8ea111fcc045c52a49cf
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Updated core
Project: dictionaries  01f9802c2513893ae4fd172402e4cd256f7a66d6

diff --git a/dictionaries b/dictionaries
index 4941ec6..01f9802 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 4941ec64e84e41bc461c5641c6a783a339f08102
+Subproject commit 01f9802c2513893ae4fd172402e4cd256f7a66d6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-3' - ca/description.xml ca/dictionaries.xcu

[Caolán McNamara]

 ca/description.xml  |2 +-
 ca/dictionaries.xcu |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 01f9802c2513893ae4fd172402e4cd256f7a66d6
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Resolves: fdo#79012 wrong path to dictionaries

Change-Id: Ie865a386dc537947f85130b036bbadcc0ef19a60
(cherry picked from commit b310c7910565cb1a4beea309ce404bb533ac6f44)

diff --git a/ca/description.xml b/ca/description.xml
index 34f4116..00d2c99 100644
--- a/ca/description.xml
+++ b/ca/description.xml
@@ -19,7 +19,7 @@
 !-- The version of your extension. NOT the one of OpenOffice.org...
  It will also be used to automatically check if there are updates for 
this
  extension available. Newer versions should have higher values. --
-version value=2.5.1 /
+version value=2.5.1.1 /
 
 !-- A unique identifier for your extension.
 In order to avoid name clashes with other extensions it should 
probably hold
diff --git a/ca/dictionaries.xcu b/ca/dictionaries.xcu
index 4dba211..2939195 100644
--- a/ca/dictionaries.xcu
+++ b/ca/dictionaries.xcu
@@ -4,7 +4,7 @@
 node oor:name=Dictionaries
 node oor:name=HunSpellDic_catalan_general oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca.aff 
%origin%/dictionaries/ca.dic/value
+value%origin%/ca.aff %origin%/ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -15,7 +15,7 @@
 /node
 node oor:name=HunSpellDic_catalan_valencia oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca-valencia.aff 
%origin%/dictionaries/ca-valencia.dic/value
+value%origin%/ca-valencia.aff 
%origin%/ca-valencia.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -28,7 +28,7 @@
 
 node oor:name=hyph_ca_ANY oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/hyph_ca.dic/value
+value%origin%/hyph_ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_HYPH/value/prop
@@ -38,7 +38,7 @@
 /node
 node oor:name=ThesDic_ca-ES oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/th_ca_ES_v3.dat 
%origin%/dictionaries/th_ca_ES_v3.idx/value
+value%origin%/th_ca_ES_v3.dat 
%origin%/th_ca_ES_v3.idx/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_THES/value
___
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

[Caolán McNamara]

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

New commits:
commit 0acf899a982e850961350aba531bb87f43c8a422
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Updated core
Project: dictionaries  8fd0010032962507764ffbfd92e3757f8d626120

diff --git a/dictionaries b/dictionaries
index 0a68bdc..8fd0010 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0a68bdc3b29237ab76bce445f3cdc535b1482307
+Subproject commit 8fd0010032962507764ffbfd92e3757f8d626120
___
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' - ca/description.xml ca/dictionaries.xcu

[Caolán McNamara]

 ca/description.xml  |2 +-
 ca/dictionaries.xcu |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8fd0010032962507764ffbfd92e3757f8d626120
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 11:54:16 2014 +0100

Resolves: fdo#79012 wrong path to dictionaries

Change-Id: Ie865a386dc537947f85130b036bbadcc0ef19a60
(cherry picked from commit b310c7910565cb1a4beea309ce404bb533ac6f44)

diff --git a/ca/description.xml b/ca/description.xml
index 34f4116..00d2c99 100644
--- a/ca/description.xml
+++ b/ca/description.xml
@@ -19,7 +19,7 @@
 !-- The version of your extension. NOT the one of OpenOffice.org...
  It will also be used to automatically check if there are updates for 
this
  extension available. Newer versions should have higher values. --
-version value=2.5.1 /
+version value=2.5.1.1 /
 
 !-- A unique identifier for your extension.
 In order to avoid name clashes with other extensions it should 
probably hold
diff --git a/ca/dictionaries.xcu b/ca/dictionaries.xcu
index 4dba211..2939195 100644
--- a/ca/dictionaries.xcu
+++ b/ca/dictionaries.xcu
@@ -4,7 +4,7 @@
 node oor:name=Dictionaries
 node oor:name=HunSpellDic_catalan_general oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca.aff 
%origin%/dictionaries/ca.dic/value
+value%origin%/ca.aff %origin%/ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -15,7 +15,7 @@
 /node
 node oor:name=HunSpellDic_catalan_valencia oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/ca-valencia.aff 
%origin%/dictionaries/ca-valencia.dic/value
+value%origin%/ca-valencia.aff 
%origin%/ca-valencia.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_SPELL/value
@@ -28,7 +28,7 @@
 
 node oor:name=hyph_ca_ANY oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/hyph_ca.dic/value
+value%origin%/hyph_ca.dic/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_HYPH/value/prop
@@ -38,7 +38,7 @@
 /node
 node oor:name=ThesDic_ca-ES oor:op=fuse
 prop oor:name=Locations oor:type=oor:string-list
-value%origin%/dictionaries/th_ca_ES_v3.dat 
%origin%/dictionaries/th_ca_ES_v3.idx/value
+value%origin%/th_ca_ES_v3.dat 
%origin%/th_ca_ES_v3.idx/value
 /prop
 prop oor:name=Format oor:type=xs:string
 valueDICT_THES/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-4-1-4-2' - 2 commits - framework/source sc/inc sc/qa sc/source

[Mohamed-Ali BEN MANSOUR]

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   22 -
 sc/inc/drwlayer.hxx |5 
 sc/qa/unit/filters-test.cxx |   12 
 sc/qa/unit/ucalc.cxx|4 
 sc/source/core/data/drwlayer.cxx|  255 +---
 sc/source/filter/xml/xmlexprt.cxx   |   14 
 sc/source/ui/unoobj/shapeuno.cxx|2 
 sc/source/ui/view/drawview.cxx  |2 
 8 files changed, 117 insertions(+), 199 deletions(-)

New commits:
commit 040f448ade7cc45f964132fea34c737f07e90b40
Author: Mohamed-Ali BEN MANSOUR mohamed-ali.ben-mans...@capgemini.com
Date:   Thu Mar 20 10:52:16 2014 +0100

Ticket 385: Regression Ancrage des objets (fdo#67712)

diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 7392a05..4045d32 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -102,6 +102,7 @@ public:
 virtual SdrPage*  AllocPage(bool bMasterPage);
 virtual SdrModel* AllocModel() const;
 virtual voidSetChanged( sal_Bool bFlg = sal_True );
+virtual Window* GetCurDocViewWin();
 
 virtual SdrLayerID GetControlExportLayerId( const SdrObject  ) const;
 
@@ -169,9 +170,9 @@ public:
 static void SetCellAnchored( SdrObject, const ScDrawObjData 
rAnchor );
 static void SetVisualCellAnchored( SdrObject, const 
ScDrawObjData rAnchor );
 // Updates rAnchor based on position of rObj
-static void GetCellAnchorFromPosition( SdrObject rObj, 
ScDrawObjData rAnchor, const ScDocument rDoc, SCTAB nTab, bool bUseLogicRect 
= true, bool bHiddenAsZero = true );
+static void GetCellAnchorFromPosition( SdrObject rObj, 
ScDrawObjData rAnchor ,const ScDocument rDoc, SCTAB nTab);
 static void SetCellAnchoredFromPosition( SdrObject rObj, 
const ScDocument rDoc, SCTAB nTab );
-static void UpdateCellAnchorFromPositionEnd( SdrObject rObj, 
ScDrawObjData rAnchor, const ScDocument rDoc, SCTAB nTab, bool bUseLogicRect 
= true );
+static void UpdateCellAnchorFromPositionEnd( SdrObject rObj, 
const ScDocument rDoc, SCTAB nTab);
 static ScAnchorType GetAnchorType( const SdrObject );
 
 // positions for detektive lines
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 8f245c2..10c1cae 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -327,8 +327,8 @@ void impl_testLegacyCellAnchoredRotatedShape( ScDocument* 
pDoc, Rectangle aRect
 const Rectangle aSnap = pObj-GetSnapRect();
 printf(expected height %ld actual %ld\n, aRect.GetHeight(), 
aSnap.GetHeight() );
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.GetHeight(), 
aSnap.GetHeight(), TOLERANCE ) );
-printf(expected width %ld actual %ld\n, aRect.GetWidth(), 
aSnap.GetWidth() );
-CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.GetWidth(), 
aSnap.GetWidth(), TOLERANCE ) );
+//printf(expected width %ld actual %ld\n, aRect.GetWidth(), 
aSnap.GetWidth() );
+//CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.GetWidth(), 
aSnap.GetWidth(), TOLERANCE ) );
 printf(expected left %ld actual %ld\n, aRect.Left(), aSnap.Left() );
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.Left(), 
aSnap.Left(), TOLERANCE ) );
 printf(expected right %ld actual %ld\n, aRect.Top(), aSnap.Top() );
@@ -337,13 +337,13 @@ void impl_testLegacyCellAnchoredRotatedShape( ScDocument* 
pDoc, Rectangle aRect
 
 ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj );
 printf(expected startrow % SAL_PRIdINT32  actual % SAL_PRIdINT32 \n, 
aAnchor.maStart.Row(), pData-maStart.Row()  );
-CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Row(), pData-maStart.Row() );
+CPPUNIT_ASSERT_EQUAL(true, testEqualsWithTolerance( aAnchor.maStart.Row(), 
pData-maStart.Row() , TOLERANCE) );
 printf(expected startcol %d actual %d\n, aAnchor.maStart.Col(), 
pData-maStart.Col()  );
-CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Col(), pData-maStart.Col() );
+CPPUNIT_ASSERT_EQUAL(true, testEqualsWithTolerance( aAnchor.maStart.Col(), 
pData-maStart.Col() , TOLERANCE) );
 printf(expected endrow % SAL_PRIdINT32  actual % SAL_PRIdINT32 \n, 
aAnchor.maEnd.Row(), pData-maEnd.Row()  );
-CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Row(), pData-maEnd.Row() );
+CPPUNIT_ASSERT_EQUAL( true,testEqualsWithTolerance (aAnchor.maEnd.Row(), 
pData-maEnd.Row(), TOLERANCE ) );
 printf(expected endcol %d actual %d\n, aAnchor.maEnd.Col(), 
pData-maEnd.Col()  );
-CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Col(), pData-maEnd.Col() );
+CPPUNIT_ASSERT_EQUAL(true, testEqualsWithTolerance ( aAnchor.maEnd.Col(), 
pData-maEnd.Col(), TOLERANCE ) );
 }
 
 void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 0bda2a4..d4fbcb4 100644
--- 

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

[Zolnai Tamás]

 external/libgltf/ExternalProject_libgltf.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c7d6541f5daa59d04accb30c727a83d936f02150
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 13:41:36 2014 +0200

libgltf: it seems gb_SPACE is not that we need here

Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 580c010..5c40aa7 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,6 +39,9 @@ ifeq ($(SYSTEM_GLM),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,glm)
 endif
 
+libgltf_empty :=
+libgltf_space := $(libgltf_empty) $(libgltf_empty)
+
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
@@ -47,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
-   '/p:AdditionalIncludeDirectories=$(subst 
$(gb_SPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
+   '/p:AdditionalIncludeDirectories=$(subst 
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 rsc/source/prj/start.cxx |   17 +
 rsc/source/rscpp/cpp3.c  |   14 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

New commits:
commit d75049f9785db101d6ecb043a4576652b71da2a7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 14:04:39 2014 +0200

rsc: fix how -isystem args are filtered out for the preproc

Change-Id: I7688f3d68be99362e79304bbac041424eee6347a

diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 7c7cc32..7c926f0 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -75,6 +75,23 @@ static bool CallPrePro( const OString rInput,
 bVerbose = true;
 continue;
 }
+if (strcmp(static_castchar *(pCmdLine-GetEntry(i)), -isystem) == 
0)
+{
+// ignore -isystem and following arg
+if (i  int(pCmdLine-GetCount()) - 1)
+{
+++i;
+}
+continue;
+}
+if (strncmp(
+static_castchar *(pCmdLine-GetEntry(i)), -isystem,
+strlen(-isystem))
+== 0)
+{
+// ignore args starting with -isystem
+continue;
+}
 if ( !rsc_strnicmp( (char *)pCmdLine-GetEntry( i ), -u, 2 ) ||
  !rsc_strnicmp( (char *)pCmdLine-GetEntry( i ), -i, 2 ) ||
  !rsc_strnicmp( (char *)pCmdLine-GetEntry( i ), -d, 2 ))
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 02361649..287b2a5 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -217,19 +217,7 @@ dooptions(int argc, char** argv)
 for (i = j = 1; i  argc; i++) {
 arg = ap = argv[i];
 
-if (strcmp(arg, -isystem) == 0)
-{
-// ignore -isystem and following arg
-if (i  argc)
-{
-++i;
-}
-}
-else if (strncmp(arg, -isystem, strlen(-isystem)) == 0)
-{
-// ignore args starting with -isystem
-}
-else if (*ap++ != '-' || *ap == EOS)
+if (*ap++ != '-' || *ap == EOS)
 {
 argv[j++] = argv[i];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d1a185f3af74ac4c6fe29e3d54c17133cd8d2db1
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 13:21:01 2014 +0100

send wheel scroll events of disabled widgets to its enabled parent first

on scrolling with the wheel scroll if the pointer ends up over a disabled
widget then the event doesn't go to its parent and so the scrolling
halts unless the window happens to be the focus window

Change-Id: I57566b5c6e395e0f62d6b928f28e47a0c3486d65

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 1a343a6..e98f7dd 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1361,6 +1361,11 @@ static bool ImplCallWheelCommand( Window* pWindow, const 
Point rPos,
 return false;
 }
 
+static bool acceptableWheelScrollTarget(const Window *pMouseWindow)
+{
+return (pMouseWindow  pMouseWindow-IsInputEnabled()  
!pMouseWindow-IsInModalMode());
+}
+
 static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent 
rEvt, bool scaleDirectly = false )
 {
 ImplDelData aDogTag( pWindow );
@@ -1418,8 +1423,15 @@ static bool ImplHandleWheelEvent( Window* pWindow, const 
SalWheelMouseEvent rEv
 bIsFloat = true;
 }
 
-if ( pMouseWindow 
- pMouseWindow-IsEnabled()  pMouseWindow-IsInputEnabled()  ! 
pMouseWindow-IsInModalMode() )
+while (acceptableWheelScrollTarget(pMouseWindow))
+{
+if (pMouseWindow-IsEnabled())
+break;
+//try the parent if this one is disabled
+pMouseWindow = pMouseWindow-GetParent();
+}
+
+if (acceptableWheelScrollTarget(pMouseWindow)  
!pMouseWindow-IsInModalMode())
 {
 // transform coordinates to float window frame coordinates
 Point aRelMousePos( pMouseWindow-OutputToScreenPixel(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 external/libgltf/ExternalProject_libgltf.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab028bf00e3e5f8424ea5e746815e8438144e4bf
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 14:23:43 2014 +0200

libgltf: fix wrong include path to config_$(gb_Side)

Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 5c40aa7..01f0666 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -28,7 +28,7 @@ libgltf_AdditionalIncludes :=
 
 ifeq ($(SYSTEM_BOOST),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,boost)
-libgltf_AdditionalIncludes += $(SRCDIR)/config_host
+libgltf_AdditionalIncludes += $(BUILDDIR)/config_$(gb_Side)
 endif
 
 ifeq ($(SYSTEM_GLEW),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b9ad2ef6bf904a8c2ec94e58644e8a7f7a36ae3
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 13:31:45 2014 +0100

do what I mean, not what I say

Change-Id: I1c86ff5713401771d6002de0a26bad4430d271fd

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index e98f7dd..c8094c4 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1431,7 +1431,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const 
SalWheelMouseEvent rEv
 pMouseWindow = pMouseWindow-GetParent();
 }
 
-if (acceptableWheelScrollTarget(pMouseWindow)  
!pMouseWindow-IsInModalMode())
+if (acceptableWheelScrollTarget(pMouseWindow)  pMouseWindow-IsEnabled())
 {
 // transform coordinates to float window frame coordinates
 Point aRelMousePos( pMouseWindow-OutputToScreenPixel(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/CppunitTest_chart2_xshape.mk

[Stephan Bergmann]

 chart2/CppunitTest_chart2_xshape.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit af70a45633b34eaae4eb4577b763dadfc48c74b6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 15:08:54 2014 +0200

Missing include dir

Change-Id: Id1d1ed3639548b335dff2d9fa5689b90f1ae5f61

diff --git a/chart2/CppunitTest_chart2_xshape.mk 
b/chart2/CppunitTest_chart2_xshape.mk
index 47c03d2..9d5076b 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
 
 $(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
-I$(SRCDIR)/chart2/qa/extras \
+-I$(SRCDIR)/chart2/inc \
 $$(INCLUDE) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 external/libgltf/ExternalProject_libgltf.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit b05b970daaf69b5b491b847375ee07539de9481f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 15:08:43 2014 +0200

libgltf: use WHITESPACE

Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 01f0666..3e390b9 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,9 +39,6 @@ ifeq ($(SYSTEM_GLM),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,glm)
 endif
 
-libgltf_empty :=
-libgltf_space := $(libgltf_empty) $(libgltf_empty)
-
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
@@ -50,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
-   '/p:AdditionalIncludeDirectories=$(subst 
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
+   '/p:AdditionalIncludeDirectories=$(subst 
$(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/source bridges/source compilerplugins/clang connectivity/source hwpfilter/source include/canvas rsc/source sdext/source sd/source svl/source sw/inc

[Stephan Bergmann]

 basctl/source/inc/basidesh.hxx|2 -
 basic/source/inc/rtlproto.hxx |1 
 basic/source/runtime/methods.cxx  |2 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |2 -
 compilerplugins/clang/unreffun.cxx|   33 ++
 connectivity/source/drivers/odbc/ORealDriver.cxx  |1 
 hwpfilter/source/lexer.cxx|8 
 include/canvas/verifyinput.hxx|   23 
 rsc/source/rscpp/cpp3.c   |9 
 rsc/source/rscpp/cpp4.c   |2 -
 rsc/source/rscpp/cpp5.c   |1 
 rsc/source/rscpp/cpp6.c   |1 
 sd/source/ui/unoidl/unoobj.cxx|1 
 sdext/source/pdfimport/filterdet.cxx  |1 
 sdext/source/pdfimport/filterdet.hxx  |6 ---
 svl/source/items/rngitem.cxx  |4 --
 sw/inc/pam.hxx|1 
 sw/inc/shellio.hxx|1 
 sw/source/core/bastyp/init.cxx|2 -
 sw/source/core/doc/tblrwcl.cxx|2 -
 sw/source/core/frmedt/fetab.cxx   |1 
 sw/source/core/inc/flowfrm.hxx|4 +-
 sw/source/core/inc/unofreg.hxx|4 --
 sw/source/core/table/swtable.cxx  |2 -
 sw/source/core/undo/undobj.cxx|1 
 sw/source/ui/envelp/envlop1.cxx   |3 -
 sw/source/ui/fmtui/tmpdlg.cxx |2 -
 xmloff/inc/MetaExportComponent.hxx|   15 
 xmloff/source/text/XMLAutoTextEventExport.hxx |   30 
 xmloff/source/transform/OOo2Oasis.cxx |2 -
 xmloff/source/transform/Oasis2OOo.cxx |2 -
 31 files changed, 38 insertions(+), 131 deletions(-)

New commits:
commit e48a2339600d12d43148bbdb9a47770ae9bc94e3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 15:25:46 2014 +0200

loplugin:unreffun: also warn about redundant redeclarations

Change-Id: I9a812220b58cf6da00d854e65794f7c673ab239d

diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index daa74c8..27011d2 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -51,8 +51,6 @@ class TabBar;
 class BaseWindow;
 class LocalizationMgr;
 
-bool RemoveDialog( const ScriptDocument rDocument, const OUString rLibName, 
const OUString rDlgName );
-
 class Shell :
 public SfxViewShell,
 public DocumentEventListener
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 7a03a03..7236f78 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -226,7 +226,6 @@ extern RTLFUNC(Timer);
 extern RTLFUNC(Weekday);
 extern RTLFUNC(WeekdayName);
 extern RTLFUNC(Year);
-extern RTLFUNC(Date);
 extern RTLFUNC(InputBox);
 extern RTLFUNC(Me);
 extern RTLFUNC(MsgBox);
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 77d0828..95ac76e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -84,8 +84,6 @@ using namespace com::sun::star::uno;
 #include ctype.h
 #include errno.h
 
-SbxVariable* getDefaultProp( SbxVariable* pRef );
-
 #include sbobjmod.hxx
 
 #ifdef WNT
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index ac6be9f..9925937 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -384,8 +384,6 @@ typelib_TypeClass cpp_vtable_call(
 return eRet;
 }
 
-extern C void privateSnippetExecutor();
-
 const int codeSnippetSize = 24;
 
 // Generate a trampoline that redirects method calls to
diff --git a/compilerplugins/clang/unreffun.cxx 
b/compilerplugins/clang/unreffun.cxx
index 8c726e3..3b9c616 100644
--- a/compilerplugins/clang/unreffun.cxx
+++ b/compilerplugins/clang/unreffun.cxx
@@ -45,6 +45,19 @@ bool hasCLanguageLinkageType(FunctionDecl const * decl) {
 return false;
 }
 
+bool isFriendDecl(Decl const * decl) {
+return decl-getFriendObjectKind() != Decl::FOK_None;
+}
+
+Decl const * getPreviousNonFriendDecl(Decl const * decl) {
+for (;;) {
+decl = decl-getPreviousDecl();
+if (decl == nullptr || !isFriendDecl(decl)) {
+return decl;
+}
+}
+}
+
 class UnrefFun: public RecursiveASTVisitorUnrefFun, public loplugin::Plugin {
 public:
 explicit UnrefFun(InstantiationData const  data): Plugin(data) {}
@@ -69,6 +82,26 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * decl) {
 return true;
 }
 
+if (!(decl-isThisDeclarationADefinition() 

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

[Caolán McNamara]

 sfx2/source/sidebar/Deck.cxx  |   34 ++
 sfx2/source/sidebar/Deck.hxx  |5 +
 vcl/source/window/winproc.cxx |   26 ++
 3 files changed, 29 insertions(+), 36 deletions(-)

New commits:
commit 641154c259334874bbbcb735f0064f3241f293ad
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 14:36:01 2014 +0100

Resolves: fdo#65634 improve wheel-scrolling sidebar panels

Change-Id: I213d85a1e2bbd2377f6f0326433ddd57dc346721

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index cdd..0be4a46 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -190,9 +190,6 @@ void Deck::DataChanged (const DataChangedEvent rEvent)
 RequestLayout();
 }
 
-
-
-
 bool Deck::Notify (NotifyEvent rEvent)
 {
 if (rEvent.GetType() == EVENT_COMMAND)
@@ -202,7 +199,7 @@ bool Deck::Notify (NotifyEvent rEvent)
 switch (pCommandEvent-GetCommand())
 {
 case COMMAND_WHEEL:
-return ProcessWheelEvent(pCommandEvent, rEvent);
+return ProcessWheelEvent(pCommandEvent);
 
 default:
 break;
@@ -212,24 +209,13 @@ bool Deck::Notify (NotifyEvent rEvent)
 return Window::Notify(rEvent);
 }
 
-
-
-
-bool Deck::ProcessWheelEvent (
-CommandEvent* pCommandEvent,
-NotifyEvent rEvent)
+bool Deck::ProcessWheelEvent(CommandEvent* pCommandEvent)
 {
 if ( ! mpVerticalScrollBar)
 return false;
 if ( ! mpVerticalScrollBar-IsVisible())
 return false;
 
-// Ignore all wheel commands from outside the vertical scroll bar.
-// Otherwise after a scroll we might land on a spin field and
-// subsequent wheel events would change the value of that control.
-if (rEvent.GetWindow() != mpVerticalScrollBar.get())
-return true;
-
 // Get the wheel data and check that it describes a valid vertical
 // scroll.
 const CommandWheelData* pData = pCommandEvent-GetWheelData();
@@ -246,9 +232,6 @@ bool Deck::ProcessWheelEvent (
 return true;
 }
 
-
-
-
 void Deck::SetPanels (const SharedPanelContainer rPanels)
 {
 maPanels = rPanels;
@@ -256,13 +239,6 @@ void Deck::SetPanels (const SharedPanelContainer rPanels)
 RequestLayout();
 }
 
-
-
-
-
-
-
-
 void Deck::RequestLayout (void)
 {
 mnMinimalWidth = 0;
@@ -278,17 +254,11 @@ void Deck::RequestLayout (void)
 *mpVerticalScrollBar);
 }
 
-
-
-
 ::Window* Deck::GetPanelParentWindow (void)
 {
 return mpScrollContainer.get();
 }
 
-
-
-
 void Deck::ShowPanel (const Panel rPanel)
 {
 if (mpVerticalScrollBar  mpVerticalScrollBar-IsVisible())
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index ea33fa2..a88e258 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -100,12 +100,9 @@ private:
 ::boost::scoped_ptrScrollBar mpVerticalScrollBar;
 
 DECL_LINK(HandleVerticalScrollBarChange,void*);
-bool ProcessWheelEvent (
-CommandEvent* pCommandEvent,
-NotifyEvent rEvent);
+bool ProcessWheelEvent(CommandEvent* pCommandEvent);
 };
 
-
 } } // end of namespace sfx2::sidebar
 
 #endif
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c8094c4..4fab948 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1366,8 +1366,22 @@ static bool acceptableWheelScrollTarget(const Window 
*pMouseWindow)
 return (pMouseWindow  pMouseWindow-IsInputEnabled()  
!pMouseWindow-IsInModalMode());
 }
 
+//If the last event at the same absolute screen position was handled by a
+//different window then reuse that window if the event occurs within 1/2 a
+//second, i.e. so scrolling down something like the calc sidebar that contains
+//widgets that respond to wheel events will continue to send the event to the
+//scrolling widget in favour of the widget that happens to end up under the
+//mouse.
+static bool shouldReusePreviousMouseWindow(const SalWheelMouseEvent rPrevEvt, 
const SalWheelMouseEvent rEvt)
+{
+return (rEvt.mnX == rPrevEvt.mnX  rEvt.mnY == rPrevEvt.mnY  
rEvt.mnTime-rPrevEvt.mnTime  500/*ms*/);
+}
+
 static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent 
rEvt, bool scaleDirectly = false )
 {
+static SalWheelMouseEvent aPreviousEvent;
+static Window *pPreviousWindow;
+
 ImplDelData aDogTag( pWindow );
 
 ImplSVData* pSVData = ImplGetSVData();
@@ -1431,6 +1445,16 @@ static bool ImplHandleWheelEvent( Window* pWindow, const 
SalWheelMouseEvent rEv
 pMouseWindow = pMouseWindow-GetParent();
 }
 
+// avoid the problem that scrolling via wheel to this point brings a widget
+// under the mouse that also accepts wheel commands, so stick with the old
+// widget if the time gap is very small
+if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt)  
acceptableWheelScrollTarget(pPreviousWindow))
+{
+  

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

[Miklos Vajna]

 include/svx/svdoashp.hxx |7 ++
 svx/source/svdraw/svdoashp.cxx   |   74 ++-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 
 sw/source/core/layout/fly.cxx|   17 +++
 4 files changed, 70 insertions(+), 30 deletions(-)

New commits:
commit c00d81612e128b74c23c95e011b482dc3918fca4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 27 13:47:11 2014 +0200

SwFlyFrm::Format: inform our custom shape about size changes if needed

This adds support for the following scenario:

- Shape has no editeng text, but a textbox
- Shape has automatic size
- User edits the fly frame (serving as the textbox of the draw shape)
  and expects that both the shape and the textbox gets resized
  accordingly

Note that this way we can signal our size request for the textbox, and
the custom shape takes care of resizing the shape in a way, so that
after the resize, the text area counted from the custom shape geometry
will be exactly what we requested. (I.e. just asking the shape to have
the same size as the fly would work for rectangle, but not e.g. for
triangles.)

Change-Id: I1e7efd00db52cf28481f6821ea6949f748b855e7

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 306875b..c87d0cb 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -41,6 +41,7 @@
 #include ndole.hxx
 #include swtable.hxx
 #include svx/svdpage.hxx
+#include svx/svdoashp.hxx
 #include layouter.hxx
 #include pagefrm.hxx
 #include rootfrm.hxx
@@ -59,6 +60,7 @@
 #include vcl/svapp.hxx
 #include switerator.hxx
 #include IDocumentSettingAccess.hxx
+#include textboxhelper.hxx
 
 using namespace ::com::sun::star;
 
@@ -1275,6 +1277,21 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 InvalidateObjRectWithSpaces();
 }
 mbValidSize = true;
+
+std::mapSwFrmFmt*, SwFrmFmt* aShapes = 
SwTextBoxHelper::findShapes(GetFmt()-GetDoc());
+if (aShapes.find(GetFmt()) != aShapes.end())
+{
+// This fly is a textbox of a draw shape.
+SdrObject* pShape = aShapes[GetFmt()]-FindSdrObject();
+if (SdrObjCustomShape* pCustomShape = 
PTR_CAST(SdrObjCustomShape, pShape))
+{
+// The shape is a customshape: then inform it about the 
calculated fly size.
+Size aSize((Frm().*fnRect-fnGetWidth)(), 
(Frm().*fnRect-fnGetHeight)());
+pCustomShape-SuggestTextFrameSize(aSize);
+// Do the calculations normally done after touching 
editeng text of the shape.
+pCustomShape-NbcSetOutlinerParaObjectForText(0, 0);
+}
+}
 }
 else
 {
commit 4f33a0961d69feba72806d105da65a4dc841ca5e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 27 13:43:13 2014 +0200

SdrObjCustomShape::AdjustTextFrameWidthAndHeight: allow external text

So that in Writer, in case we're using Writer TextFrames to handle the
content of a shape, it's still possible to inform the custom shape about
the automatic size of the text, just like when native editeng text is
used.

Change-Id: I2534b942a9b2d62d7aa009ffbfa8d76feb011f92

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 1b7adf1..e5b3e8f 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -136,6 +136,7 @@ protected:
 virtual void AdaptTextMinSize() SAL_OVERRIDE;
 
 OUString  aName;
+Size  m_aSuggestedTextFrameSize;
 
 public:
 
@@ -212,6 +213,12 @@ public:
 virtual bool MovCreate(SdrDragStat rStat) SAL_OVERRIDE; // #i37448#
 virtual bool EndCreate(SdrDragStat rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
 
+/**
+ * Allows suggesting the text frame size: in case the application has its
+ * own text associated to the shape, instead of using the shape's editeng
+ * text.
+ */
+void SuggestTextFrameSize(Size aSuggestedTextFrameSize);
 virtual bool AdjustTextFrameWidthAndHeight(Rectangle rR, bool bHgt = 
true, bool bWdt = true) const SAL_OVERRIDE;
 virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt 
= true) SAL_OVERRIDE;
 virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = 
true) SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 8205121..26c563c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2312,9 +2312,17 @@ void SdrObjCustomShape::SetVerticalWriting( bool 
bVertical )
 }
 }
 }
+
+void SdrObjCustomShape::SuggestTextFrameSize(Size aSuggestedTextFrameSize)
+{
+m_aSuggestedTextFrameSize = aSuggestedTextFrameSize;
+}
+
 bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle rR, bool 
bHgt, bool 

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

[Michael Stahl]

 sw/qa/extras/rtfexport/data/fdo78758.rtf |9 ++
 sw/qa/extras/rtfexport/rtfexport.cxx |   10 +++
 sw/source/filter/ww8/attributeoutputbase.hxx |2 -
 sw/source/filter/ww8/docxattributeoutput.cxx |2 -
 sw/source/filter/ww8/docxattributeoutput.hxx |2 -
 sw/source/filter/ww8/rtfattributeoutput.cxx  |   37 +--
 sw/source/filter/ww8/rtfattributeoutput.hxx  |9 --
 sw/source/filter/ww8/writerwordglue.cxx  |3 +-
 sw/source/filter/ww8/wrtw8esh.cxx|2 -
 sw/source/filter/ww8/wrtw8nds.cxx|4 +-
 sw/source/filter/ww8/wrtww8gr.cxx|2 -
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 -
 12 files changed, 49 insertions(+), 35 deletions(-)

New commits:
commit b8907bf3d3b37c686a414ffbbd2d732348aab5b9
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jun 27 16:02:45 2014 +0200

fdo#78758: sw: RTF export: don't export multiple \fldrst for one hyperlink

Ensure that we export only one \fldresult per hyperlink by doing that in
StartURL() and EndURL(); the TextINetFormat() is called once per text
portion.  This shouldn't cause problems as there can't be anything
between the end of the \field group and the start of \fldresult anyway.

Replace the annoying call to EndURL() from EndRun() with a special case
in EndURL() to store things in the right buffer (hopefully).

(somehow this is regression from c4498251cb7181a9f272b0720f398597c0daef09)

Change-Id: I209ea7a384fb1cb5d1505a70ecc4a4536bbf26a2

diff --git a/sw/qa/extras/rtfexport/data/fdo78758.rtf 
b/sw/qa/extras/rtfexport/data/fdo78758.rtf
new file mode 100644
index 000..49c0502
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo78758.rtf
@@ -0,0 +1,9 @@
+{\rtf1\ansi
+\par \pard\plain
+{{\field{\*\fldinst HYPERLINK #__RefHeading___Toc264438068 }
+{\fldrslt {\langfe1024\rtlch \ltrch\loch\lang1024
+EE5E EeEEE5EE}{\scaps\langfe1024\rtlch \ltrch\loch\lang1024
+e}{\langfe1024\rtlch \ltrch\loch\lang1024
+\tab 46
+\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index c01dc38..c2ed07c 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -468,6 +468,16 @@ DECLARE_RTFEXPORT_TEST(testHyperlink, hyperlink.rtf)
 CPPUNIT_ASSERT_EQUAL(OUString(), 
getPropertyOUString(getRun(getParagraph(1), 3, !), HyperLinkURL));
 }
 
+DECLARE_RTFEXPORT_TEST(test78758, fdo78758.rtf)
+{
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 1, EE5E EeEEE5EE), 
HyperLinkURL));
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 2, e), 
HyperLinkURL));
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 3, \t46), 
HyperLinkURL));
+}
+
 DECLARE_RTFEXPORT_TEST(testTextFrameBorders, textframe-borders.rtf)
 {
 uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index d2df9c0..a32a4ba 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -203,7 +203,7 @@ public:
 virtual bool StartURL( const OUString rUrl, const OUString rTarget ) = 0;
 
 /// Output URL end.
-virtual bool EndURL() = 0;
+virtual bool EndURL(bool isAtEndOfParagraph) = 0;
 
 virtual void FieldVanish( const OUString rTxt, ww::eField eType ) = 0;
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3b74b5b..fcd5794 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2070,7 +2070,7 @@ bool DocxAttributeOutput::StartURL( const OUString rUrl, 
const OUString rTarge
 return true;
 }
 
-bool DocxAttributeOutput::EndURL()
+bool DocxAttributeOutput::EndURL(bool const)
 {
 m_closeHyperlinkInThisRun = true;
 if(m_startedHyperlink  m_hyperLinkAnchor !=   
m_hyperLinkAnchor.startsWith(_Toc))
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6465a71..5f979ad 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -190,7 +190,7 @@ public:
 virtual bool StartURL( const OUString rUrl, const OUString rTarget ) 
SAL_OVERRIDE;
 
 /// Output URL end.
-virtual bool EndURL() SAL_OVERRIDE;
+virtual bool EndURL(bool) SAL_OVERRIDE;
 
 virtual void FieldVanish( const OUString rTxt, ww::eField eType ) 
SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5f41c34..6dabc93 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ 

[Libreoffice-commits] test-files.git: 2 commits - calc/iworks-numbers-import calc/sort

[Kohei Yoshida]

 calc/iworks-numbers-import/blank.numbers |binary
 calc/iworks-numbers-import/universal-content.numbers |binary
 calc/sort/ref-update-on-sort.ods |binary
 3 files changed

New commits:
commit 5c01ca3c4323ab0c1586a081caffb7a254f4c3a4
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Jun 27 10:41:41 2014 -0400

New test file for updating references during sort.

diff --git a/calc/sort/ref-update-on-sort.ods b/calc/sort/ref-update-on-sort.ods
new file mode 100644
index 000..7dc209d
Binary files /dev/null and b/calc/sort/ref-update-on-sort.ods differ
commit 560cb2dabfa36a89063fc5eac0db46c357c0fe8f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Oct 2 16:08:41 2013 -0400

Some simple test documents of iWorks Numbers.

diff --git a/calc/iworks-numbers-import/blank.numbers 
b/calc/iworks-numbers-import/blank.numbers
new file mode 100644
index 000..6f59725
Binary files /dev/null and b/calc/iworks-numbers-import/blank.numbers differ
diff --git a/calc/iworks-numbers-import/universal-content.numbers 
b/calc/iworks-numbers-import/universal-content.numbers
new file mode 100644
index 000..f276bd1
Binary files /dev/null and 
b/calc/iworks-numbers-import/universal-content.numbers differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/sidebar/SidebarController.cxx |   70 +-
 1 file changed, 41 insertions(+), 29 deletions(-)

New commits:
commit df630b8f8c2c92ec2cd1e4be6a3f54a4e4960e92
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 15:52:33 2014 +0100

Related: fdo#65634 make sidebar react to resizes when floating

the parent isn't a SfxSplitWindow in this case, but it should
still react to the resize

Change-Id: Ia298d45b33fc272d6169df12cf2c58a881255163

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index a5dbcfd..cb26640 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -315,9 +315,6 @@ void SAL_CALL SidebarController::requestLayout (void)
 RestrictWidth(nMinimalWidth);
 }
 
-
-
-
 void SidebarController::BroadcastPropertyChange (void)
 {
 DataChangedEvent aEvent (DATACHANGED_USER);
@@ -325,9 +322,6 @@ void SidebarController::BroadcastPropertyChange (void)
 mpParentWindow-Invalidate(INVALIDATE_CHILDREN);
 }
 
-
-
-
 void SidebarController::NotifyResize (void)
 {
 if (mpTabBar == 0)
@@ -361,11 +355,48 @@ void SidebarController::NotifyResize (void)
 else
 bIsDeckVisible = false;
 
-SfxSplitWindow* pSplitWindow = GetSplitWindow();
-if ( mpCurrentDeck  pSplitWindow )
+if (mpCurrentDeck)
 {
-// Find out that which side of the Window do we need to attach the 
Sidebar?
-if ( pSplitWindow-GetAlign() == WINDOWALIGN_RIGHT )// attach 
the Sidebar towards the right-side of screen
+SfxSplitWindow* pSplitWindow = GetSplitWindow();
+if (pSplitWindow)   //in sidebar mode
+{
+// Find out that which side of the Window do we need to attach the 
Sidebar?
+if ( pSplitWindow-GetAlign() == WINDOWALIGN_RIGHT )// 
attach the Sidebar towards the right-side of screen
+{
+// Place the deck first.
+{
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(0,0, 
nWidth-nTabBarDefaultWidth, nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+
+// Now place the tab bar.
+
mpTabBar-setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
+mpTabBar-Show();
+}
+else if ( pSplitWindow-GetAlign() == WINDOWALIGN_LEFT) // 
attach the Sidebar towards the left-side of screen
+{
+// Place the tab bar first.
+mpTabBar-setPosSizePixel(0,0,nTabBarDefaultWidth,nHeight);
+mpTabBar-Show();
+
+// Now place the deck.
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(nTabBarDefaultWidth,0, 
nWidth-nTabBarDefaultWidth, nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+}
+else //floating window mode
 {
 // Place the deck first.
 {
@@ -383,22 +414,6 @@ void SidebarController::NotifyResize (void)
 
mpTabBar-setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
 mpTabBar-Show();
 }
-else if ( pSplitWindow-GetAlign() == WINDOWALIGN_LEFT) // attach 
the Sidebar towards the left-side of screen
-{
-// Place the tab bar first.
-mpTabBar-setPosSizePixel(0,0,nTabBarDefaultWidth,nHeight);
-mpTabBar-Show();
-
-// Now place the deck.
-if (bIsDeckVisible)
-{
-mpCurrentDeck-setPosSizePixel(nTabBarDefaultWidth,0, 
nWidth-nTabBarDefaultWidth, nHeight);
-mpCurrentDeck-Show();
-mpCurrentDeck-RequestLayout();
-}
-else
-mpCurrentDeck-Hide();
-}
 }
 
 // Determine if the closer of the deck can be shown.
@@ -414,9 +429,6 @@ void SidebarController::NotifyResize (void)
 RestrictWidth(nMinimalWidth);
 }
 
-
-
-
 void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
 {
 if ( ! mbIsDeckRequestedOpen)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/sidebar/SidebarController.cxx |   70 +-
 1 file changed, 41 insertions(+), 29 deletions(-)

New commits:
commit 7aeef829fdc25a60530c776c8f4958b7415384ce
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 15:52:33 2014 +0100

Related: fdo#65634 make sidebar react to resizes when floating

the parent isn't a SfxSplitWindow in this case, but it should
still react to the resize

Change-Id: Ia298d45b33fc272d6169df12cf2c58a881255163
(cherry picked from commit df630b8f8c2c92ec2cd1e4be6a3f54a4e4960e92)

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 7701879..2d6c56e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -315,9 +315,6 @@ void SAL_CALL SidebarController::requestLayout (void)
 RestrictWidth(nMinimalWidth);
 }
 
-
-
-
 void SidebarController::BroadcastPropertyChange (void)
 {
 DataChangedEvent aEvent (DATACHANGED_USER);
@@ -325,9 +322,6 @@ void SidebarController::BroadcastPropertyChange (void)
 mpParentWindow-Invalidate(INVALIDATE_CHILDREN);
 }
 
-
-
-
 void SidebarController::NotifyResize (void)
 {
 if (mpTabBar == 0)
@@ -361,11 +355,48 @@ void SidebarController::NotifyResize (void)
 else
 bIsDeckVisible = false;
 
-SfxSplitWindow* pSplitWindow = GetSplitWindow();
-if ( mpCurrentDeck  pSplitWindow )
+if (mpCurrentDeck)
 {
-// Find out that which side of the Window do we need to attach the 
Sidebar?
-if ( pSplitWindow-GetAlign() == WINDOWALIGN_RIGHT )// attach 
the Sidebar towards the right-side of screen
+SfxSplitWindow* pSplitWindow = GetSplitWindow();
+if (pSplitWindow)   //in sidebar mode
+{
+// Find out that which side of the Window do we need to attach the 
Sidebar?
+if ( pSplitWindow-GetAlign() == WINDOWALIGN_RIGHT )// 
attach the Sidebar towards the right-side of screen
+{
+// Place the deck first.
+{
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(0,0, 
nWidth-nTabBarDefaultWidth, nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+
+// Now place the tab bar.
+
mpTabBar-setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
+mpTabBar-Show();
+}
+else if ( pSplitWindow-GetAlign() == WINDOWALIGN_LEFT) // 
attach the Sidebar towards the left-side of screen
+{
+// Place the tab bar first.
+mpTabBar-setPosSizePixel(0,0,nTabBarDefaultWidth,nHeight);
+mpTabBar-Show();
+
+// Now place the deck.
+if (bIsDeckVisible)
+{
+mpCurrentDeck-setPosSizePixel(nTabBarDefaultWidth,0, 
nWidth-nTabBarDefaultWidth, nHeight);
+mpCurrentDeck-Show();
+mpCurrentDeck-RequestLayout();
+}
+else
+mpCurrentDeck-Hide();
+}
+}
+else //floating window mode
 {
 // Place the deck first.
 {
@@ -383,22 +414,6 @@ void SidebarController::NotifyResize (void)
 
mpTabBar-setPosSizePixel(nWidth-nTabBarDefaultWidth,0,nTabBarDefaultWidth,nHeight);
 mpTabBar-Show();
 }
-else if ( pSplitWindow-GetAlign() == WINDOWALIGN_LEFT) // attach 
the Sidebar towards the left-side of screen
-{
-// Place the tab bar first.
-mpTabBar-setPosSizePixel(0,0,nTabBarDefaultWidth,nHeight);
-mpTabBar-Show();
-
-// Now place the deck.
-if (bIsDeckVisible)
-{
-mpCurrentDeck-setPosSizePixel(nTabBarDefaultWidth,0, 
nWidth-nTabBarDefaultWidth, nHeight);
-mpCurrentDeck-Show();
-mpCurrentDeck-RequestLayout();
-}
-else
-mpCurrentDeck-Hide();
-}
 }
 
 // Determine if the closer of the deck can be shown.
@@ -414,9 +429,6 @@ void SidebarController::NotifyResize (void)
 RestrictWidth(nMinimalWidth);
 }
 
-
-
-
 void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
 {
 if ( ! mbIsDeckRequestedOpen)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 filter/source/config/cache/constant.hxx  |  103 +--
 filter/source/config/cache/filtercache.cxx   |   60 +++
 filter/source/config/cache/filterfactory.cxx |2 
 filter/source/config/cache/macros.hxx|9 --
 4 files changed, 81 insertions(+), 93 deletions(-)

New commits:
commit 556981f07815a0de0ad3576ba6f8639671a6c13c
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Jun 27 15:58:14 2014 +0100

filter: remove redundant macro wasting time.

Allocating and freeing strings thousands of times just to compare
them is not a great idea - 0.5% of startup.

Change-Id: I076bc961d3612143b7f81ef024e261ec3ed4ff76

diff --git a/filter/source/config/cache/constant.hxx 
b/filter/source/config/cache/constant.hxx
index 7cb60d1..98327f0 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -27,7 +27,6 @@
 // #define LOAD_IMPLICIT
 
 
-
 /** @short  used to identify a some generic item properties against the
 configuration API and can be used at all name containers
 (based on this filtercache) too.
@@ -71,18 +70,18 @@
 /** @short  used to identify the list of sorted filters for a specific
 office module
  */
-#define  PROPNAME_SORTEDFILTERLIST 
_FILTER_CONFIG_FROM_ASCII_(SortedFilterList)
+#define  PROPNAME_SORTEDFILTERLIST SortedFilterList
 
 /** @short  implicit properties. which are used at the container interface 
only.
  */
-#define  PROPNAME_FINALIZED _FILTER_CONFIG_FROM_ASCII_(Finalized)
-#define  PROPNAME_MANDATORY _FILTER_CONFIG_FROM_ASCII_(Mandatory)
+#define  PROPNAME_FINALIZED Finalized
+#define  PROPNAME_MANDATORY Mandatory
 
 /** @short  used to identify a set of items against the configuration API. */
-#define  CFGSET_TYPES   _FILTER_CONFIG_FROM_ASCII_(Types 
 )
-#define  CFGSET_FILTERS _FILTER_CONFIG_FROM_ASCII_(Filters   
 )
-#define  CFGSET_FRAMELOADERS_FILTER_CONFIG_FROM_ASCII_(FrameLoaders  
 )
-#define  CFGSET_CONTENTHANDLERS 
_FILTER_CONFIG_FROM_ASCII_(ContentHandlers)
+#define  CFGSET_TYPES   Types
+#define  CFGSET_FILTERS Filters
+#define  CFGSET_FRAMELOADERSFrameLoaders
+#define  CFGSET_CONTENTHANDLERS ContentHandlers
 
 /** @short  used to address some configuration keys directly.
 
@@ -91,40 +90,40 @@
 
 @TODO   define these direct keys ...
  */
-#define  CFGDIRECTKEY_OFFICELOCALE  
_FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/L10N/ooLocale
   )
-#define  CFGDIRECTKEY_DEFAULTFRAMELOADER
_FILTER_CONFIG_FROM_ASCII_(/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader)
-#define  CFGDIRECTKEY_OFFICELOCALE  
_FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/L10N/ooLocale
   )
-#define  CFGDIRECTKEY_PRODUCTNAME   
_FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/Product/ooName   
   )
+#define  CFGDIRECTKEY_OFFICELOCALE  
/org.openoffice.Setup/L10N/ooLocale
+#define  CFGDIRECTKEY_DEFAULTFRAMELOADER
/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader
+#define  CFGDIRECTKEY_OFFICELOCALE  
/org.openoffice.Setup/L10N/ooLocale
+#define  CFGDIRECTKEY_PRODUCTNAME   
/org.openoffice.Setup/Product/ooName
 
 // Note that these flag bits have parallel names in
 // comphelper/inc/comphelper/documentconstants.hxx . See that file for
 // documentation on their meaning.
 
 /** @short  names of filter flags, sorted in alphabetical order */
-#define  FLAGNAME_3RDPARTYFILTER
_FILTER_CONFIG_FROM_ASCII_(3RDPARTYFILTER   )
-#define  FLAGNAME_ALIEN _FILTER_CONFIG_FROM_ASCII_(ALIEN 
   )
-#define  FLAGNAME_ASYNCHRON _FILTER_CONFIG_FROM_ASCII_(ASYNCHRON 
   )
-#define  FLAGNAME_BROWSERPREFERRED  
_FILTER_CONFIG_FROM_ASCII_(BROWSERPREFERRED )
-#define  FLAGNAME_CONSULTSERVICE
_FILTER_CONFIG_FROM_ASCII_(CONSULTSERVICE   )
-#define  FLAGNAME_DEFAULT   _FILTER_CONFIG_FROM_ASCII_(DEFAULT   
   )
-#define  FLAGNAME_ENCRYPTION_FILTER_CONFIG_FROM_ASCII_(ENCRYPTION
   )
-#define  FLAGNAME_EXPORT_FILTER_CONFIG_FROM_ASCII_(EXPORT
   )
-#define  FLAGNAME_IMPORT_FILTER_CONFIG_FROM_ASCII_(IMPORT
   )
-#define  FLAGNAME_INTERNAL  _FILTER_CONFIG_FROM_ASCII_(INTERNAL  
   )
-#define  FLAGNAME_NOTINCHOOSER  _FILTER_CONFIG_FROM_ASCII_(NOTINCHOOSER  
   )
-#define  FLAGNAME_NOTINFILEDIALOG   
_FILTER_CONFIG_FROM_ASCII_(NOTINFILEDIALOG  )
-#define  FLAGNAME_NOTINSTALLED  _FILTER_CONFIG_FROM_ASCII_(NOTINSTALLED  
   )
-#define  FLAGNAME_OWN   _FILTER_CONFIG_FROM_ASCII_(OWN   
   )
-#define  FLAGNAME_PACKED_FILTER_CONFIG_FROM_ASCII_(PACKED
   )
-#define  FLAGNAME_PASSWORDTOMODIFY  
_FILTER_CONFIG_FROM_ASCII_(PASSWORDTOMODIFY )
-#define  FLAGNAME_PREFERRED 

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

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowser.cxx   |3 +--
 chart2/source/controller/main/ChartController_EditData.cxx |4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 483a4b546c850e82a2d1d304238d4830ac6b441f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 27 11:31:06 2014 -0400

Flush modified data to the model when pressing OK in the data table dialog.

This dialog used to have no OK / Cancel buttons, and the data would get
flushed when the dialog got dismissed.  This behavior got lost during the
dialog conversion.

Also, SaveModified() does check whether or not the data table is modified.
No need to call IsModified() before calling SaveModified().

Change-Id: I5cea88cb52127cc5c7c1be67a5a592d87df92d0c

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index cb3ee05..8c0c83f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1182,8 +1182,7 @@ bool DataBrowser::SaveModified()
 
 bool DataBrowser::EndEditing()
 {
-if( IsModified())
-SaveModified();
+SaveModified();
 
 // apply changes made to series headers
 ::std::for_each( m_aSeriesHeaders.begin(), m_aSeriesHeaders.end(), 
impl::applyChangesFunctor());
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx 
b/chart2/source/controller/main/ChartController_EditData.cxx
index c87f167..726ba03 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -57,8 +57,8 @@ void ChartController::executeDispatch_EditData()
 SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
 m_xUndoManager );
 DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC );
-// the dialog has no OK/Cancel
-aDataEditorDialog.Execute();
+if (aDataEditorDialog.Execute() == RET_OK)
+aDataEditorDialog.ApplyChangesToModel();
 aUndoGuard.commit();
 }
 }
___
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

[Miklos Vajna]

 sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   18 ++
 sw/source/core/doc/textboxhelper.cxx  |1 +
 3 files changed, 19 insertions(+)

New commits:
commit 10d91ef984ae54eb688cbfe39acaf0f131964634
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 27 17:34:02 2014 +0200

SwTextBoxHelper::create: handle TextAutoGrowHeight

Without this, in case TextAutoGrowHeight is set before TextBox, the
textbox of the shape won't have automatic height.

Change-Id: I2ebf77eacbe1f1d10ccf64ef833c39ee965245d3

diff --git a/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt 
b/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt
new file mode 100644
index 000..8877c72
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index b279e7c..47aba1e 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -45,6 +45,7 @@ public:
 void testShapeTextboxDelete();
 void testCp171();
 void testShapeTextboxVertadjust();
+void testShapeTextboxAutosize();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -60,6 +61,7 @@ public:
 CPPUNIT_TEST(testShapeTextboxDelete);
 CPPUNIT_TEST(testCp171);
 CPPUNIT_TEST(testShapeTextboxVertadjust);
+CPPUNIT_TEST(testShapeTextboxAutosize);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -372,6 +374,22 @@ void SwUiWriterTest::testShapeTextboxVertadjust()
 CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, 
pFmt-GetTextVertAdjust().GetValue());
 }
 
+void SwUiWriterTest::testShapeTextboxAutosize()
+{
+SwDoc* pDoc = createDoc(shape-textbox-autosize.odt);
+SdrPage* pPage = 
pDoc-getIDocumentDrawModelAccess().GetDrawModel()-GetPage(0);
+SdrObject* pFirst = pPage-GetObj(0);
+CPPUNIT_ASSERT_EQUAL(OUString(1st), pFirst-GetName());
+
+SdrObject* pSecond = pPage-GetObj(1);
+CPPUNIT_ASSERT_EQUAL(OUString(2nd), pSecond-GetName());
+
+// Shape - textbox synchronization was missing, the second shape had the
+// same height as the first, even though the first contained 1 paragraph
+// and the other 2 ones.
+CPPUNIT_ASSERT(pFirst-GetSnapRect().getHeight()  
pSecond-GetSnapRect().getHeight());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index e93aae7..cc044d7 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -95,6 +95,7 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
 syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_RELATION, 
xShapePropertySet-getPropertyValue(UNO_NAME_VERT_ORIENT_RELATION));
 syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_POSITION, 
xShapePropertySet-getPropertyValue(UNO_NAME_HORI_ORIENT_POSITION));
 syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, 
xShapePropertySet-getPropertyValue(UNO_NAME_VERT_ORIENT_POSITION));
+syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_IS_AUTO_HEIGHT, 
xShapePropertySet-getPropertyValue(UNO_NAME_TEXT_AUTOGROWHEIGHT));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/inc/unx/XIM.h   |2 --
 vcl/inc/unx/i18n_cb.hxx |1 -
 vcl/unx/generic/app/i18n_im.cxx |3 ---
 3 files changed, 6 deletions(-)

New commits:
commit 4c6e54a194516acda6499136a5e9996126dbcb10
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 18:07:52 2014 +0200

loplugin:unreffun: redundant function redeclaration

Change-Id: I6c9b85ab587f6fb9f585c9714c3a1076f627c7d3

diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
index 4239921..62c127e 100644
--- a/vcl/inc/unx/XIM.h
+++ b/vcl/inc/unx/XIM.h
@@ -22,8 +22,6 @@
 #include X11/Xlib.h
 #include X11/Xresource.h
 
-extern Status XCloseIM(XIM);
-
 #ifndef XIMCallback1
 typedef int (*XIMProc1)(XIC, XPointer, XPointer);
 typedef struct {
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 4d13799..7ce4f46 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -29,7 +29,6 @@ extern C {
 // xim callbacks
 void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
 int  PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
-void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
 void PreeditDrawCallback ( XIC ic, XPointer client_data,
XIMPreeditDrawCallbackStruct *call_data );
 void PreeditCaretCallback( XIC ic, XPointer client_data,
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 7522416..4137e4b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -43,9 +43,6 @@
 
 using namespace vcl;
 #include unx/i18n_cb.hxx
-#if defined(SOLARIS) ||  defined(LINUX)
-extern C char * XSetIMValues(XIM im, ...);
-#endif
 
 // kinput2 IME needs special key handling since key release events are 
filtered in
 // preeditmode and XmbResetIC does not work
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Benitius Brevoort license statement

[Benitius Brevoort]

Peace!

With this, I, Benitius Brevoort declare:

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

All good to you

--
--
Ben Brevoort OFMCap (Benitius)
benit...@tiscali.it

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svl/CppunitTest_svl_itempool.mk svl/CppunitTest_svl_items.mk svl/Module_svl.mk svl/qa svl/source

[Michael Meeks]

 svl/CppunitTest_svl_itempool.mk |   36 ++
 svl/CppunitTest_svl_items.mk|   11 ---
 svl/Module_svl.mk   |1 
 svl/qa/unit/items/test_itempool.cxx |  117 +++
 svl/source/inc/poolio.hxx   |   31 +++--
 svl/source/items/itempool.cxx   |  119 ++--
 svl/source/items/poolio.cxx |   10 +--
 svl/source/items/style.cxx  |1 
 8 files changed, 259 insertions(+), 67 deletions(-)

New commits:
commit 8aff83b95fa5969edfc48022ddaae05031b178cf
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Jun 16 22:27:00 2014 +0100

fdo#38513 - Accelerate non-poolable item add / remove.

For large documents we create and destroy a large number of non-poolable
SfxPoolItems, which get inserted into and removed from a vector.
Unfortunately the performance of this (depending on pattern) is O(N) and
this insert/remove/extend pattern can happen per text span we insert.
This patch makes this O(const) via a hash. This gives a 5x speedup for
the above bug; 176s to 34s or so, and moves the remaining performance
issues elsewhere.

Unfortunately, we have to retain the ordered array to keep the binary
file format code (used for editeng cut-and-paste) in place, so have to
keep both a hash, and an array, and a list around for free slots. cf.
fdo#79851 where there is a start at removing that.

This wastes space; but not that much - for a large open document
collection we have O(100's) of SfxItemPools, and O(1000's) of
SfxPoolItemArray_Impls; having fixed fdo#79851 we can consolidate this.

Add skeletal unit test; translate several German comments; remove
un-necessary include.

Change-Id: Ie0de32b1a29217560c5591c71a6cd4e26d39a531
Reviewed-on: https://gerrit.libreoffice.org/9818
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com

diff --git a/svl/CppunitTest_svl_itempool.mk b/svl/CppunitTest_svl_itempool.mk
new file mode 100644
index 000..4b59498
--- /dev/null
+++ b/svl/CppunitTest_svl_itempool.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,svl_itempool))
+
+$(eval $(call gb_CppunitTest_use_external,svl_itempool,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,svl_itempool, \
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svl_itempool, \
+   svl/qa/unit/items/test_itempool \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svl_itempool, \
+   svl \
+   comphelper \
+   sal \
+   cppu \
+   cppuhelper \
+))
+
+$(eval $(call gb_CppunitTest_set_include,svl_itempool,\
+   -I$(SRCDIR)/svl/source/inc \
+   $$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svl/CppunitTest_svl_items.mk b/svl/CppunitTest_svl_items.mk
index d51b8fc..501c91a 100644
--- a/svl/CppunitTest_svl_items.mk
+++ b/svl/CppunitTest_svl_items.mk
@@ -16,11 +16,6 @@ $(eval $(call gb_CppunitTest_use_api,svl_items, \
 udkapi \
 ))
 
-
-#$(eval $(call gb_CppunitTest_use_components,svl_items, \
-#ucb/source/core/ucb1 \
-#))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,svl_items, \
svl/qa/unit/items/test_IndexedStyleSheets \
 ))
@@ -33,10 +28,4 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_items, \
cppuhelper \
 ))
 
-#$(eval $(call gb_CppunitTest_use_ure,svl_items))
-
-#$(eval $(call gb_CppunitTest_use_components,svl_urihelper,\
-#i18npool/util/i18npool \
-#))
-
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index f52c7a4..7589030 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_check_targets,svl,\
CppunitTest_svl_qa_cppunit \
CppunitTest_svl_inetcontenttype \
CppunitTest_svl_items \
+   CppunitTest_svl_itempool \
 ))
 
 #TODO: CppunitTest_svl_urihelper depends on ucb, can only be added once svl is
diff --git a/svl/qa/unit/items/test_itempool.cxx 
b/svl/qa/unit/items/test_itempool.cxx
new file mode 100644
index 000..469287e
--- /dev/null
+++ b/svl/qa/unit/items/test_itempool.cxx
@@ -0,0 +1,117 @@
+/* -*- 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 svl/itempool.hxx
+#include poolio.hxx
+
+#include cppunit/TestAssert.h

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

[Stephan Bergmann]

 vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
 vcl/unx/gtk/app/gtkinst.cxx   |3 +--
 vcl/unx/kde/kdedata.cxx   |3 +--
 vcl/unx/kde4/main.cxx |2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 852c8e53d7bdb978951ab2703085341ee529a211
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 18:15:55 2014 +0200

create_SalInstance does not need an oslModule parameter

Change-Id: I658974102f544185bf27f985bc920d8d54b40656

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index ff0899d..cf7ff97 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -33,7 +33,7 @@
 #include unistd.h
 
 extern C {
-typedef SalInstance*(*salFactoryProc)( oslModule pModule);
+typedef SalInstance*(*salFactoryProc)();
 }
 
 static oslModule pCloseModule = NULL;
@@ -63,7 +63,7 @@ static SalInstance* tryInstance( const OUString rModuleBase, 
bool bForce = fals
 salFactoryProc aProc = (salFactoryProc)osl_getAsciiFunctionSymbol( 
aMod, create_SalInstance );
 if( aProc )
 {
-pInst = aProc( aMod );
+pInst = aProc();
 SAL_INFO(
 vcl.plugadapt,
 sal plugin   aModule   produced instance   pInst);
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 6389cf0..042d541 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -19,7 +19,6 @@
 
 #include stack
 #include string.h
-#include osl/module.h
 #include osl/process.h
 #include unx/gtk/gtkdata.hxx
 #include unx/gtk/gtkinst.hxx
@@ -58,7 +57,7 @@ extern C
 pYieldMutex-ThreadsLeave();
 }
 
-VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule )
+VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance()
 {
 SAL_INFO(
 vcl.gtk,
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index b9385ca..9ec9a28 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -35,7 +35,6 @@
 
 #include osl/thread.h
 #include osl/process.h
-#include osl/module.h
 #include osl/mutex.hxx
 
 #include unx/kde/kdedata.hxx
@@ -202,7 +201,7 @@ void KDEData::Init()
  **/
 
 extern C {
-VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance( oslModule )
+VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance()
 {
 /* #i92121# workaround deadlocks in the X11 implementation
 */
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 38b5422..f4f9775 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -34,7 +34,7 @@
 
 /// entry point for the KDE4 VCL plugin
 extern C {
-VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule )
+VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance()
 {
 /* #i92121# workaround deadlocks in the X11 implementation
 */
___
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' - 59/10f43232e85b52edf73dced0387c70b64347e5

[Caolán McNamara]

 59/10f43232e85b52edf73dced0387c70b64347e5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa6520390dcdabb99eb25152c68a2bed69aae4e6
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 17:22:41 2014 +0100

Notes added by 'git notes add'

diff --git a/59/10f43232e85b52edf73dced0387c70b64347e5 
b/59/10f43232e85b52edf73dced0387c70b64347e5
new file mode 100644
index 000..99bdff9
--- /dev/null
+++ b/59/10f43232e85b52edf73dced0387c70b64347e5
@@ -0,0 +1 @@
+merged as: b733d208b02facaaad8c4925277b34b9f7fd928f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Sort and copy results

[Kohei Yoshida]

On Fri, 2014-06-06 at 12:42 +0100, Wols Lists wrote:
 Why can't LibreOffice treat it as two separate steps, INCLUDING for
 things like undo? Treat the copy as one operation, then the sort as a
 second operation, and if you need to undo it then it's two ctrl-z,
 not one?

I'll take this idea.  I hope nobody will object to this.

Thanks,

Kohei


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

[Libreoffice-commits] core.git: 2 commits - editeng/source svtools/source svx/source sw/inc sw/source

[Caolán McNamara]

 editeng/source/editeng/impedit5.cxx |   12 +---
 svtools/source/control/valueacc.cxx |   16 --
 svx/source/gallery2/galbrws1.cxx|4 -
 sw/inc/doc.hxx  |6 +-
 sw/inc/editsh.hxx   |3 -
 sw/inc/fmtcol.hxx   |   36 -
 sw/source/core/doc/docfmt.cxx   |   94 +++-
 sw/source/core/doc/doctxm.cxx   |4 +
 sw/source/core/doc/fmtcol.cxx   |   14 +++--
 sw/source/core/edit/edfcol.cxx  |4 -
 sw/source/core/layout/findfrm.cxx   |6 +-
 sw/source/core/txtnode/ndtxt.cxx|5 +
 sw/source/core/undo/unfmco.cxx  |6 --
 sw/source/core/unocore/unostyle.cxx |2 
 sw/source/filter/html/svxcss1.cxx   |4 -
 sw/source/filter/xml/xmltbli.cxx|2 
 sw/source/uibase/fldui/fldwrap.cxx  |5 -
 sw/source/uibase/uiview/viewmdi.cxx |8 +--
 18 files changed, 109 insertions(+), 122 deletions(-)

New commits:
commit 78bea877ff9471d7308041e65e0d6864a862c91b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jun 27 17:04:52 2014 +0100

OSL_ENSURE-assert where guaranteed deref follows

Change-Id: I6e007cc3a9fd222c1c1381c8b4f890966c05cbab

diff --git a/editeng/source/editeng/impedit5.cxx 
b/editeng/source/editeng/impedit5.cxx
index fe9cf60..a884eb2 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -700,24 +700,22 @@ void ImpEditEngine::SetParaAttribs( sal_Int32 nPara, 
const SfxItemSet rSet )
 const SfxItemSet ImpEditEngine::GetParaAttribs( sal_Int32 nPara ) const
 {
 const ContentNode* pNode = aEditDoc.GetObject( nPara );
-DBG_ASSERT( pNode, Node not found: GetParaAttribs );
+assert(pNode  Node not found: GetParaAttribs);
 return pNode-GetContentAttribs().GetItems();
 }
 
 bool ImpEditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
 {
 const ContentNode* pNode = aEditDoc.GetObject( nPara );
-DBG_ASSERT( pNode, Node not found: HasParaAttrib );
-
+assert(pNode  Node not found: HasParaAttrib);
 return pNode-GetContentAttribs().HasItem( nWhich );
 }
 
 const SfxPoolItem ImpEditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 
nWhich ) const
 {
-const ContentNode* pNode = aEditDoc.GetObject( nPara );
-DBG_ASSERT( pNode, Node not found: GetParaAttrib );
-
-return pNode-GetContentAttribs().GetItem( nWhich );
+const ContentNode* pNode = aEditDoc.GetObject(nPara);
+assert(pNode  Node not found: GetParaAttrib);
+return pNode-GetContentAttribs().GetItem(nWhich);
 }
 
 void ImpEditEngine::GetCharAttribs( sal_Int32 nPara, 
std::vectorEECharAttrib rLst ) const
diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index f0d7ede..585908b 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -776,35 +776,23 @@ void ValueSetAcc::ThrowIfDisposed (void)
 }
 }
 
-
-
-bool ValueSetAcc::HasNoneField (void) const
+bool ValueSetAcc::HasNoneField() const
 {
-DBG_ASSERT (mpParent!=NULL, ValueSetAcc::HasNoneField called with 
mpParent==NULL);
+assert(mpParent  ValueSetAcc::HasNoneField called with mpParent==NULL);
 return ((mpParent-GetStyle()  WB_NONEFIELD) != 0);
 }
 
-
-
-
-
 // - ValueItemAcc -
-
-
 ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool 
bIsTransientChildrenDisabled ) :
 mpParent( pParent ),
 mbIsTransientChildrenDisabled( bIsTransientChildrenDisabled )
 {
 }
 
-
-
 ValueItemAcc::~ValueItemAcc()
 {
 }
 
-
-
 void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any 
rOldValue, const uno::Any rNewValue )
 {
 if( nEventId )
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ddb6bfa..3705fa9 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -272,9 +272,9 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const 
OUString  rThemeName, b
 ImplFillExchangeData( pTheme, *mpExchangeData );
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-DBG_ASSERT(pFact, Got no AbstractDialogFactory!);
+assert(pFact  Got no AbstractDialogFactory!);
 VclAbstractDialog2* pThemeProps = 
pFact-CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, 
mpThemePropsDlgItemSet );
-DBG_ASSERT(pThemeProps, Got no GalleryThemePropertiesDialog!);
+assert(pThemeProps  Got no GalleryThemePropertiesDialog!);
 
 if ( bCreateNew )
 {
diff --git a/sw/source/core/layout/findfrm.cxx 
b/sw/source/core/layout/findfrm.cxx
index 8b4b1e4..749fa84 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1365,13 +1365,13 @@ static SwCellFrm* lcl_FindCorrespondingCellFrm( const 
SwRowFrm rOrigRow,
 pCorrCell = (SwCellFrm*)pCorrCell-GetNext();
 }
 
-OSL_ENSURE( pCell  pCorrCell, lcl_FindCorrespondingCellFrm does not 
work );
+assert(pCell  pCorrCell  lcl_FindCorrespondingCellFrm does not work);
 

[Libreoffice-commits] dev-tools.git: 3 commits - scripts/Bugzilla.pm scripts/build-portal.pl scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/Bugzilla.pm  |  199 +++
 scripts/build-portal.pl  |   57 +++
 scripts/esc-bug-stats.pl |  238 +--
 3 files changed, 285 insertions(+), 209 deletions(-)

New commits:
commit 681121114eaa2e786ab59cf8563babd6a8c974fd
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Jun 27 17:24:30 2014 +0100

Start splitting Bugzilla stats out into its own perl module.

diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm
new file mode 100644
index 000..8ee0e58
--- /dev/null
+++ b/scripts/Bugzilla.pm
@@ -0,0 +1,199 @@
+package Bugzilla;
+
+use strict;
+use warnings;
+use URI::Escape qw(uri_escape);
+
+our ($bugserver);
+our @EXPORT_OK = qw(bugserver get_url get_deps get_query read_bugstats);
+
+# Please take the time to check that the script still runs
+# before changing this to something else.
+$bugserver = bugs.freedesktop.org;
+
+# use me for testing XML pretty printing etc.
+my $fast_debug = 0;
+
+# config for eliding top bug contributors who are
+# not (yet) libreoffice hackers.
+my %sadly_non_libreoffice = (
+'Chris Wilson' = 1,
+'Bastien Nocera' = 1,
+'Kristian Høgsberg' = 1,
+'Simon McVittie' = 1,
+'Søren Sandmann Pedersen' = 1,
+'Daniel Vetter' = 1,
+'Sergey V. Udaltsov' = 1,
+'Marek Olšák' = 1,
+'Emil Velikov' = 1,
+'ajax at nwnk dot net' = 1,
+'Jesse Barnes' = 1,
+'Albert Astals Cid' = 1,
+'Daniel Stone' = 1,
+'Eric Anholt' = 1,
+'Lennart Poettering' = 1,
+'Ilia Mirkin' = 1,
+'Behdad Esfahbod' = 1,
+'Richard Hughes' = 1,
+'Ben Widawsky' = 1,
+'Chengwei Yang' = 1,
+'Dan Nicholson' = 1,
+'Zbigniew Jedrzejewski-Szmek' = 1,
+'Tanu Kaskinen' = 1,
+'Vinson Lee' = 1,
+'Sylvain BERTRAND' = 1,
+'lu hua' = 1,
+'Kenneth Graunke' = 1,
+'Seif Lotfy' = 1,
+'Alex Deucher' = 1,
+'Ian Romanick' = 1,
+'Tollef Fog Heen' = 1,
+'Patrick Ohly' = 1,
+'Peter Hutterer' = 1,
+'Guillaume Desmottes' = 1,
+'Bryce Harrington' = 1,
+'Paolo Zanoni' = 1,
+'David Faure' = 1,
+'Rex Dieter' = 1,
+'Tom Stellard' = 1,
+'almos' = 1,
+);
+
+sub get_url($)
+{
+my $url = shift;
+my @lines;
+my $handle;
+open ($handle, curl -k -s '$url' 21 |) || die can't exec curl: $!;
+while ($handle) {
+   push @lines, $_;
+}
+close ($handle);
+return @lines;
+}
+
+sub get_deps($)
+{
+my ($url) = @_;
+
+return 42 if ($fast_debug);
+
+my @bugs = get_url($url);
+
+my $bug_count = -1;
+while (my $line = shift (@bugs)) {
+   if ($line =~ m/does not depend on any open bugs/) {
+   $bug_count = 0;
+   last;
+   }
+   elsif ($line =~ m/^\s*depends on\s*$/) {
+   $line = shift @bugs;
+#  print STDERR Have depends on '$line'\n;
+   if ($line =~ m/^\s*(\d+)\s*$/) {
+   my $num = $1;
+   $line = shift @bugs;
+   $line = shift @bugs;
+   if ($line =~ m/bugs:/) {
+   $bug_count = $num;
+   last;
+   }
+   } elsif ($line =~ m/\s+one\s+/) { # special case for one
+   $bug_count = 1;
+   last;
+   } else {
+   print STDERR odd depends on follow-on: '$line'\n;
+   }
+   }
+}
+return $bug_count;
+}
+
+sub get_query($)
+{
+my ($url) = @_;
+
+return 6 if ($fast_debug);
+
+my @bugs = get_url($url);
+
+my $bug_count = -1;
+while (my $line = shift (@bugs)) {
+   if ($line =~ m/span class=bz_result_count(\d+) bugs found./) {
+   $bug_count = $1;
+   last;
+   } elsif ($line =~ m/One bug found./) {
+   $bug_count = 1;
+   last;
+   } elsif ($line =~ m/Zarro Boogs found./) {
+   $bug_count = 0;
+   last;
+   }
+}
+return $bug_count;
+}
+
+sub extract_number($)
+{
+my $line = shift;
+chomp ($line);
+$line =~ s/^.*\\//;
+$line =~ s/.*$//;
+return $line;
+}
+
+sub read_bugstats($)
+{
+my @lines = get_url(shift);
+
+my $region = 'header';
+my $closer_name;
+my %closed_stats;
+my $delta = 0;
+
+while ((my $line = shift @lines)  $region ne 'end') {
+#  print STDERR $region - $line\n;
+   if ($region eq 'header'  $line =~ /h2Top .* modules\/h2/) {
+   $region = 'top-modules';
+
+   } elsif ($region eq 'top-modules' 
+$line =~ /tdLibreOffice\/td/) {
+   my ($total, $opened, $closed);
+   $total = extract_number (shift @lines);
+   $opened = extract_number (shift @lines);
+   $closed = extract_number (shift @lines);
+   my $sign = '', $delta = $opened + $closed;
+   $sign = '+' if ($delta  0);
+   print STDERR $opened$closed($sign$delta 
overall)\n;
+   $region = 'seek-end-top-modules';
+
+   } elsif 

[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/dbdocfun.cxx |  117 -
 sc/source/ui/inc/undodat.hxx   |4 -
 sc/source/ui/undo/undodat.cxx  |   18 -
 3 files changed, 16 insertions(+), 123 deletions(-)

New commits:
commit 9e47c4d1947ef57182a7cb48a37dbe12b168c65a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 27 12:38:20 2014 -0400

Make sort a two step process when copy to range is specified.

First step is to copy the range from A to B, then sort on B.  This will
be handled as two commands rather than one.

Change-Id: Ibb1ad7384a3a25337b2b15c67ece90b3d61a6632

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 3e5c6e1..b422213 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -473,7 +473,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 ScDocument rDoc = rDocShell.GetDocument();
 if (bRecord  !rDoc.IsUndoEnabled())
 bRecord = false;
-SCTAB nSrcTab = nTab;
+
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
 
 ScDBData* pDBData = rDoc.GetDBAtArea( nTab, rSortParam.nCol1, 
rSortParam.nRow1,
@@ -484,28 +484,25 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 return false;
 }
 
-ScDBData* pDestData = NULL;
-ScRange aOldDest;
 bool bCopy = !rSortParam.bInplace;
 if ( bCopy  rSortParam.nDestCol == rSortParam.nCol1 
   rSortParam.nDestRow == rSortParam.nRow1  
rSortParam.nDestTab == nTab )
 bCopy = false;
+
 ScSortParam aLocalParam( rSortParam );
 if ( bCopy )
 {
-aLocalParam.MoveToDest();
-if ( !ValidColRow( aLocalParam.nCol2, aLocalParam.nRow2 ) )
-{
-if (!bApi)
-rDocShell.ErrorMessage(STR_PASTE_FULL);
+// Copy the data range to the destination then move the sort range to 
it.
+ScRange aSrcRange(rSortParam.nCol1, rSortParam.nRow1, nTab, 
rSortParam.nCol2, rSortParam.nRow2, nTab);
+ScAddress 
aDestPos(rSortParam.nDestCol,rSortParam.nDestRow,rSortParam.nDestTab);
+
+ScDocFunc rDocFunc = rDocShell.GetDocFunc();
+bool bRet = rDocFunc.MoveBlock(aSrcRange, aDestPos, false, bRecord, 
bPaint, bApi);
+
+if (!bRet)
 return false;
-}
 
-nTab = rSortParam.nDestTab;
-pDestData = rDoc.GetDBAtCursor( rSortParam.nDestCol, 
rSortParam.nDestRow,
-rSortParam.nDestTab, true );
-if (pDestData)
-pDestData-GetArea(aOldDest);
+aLocalParam.MoveToDest();
 }
 
 ScEditableTester aTester( rDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1,
@@ -552,15 +549,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 if ( aQueryParam.GetEntry(0).bDoQuery )
 bRepeatQuery = true;
 
-if (bRepeatQuery  bCopy)
-{
-if ( aQueryParam.bInplace ||
-aQueryParam.nDestCol != rSortParam.nDestCol ||
-aQueryParam.nDestRow != rSortParam.nDestRow ||
-aQueryParam.nDestTab != rSortParam.nDestTab )   // Query 
auf selben Zielbereich?
-bRepeatQuery = false;
-}
-
 ScUndoSort* pUndoAction = 0;
 if ( bRecord )
 {
@@ -580,19 +568,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 aLocalParam.nCol2, aLocalParam.nRow2, nTab,
 IDF_ALL|IDF_NOCAPTIONS, false, pUndoDoc );
 
-const ScRange* pR = 0;
-if (pDestData)
-{
-/*  #i59745# Do not copy note captions from destination range to
-undo document. All existing caption objects will be removed
-which is tracked in drawing undo. When undo is executed, the
-caption objects are reinserted with drawing undo, and the cells
-with the old notes (which still refer to the existing captions)
-will be copied back into the source document. */
-rDoc.CopyToDocument( aOldDest, IDF_ALL|IDF_NOCAPTIONS, false, 
pUndoDoc );
-pR = aOldDest;
-}
-
 //  Zeilenhoehen immer (wegen automatischer Anpassung)
 //! auf ScBlockUndo umstellen
 //if (bRepeatQuery)
@@ -604,7 +579,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 if (!pDocDB-empty())
 pUndoDB = new ScDBCollection( *pDocDB );
 
-pUndoAction = new ScUndoSort( rDocShell, nTab, rSortParam, pUndoDoc, 
pUndoDB, pR );
+pUndoAction = new ScUndoSort(rDocShell, nTab, rSortParam, pUndoDoc, 
pUndoDB);
 rDocShell.GetUndoManager()-AddUndoAction( pUndoAction );
 
 // #i59745# collect all drawing undo actions affecting cell note 
captions
@@ -612,18 +587,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 pDrawLayer-BeginCalcUndo(false);
  

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

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk |1 +
 external/libgltf/patches/fix_package_file.patch |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 4bdbc1c93bb3b7e6b1f2fc9a700977ccfa3daae4
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 19:19:46 2014 +0200

libgltf: make 'Requires' valid in libgltf-0.0.pc file

Thanks to Rene Engelhard for help to make it valid.

Plus glu is not used, so remove it.

Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 175fe43..174e719 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\

external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch 
\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
external/libgltf/patches/compiler_error_fixes.patch \
+   external/libgltf/patches/fix_package_file.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/fix_package_file.patch 
b/external/libgltf/patches/fix_package_file.patch
new file mode 100644
index 000..509634d
--- /dev/null
+++ b/external/libgltf/patches/fix_package_file.patch
@@ -0,0 +1,13 @@
+diff -ur libgltf.org/libgltf.pc.in libgltf/libgltf.pc.in
+--- libgltf.org/libgltf.pc.in  2014-06-27 18:52:24.323562505 +0200
 libgltf/libgltf.pc.in  2014-06-27 18:52:48.423561484 +0200
+@@ -6,8 +6,7 @@
+ Name: libgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ Description: Library for rendering glTF models.
+ Version: @VERSION@
+-Requires: glew-1.10.0 glm glu
++Requires: glew
+ Libs: -L${libdir} -lgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ Cflags: -I${includedir}/libgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ 
+-Requires.private: boost
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] homepages and source URLs of import libraries have changed

[David Tardon]

Hello,

This message concerns all package maintainers of the import libraries
hosted in gerrit (libabw, libcdr, libetonyek, libfreehand, libmspub and
libvisio). Since the Document Liberation Project has got its own
subsection on TDF's wiki, I have moved the homepages of the mentioned
libraries from FDO's wiki to there. The new locations are
http://wiki.documentfoundation.org/DLP/Libraries/libabw etc. The old
pages on FDO's wiki still exist, but they only contain a notice about
the move and a link to the new location.

I have also changed the locations for source tarballs, to make it easier
to see tarballs for a particular library (previously they were all
heaped into http://dev-www.libreoffice.org/src/, which contains quite a
lot of stuff). I have added a level to that, so the new locations are
http://dev-www.libreoffice.org/src/libabw/ etc. The *.tar.bz2 files,
used by libreoffice, are still available in /src/, of course.

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source cui/uiconfig officecfg/registry vcl/source

[Rachit Gupta]

 cui/source/options/personalization.cxx |   54 +
 cui/source/options/personalization.hxx |2 
 cui/uiconfig/ui/personalization_tab.ui |   76 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   23 +++
 vcl/source/app/settings.cxx|2 
 5 files changed, 137 insertions(+), 20 deletions(-)

New commits:
commit e62172ebbe41e0fe184e8a65c84dbd06f87bb01b
Author: Rachit Gupta rachitgupta1...@gmail.com
Date:   Fri Jun 27 23:52:42 2014 +0530

The Personas can be install through oxt extensions.

The user can install an oxt extension and choose his/her theme from
the Personalization page.

* Created a template in Common.xcs registry to hold the values for the
  PersonasList set.
* Added 3 buttons to personalization_tab.ui to incorporate the latest 3
  personas installed through extensions.
* Currently, only 3 installed personas are shown alongwith the default
  available personas.

Change-Id: I30a40ae48d17f4ed8caef33854ef88afcbec5a54

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index ec7..1cc8b75 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -14,6 +14,8 @@
 
 #include comphelper/processfactory.hxx
 #include officecfg/Office/Common.hxx
+#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/beans/XPropertySet.hpp
 #include osl/file.hxx
 #include rtl/bootstrap.hxx
 #include tools/urlobj.hxx
@@ -31,6 +33,7 @@
 using namespace com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::beans;
 
 SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
 : ModalDialog( pParent, SelectPersonaDialog, 
cui/ui/select_persona_dialog.ui )
@@ -241,6 +244,15 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
Window *pParent, const Sfx
 get( m_vDefaultPersonaImages[2], default3 );
 m_vDefaultPersonaImages[2]-SetClickHdl( LINK( this, 
SvxPersonalizationTabPage, DefaultPersona ) );
 
+get( m_vExtensionPersonas[0], extension1 );
+m_vExtensionPersonas[0]-SetClickHdl( LINK( this, 
SvxPersonalizationTabPage, DefaultPersona ) );
+
+get( m_vExtensionPersonas[1], extension2 );
+m_vExtensionPersonas[1]-SetClickHdl( LINK( this, 
SvxPersonalizationTabPage, DefaultPersona ) );
+
+get( m_vExtensionPersonas[2], extension3 );
+m_vExtensionPersonas[2]-SetClickHdl( LINK( this, 
SvxPersonalizationTabPage, DefaultPersona ) );
+
 LoadDefaultImages();
 }
 
@@ -273,7 +285,6 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet  )
 
 // write
 boost::shared_ptr comphelper::ConfigurationChanges  batch( 
comphelper::ConfigurationChanges::create() );
-
 officecfg::Office::Common::Misc::Persona::set( aPersona, batch );
 officecfg::Office::Common::Misc::PersonaSettings::set( m_aPersonaSettings, 
batch );
 batch-commit();
@@ -316,6 +327,8 @@ void SvxPersonalizationTabPage::SetPersonaSettings( const 
OUString aPersonaSetti
 
 void SvxPersonalizationTabPage::LoadDefaultImages()
 {
+// Load the pre saved personas
+
 OUString gallery(  );
 gallery = $BRAND_BASE_DIR/ LIBO_SHARE_FOLDER;
 gallery += /gallery/personas/;
@@ -345,6 +358,38 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vDefaultPersonaImages[nIndex]-Show();
 m_vDefaultPersonaImages[nIndex++]-SetModeImage( Image( aBmp ) );
 }
+
+// See if any extensions are used to install personas. If yes, load them.
+
+css::uno::SequenceOUString installedPersonas( 
officecfg::Office::Common::Misc::PersonasList::get()-getElementNames() );
+sal_Int32 nLength = installedPersonas.getLength();
+sal_Int32 nCount = 0;
+nIndex = 0;
+
+if( nLength == 0 )
+return;
+
+if( nLength  3 )
+nIndex = nLength - 3;
+
+for( ; nIndex  nLength; nIndex++ )
+{
+Reference XPropertySet  xPropertySet( 
officecfg::Office::Common::Misc::PersonasList::get()-getByName( 
installedPersonas[nIndex] ), UNO_QUERY_THROW );
+Any aValue = xPropertySet-getPropertyValue( PersonaPreview );
+OUString aPreviewFile;
+aValue = aPreviewFile;
+INetURLObject aURLObj( aPreviewFile );
+aFilter.ImportGraphic( aGraphic, aURLObj );
+Bitmap aBmp = aGraphic.GetBitmap();
+m_vExtensionPersonas[nCount]-Show();
+m_vExtensionPersonas[nCount++]-SetModeImage( Image( aBmp ) );
+
+aValue = xPropertySet-getPropertyValue( PersonaSettings );
+OUString sPersonaSettings;
+aValue = sPersonaSettings;
+rtl::Bootstrap::expandMacros( sPersonaSettings );
+m_vExtensionPersonaSettings.push_back( sPersonaSettings );
+}
 }
 
 IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
@@ -381,6 +426,13 @@ IMPL_LINK( 

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

[matteocam]

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

New commits:
commit 5e9943e2346d42b1bfb1cf25c468cfde9ece74d0
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 27 21:39:49 2014 +0200

Setting bgrow=false in CreateLines

Change-Id: I7132f059fd2d817c54283f6f0762fe8ea781aeb6

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 4d4a15b..314ee87 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -403,7 +403,8 @@ void ImpEditEngine::FormatDoc()
 pPP-GetLines().Reset();
 }
 }
-bGrow = true;
+// FIXME(matteocam)
+//bGrow = true;
 if ( IsCallParaInsertedOrDeleted() )
 GetEditEnginePtr()-ParagraphHeightChanged( nPara );
 pParaPortion-SetMustRepaint( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit b97c5480e9bb6372cd21d1b168a0d9973f91ee0c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 22:16:35 2014 +0200

Unused declaration

(which loplugin:unreffun did not catch, as it was referenced by a
friend declaration in vendorbase.hxx)

Change-Id: I8a1afd4699b56425b580c1e63557342ee7ec1cb2

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 9fc8e83..3288c2f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -30,16 +30,6 @@ using namespace osl;
 
 namespace jfw_plugin
 {
-rtl::ReferenceVendorBase createInstance(createInstance_func pFunc,
-  vectorpairOUString, OUString  
properties);
-
-
-
-
-
-
-
-
 
 MalformedVersionException::MalformedVersionException()
 {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - 3 commits - sc/inc sc/Library_sc.mk sc/qa sc/source

[Kohei Yoshida]

 sc/Library_sc.mk|1 +
 sc/inc/document.hxx |3 ++-
 sc/inc/refhint.hxx  |   12 ++--
 sc/inc/sortparam.hxx|   13 +
 sc/inc/table.hxx|8 +---
 sc/inc/tokenarray.hxx   |8 ++--
 sc/inc/types.hxx|3 +--
 sc/inc/undosort.hxx |   34 ++
 sc/qa/unit/ucalc.cxx|   12 ++--
 sc/source/core/data/documen3.cxx|5 +++--
 sc/source/core/data/formulacell.cxx |9 ++---
 sc/source/core/data/table3.cxx  |   25 ++---
 sc/source/core/tool/refhint.cxx |8 
 sc/source/core/tool/token.cxx   |   14 +++---
 sc/source/ui/docshell/dbdocfun.cxx  |   18 +-
 sc/source/ui/undo/undosort.cxx  |   34 ++
 16 files changed, 159 insertions(+), 48 deletions(-)

New commits:
commit 9e66aa3a2bb1b103442166cb642ff6085f38b770
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 27 16:24:36 2014 -0400

Set up a new undo sort mechanism.  It's empty for now.

Change-Id: I14a235f050d64d64d1102a688a304249afacf802

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 8e42c63..639946a 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -518,6 +518,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/undo/undodraw \
 sc/source/ui/undo/undoolk \
 sc/source/ui/undo/undorangename \
+sc/source/ui/undo/undosort \
 sc/source/ui/undo/undostyl \
 sc/source/ui/undo/undotab \
 sc/source/ui/undo/undoutil \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5897fe3..848e162 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -79,6 +79,7 @@ class CellValues;
 class RowHeightContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
+struct SortUndoParam;
 
 }
 
@@ -1675,7 +1676,7 @@ public:
 SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
 SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
 
-voidSort( SCTAB nTab, const ScSortParam rSortParam, bool 
bKeepQuery, ScProgress* pProgress );
+void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, 
ScProgress* pProgress, sc::SortUndoParam* pUndo );
 SCSIZE  Query( SCTAB nTab, const ScQueryParam rQueryParam, bool 
bKeepSub );
 SC_DLLPUBLIC bool   CreateQueryParam( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2,
 SCTAB nTab, ScQueryParam rQueryParam 
);
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 55b09a6..df3a449 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -78,6 +78,19 @@ struct SC_DLLPUBLIC ScSortParam
 inline sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); }
 };
 
+namespace sc {
+
+struct SC_DLLPUBLIC SortUndoParam
+{
+ScRange maSortRange;
+std::vectorSCCOLROW maOldIndices;
+bool mbHasHeader;
+bool mbByRow;
+bool mbIncludePattern;
+};
+
+}
+
 #endif // INCLUDED_SC_INC_SORTPARAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 580b738..649d8e6 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -73,6 +73,7 @@ class RowHeightContext;
 class CompileFormulaContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
+struct SortUndoParam;
 
 }
 
@@ -824,7 +825,8 @@ public:
 voidStripHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
 voidExtendHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
 
-voidSort(const ScSortParam rSortParam, bool bKeepQuery, 
ScProgress* pProgress);
+void Sort(
+const ScSortParam rSortParam, bool bKeepQuery, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
 bool ValidQuery(
 SCROW nRow, const ScQueryParam rQueryParam, ScRefCellValue* pCell = 
NULL,
 bool* pbTestEqualCondition = NULL);
@@ -1019,8 +1021,8 @@ private:
 short   Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2) 
const;
 ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2, bool 
bKeepQuery );
 voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
-void SortReorderByColumn( ScSortInfoArray* pArray, ScProgress* pProgress );
-void SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress );
+void SortReorderByColumn( ScSortInfoArray* pArray, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
+void SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
 
 boolCreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScQueryParam rQueryParam);
 boolCreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScQueryParam rQueryParam);
diff --git a/sc/inc/undosort.hxx b/sc/inc/undosort.hxx

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/fdo80167.rtf |6 ++
 sw/qa/extras/rtfexport/rtfexport.cxx |   12 +---
 sw/source/filter/ww8/docxexport.hxx  |2 ++
 sw/source/filter/ww8/rtfexport.hxx   |5 +
 sw/source/filter/ww8/wrtww8.hxx  |5 +
 sw/source/filter/ww8/ww8atr.cxx  |   13 ++---
 6 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit 8100100298b877765e1781fb0eed285e82749ad1
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jun 27 21:28:36 2014 +0200

fdo#80167 RTF export: don't loose page breaks

DOCX export tries to write accurately both w:br and
w:pageBreakBefore, while DOC/RTF prefers just the page break before
paragraph attribute. Given that these later two exporters are not
adapted to write their equivalent of w:br at all, add a virtual method
to determine if writing page breaks as page break before is preferred
or not, that'll give the expected RTF export result.

This conditionally reverts commit
a31fbb53dba76736b37213b98b64937f05929a67 (fdo#74566:DOCX: Preservation
w:br tag for Break to Next Page, 2014-02-06).

Change-Id: I4a5dd295b07739a570cd8cc6709561e64d031273

diff --git a/sw/qa/extras/rtfexport/data/fdo80167.rtf 
b/sw/qa/extras/rtfexport/data/fdo80167.rtf
new file mode 100644
index 000..3aa9dd3
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo80167.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+\pard\plain
+one\par
+\pard\page\par
+\pard two\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 1fe8c88..cdbb06d 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -653,6 +653,12 @@ DECLARE_RTFEXPORT_TEST(testFdo79599, fdo79599.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x800080), getPropertysal_uInt32(xRun, 
CharBackColor));
 }
 
+DECLARE_RTFEXPORT_TEST(testFdo80167, fdo80167.rtf)
+{
+// Problem was that after export, the page break was missing, so this was 
1.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 3415b03..9e2b6b7 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -124,6 +124,8 @@ public:
 
 virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const 
SAL_OVERRIDE;
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return false; }
+
 /// Guess the script (asian/western).
 virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 
nWhich ) SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index aebb839..c384289 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -80,6 +80,11 @@ public:
 return false;
 }
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE
+{
+return true;
+}
+
 /// Guess the script (asian/western).
 virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 
nWhich) SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 46c4077..d4eaa22 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -655,6 +655,9 @@ public:
 /// Used to filter out attributes that can be e.g. written to .doc but not 
to .docx
 virtual bool ignoreAttributeForStyles( sal_uInt16 /*nWhich*/ ) const { 
return false; }
 
+/// If saving page break is preferred as a paragraph attribute (yes) or as 
a special character (no).
+virtual bool PreferPageBreakBefore() const = 0;
+
 /// Guess the script (asian/western).
 ///
 /// Sadly word does not have two different sizes for asian font size and
@@ -974,6 +977,8 @@ public:
 /// False for WW6, true for WW8.
 virtual bool SupportsUnicode() const SAL_OVERRIDE { return bWrtWW8; }
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return true; }
+
 virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; }
 
 virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 31b9df7..4eeb176 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3765,9 +3765,16 @@ void AttributeOutputBase::FormatBreak( const 
SvxFmtBreakItem rBreak )
 break;
 
 case SVX_BREAK_PAGE_BEFORE: // PageBreak
-// From now on(fix for #i77900#) we prefer to save a page 
break as
-// paragraph attribute, this has to be done after the export 
of the
-// paragraph ( = !GetExport().bBreakBefore )
+// From now on(fix for #i77900#) we prefer to save a page break
+// as paragraph attribute (if the exporter is OK with that),
+ 

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

[matteocam]

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

New commits:
commit bd71d877553fe854d0f1715637c66065e07a1fbf
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 27 22:43:17 2014 +0200

Resuming bgrow

Change-Id: I14de859adbf911844e936cb7f90650559f2db8bf

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 314ee87..ee2f157 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -403,8 +403,8 @@ void ImpEditEngine::FormatDoc()
 pPP-GetLines().Reset();
 }
 }
-// FIXME(matteocam)
-//bGrow = true;
+
+bGrow = true;
 if ( IsCallParaInsertedOrDeleted() )
 GetEditEnginePtr()-ParagraphHeightChanged( nPara );
 pParaPortion-SetMustRepaint( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Icons/themes selection broken on 4.3.0.1

[Rene Engelhard]

Hi,

On Fri, Jun 27, 2014 at 11:36:05AM +0200, Tomáš Chvátal wrote:
When I launch libreoffice it searches only for images_tango.zip file and
if not found shows no icons. Regardless wether it should use oxygen as it
is launched on KDE.

Ah. I am not the only one

Good.

Other problem is while I tried to debug this when I clicked on Tools -
Options - View  I got warning Could not find theme id in theme vector.
and when I clicked ok whole app closed (it didn't crash tho as the exit
value was 0 and no backtrace to show).

I have a strace at http://zyklop.dyndns.org/~rene/icons.strace. Which isn't
really helpful, though.

Any help appreciated.

Dito.

I have http://bugs.debian.org/752541 for this...

Regards,

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

[Bug 70357] Sort and clean Wiki pages!

[bugzilla-daemon]

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

Bug 70357 depends on bug 71761, which changed state.

Bug 71761 Summary: Cleanup Whiteboard Wiki Page
https://bugs.freedesktop.org/show_bug.cgi?id=71761

   What|Removed |Added

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

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

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

[Stephan Bergmann]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |   33 ++--
 1 file changed, 22 insertions(+), 11 deletions(-)

New commits:
commit 939ce4afbb36673e03e90881c48fd4e2bbb74bb8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 27 23:07:00 2014 +0200

Blind fix for OPreparedStatement::setParameter's useWChar case

...after 0181a13904daef160bee543e9806b23a835f79c8 odbc properly support
platform with sizeof(SQLWCHAR) = 4 introduced usage of 
RTL_TEXTENCODING_UCS2/4
there, which do not make sense in combination with converting between 
OString
and OUString.

OTools::getStringValue will need a corresponding fix, too, in the other
direction (where the OUString(sal_uInt32 const * codePoints,
sal_Int32 codPointCount) ctor will be useful).

Change-Id: Ia94cd0deec46d269b6ee43362f4849837bb011c5

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 1a39897..e2bf7ce 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -317,7 +317,6 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
 sal_Int32 nCharLen;
 sal_Int32 nByteLen;
 void *pData;
-OString sOData;
 if (useWChar)
 {
 /*
@@ -337,23 +336,35 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
  *
  * Our internal OUString storage is always UTF-16, so no conversion to 
do here.
  */
-rtl_TextEncoding nSQLWCHAREncoding = RTL_TEXTENCODING_UCS2;
-if( sizeof(SQLWCHAR) == 4 )
+BOOST_STATIC_ASSERT(sizeof (SQLWCHAR) == 2 || sizeof (SQLWCHAR) == 4);
+if (sizeof (SQLWCHAR) == 2)
 {
-nSQLWCHAREncoding = RTL_TEXTENCODING_UCS4;
+nCharLen = _sData.getLength();
+nByteLen = 2 * nCharLen;
+pData = allocBindBuf(parameterIndex, nByteLen);
+memcpy(pData, _sData.getStr(), nByteLen);
+}
+else
+{
+std::vectorsal_uInt32 u;
+for (sal_Int32 i = 0; i != _sData.getLength();)
+{
+u.push_back(_sData.iterateCodePoints(i));
+}
+nCharLen = u.size();
+nByteLen = 4 * nCharLen;
+pData = allocBindBuf(parameterIndex, nByteLen);
+memcpy(pData, u.empty() ? 0 : u[0], nByteLen);
 }
-
-sOData = OUStringToOString(_sData, nSQLWCHAREncoding);
-nByteLen = sOData.getLength();
-nCharLen = nByteLen / sizeof(SQLWCHAR);
 }
 else
 {
-sOData = OUStringToOString(_sData, 
getOwnConnection()-getTextEncoding());
+OString sOData(
+OUStringToOString(_sData, getOwnConnection()-getTextEncoding()));
 nCharLen = nByteLen = sOData.getLength();
+pData = allocBindBuf(parameterIndex, nByteLen);
+memcpy(pData, sOData.getStr(), nByteLen);
 }
-pData = allocBindBuf(parameterIndex, nByteLen);
-memcpy(pData, sOData.getStr(), nByteLen);
 
 setParameter( parameterIndex, _nType, nCharLen, _nScale, pData, nByteLen, 
nByteLen );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8be7a99d214f204063dd1219b058ad0f2417282f
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 27 23:16:02 2014 +0200

Removing checks on nDiff and CheckAutoPageSize()

Change-Id: I351800be530354c046177fcc7e30f05b146d0893

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index ee2f157..2494838 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -436,7 +436,9 @@ void ImpEditEngine::FormatDoc()
 {
 sal_uInt32 nNewHeightNTP;
 sal_uInt32 nNewHeight = CalcTextHeight( nNewHeightNTP );
-long nDiff = nNewHeight - nCurTextHeight;
+// FIXME(matteocam)
+long nDiff = 0;
+//long nDiff = nNewHeight - nCurTextHeight;
 if ( nDiff )
 aStatus.GetStatusWord() |= !IsVertical() ? 
EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
 if ( nNewHeight  nCurTextHeight )
@@ -454,7 +456,9 @@ void ImpEditEngine::FormatDoc()
 nCurTextHeight = nNewHeight;
 nCurTextHeightNTP = nNewHeightNTP;
 
-if ( aStatus.AutoPageSize() )
+// FIXME(matteocam)
+//if ( aStatus.AutoPageSize() )
+if (false)
 CheckAutoPageSize();
 else if ( nDiff )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4f1f89591e1e6496394b204dec0ebc8ffa9424b1
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 27 23:28:33 2014 +0200

nDiff=0 and CheckAutoPageSize modified internally

Change-Id: If383111e57f97987de3e8b58b31c716d81a04b65

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 79af980..94a1b67 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -437,8 +437,8 @@ void ImpEditEngine::FormatDoc()
 sal_uInt32 nNewHeightNTP;
 sal_uInt32 nNewHeight = CalcTextHeight( nNewHeightNTP );
 // FIXME(matteocam)
-//long nDiff = 0;
-long nDiff = nNewHeight - nCurTextHeight;
+long nDiff = 0;
+//long nDiff = nNewHeight - nCurTextHeight;
 if ( nDiff )
 aStatus.GetStatusWord() |= !IsVertical() ? 
EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
 if ( nNewHeight  nCurTextHeight )
@@ -456,9 +456,7 @@ void ImpEditEngine::FormatDoc()
 nCurTextHeight = nNewHeight;
 nCurTextHeightNTP = nNewHeightNTP;
 
-// FIXME(matteocam)
-//if ( aStatus.AutoPageSize() )
-if (false)
+if ( aStatus.AutoPageSize() )
 CheckAutoPageSize();
 else if ( nDiff )
 {
@@ -520,7 +518,13 @@ bool ImpEditEngine::ImpCheckRefMapMode()
 
 void ImpEditEngine::CheckAutoPageSize()
 {
+// FIXME(matteocam)
+SetValidPaperSize( aPaperSize );// consider Min, Max
+return;
+// END FIXME
+
 Size aPrevPaperSize( GetPaperSize() );
+
 if ( GetStatus().AutoPageWidth() )
 aPaperSize.Width() = !IsVertical() ? CalcTextWidth( true ) : 
GetTextHeight();
 if ( GetStatus().AutoPageHeight() )
commit 7577a2d3fd4bb771b789d13267dc4c587da325a5
Author: matteocam matteo.campane...@gmail.com
Date:   Fri Jun 27 23:19:41 2014 +0200

Resumed nDiff only

Change-Id: Ia841e76117737b00c4fe774685ee4567bc179781

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 2494838..79af980 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -437,8 +437,8 @@ void ImpEditEngine::FormatDoc()
 sal_uInt32 nNewHeightNTP;
 sal_uInt32 nNewHeight = CalcTextHeight( nNewHeightNTP );
 // FIXME(matteocam)
-long nDiff = 0;
-//long nDiff = nNewHeight - nCurTextHeight;
+//long nDiff = 0;
+long nDiff = nNewHeight - nCurTextHeight;
 if ( nDiff )
 aStatus.GetStatusWord() |= !IsVertical() ? 
EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
 if ( nNewHeight  nCurTextHeight )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 connectivity/source/drivers/firebird/PreparedStatement.cxx   |4 
 connectivity/source/drivers/firebird/StatementCommonBase.cxx |  115 ++-
 connectivity/source/drivers/firebird/Util.cxx|   14 +
 3 files changed, 76 insertions(+), 57 deletions(-)

New commits:
commit f7453024e1f46a038d1278ddcbba64ccdbf8dcd1
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Jun 27 23:35:21 2014 +0200

fdo#80574 firebird memory management issues

Change-Id: I37438cd3f9c8e197e5a3aa3d9cbcc5bf3681d792

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index d5e1213..3c40ecd 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -76,7 +76,7 @@ void OPreparedStatement::ensurePrepared()
 
 if (!m_pInSqlda)
 {
-m_pInSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(10));
+m_pInSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(10));
 m_pInSqlda-version = SQLDA_VERSION1;
 m_pInSqlda-sqln = 10;
 }
@@ -99,7 +99,7 @@ void OPreparedStatement::ensurePrepared()
 {
 short nItems = m_pInSqlda-sqld;
 free(m_pInSqlda);
-m_pInSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(nItems));
+m_pInSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(nItems));
 m_pInSqlda-version = SQLDA_VERSION1;
 m_pInSqlda-sqln = nItems;
 isc_dsql_describe_bind(m_statusVector,
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx 
b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 49415fa..5daa56d 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -133,7 +133,7 @@ void 
OStatementCommonBase::prepareAndDescribeStatement(const OUString sql,
 
 if (!pOutSqlda)
 {
-pOutSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(10));
+pOutSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(10));
 pOutSqlda-version = SQLDA_VERSION1;
 pOutSqlda-sqln = 10;
 }
@@ -146,68 +146,79 @@ void 
OStatementCommonBase::prepareAndDescribeStatement(const OUString sql,
 
 if (aErr)
 {
-free(pOutSqlda);
-pOutSqlda = 0;
 evaluateStatusVector(m_statusVector,
  isc_dsql_allocate_statement,
  *this);
 }
-
-aErr = isc_dsql_prepare(m_statusVector,
-m_pConnection-getTransaction(),
-m_aStatementHandle,
-0,
-OUStringToOString(sql, 
RTL_TEXTENCODING_UTF8).getStr(),
-FIREBIRD_SQL_DIALECT,
-pInSqlda);
-
-if (aErr)
+else
 {
-// TODO: free statement handle?
-free(pOutSqlda);
-pOutSqlda = 0;
-evaluateStatusVector(m_statusVector,
- isc_dsql_prepare,
- *this);
-}
-
-aErr = isc_dsql_describe(m_statusVector,
- m_aStatementHandle,
- 1,
- pOutSqlda);
+aErr = isc_dsql_prepare(m_statusVector,
+m_pConnection-getTransaction(),
+m_aStatementHandle,
+0,
+OUStringToOString(sql, 
RTL_TEXTENCODING_UTF8).getStr(),
+FIREBIRD_SQL_DIALECT,
+pInSqlda);
 
+if (aErr)
+{
+evaluateStatusVector(m_statusVector,
+ isc_dsql_prepare,
+ *this);
+}
+else
+{
+aErr = isc_dsql_describe(m_statusVector,
+ m_aStatementHandle,
+ 1,
+ pOutSqlda);
 
-if (aErr)
-{
-// TODO: free statement handle, etc.?
-free(pOutSqlda);
-pOutSqlda = 0;
-evaluateStatusVector(m_statusVector,
- isc_dsql_describe,
- *this);
+if (aErr)
+{
+// TODO: free statement handle, etc.?
+evaluateStatusVector(m_statusVector,
+ isc_dsql_describe,
+ *this);
+}
+else
+{
+// Ensure we have enough space in pOutSqlda
+if (pOutSqlda-sqld  pOutSqlda-sqln)
+{
+int n = pOutSqlda-sqld;
+free(pOutSqlda);
+pOutSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(n));
+pOutSqlda-version = SQLDA_VERSION1;
+

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

[Michael Stahl]

 xmloff/source/style/XMLClipPropertyHandler.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 924a28a7b1dc2f89e6940630057557f5f03494df
Author: Michael Stahl mst...@redhat.com
Date:   Sat Jun 28 00:09:43 2014 +0200

fdo#80009: xmloff: ignore excessive fo:clip values

These cause problems in drawinglayer, and nobody needs a 5km clip.

Change-Id: Ic485250413194adbcd0ccf855f12e89e532d7120

diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx 
b/xmloff/source/style/XMLClipPropertyHandler.cxx
index af089d7..2090462 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -81,6 +81,13 @@ bool XMLClipPropertyHandler::importXML( const OUString 
rStrImpValue, uno::Any
 !rUnitConverter.convertMeasureToCore( nVal, aToken ) )
 break;
 
+// fdo#80009 such nonsense could be written via WW8 import 
fdo#77454
+if (abs(nVal)  40)
+{
+SAL_INFO(xmloff.style, ignoring excessive clip   aToken);
+nVal = 0;
+}
+
 switch( nPos )
 {
 case 0: aCrop.Top = nVal;   break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 80009, which changed state.

Bug 80009 Summary: ODF import: enormous fo:clip values on graphics result in 
crashes in drawinglayer
https://bugs.freedesktop.org/show_bug.cgi?id=80009

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: Branch 'private/jmux/mailmerge-fixes' - sw/inc sw/source

[Jan-Marek Glogowski]

 sw/inc/doc.hxx   |3 +
 sw/inc/fesh.hxx  |2 
 sw/source/core/doc/docnew.cxx|  100 +++
 sw/source/core/frmedt/fecopy.cxx |8 ++-
 sw/source/uibase/dbui/dbmgr.cxx  |   64 ++--
 5 files changed, 97 insertions(+), 80 deletions(-)

New commits:
commit 414a112be566fe41256dfaaf8db8d3f110883cbe
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Sat Jun 28 01:41:17 2014 +0200

MM: introduce SwDoc::Append helper function

This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function.

There is still a little common codepath, therefore this adds
comments to always update both functions.

Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index be6e30a..e98370f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1883,7 +1883,10 @@ public:
 ::sw::MetaFieldManager  GetMetaFieldManager();
 ::sw::UndoManager   GetUndoManager();
 ::sw::UndoManager const GetUndoManager() const;
+
 SfxObjectShell* CreateCopy(bool bCallInitNew) const;
+void Append( const SwDoc rSource, int nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, int nPhysPageNumber );
 
 /**
  * Dumps the entire nodes structure to the given destination (file 
nodes.xml in the current directory by default)
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 2660c5a..749e735 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -219,7 +219,7 @@ public:
 
 /// Copy and Paste methods for internal clipboard.
 bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
-bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false, bool 
bIncludeFullDocument = false);
+bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false );
 
 /// Paste some pages into another doc - used in mailmerge.
 bool PastePages( SwFEShell rToFill, sal_uInt16 nStartPage, sal_uInt16 
nEndPage);
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 463cb83..4047589 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -978,7 +978,8 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 SfxObjectShell* pRetShell = new SwDocShell( pRet, SFX_CREATE_MODE_STANDARD 
);
 if( bCallInitNew )
 {
-// it could happen that DoInitNew creates model, that increases the 
refcount of the object
+// it could happen that DoInitNew creates model,
+// that increases the refcount of the object
 pRetShell-DoInitNew();
 }
 
@@ -990,30 +991,54 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) 
const
 
 pRet-ReplaceStyles(*this);
 
-// Based on the simplified codepath from SwFEShell::Paste()
+pRet-Append(*this, 0, NULL, 0);
 
+if ( bCallInitNew ) {
+// delete leading page / initial content from target document
+SwNodeIndex aDeleteIdx( pRet-GetNodes().GetEndOfExtras(), 2 );
+pRet-GetNodes().Delete( aDeleteIdx, 1 );
+}
+
+// remove the temporary shell if it is there as it was done before
+pRet-SetTmpDocShell( (SfxObjectShell*) NULL );
+
+pRet-release();
+
+return pRetShell;
+}
+
+// appends all pages of source SwDoc - based on SwFEShell::Paste( SwDoc* )
+void SwDoc::Append( const SwDoc rSource, int nStartPageNumber,
+SwPageDesc* pTargetPageDesc, int nPhysPageNumber )
+{
 // GetEndOfExtras + 1 = StartOfContent
-SwNodeIndex aSourceIdx( GetNodes().GetEndOfExtras(), 1 );
-SwPaM aCpyPam( aSourceIdx ); // DocStart
+SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
+SwPaM aCpyPam( aSourceIdx ); //DocStart
 
-SwNodeIndex aTargetIdx( pRet-GetNodes().GetEndOfContent() );
-SwPaM aInsertPam( aTargetIdx );
+// Append at the end of document / content
+SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
+SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+aTargetIdx--;
 
 aCpyPam.SetMark();
 aCpyPam.Move( fnMoveForward, fnGoDoc );
 
-pRet-LockExpFlds();
+GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
+LockExpFlds();
 
 {
+// **
+// ** refer to SwFEShell::Paste, if you change the following code **
+// **
+
 SwPosition rInsPos = *aInsertPam.GetPoint();
-SwPosition aInsertPosition( rInsPos );
 
 {
 SwNodeIndex aIndexBefore(rInsPos.nNode);
 
 aIndexBefore--;
 
-CopyRange( aCpyPam, rInsPos, true );
+rSource.CopyRange( aCpyPam, rInsPos, true );
 // Note: aCpyPam is invalid now
 
 ++aIndexBefore;
@@ -1022,37 +1047,54 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) 
const
 
 aPaM.GetDoc()-MakeUniqueNumRules(aPaM);
 
-// No need to update the rsid, as pRet is an empty doc
+ 

[Bug 70357] Sort and clean Wiki pages!

[bugzilla-daemon]

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

Bug 70357 depends on bug 71761, which changed state.

Bug 71761 Summary: Cleanup Whiteboard Wiki Page
https://bugs.freedesktop.org/show_bug.cgi?id=71761

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

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

Re: Sort and copy results

[Wols Lists]

On 27/06/14 17:22, Kohei Yoshida wrote:
 On Fri, 2014-06-06 at 12:42 +0100, Wols Lists wrote:
 Why can't LibreOffice treat it as two separate steps, INCLUDING for
 things like undo? Treat the copy as one operation, then the sort as a
 second operation, and if you need to undo it then it's two ctrl-z,
 not one?
 
 I'll take this idea.  I hope nobody will object to this.
 
Word does it (not that I consider Word a good example to copy from :-)
If Word's autocorrect kicks in, that's considered a separate action from
what the user did, so if I mis-type then Word autocorrupts, the first
ctrl-z reverses the autocorrupt, and I need a second ctrl-z to undo what
I did.

Cheers,
Wol

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

[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx|4 +++-
 sc/inc/sortparam.hxx   |3 +--
 sc/inc/table.hxx   |   10 ++
 sc/inc/undosort.hxx|4 ++--
 sc/source/core/data/documen3.cxx   |   14 +-
 sc/source/core/data/table3.cxx |   37 ++---
 sc/source/ui/docshell/dbdocfun.cxx |2 +-
 sc/source/ui/undo/undosort.cxx |4 +++-
 8 files changed, 59 insertions(+), 19 deletions(-)

New commits:
commit 80b93eeac80b902fe83dd8aa4b4c375462df3d91
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Jun 27 21:00:38 2014 -0400

More tweaking...

Change-Id: I9276fd92a90dc2689bd59b2ed7eef3d7267ff5b8

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 848e162..fef0683 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1676,7 +1676,9 @@ public:
 SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
 SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
 
-void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, 
ScProgress* pProgress, sc::SortUndoParam* pUndo );
+void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, 
ScProgress* pProgress, sc::ReorderParam* pUndo );
+void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
+
 SCSIZE  Query( SCTAB nTab, const ScQueryParam rQueryParam, bool 
bKeepSub );
 SC_DLLPUBLIC bool   CreateQueryParam( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2,
 SCTAB nTab, ScQueryParam rQueryParam 
);
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index df3a449..83a1c34 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -80,11 +80,10 @@ struct SC_DLLPUBLIC ScSortParam
 
 namespace sc {
 
-struct SC_DLLPUBLIC SortUndoParam
+struct SC_DLLPUBLIC ReorderParam
 {
 ScRange maSortRange;
 std::vectorSCCOLROW maOldIndices;
-bool mbHasHeader;
 bool mbByRow;
 bool mbIncludePattern;
 };
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 649d8e6..9f0cff2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -73,7 +73,7 @@ class RowHeightContext;
 class CompileFormulaContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
-struct SortUndoParam;
+struct ReorderParam;
 
 }
 
@@ -826,7 +826,9 @@ public:
 voidExtendHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
 
 void Sort(
-const ScSortParam rSortParam, bool bKeepQuery, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
+const ScSortParam rSortParam, bool bKeepQuery, ScProgress* pProgress, 
sc::ReorderParam* pUndo );
+void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
+
 bool ValidQuery(
 SCROW nRow, const ScQueryParam rQueryParam, ScRefCellValue* pCell = 
NULL,
 bool* pbTestEqualCondition = NULL);
@@ -1021,8 +1023,8 @@ private:
 short   Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2) 
const;
 ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2, bool 
bKeepQuery );
 voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
-void SortReorderByColumn( ScSortInfoArray* pArray, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
-void SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress, 
sc::SortUndoParam* pUndo );
+void SortReorderByColumn( ScSortInfoArray* pArray, ScProgress* pProgress );
+void SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress );
 
 boolCreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScQueryParam rQueryParam);
 boolCreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScQueryParam rQueryParam);
diff --git a/sc/inc/undosort.hxx b/sc/inc/undosort.hxx
index d7a4512..fb8fbeb 100644
--- a/sc/inc/undosort.hxx
+++ b/sc/inc/undosort.hxx
@@ -17,10 +17,10 @@ namespace sc {
 
 class UndoSort : public ScSimpleUndo
 {
-SortUndoParam maParam;
+ReorderParam maParam;
 
 public:
-UndoSort( ScDocShell* pDocSh, const SortUndoParam rParam );
+UndoSort( ScDocShell* pDocSh, const ReorderParam rParam );
 
 virtual OUString GetComment() const;
 virtual void Undo();
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 38162ce..1486092 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1336,7 +1336,7 @@ bool ScDocument::UpdateOutlineRow( SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab, b
 }
 
 void ScDocument::Sort(
-SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, ScProgress* 
pProgress, sc::SortUndoParam* pUndo )
+SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, ScProgress* 
pProgress, sc::ReorderParam* pUndo )
 {
 if ( ValidTab(nTab)  nTab  static_castSCTAB(maTabs.size())  
maTabs[nTab] )
 {
@@ -1347,6 +1347,18 @@ void ScDocument::Sort(
 }
 }
 
+void 

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

[David Tardon]

 connectivity/source/drivers/odbc/OPreparedStatement.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6af39266090773950a1e0de64d6b7487fcd38ad3
Author: David Tardon dtar...@redhat.com
Date:   Sat Jun 28 07:22:23 2014 +0200

WaE: null argument where non-null required (argument 2)

Change-Id: I3eb71120aed85a4ec2c697d149006bce063d983e

diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index e2bf7ce..c40c665 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -354,7 +354,8 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
 nCharLen = u.size();
 nByteLen = 4 * nCharLen;
 pData = allocBindBuf(parameterIndex, nByteLen);
-memcpy(pData, u.empty() ? 0 : u[0], nByteLen);
+if (!u.empty())
+memcpy(pData, u[0], nByteLen);
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3934ec179f1b14c92ae7acc998318564ef06d3f2
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Jun 28 07:29:56 2014 +0200

revert forcing system-odbc on MAc as Maverick dropped system support

We prolly need to look at iODBC and how to carry the headers
as 'external'
Note the dylib for runtime are still in 10.9

Change-Id: I6cad2b90fcb61b5787c0599e40d48a74b8ff917a

diff --git a/configure.ac b/configure.ac
index 4da7afc..c3cc055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8797,7 +8797,7 @@ dnl 
===
 dnl Check for system odbc
 dnl ===
 AC_MSG_CHECKING([which odbc headers to use])
-if test $with_system_odbc = yes -o $_os = Darwin ; then
+if test $with_system_odbc = yes ; then
 AC_MSG_RESULT([external])
 SYSTEM_ODBC_HEADERS=TRUE
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits