date:20140829

 sc/qa/unit/helper/qahelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 214fd01ba451f10226c703d3f2337ad4f42a378c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 08:37:03 2014 +0200

Fix signature of dummy non-ORCUS implementation

Change-Id: I8ff7d0d8d4f5bfd4426bd3878f77eda714d0f01d

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 6f02e9f..b5d9a17 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -160,7 +160,7 @@ void testCondFile(OUString aFileName, ScDocument* pDoc, 
SCTAB nTab)
 
 #else
 
-void testFile(OUString, ScDocument*, SCTAB, StringType) {}
+void testFile(OUString, ScDocument, SCTAB, StringType) {}
 void testCondFile(OUString, ScDocument*, SCTAB) {}
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Jennifer Liebel license statement

2014-08-29 Thread Jennifer Liebel

Hi,

all my current and past contributions made to the LibreOffice project
may be licensed under the MPLv2/LGPLv3+ dual license.

Until further notice, all my future contributions to the LibreOffice
project are available under the MPLv2/LGPLv3+ dual license.

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

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

2014-08-29 Thread Maxim Monastirsky

 sw/source/uibase/shells/annotsh.cxx  |2 +-
 sw/source/uibase/shells/drwtxtex.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6045c38f86fc6e96610dcd9a055892af21ea2629
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Fri Aug 29 02:31:42 2014 +0300

Avoid crash when no args specified

Change-Id: Id3d10566af674f02f3734f981e6b4b45b528ed92

diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 5c74c35..7ead827 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -467,7 +467,7 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
 {
 const SfxItemSet* pArgs = rReq.GetArgs();
 const SfxStringItem* pItem = 0;
-if (nSlot == SID_CHAR_DLG)
+if (pArgs  nSlot == SID_CHAR_DLG)
 pItem = static_cast const SfxStringItem* 
(pArgs-GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
 
 if( !pArgs || pItem )
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 84b1fa5..fef670e 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -299,7 +299,7 @@ void SwDrawTextShell::Execute( SfxRequest rReq )
 {
 const SfxItemSet* pArgs = rReq.GetArgs();
 const SfxStringItem* pItem = 0;
-if (nSlot == SID_CHAR_DLG)
+if (pArgs  nSlot == SID_CHAR_DLG)
 pItem = static_cast const SfxStringItem* 
(pArgs-GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
 
 if( !pArgs || pItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: UNO Writer: Merging cells results in wrong column count from XTextTable

On Thu, Aug 28, 2014 at 03:35:08PM -0400, Grover Blue grover.b...@gmail.com 
wrote:
 So, really, I want to grab all rows and find the max columns count among
 them.

Correct. In an idea world there would be no SwXTableColumns::getCount()
at all IMHO. :)


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

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

2014-08-29 Thread Rohit Deshmukh

 sw/qa/extras/ooxmlexport/data/fdo83044.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   14 --
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 96dc17221c286dd02772f1dd54b4ffc3c3091b9a
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date:   Wed Aug 27 12:43:29 2014 +0530

fdo#83044:Fix for corruption of file with SDT content.

Issue:
  w:text has a wrong child w:docPartGallery and w:docPartUnique.

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

diff --git a/sw/qa/extras/ooxmlexport/data/fdo83044.docx 
b/sw/qa/extras/ooxmlexport/data/fdo83044.docx
new file mode 100644
index 000..01d32bf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo83044.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f843c24..3cda4ce 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -201,6 +201,15 @@ DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, 
first-header-footer.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(Even page footer 2),  
parseDump(/root/page[6]/footer/txt/text()));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFDO83044, fdo83044.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+
+if (!pXmlDoc)
+   return;
+
+assertXPath(pXmlDoc, /w:document/w:body/w:sdt/w:sdtPr/w:text, 1);
+}
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3e78a1a..b4587e8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -632,12 +632,14 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32 
nSdtPrToken,
 pSdtPrTokenAttributes = 0;
 }
 
-uno::Sequencexml::FastAttribute aChildren = 
pSdtPrTokenChildren-getFastAttributes();
-for( sal_Int32 i=0; i  aChildren.getLength(); ++i )
-m_pSerializer-singleElement( aChildren[i].Token,
-  FSNS(XML_w, XML_val),
-  rtl::OUStringToOString( 
aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
-  FSEND );
+if (nSdtPrToken ==  FSNS( XML_w, XML_date ) || nSdtPrToken ==  
FSNS( XML_w, XML_docPartObj ) || nSdtPrToken ==  FSNS( XML_w, XML_docPartList ) 
|| nSdtPrToken ==  FSNS( XML_w14, XML_checkbox )) {
+uno::Sequencexml::FastAttribute aChildren = 
pSdtPrTokenChildren-getFastAttributes();
+for( sal_Int32 i=0; i  aChildren.getLength(); ++i )
+m_pSerializer-singleElement( aChildren[i].Token,
+  FSNS(XML_w, XML_val),
+  rtl::OUStringToOString( 
aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
+  FSEND );
+}
 
 m_pSerializer-endElement( nSdtPrToken );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39674] find / fix all German spellings in internal APIs

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

--- Comment #15 from je...@live.de ---
Committed a patch related to this issue. Translated German to English in
sc/source/core/tool/interpr2.cxx
https://gerrit.libreoffice.org/#/c/11184/

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

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

2014-08-29 Thread Michael Stahl

 RepositoryModule_host.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a02f846aac48eddca5e9a7d8d841a11bca6d8a9d
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 26 13:17:44 2014 +0200

gbuild: serialize linking on make check too

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

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 86ddf1f..1ba50ec 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -180,7 +180,7 @@ endef
 # otherwise cyclic dependencies ruin everything.
 # do not serialize on a partial build as that may fail due to missing deps.
 # the default goal is all (see Module.mk)
-ifeq (,$(filter-out all,$(MAKECMDGOALS)))
+ifeq (,$(filter-out all build check unitcheck slowcheck 
subsequentcheck,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
scfilt scopencl \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
___
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' - oox/source

2014-08-29 Thread Tomaž Vajngerl

 oox/source/export/drawingml.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit eed9b96cd65816f2f03b3ad00994d26d6a3cf783
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Aug 28 13:32:38 2014 +0200

bnc#822347: if number type is not set, skip numbering

If numbering is detected then (level is  0) and the number type
is not set, the defult bullet symbol is written. This is not
correct as the default should be SVX_NUM_NUMBER_NONE which should
skip numbering or set it to none. With this change the numbering
is skipped (as in MSO).

(cherry picked from commit 14fa2698f2f651343675761e75be01b84c4c5ff1)

Conflicts:
oox/source/export/drawingml.cxx

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

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fe55aa8..2ef0d1f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1458,7 +1458,7 @@ void DrawingML::WriteParagraphNumbering( Reference 
XPropertySet  rXPropSet, sa
 
 if ( nPropertyCount ) {
 
-sal_Int16 nNumberingType = -1;
+sal_Int16 nNumberingType = SVX_NUM_NUMBER_NONE;
 bool bSDot = false;
 bool bPBehind = false;
 bool bPBoth = false;
@@ -1520,6 +1520,9 @@ void DrawingML::WriteParagraphNumbering( Reference 
XPropertySet  rXPropSet, sa
 }
 }
 
+if (nNumberingType == SVX_NUM_NUMBER_NONE)
+return;
+
 const char* pAutoNumType = GetAutoNumType( nNumberingType, 
bSDot, bPBehind, bPBoth );
 
 if( nLevel = 0 ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-icu11131.patch.1 |   46 
 svtools/source/control/ctrlbox.cxx  |3 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit d54b2bd8dcc393bb168386a5c0ec4ce40bb3c6d4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 29 09:27:01 2014 +0100

Resolves: fdo#83068 ignore spaces in font-size unit detection

Change-Id: Id9a5c2ee576bd533d8b0a2b4356e319354abbbac

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 10f1049..097e73a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -19,6 +19,7 @@
 
 #include config_folders.h
 
+#include i18nutil/unicode.hxx
 #include tools/stream.hxx
 #include vcl/builder.hxx
 #include vcl/svapp.hxx
@@ -1604,7 +1605,7 @@ void FontSizeBox::Modify()
 const sal_Unicode* pStr = aStr.getStr();
 while ( *pStr )
 {
-if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%') )
+if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%')  
!unicode::isSpace(*pStr) )
 {
 if ( ('-' == *pStr || '+' == *pStr)  !bPtRelative )
 bPtRelative = true;
commit f3cbb539e5d8e042432ab2ee9c90a3ad8c9ade5a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 29 09:21:03 2014 +0100

icu#11131 coverity warnings

Change-Id: I67d0b4b0c39c62646c7a0ae7152c7ca256680c38

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 3f9eda2..0f6ecd1 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu-ubsan.patch.0 \
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
+   external/icu/icu4c-icu11131.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11131.patch.1 
b/external/icu/icu4c-icu11131.patch.1
new file mode 100644
index 000..58364b0
--- /dev/null
+++ b/external/icu/icu4c-icu11131.patch.1
@@ -0,0 +1,46 @@
+--- icu/source/i18n/smpdtfmt.cpp.orig  2014-08-27 10:29:29.849821672 +0530
 icu/source/i18n/smpdtfmt.cpp   2014-08-27 10:29:49.323821401 +0530
+@@ -1082,6 +1082,7 @@
+ }
+ } else {
+ status = U_MEMORY_ALLOCATION_ERROR;
++return;
+ }
+ }
+ umtx_unlock(LOCK);
+--- icu/source/common/usprep.cpp.orig  2014-08-27 10:38:24.360821077 +0530
 icu/source/common/usprep.cpp   2014-08-27 10:38:38.696821312 +0530
+@@ -796,16 +796,23 @@ usprep_prepare(   const UStringPrepProfi
+ }
+ 
+ CLEANUP:
+-if(b1!=b1Stack){
+-uprv_free(b1);
+-b1=NULL;
+-}
+-
+-if(b2!=b1Stack  b2!=b2Stack  b2!=b1 /* b1 should not be freed twice 
*/){
+-uprv_free(b2);
+-b2=NULL;
+-}
+-return u_terminateUChars(dest, destCapacity, b2Len, status);
++  if(b2==b1  b1!=b1Stack){
++  uprv_free(b1);
++  b1=NULL;
++  b2=NULL;
++  }
++  else
++  {
++  if(b1!=b1Stack){
++  uprv_free(b1);
++  b1=NULL;
++  }
++  if(b2!=b1Stack  b2!=b2Stack  b2!=b1 /* b1 should not be 
freed twice */){
++  uprv_free(b2);
++  b2=NULL;
++  }
++  }
++  return u_terminateUChars(dest, destCapacity, b2Len, status);
+ }
+ 
+ 
___
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' - svtools/source

 svtools/source/control/ctrlbox.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5fedcf7fe56a56475dea484a78971c504e52272
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 29 09:27:01 2014 +0100

Resolves: fdo#83068 ignore spaces in font-size unit detection

Change-Id: Id9a5c2ee576bd533d8b0a2b4356e319354abbbac
(cherry picked from commit d54b2bd8dcc393bb168386a5c0ec4ce40bb3c6d4)
Reviewed-on: https://gerrit.libreoffice.org/11186
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index d54dcb4..415750b 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -19,6 +19,7 @@
 
 #include config_folders.h
 
+#include i18nutil/unicode.hxx
 #include tools/stream.hxx
 #include vcl/builder.hxx
 #include vcl/svapp.hxx
@@ -1724,7 +1725,7 @@ void FontSizeBox::Modify()
 const sal_Unicode* pStr = aStr.getStr();
 while ( *pStr )
 {
-if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%') )
+if ( ((*pStr  '0') || (*pStr  '9'))  (*pStr != '%')  
!unicode::isSpace(*pStr) )
 {
 if ( ('-' == *pStr || '+' == *pStr)  !bPtRelative )
 bPtRelative = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sc/uiconfig sd/uiconfig sfx2/source sw/uiconfig

2014-08-29 Thread Samuel Mehrbrodt

 include/sfx2/sfx.hrc |6 --
 include/sfx2/viewfrm.hxx |1 +
 sc/uiconfig/scalc/toolbar/standardbar.xml|2 --
 sc/uiconfig/scalc/toolbar/viewerbar.xml  |1 -
 sd/uiconfig/sdraw/toolbar/standardbar.xml|2 --
 sd/uiconfig/sdraw/toolbar/viewerbar.xml  |1 -
 sfx2/source/view/view.src|   12 +++-
 sfx2/source/view/viewfrm.cxx |   18 --
 sw/uiconfig/sglobal/toolbar/standardbar.xml  |2 --
 sw/uiconfig/sglobal/toolbar/viewerbar.xml|1 -
 sw/uiconfig/sweb/toolbar/standardbar.xml |2 --
 sw/uiconfig/sweb/toolbar/viewerbar.xml   |1 -
 sw/uiconfig/swform/toolbar/standardbar.xml   |2 --
 sw/uiconfig/swform/toolbar/viewerbar.xml |1 -
 sw/uiconfig/swreport/toolbar/standardbar.xml |2 --
 sw/uiconfig/swreport/toolbar/viewerbar.xml   |1 -
 sw/uiconfig/swriter/toolbar/standardbar.xml  |2 --
 sw/uiconfig/swriter/toolbar/viewerbar.xml|1 -
 sw/uiconfig/swxform/toolbar/standardbar.xml  |2 --
 sw/uiconfig/swxform/toolbar/viewerbar.xml|1 -
 20 files changed, 32 insertions(+), 29 deletions(-)

New commits:
commit c6270de939d5ee51b61dc4ac02c52f1d9b5b1e47
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Fri Aug 29 00:35:07 2014 +0200

fdo#80538 Show an infobar when document is in read-only mode

and remove the Edit icon from the toolbar

Change-Id: I27d9506bd0fb76b3f1ad056a9866f7744674a3e2
Reviewed-on: https://gerrit.libreoffice.org/11182
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 6c8d6e1..6909d1c 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -151,8 +151,10 @@
 #define STR_PASSWD_MIN_LEN  (RID_SFX_START+124)
 #define STR_NONCHECKEDOUT_DOCUMENT  (RID_SFX_START+125)
 #define BT_CHECKOUT (RID_SFX_START+126)
-#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127)
-#define STR_MODULENOTINSTALLED  (RID_SFX_START+128)
+#define BT_READONLY_EDIT(RID_SFX_START+127)
+#define STR_READONLY_DOCUMENT   (RID_SFX_START+128)
+#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129)
+#define STR_MODULENOTINSTALLED  (RID_SFX_START+130)
 #define STR_ACCTITLE_PRODUCTIVITYTOOLS  (RID_SFX_START+157)
 
 #define SFX_THUMBNAIL_TEXT  (RID_SFX_START+158)
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 16088cd..919ed9d 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -77,6 +77,7 @@ private:
 protected:
 virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint 
) SAL_OVERRIDE;
 
+DECL_LINK( SwitchReadOnlyHandler, void * );
 SAL_DLLPRIVATE void KillDispatcher_Impl();
 
 virtual ~SfxViewFrame();
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 5368218..84c9f16 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
  toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:SendMail/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:EditDoc/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ExportDirectToPDF/
  toolbar:toolbaritem xlink:href=.uno:PrintDefault toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:Print/
diff --git a/sc/uiconfig/scalc/toolbar/viewerbar.xml 
b/sc/uiconfig/scalc/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sc/uiconfig/scalc/toolbar/viewerbar.xml
+++ b/sc/uiconfig/scalc/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
 toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; 
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
  toolbar:toolbaritem xlink:href=.uno:SaveAs/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:EditDoc/
  toolbar:toolbaritem xlink:href=.uno:SendMail/
  toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ExportDirectToPDF/
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml 
b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 8b8af1f..589be80 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
  toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false 
toolbar:helpid=5502/
  toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:helpid=5331/
  toolbar:toolbarseparator/
- toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312/
- toolbar:toolbarseparator/
  toolbar:toolbaritem xlink:href=.uno:ExportDirectToPDF 
toolbar:helpid=6674/
  toolbar:toolbaritem xlink:href=.uno:PrintDefault toolbar:visible=false/
  toolbar:toolbaritem xlink:href=.uno:Print/
diff --git

Re: Patch for compilation against boost-1.56.0

On Thu, 2014-08-28 at 12:46 +0200, Thomas Klausner wrote:
 Hi!
 
 Jörg Sonnenberger made a patch fixing the compilation of
 libreoffice-4.2.5.2 against boost-1.56.0. I've applied the patches to
 git head (only one patch needed slight modifications). The result is
 attached.

...

 Please integrate this.

Done, thanks.

C.

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

[Libreoffice-commits] core.git: canvas/source dbaccess/source oox/source reportdesign/source slideshow/source

2014-08-29 Thread Jörg Sonnenberger

 canvas/source/cairo/cairo_spritecanvashelper.cxx|3 ++-
 canvas/source/vcl/spritecanvashelper.cxx|4 ++--
 dbaccess/source/ui/tabledesign/TableController.cxx  |3 ++-
 oox/source/drawingml/table/tablecell.cxx|4 ++--
 reportdesign/source/core/api/ReportDefinition.cxx   |3 ++-
 slideshow/source/engine/activities/activitybase.hxx |2 +-
 slideshow/source/engine/rehearsetimingsactivity.cxx |3 ++-
 slideshow/source/engine/shapes/appletshape.cxx  |6 --
 slideshow/source/engine/shapes/drawshape.cxx|4 ++--
 slideshow/source/engine/shapes/mediashape.cxx   |3 ++-
 slideshow/source/engine/unoviewcontainer.cxx|3 ++-
 11 files changed, 23 insertions(+), 15 deletions(-)

New commits:
commit 45dfbdca6a9afba1a6aef21623ec025ded635a4d
Author: JÃ¶rg Sonnenberger jo...@netbsd.org
Date:   Thu Aug 28 12:18:43 2014 +0200

Fix build with boost-1.56.0.

Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner w...@netbsd.org

diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx 
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index eb33f8f..741dbb3 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -402,11 +402,12 @@ namespace cairocanvas
 ::basegfx::computeSetDifference( aUncoveredAreas,
  rUpdateArea.maTotalBounds,
  ::basegfx::B2DRange( rDestRect ) );
+SurfaceSharedPtr surface(mpOwningSpriteCanvas-getBufferSurface());
 ::std::for_each( aUncoveredAreas.begin(),
  aUncoveredAreas.end(),
  ::boost::bind( repaintBackground,
 boost::cref(pCompositingCairo),
-
boost::cref(mpOwningSpriteCanvas-getBufferSurface()),
+boost::cref(surface),
 _1 ) );
 
 cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() 
);
diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 13ae629..e2ded77 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -573,12 +573,12 @@ namespace vclcanvas
 
 // repaint all affected sprites on top of background into
 // VDev.
+::basegfx::B2DPoint outPos( 
::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
 ::std::for_each( rSortedUpdateSprites.begin(),
  rSortedUpdateSprites.end(),
  ::boost::bind( spriteRedrawStub2,
 ::boost::ref( maVDev.get() ),
-::boost::cref(
-
::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
+::boost::cref( outPos ),
 _1 ) );
 
 // flush to screen
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index d51d1bc..14f24e6 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1396,7 +1396,8 @@ void OTableController::assignTable()
 setEditable( xMeta.is()  !xMeta-isReadOnly()  
(isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
 if(!isEditable())
 {
-
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( 
OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
+sal_Bool t( sal_True );
+
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( 
OTableRow::SetReadOnly, _1, boost::cref( t )));
 }
 m_bNew = false;
 // be notified when the table is in disposing
diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index e91f5b8..033434a 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml::FillProperties 
rFillProperties,
 if (rTableStylePart.getTextColor().isUsed())
 aTextCharProps.maCharColor = rTableStylePart.getTextColor();
 if( rTableStylePart.getTextBoldStyle().is_initialized() )
-aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
+aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
 if( rTableStylePart.getTextItalicStyle().is_initialized() )
-aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
+aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
 }
 
 void

About the location of the Help forbidden word in dialogs

2014-08-29 Thread Olivier Hallot

Hi

The straight question is: is there a rule to place the help forbidden
word in a dialog?

Some dialogs (most of them actually) have OK-Cancel-Help layout and
others have Help-OK-Cancel (often seen in Draw).

Some wizzards have other layouts for the Help forbidden word.

If there is a rule, what is it?

If not, then what to do? (leave it as is?)

Regards
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: UNO Writer: Merging cells results in wrong column count from XTextTable

2014-08-29 Thread Jan-Marek Glogowski



Am 29.08.2014 10:06, schrieb Miklos Vajna:
 On Thu, Aug 28, 2014 at 03:35:08PM -0400, Grover Blue grover.b...@gmail.com 
 wrote:
 So, really, I want to grab all rows and find the max columns count among
 them.
 
 Correct. In an idea world there would be no SwXTableColumns::getCount()
 at all IMHO. :)
 

| |  |
--
|  | |

Hmm - from my POV you would have 3 columns in this example.

Probably we should mark SwXTableColumns::getCount() as deprecated and
drop it in the next major update?

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

[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering_attempt3' - 31 commits - include/tools sc/inc sc/source

2014-08-29 Thread Andrzej Hunt

 include/tools/mapunit.hxx|   26 +
 sc/inc/editutil.hxx  |7 
 sc/source/core/tool/editutil.cxx |   57 ++--
 sc/source/ui/docshell/docsh4.cxx |   24 -
 sc/source/ui/inc/output.hxx  |   73 -
 sc/source/ui/inc/viewdata.hxx|   20 -
 sc/source/ui/view/colrowba.cxx   |   25 +
 sc/source/ui/view/gridwin3.cxx   |   24 -
 sc/source/ui/view/gridwin4.cxx   |  187 +
 sc/source/ui/view/output.cxx |  201 +++---
 sc/source/ui/view/output2.cxx|  530 +++
 sc/source/ui/view/viewdata.cxx   |  271 ++-
 12 files changed, 873 insertions(+), 572 deletions(-)

New commits:
commit 9bf68bb547b1c3e10307cc2b9a2b092bce0f74f8
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Fri Aug 29 11:47:55 2014 +0200

TEMPORARY: more twips in ScOutputData.

Some parts are working, some aren't.

Change-Id: I69b63a585e971a4a56514a66ab318e48507ca5be

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 917309f..92ee91c 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3198,9 +3198,11 @@ bool ScOutputData::Clip( DrawEditParam rParam, const 
Size aCellSize,
 aAreaParam.maClipRect.Left() = nScrX;
 aAreaParam.mbLeftClip = true;
 }
-if ( aAreaParam.maClipRect.Right()  nScrX + nScrW )
+if ( aAreaParam.maClipRect.Right() 
+ nScrX + LogicToPixelHorizontal(nScrWTwips ) )
 {
-aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
+aAreaParam.maClipRect.Right() = nScrX +
+LogicToPixelHorizontal( nScrWTwips );  //! minus one?
 aAreaParam.mbRightClip = true;
 }
 
@@ -3218,9 +3220,11 @@ bool ScOutputData::Clip( DrawEditParam rParam, const 
Size aCellSize,
 aAreaParam.maClipRect.Top() = nScrY;
 bClip = true;
 }
-if ( aAreaParam.maClipRect.Bottom()  nScrY + nScrH )
+if ( aAreaParam.maClipRect.Bottom() 
+ nScrY + LogicToPixelVertical( nScrHTwips ) )
 {
-aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+aAreaParam.maClipRect.Bottom() = nScrY +
+LogicToPixelVertical( nScrHTwips ); //! minus one?
 bClip = true;
 }
 
@@ -3282,7 +3286,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam 
rParam)
 //! mirror margin values for RTL?
 //! move margin down to after final GetOutputArea call
 long nTopM, nLeftM, nBottomM, nRightM;
-rParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, mnPPTX, mnPPTY);
+rParam.calcMargins( nTopM, nLeftM, nBottomM, nRightM );
 
 SCCOL nXForPos = rParam.mnX;
 if ( nXForPos  nX1 )
@@ -3312,7 +3316,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam 
rParam)
rParam.mbCellIsValue, true, false, aAreaParam );
 
 //! special ScEditUtil handling if formatting for printer
-rParam.calcPaperSize(aPaperSize, aAreaParam.maAlignRect, mnPPTX, 
mnPPTY);
+rParam.calcPaperSize( aPaperSize, aAreaParam.maAlignRect );
 }
 if (rParam.mbPixelToLogic)
 {
@@ -3444,7 +3448,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam 
rParam)
 nStartX += nLeftM;
 }
 
-const bool bOutside = (aAreaParam.maClipRect.Right()  nScrX || 
aAreaParam.maClipRect.Left() = nScrX + nScrW);
+const bool bOutside = (aAreaParam.maClipRect.Right()  nScrX || 
aAreaParam.maClipRect.Left() = nScrX + nScrWTwips);
 if (bOutside)
 return;
 
@@ -3542,7 +3546,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam 
rParam)
 //! mirror margin values for RTL?
 //! move margin down to after final GetOutputArea call
 long nTopM, nLeftM, nBottomM, nRightM;
-rParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, mnPPTX, mnPPTY);
+rParam.calcMargins( nTopM, nLeftM, nBottomM, nRightM );
 
 SCCOL nXForPos = rParam.mnX;
 if ( nXForPos  nX1 )
@@ -3572,7 +3576,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam 
rParam)
rParam.mbCellIsValue, true, false, aAreaParam );
 
 //! special ScEditUtil handling if formatting for printer
-rParam.calcPaperSize(aPaperSize, aAreaParam.maAlignRect, mnPPTX, 
mnPPTY);
+rParam.calcPaperSize( aPaperSize, aAreaParam.maAlignRect );
 }
 if (rParam.mbPixelToLogic)
 {
@@ -3706,7 +3710,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam 
rParam)
 nStartX += nLeftM;
 }
 
-const bool bOutside = (aAreaParam.maClipRect.Right()  nScrX || 
aAreaParam.maClipRect.Left() = nScrX + nScrW);
+const bool bOutside = (aAreaParam.maClipRect.Right()  nScrX || 
aAreaParam.maClipRect.Left() = nScrX + nScrWTwips);
 if (bOutside)
 return;
 
@@ -3809,7 +3813,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam rParam)
 //! mirror margin values for RTL?
 //! move margin down to after final GetOutputArea call
 long nTopM, nLeftM, nBottomM,

Re: [Libreoffice-commits] core.git: canvas/source dbaccess/source oox/source reportdesign/source slideshow/source

2014-08-29 Thread Thorsten Behrens

Jörg Sonnenberger wrote:
 +SurfaceSharedPtr surface(mpOwningSpriteCanvas-getBufferSurface());
  ::std::for_each( aUncoveredAreas.begin(),
   aUncoveredAreas.end(),
   ::boost::bind( repaintBackground,
  boost::cref(pCompositingCairo),
 -
 boost::cref(mpOwningSpriteCanvas-getBufferSurface()),
 +boost::cref(surface),
  _1 ) );

If you need a local variable anyway - why not insted getting rid of
the boost::cref and pass the parameter by value in the first place?

e.g. , mpOwningSpriteCanvas-getBufferSurface(), _1 ... ?

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: avmedia/source configure.ac download.lst external/libgltf include/vcl RepositoryExternal.mk vcl/source

2014-08-29 Thread Zolnai Tamás

 RepositoryExternal.mk|8 
 avmedia/source/opengl/oglframegrabber.hxx|4 --
 avmedia/source/opengl/oglplayer.cxx  |   16 +++-
 avmedia/source/opengl/oglplayer.hxx  |6 +--
 avmedia/source/opengl/oglwindow.cxx  |   36 +-
 avmedia/source/opengl/oglwindow.hxx  |6 ---
 configure.ac |2 -
 download.lst |4 +-
 external/libgltf/UnpackedTarball_libgltf.mk  |2 -
 external/libgltf/patches/append_shader_version.patch |   37 ---
 external/libgltf/patches/missing_include.patch   |   11 -
 include/vcl/opengl/OpenGLContext.hxx |2 +
 vcl/source/opengl/OpenGLContext.cxx  |6 +++
 13 files changed, 47 insertions(+), 93 deletions(-)

New commits:
commit a60cc580212e2770c3aef7decfa09b64d4a3e52f
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Aug 29 11:55:23 2014 +0200

Upgrade libgltf to 0.0.1

News in this version:
- Solve some limitations of walkthrough mode (fdo#81425)
- Multisampling (better rendering quality, mainly at the edges)
- Better error handling (no crash in case of invalid input file)

Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794
Reviewed-on: https://gerrit.libreoffice.org/11179
Reviewed-by: Zolnai TamÃ¡s tamas.zol...@collabora.com
Tested-by: Zolnai TamÃ¡s tamas.zol...@collabora.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 05e1e05..1350449 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3352,11 +3352,6 @@ $(call gb_LinkTarget_use_external_project,$(1),libgltf)
 
 endef
 
-define gb_ExternalProject__use_libgltf
-$(call gb_ExternalProject_use_external_project,$(1),libgltf)
-
-endef
-
 else # SYSTEM_LIBGLTF
 
 define gb_LinkTarget__use_libgltf
@@ -3365,9 +3360,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(LIBGLTF_CFLAGS) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
-$(call gb_LinkTarget_add_defs,$(1),\
-   -DSYSTEM_LIBGLTF \
-)
 
 endef
 
diff --git a/avmedia/source/opengl/oglframegrabber.hxx 
b/avmedia/source/opengl/oglframegrabber.hxx
index 0d38224..5beb15b 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -14,11 +14,7 @@
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/media/XFrameGrabber.hpp
 
-#ifdef SYSTEM_LIBGLTF
-#include libgltf/libgltf.h
-#else
 #include libgltf.h
-#endif
 
 namespace avmedia { namespace ogl {
 
diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index ff766e3..0b7e242 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -262,6 +262,12 @@ uno::Reference media::XPlayerWindow  SAL_CALL 
OGLPlayer::createPlayerWindow( c
 return uno::Reference media::XPlayerWindow ();
 }
 
+if( !m_aContext.supportMultiSampling() )
+{
+SAL_WARN(avmedia.opengl, Context does not support multisampling!);
+return uno::Reference media::XPlayerWindow ();
+}
+
 if( !lcl_CheckOpenGLRequirements() )
 {
 SAL_WARN(avmedia.opengl, Your platform does not have the minimal 
OpenGL requiremenets!);
@@ -280,7 +286,7 @@ uno::Reference media::XPlayerWindow  SAL_CALL 
OGLPlayer::createPlayerWindow( c
 releaseInputFiles();
 if( nRet != 0 )
 {
-SAL_WARN(avmedia.opengl, Error occured while parsing *.json file! 
Error code:   nRet);
+SAL_WARN(avmedia.opengl, Error occured while setting up the scene! 
Error code:   nRet);
 return uno::Reference media::XPlayerWindow ();
 }
 // The background color is white by default, but we need to separate the
@@ -302,6 +308,12 @@ uno::Reference media::XFrameGrabber  SAL_CALL 
OGLPlayer::createFrameGrabber()
 return uno::Reference media::XFrameGrabber ();
 }
 
+if( !m_aContext.supportMultiSampling() )
+{
+SAL_WARN(avmedia.opengl, Context does not support multisampling!);
+return uno::Reference media::XFrameGrabber ();
+}
+
 if( !lcl_CheckOpenGLRequirements() )
 {
 SAL_WARN(avmedia.opengl, Your platform does not have the minimal 
OpenGL requiremenets!);
@@ -317,7 +329,7 @@ uno::Reference media::XFrameGrabber  SAL_CALL 
OGLPlayer::createFrameGrabber()
 releaseInputFiles();
 if( nRet != 0 )
 {
-SAL_WARN(avmedia.opengl, Error occured while parsing *.json file! 
Error code:   nRet);
+SAL_WARN(avmedia.opengl, Error occured while setting up the scene! 
Error code:   nRet);
 return uno::Reference media::XFrameGrabber ();
 }
 glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
diff --git a/avmedia/source/opengl/oglplayer.hxx 
b/avmedia/source/opengl/oglplayer.hxx
index 75e2964..e7a4ecc 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++

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

 external/libmwaw/UnpackedTarball_libmwaw.mk |1 +
 external/libmwaw/ubsan.patch.0  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 7a1d8c2187300aaa24d3aea239360bc360d8c950
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 12:20:00 2014 +0200

external/libmwaw: Invalid downcasts to libmwaw_applepict2::OpCode

cf. https://sourceforge.net/p/libmwaw/tickets/6/

Change-Id: Id59fc23ab25a8b4e12a96a0eb88d091cc5ae6e25

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index c1b7db7..cfa63c5 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\

external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
external/libmwaw/0001-msvc2013-does-not-like-this.patch \

external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch \
+   external/libmwaw/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ubsan.patch.0 b/external/libmwaw/ubsan.patch.0
new file mode 100644
index 000..26f1d96
--- /dev/null
+++ b/external/libmwaw/ubsan.patch.0
@@ -0,0 +1,11 @@
+See https://sourceforge.net/p/libmwaw/tickets/6/attachment/minimal.patch:
+--- src/lib/MWAWPictMac.cxx
 src/lib/MWAWPictMac.cxx
+@@ -1060,7 +1060,6 @@
+ if (type5==WP_NONE) return;
+ else m_types.push_back(type5);
+   }
+-  virtual ~OpCode() {}
+ 
+   /** tries to read the data in the file
+*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7da6716e98f22d6cb968c3218b5f4936f868a977
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 29 11:29:36 2014 +0100

sigh, simply forgot to include the endian header

so the ppc64 bridge was broken

Change-Id: Ib60274ed25531f500bcd97f5ea9b04091ce01825

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 430999f..ee95c9c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -21,7 +21,7 @@
 #include com/sun/star/uno/genfunc.hxx
 #include uno/data.h
 #include typelib/typedescription.hxx
-
+#include osl/endian.h
 #include bridges/cpp_uno/shared/bridge.hxx
 #include bridges/cpp_uno/shared/cppinterfaceproxy.hxx
 #include bridges/cpp_uno/shared/types.hxx
___
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' - bridges/source

 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23b26d26d5e75d43a9ff298a48aacd722e8578ff
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 29 11:29:36 2014 +0100

sigh, simply forgot to include the endian header

so the ppc64 bridge was broken

Change-Id: Ib60274ed25531f500bcd97f5ea9b04091ce01825
(cherry picked from commit 7da6716e98f22d6cb968c3218b5f4936f868a977)
Reviewed-on: https://gerrit.libreoffice.org/11188
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index eaee739..acee17d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -21,7 +21,7 @@
 #include com/sun/star/uno/genfunc.hxx
 #include uno/data.h
 #include typelib/typedescription.hxx
-
+#include osl/endian.h
 #include bridges/cpp_uno/shared/bridge.hxx
 #include bridges/cpp_uno/shared/cppinterfaceproxy.hxx
 #include bridges/cpp_uno/shared/types.hxx
___
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' - download.lst external/hunspell

 download.lst  |2 
 external/hunspell/UnpackedTarball_hunspell.mk |4 
 external/hunspell/hunspell-1.3.2-compound.patch   |   11 --
 external/hunspell/hunspell-1.3.2-literal.patch|4 
 external/hunspell/hunspell-android.patch  |   22 
 external/hunspell/hunspell-fdo48017-wfopen.patch  |  114 +-
 external/hunspell/hunspell-twoaffixcompound.patch |   80 ---
 external/hunspell/hunspell-wundef.patch.1 |   11 --
 external/hunspell/hunspell.rhbz918938.patch   |   72 -
 9 files changed, 12 insertions(+), 308 deletions(-)

New commits:
commit 671083ca561345a202383f940c0456edba03c318
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Aug 27 12:02:32 2014 +0100

upgrade to hunspell 1.3.3

Reviewed-on: https://gerrit.libreoffice.org/11136
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 5955a98b2aff796a0c7311f6f61a13eac8754ce7)

Conflicts:
download.lst

Change-Id: Ibf8345885e99ae8eb9dd6d64ccd9b5407d8d610e
Reviewed-on: https://gerrit.libreoffice.org/11185
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/download.lst b/download.lst
index a34756c..bc2b383 100644
--- a/download.lst
+++ b/download.lst
@@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := graphite2-1.2.4.tgz
 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 HUNSPELL_TARBALL := 
4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk 
b/external/hunspell/UnpackedTarball_hunspell.mk
index 730a6ce..96c85bb 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -12,15 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hunspell))
 $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
-   external/hunspell/hunspell-twoaffixcompound.patch \
external/hunspell/hunspell-solaris.patch \
external/hunspell/hunspell-1.3.2-overflow.patch \
external/hunspell/hunspell-android.patch \
external/hunspell/hunspell-1.3.2-nullptr.patch \
external/hunspell/hunspell-1.3.2-literal.patch \
-   external/hunspell/hunspell-1.3.2-compound.patch \
-   external/hunspell/hunspell.rhbz918938.patch \
-   external/hunspell/hunspell-wundef.patch.1 \
external/hunspell/hunspell-fdo48017-wfopen.patch \
 ))
 
diff --git a/external/hunspell/hunspell-1.3.2-compound.patch 
b/external/hunspell/hunspell-1.3.2-compound.patch
deleted file mode 100644
index 3629add..000
--- a/external/hunspell/hunspell-1.3.2-compound.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 misc/hunspell-1.3.2/src/hunspell/affixmgr.cxx  2010-02-27 
12:59:53.0 +0100
-+++ misc/build/hunspell-1.3.2/src/hunspell/affixmgr.cxx2012-09-18 
11:50:04.535803282 +0200
-@@ -2125,7 +2125,7 @@
- }
- 
- if (!rv) {
--if (onlycpdrule) break;
-+if (onlycpdrule  strlen(*result)  MAXLNLEN/10) break;
- if (compoundflag 
-  !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : 
IN_CPD_BEGIN, compoundflag))) {
- if (((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL,
diff --git a/external/hunspell/hunspell-1.3.2-literal.patch 
b/external/hunspell/hunspell-1.3.2-literal.patch
index 4cbf377..b0a8fb9 100644
--- a/external/hunspell/hunspell-1.3.2-literal.patch
+++ b/external/hunspell/hunspell-1.3.2-literal.patch
@@ -7,5 +7,5 @@
 -#define HUNSPELL_PIPE_HEADING @(#) International Ispell Version 3.2.06 (but 
really Hunspell VERSION)\n
 +#define HUNSPELL_PIPE_HEADING @(#) International Ispell Version 3.2.06 (but 
really Hunspell  VERSION )\n
  #define HUNSPELL_HEADING Hunspell 
- 
- //for debugging only
+ #define ODF_EXT odt|ott|odp|otp|odg|otg|ods|ots
+ #define ENTITY_APOS apos;
diff --git a/external/hunspell/hunspell-android.patch 
b/external/hunspell/hunspell-android.patch
index 1bfbb4b..6653d63 100644
--- a/external/hunspell/hunspell-android.patch
+++ b/external/hunspell/hunspell-android.patch
@@ -18,25 +18,3 @@
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  | -storm-chaos* | -tops10* | -tenex* |

java wizard needed (Base wizards): java.lang.IllegalAccessException

2014-08-29 Thread Lionel Elie Mamane

Hi,

In master, the Base wizards do not work for me anymore. The console says:

warn:legacy.osl:12673:1:dbaccess/source/ui/misc/linkeddocuments.cxx:208:caught 
an exception!
in function:void dbaui::OLinkedDocumentsAccess::impl_newWithPilot(const char*, 
sal_Int32, const rtl::OUString)
type: com.sun.star.uno.Exception
message: java.lang.IllegalAccessException: Class 
com.sun.star.comp.loader.FactoryHelper$Factory can not access a member of class 
com.sun.star.wizards.form.CallFormWizard$FormWizardImplementation with 
modifiers public
java stack trace:
com.sun.star.uno.Exception: java.lang.IllegalAccessException: Class 
com.sun.star.comp.loader.FactoryHelper$Factory can not access a member of class 
com.sun.star.wizards.form.CallFormWizard$FormWizardImplementation with 
modifiers public
  at
  
com.sun.star.comp.loader.FactoryHelper$Factory.createInstanceWithArgumentsAndContext(FactoryHelper.java:288)


Since the modifier is public... anybody should be able to access it, no? So, 
what's up?

Thanks in advance for your help,

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

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

2014-08-29 Thread Michael Stahl

 RepositoryModule_host.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 539f5b5f7dfc1168c4a6b826bfb18362c80fb424
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 26 13:17:44 2014 +0200

gbuild: serialize linking on make check too

Change-Id: Icdcca50627d2a7aed19287807f8f1bc17cb18efb
(cherry picked from commit e2bc4c005a13a4e3925c01b1e0d899899494f053)
Reviewed-on: https://gerrit.libreoffice.org/11176
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 91141f1..4f90a70 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -181,7 +181,7 @@ endef
 # otherwise cyclic dependencies ruin everything.
 # do not serialize on a partial build as that may fail due to missing deps.
 # the default goal is all (see Module.mk)
-ifeq (,$(filter-out all,$(MAKECMDGOALS)))
+ifeq (,$(filter-out all build check unitcheck slowcheck 
subsequentcheck,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
scfilt scopencl \
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45789] automatic row height in reports

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

--- Comment #21 from je...@live.de ---
Hi,
I am trying to work on this Bug but I don't know where to start. Maybe you can
help me and tell me in which file I have to look for.

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

[Bug 51357] SVG: Add support for more shape transition effects to svg documents exported by Impress

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

--- Comment #4 from d.sikele...@gmail.com ---
Hello, I'm going to add the support for the Iriswipe-Transitionl.

-- 
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: reportbuilder/java wizards/com

2014-08-29 Thread Noel Grandin

 reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java|
2 
 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |   
37 +-
 wizards/com/sun/star/wizards/form/CallFormWizard.java |
2 
 wizards/com/sun/star/wizards/query/CallQueryWizard.java   |
2 
 4 files changed, 39 insertions(+), 4 deletions(-)

New commits:
commit 610cfb377161a84f24c9022fc04cf7cb55d74ea9
Author: Noel Grandin n...@peralex.com
Date:   Fri Aug 29 13:13:26 2014 +0200

java: fix reportbuilder and wizard

which I broke in commits
70f56bc22fe95 java: reduce scope, make member classes private
and
34bcf9b498b java: remove dead methods

Change-Id: Id21482782bbc102e60f346a2bf51096af2fcbe22

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
index d6cde5d..7918826 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
@@ -329,7 +329,7 @@ public final class SOFormulaParser extends ComponentBase
  * This method is a simple helper function to used in the static component 
initialisation functions as well as
  * in getSupportedServiceNames.
  */
-private static String[] getServiceNames()
+public static String[] getServiceNames()
 {
 return new String[]
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 6ed6ec7..b9a0c2d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -30,6 +30,8 @@ import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
 import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.registry.InvalidRegistryException;
@@ -74,7 +76,7 @@ public class SOReportJobFactory
 {
 }
 
-private static class _SOReportJobFactory extends WeakBase implements 
XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
+public static class _SOReportJobFactory extends WeakBase implements 
XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
 {
 
 private static final Log LOGGER = 
LogFactory.getLog(_SOReportJobFactory.class);
@@ -381,5 +383,38 @@ public class SOReportJobFactory
 }
 }
 
+/**
+ * Gives a factory for creating the service. This method is called by the 
codeJavaLoader/code
+ * p/
+ *
+ * @param sImplName the name of the implementation for which a service is 
desired
+ * @return returns a codeXSingleComponentFactory/code for creating the 
component
+ * @see com.sun.star.comp.loader.JavaLoader
+ */
+public static XSingleComponentFactory __getComponentFactory(final String 
sImplName)
+{
+XSingleComponentFactory xFactory = null;
+
+try
+{
+if (sImplName.equals(_SOReportJobFactory.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(_SOReportJobFactory.class, 
_SOReportJobFactory.getServiceNames());
+}
+else if (sImplName.equals(SOFunctionManager.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(SOFunctionManager.class, 
SOFunctionManager.getServiceNames());
+}
+else if (sImplName.equals(SOFormulaParser.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(SOFormulaParser.class, 
SOFormulaParser.getServiceNames());
+}
+}
+catch (java.lang.IncompatibleClassChangeError e2)
+{
+}
+
+return xFactory;
+}
 
 }
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java 
b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 1d72909..a73391a 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -51,7 +51,7 @@ public class CallFormWizard
 /** This class implements the component. At least the interfaces 
XServiceInfo,
  * XTypeProvider, and XInitialization should be provided by the service.
  */
-private static class FormWizardImplementation extends 
com.sun.star.lib.uno.helper.PropertySet implements 
com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, 
com.sun.star.task.XJobExecutor
+public static class FormWizardImplementation extends

Re: java wizard needed (Base wizards): java.lang.IllegalAccessException

2014-08-29 Thread Noel Grandin


My bad, I broke that.

Fixed in commit 610cfb377161a84f24c9022fc04cf7cb55d74ea9

I made the inner class private, so even though the method on the inner class was public, the class itself was not 
accessible.



Disclaimer: http://www.peralex.com/disclaimer.html


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

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

2014-08-29 Thread László Németh

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

New commits:
commit f781b7c6599589c37b456c4b2f1c6c2e249c
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Fri Aug 29 13:01:55 2014 +0200

fdo#62923 Autocorrect opt. 'Replace dashes' uses en-dash between numbers

to avoid the bad replacement of the frequent number ranges between
years, page numbers etc., more information:

http://en.wikipedia.org/wiki/Dash

Change-Id: I9cae6bcbc227e80d59e091be591448c9289371eb

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5fb9424..9aae335 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -586,7 +586,8 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
 }
 }
 
-// Replace [A-z0-9]--[A-z0-9] double dash with emDash or enDash.
+// Replace [A-z0-9]--[A-z0-9] double dash with emDash or enDash
+// [0-9]--[0-9] double dash always replaced with enDash
 // Finnish and Hungarian use enDash instead of emDash.
 bool bEnDash = (eLang == LANGUAGE_HUNGARIAN || eLang == LANGUAGE_FINNISH);
 if( ((cEmDash  !bEnDash) || (cEnDash  bEnDash))  4 = nEndPos - 
nSttPos )
@@ -602,7 +603,8 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
 {
 nSttPos = nSttPos + nFndPos;
 rDoc.Delete( nSttPos, nSttPos + 2 );
-rDoc.Insert( nSttPos, (bEnDash ? OUString(cEnDash) : 
OUString(cEmDash)) );
+rDoc.Insert( nSttPos, (bEnDash || (rCC.isDigit( sTmp, nFndPos - 1 
) 
+rCC.isDigit( sTmp, nFndPos + 2 )) ? OUString(cEnDash) : 
OUString(cEmDash)) );
 bRet = true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45789] automatic row height in reports

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

je...@live.de changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |je...@live.de
   |desktop.org |

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

[Bug 51357] SVG: Add support for more shape transition effects to svg documents exported by Impress

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

d.sikele...@gmail.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |d.sikele...@gmail.com
   |desktop.org |

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

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

 filter/source/graphicfilter/ipbm/ipbm.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dfb24d09a8714d9e4c854a7f0d5a1ca1ad82e81b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 13:27:10 2014 +0200

Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy

Change-Id: I10d58f79bf8e803953ce960d8f63c7139a23d609

diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx 
b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 01ebe5c..63a8b09 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
 
+#include vcl/FilterConfigItem.hxx
 #include vcl/graph.hxx
 #include vcl/bmpacc.hxx
 
-class FilterConfigItem;
-
 // PBMReader ==
 
 class PBMReader {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/CppunitTest_writerperfect_calc.mk

 writerperfect/CppunitTest_writerperfect_calc.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e6401bb6a16393ec7819cef54db0e09c0188ffd9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 13:26:40 2014 +0200

Missing unit test dependency

Change-Id: I6ea03aadce23e324ee80f2f73e2175a5307c706a

diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk 
b/writerperfect/CppunitTest_writerperfect_calc.mk
index 462871f..75716b3 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -44,4 +44,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,writerperfect_calc,\
writerperfect/qa/unit/WpftCalcFilterTest \
 ))
 
+$(call gb_CppunitTest_get_target,writerperfect_calc): \
+$(call gb_Library_get_target,ipb)
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: java wizard needed (Base wizards): java.lang.IllegalAccessException

2014-08-29 Thread Lionel Elie Mamane

On Fri, Aug 29, 2014 at 01:16:03PM +0200, Noel Grandin wrote:

 Fixed in commit 610cfb377161a84f24c9022fc04cf7cb55d74ea9

Great, thanks.

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

Re: About the location of the Help forbidden word in dialogs

On Fri, 2014-08-29 at 06:44 -0300, Olivier Hallot wrote:
 Hi
 
 The straight question is: is there a rule to place the help forbidden
 word in a dialog?
 
 Some dialogs (most of them actually) have OK-Cancel-Help layout and
 others have Help-OK-Cancel (often seen in Draw).
 Some wizzards have other layouts for the Help forbidden word.
 
 If there is a rule, what is it?
 
 If not, then what to do? (leave it as is?)#

I've been putting off the button ordering problem. But now that all
resource based dialogs are converted to .ui files we have the capacity
to enable button sorting per-desktop like we do for the message dialogs.

In the meantime, I believe the correct ordering for the current
windows-inspired layout is ok, cancel, everything-else, help

i.e. http://msdn.microsoft.com/en-us/library/windows/desktop/dn742499%
28v=vs.85%29.aspx

Present the commit buttons in the following order:
OK/[Do it]/Yes
[Don't do it]/No
Cancel
Apply (if present)
Help (if present) 

where [Do it] and [Don't do it] are specific responses to the main
instruction.

And see
http://stackoverflow.com/questions/6667271/standard-placement-order-for-common-buttons
http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGWindows/XHIGWindows.html#//apple_ref/doc/uid/2961-BACJGAAI
etc for the more complicated mac (and presumably GNOME) ones.

The design team are likely to have an opinion here but I think the
ordering in the .ui files should follow the windows guidelines
consistently and that we should then sort and position the buttons
as .ui load time according to the desktop guidelines, which will turn a
windows

|   ok, cancel, help|

into a mac

|help cancel, ok|

C.

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

[Bug 45789] automatic row height in reports

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

--- Comment #22 from Lionel Elie Mamane lio...@mamane.lu ---
To add the property AutoGrow to controls, you need to add it:

1) To the file format in reportdesign/source/filter/xml/
   (probably xmlReportElementBase.* or xmlReportElement.*)

2) To the actual in-memory model (implementation) of controls:
   I suggest you start with
   Formatted field: reportdesign/source/core/api/FormattedField.cxx
reportdesign/source/core/inc/FormattedField.hxx

3) Have the actual treatment (generation) of the report take these
   into account. The treatment happens in
   reportbuilder/java/org/libreoffice/report/

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

[Bug 45789] automatic row height in reports

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

--- Comment #23 from Lionel Elie Mamane lio...@mamane.lu ---
For an example of a commit that added a new property (albeit not to controls,
the the report as a whole), see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4178806bb010129f3b13b6282547fe48ddcd

It shows e.g. how to add a new token to the XML format.

-- 
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: external/libodfgen external/librevenge

 external/libodfgen/ExternalProject_libodfgen.mk   |2 +-
 external/librevenge/ExternalProject_librevenge.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 691450b8d4f9de48fca32b621348ef2a306b0349
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 14:06:04 2014 +0200

Pass --enable-debug down to some externals

Change-Id: I3bb3c90142cbbd32877ba5e3d9070bc52ee76df9

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index 6e1c7ff..c86fdc3 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
, \
--enable-shared --disable-static \
) \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--without-docs \
diff --git a/external/librevenge/ExternalProject_librevenge.mk 
b/external/librevenge/ExternalProject_librevenge.mk
index 707b16e..7fcdc3e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--with-pic \
--enable-shared \
--disable-static \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--disable-streams \
___
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' - avmedia/source config_host.mk.in configure.ac RepositoryExternal.mk

2014-08-29 Thread Rene Engelhard

 RepositoryExternal.mk |   18 ++
 avmedia/source/opengl/oglframegrabber.hxx |4 
 avmedia/source/opengl/oglplayer.hxx   |4 
 avmedia/source/opengl/oglwindow.hxx   |4 
 config_host.mk.in |3 +++
 configure.ac  |   15 ++-
 6 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2
Author: Rene Engelhard r...@debian.org
Date:   Tue Aug 5 20:05:35 2014 +0200

implement --with-system-gltf

Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ff50598..b42dce2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3281,6 +3281,8 @@ endif # DESKTOP
 
 ifeq ($(ENABLE_GLTF),TRUE)
 
+ifneq ($(SYSTEM_LIBGLTF),TRUE)
+
 define gb_LinkTarget__use_libgltf
 $(call gb_LinkTarget_set_include,$(1),\
 -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
@@ -3306,6 +3308,22 @@ $(call 
gb_ExternalProject_use_external_project,$(1),libgltf)
 
 endef
 
+else # SYSTEM_LIBGLTF
+
+define gb_LinkTarget__use_libgltf
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(LIBGLTF_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_LIBGLTF \
+)
+
+endef
+
+endif # SYSTEN_LIBGLTF
+
 define gb_LinkTarget__use_opencollada_parser
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call 
gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
diff --git a/avmedia/source/opengl/oglframegrabber.hxx 
b/avmedia/source/opengl/oglframegrabber.hxx
index 5beb15b..0d38224 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -14,7 +14,11 @@
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/media/XFrameGrabber.hpp
 
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
 #include libgltf.h
+#endif
 
 namespace avmedia { namespace ogl {
 
diff --git a/avmedia/source/opengl/oglplayer.hxx 
b/avmedia/source/opengl/oglplayer.hxx
index 03ad515..52aa395 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -14,7 +14,11 @@
 #include cppuhelper/basemutex.hxx
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/media/XPlayer.hpp
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
 #include libgltf.h
+#endif
 #include vcl/opengl/OpenGLContext.hxx
 #include vcl/timer.hxx
 
diff --git a/avmedia/source/opengl/oglwindow.hxx 
b/avmedia/source/opengl/oglwindow.hxx
index a68f667..ae86083 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -17,7 +17,11 @@
 #include com/sun/star/media/XPlayerWindow.hpp
 #include com/sun/star/media/ZoomLevel.hpp
 
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
 #include libgltf.h
+#endif
 #include vcl/opengl/OpenGLContext.hxx
 #include vcl/syschild.hxx
 
diff --git a/config_host.mk.in b/config_host.mk.in
index b7e5b6c..aec0fa5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_ORCUS=@ENABLE_ORCUS@
 export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
 export ENABLE_GLTF=@ENABLE_GLTF@
+export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@
+export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@
+export LIBGLTF_LIBS=@LIBGLTF_LIBS@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
 export ENABLE_GTK3=@ENABLE_GTK3@
diff --git a/configure.ac b/configure.ac
index 02791ca..63e067b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1552,6 +1552,11 @@ AC_ARG_WITH(system-jpeg,
 [Use jpeg already on system.]),,
 [with_system_jpeg=auto])
 
+AC_ARG_WITH(system-libgltf,
+AS_HELP_STRING([--with-system-libgltf],
+[Use libgltf already on system.]),,
+[with_system_libgltf=auto])
+
 AC_ARG_WITH(system-clucene,
 AS_HELP_STRING([--with-system-clucene],
 [Use clucene already on system.]),,
@@ -10561,7 +10566,12 @@ if test x$enable_gltf != xno -a $_os != Darwin -a 
$_os != iOS -a $_os != And
 ENABLE_GLTF=TRUE
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_FEATURE_GLTF,1)
-BUILD_TYPE=$BUILD_TYPE LIBGLTF
+if test $with_system_libgltf = yes; then
+   SYSTEM_LIBGLTF=TRUE
+   PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 )
+else
+   BUILD_TYPE=$BUILD_TYPE LIBGLTF
+fi
 # otherwise build fails in collada2gltf external because of std::shared_ptr
 if test $have_std_shared_ptr = yes; then
 BUILD_TYPE=$BUILD_TYPE COLLADA2GLTF
@@ -10570,6 +10580,9 @@ else
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_GLTF)
+AC_SUBST(SYSTEM_LIBGLTF)
+AC_SUBST(LIBGLTF_CFLAGS)
+AC_SUBST(LIBGLTF_LIBS)
 
 # pdf import?
 AC_MSG_CHECKING([whether to build the PDF import feature])

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

2014-08-29 Thread László Németh

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

New commits:
commit 45a3b79f12c5d057302a4c74977e86fefd299208
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Fri Aug 29 14:09:05 2014 +0200

fdo#62923 replace -- between digits to en-dash, not em-dash

extended help at Autocorrect option Replace dashes

Change-Id: I43ed6c9084c25f7e1106d598664d08861a1bd804

diff --git a/source/text/shared/01/06040100.xhp 
b/source/text/shared/01/06040100.xhp
index 66c4315..d4ef1c7 100644
--- a/source/text/shared/01/06040100.xhp
+++ b/source/text/shared/01/06040100.xhp
@@ -144,7 +144,7 @@
  /tablerow
   /table
 
-  paragraph xml-lang=en-US id=par_id1416974 role=note l10n=NEWIf 
the text has the Hungarian or Finnish language attribute, then two hyphens in 
the sequence A--B are replaced by an en-dash instead of an 
em-dash.commenti71908/comment/paragraph
+  paragraph xml-lang=en-US id=par_id1416974 role=note l10n=NEWIf 
the hyphens are there between digits or the text has the Hungarian or Finnish 
language attribute, then two hyphens in the sequence A--B are replaced by an 
en-dash instead of an em-dash.commenti71908/comment/paragraph
   paragraph xml-lang=en-US id=hd_id3152472 role=heading level=3 
l10n=U
  oldref=99switchinline select=applcaseinline 
select=WRITERDelete spaces and tabs at beginning and end of paragraph
 /caseinline/switchinline/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-08-29 Thread László Németh

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

New commits:
commit 8f3d5752a53bc65b8c45031a9ee883e2672ad549
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Fri Aug 29 14:09:05 2014 +0200

Updated core
Project: help  45a3b79f12c5d057302a4c74977e86fefd299208

diff --git a/helpcontent2 b/helpcontent2
index 3faab36..45a3b79 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3faab36347837d4168d12893b7e47f58d6440c68
+Subproject commit 45a3b79f12c5d057302a4c74977e86fefd299208
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45789] automatic row height in reports

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

--- Comment #24 from Lionel Elie Mamane lio...@mamane.lu ---
The reportbuilder creates an odt file (OpenDocument text), but not through
Writer. It creates the XML directly and *then* starts writer on it for display
/ print / etc.

When working on it, I've found the ODF reference a good help to understand what
is being generated and what needs to be generated.
https://lists.oasis-open.org/archives/tc-announce/201201/msg1.html

Here, in particular, we are generating tables
http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1415580_253892949
Need to find how in the XML a table row with automatic height is coded. To find
out that kind of things, create an odt document with writer, with a table. Save
it. Then make *one* change, namely changing *one* row to automatic height.
Save it under a different name. Compare the two documents (that is, the XML
that is within the ZIP structure). xmlindent is your friend. Most probably one
attribute is added/changed in the table:table-row element.

That's the result you need to produce in ReportBuilder when the AutoGrow
feature is on.

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

[Bug 45789] automatic row height in reports

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

--- Comment #25 from Lionel Elie Mamane lio...@mamane.lu ---
The code that creates a new row seems to be

 private void startRow(final AttributeMap attrs)

in
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget

look where/how this is called. The decision to apply automatic height or not
will most probably be in the/a caller of this startRow (or their caller).
Thread.dumpStack() is your friend :)

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

[Bug 45789] automatic row height in reports

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

--- Comment #26 from Lionel Elie Mamane lio...@mamane.lu ---
Finally, the *UI* for handling properties of controls is apparently in 
reportdesign/source/ui/

You can look at how the other properties are handled there.

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

[Bug 45789] automatic row height in reports

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

--- Comment #27 from Lionel Elie Mamane lio...@mamane.lu ---
These pointers should hopefully get you started. Let me know if you run into
difficulties or have other questions. Because of the LibreOffice conference, I
might be less avaible from 2 to 7 September.

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

[Bug 45789] automatic row height in reports

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

--- Comment #28 from je...@live.de ---
Thank you for the information!
I'll try it on monday

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

WIP: some improvements in javadoc

2014-08-29 Thread Robert Antoni

Hi,

I'm going to replace the javadoc tags code../code and tt../tt with
{@code ...}.
Next, I will replace package.html with package-info.java.

Regards,
Robert

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

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

 external/libodfgen/UnpackedTarball_libodfgen.mk |6 ++
 external/libodfgen/ubsan.patch  |   60 
 2 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 66e3194e6a5cca0400fa9628446246b2668ef2b5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 14:33:05 2014 +0200

external/libodfgen: Avoid undefined-behavior casts...

...from (potentially negative) double to unsigned

Change-Id: I2f922beec7201a8d769133e879208d2e951e6429

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 60258a3..66707dd 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+external/libodfgen/ubsan.patch \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ubsan.patch b/external/libodfgen/ubsan.patch
new file mode 100644
index 000..0b807dd
--- /dev/null
+++ b/external/libodfgen/ubsan.patch
@@ -0,0 +1,60 @@
+See 
https://sourceforge.net/p/libwpd/tickets/2/attachment/0001-Avoid-undefined-behavior-casts-from-potentially-nega.patch:
+--- src/GraphicFunctions.cxx
 src/GraphicFunctions.cxx
+@@ -448,42 +448,42 @@
+   // 2540 is 2.54*1000, 2.54 in = 1 inch
+   if (path[i][svg:x]  action[0] == 'H')
+   {
+-  sElement.sprintf(H%i, 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540));
++  sElement.sprintf(H%i, 
(int)((getInchValue(path[i][svg:x])-px)*2540));
+   sValue.append(sElement);
+   }
+   else if (path[i][svg:y]  action[0] == 'V')
+   {
+-  sElement.sprintf(V%i, 
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(V%i, 
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coordOk  (action[0] == 'M' || action[0] == 'L' || 
action[0] == 'T'))
+   {
+-  sElement.sprintf(%c%i %i, action[0], 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(%c%i %i, action[0], 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coord1Ok  (action[0] == 'Q' || action[0] == 'S'))
+   {
+-  sElement.sprintf(%c%i %i %i %i, action[0], 
(unsigned)((getInchValue(path[i][svg:x1])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y1])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(%c%i %i %i %i, action[0], 
(int)((getInchValue(path[i][svg:x1])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y1])-py)*2540), 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coord2Ok  action[0] == 'C')
+   {
+-  sElement.sprintf(C%i %i %i %i %i %i, 
(unsigned)((getInchValue(path[i][svg:x1])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y1])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x2])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y2])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(C%i %i %i %i %i %i, 
(int)((getInchValue(path[i][svg:x1])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y1])-py)*2540), 
(int)((getInchValue(path[i][svg:x2])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y2])-py)*2540), 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coordOk  path[i][svg:rx]  path[i][svg:ry]  
action[0] == 'A')
+   {
+-

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

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

New commits:
commit 2426e72dba6e5fc9659dc6d691c3e2cbb64e684e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 14:38:33 2014 +0200

Pass --enable-debug also down to external/libmspub

Change-Id: I76f834dea9aebbdef6cdb240e0a2f1ac49217f5e

diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index 8cbf9a6..5805f58 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-shared \
--without-docs \
--disable-tools \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Remaining dialogs ( was: Re: About the location of the Help forbidden word in dialogs)

2014-08-29 Thread Olivier Hallot

Hi Caolán

On 29-08-2014 08:45, Caolán McNamara wrote:
 But now that all
 resource based dialogs are converted to .ui files

The dialogs for 3D objects in Draw are soon to be released? I don't have
them in my master (especially the 3D properties, which have an odd
layout).

Regards
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/qa/extras/inc/swmodeltestbase.hxx|3 
 sw/qa/extras/rtfexport/data/fdo32613.odt|binary
 sw/qa/extras/rtfexport/rtfexport.cxx|   11 ++-
 sw/source/filter/ww8/rtfattributeoutput.cxx |  101 +++-
 4 files changed, 96 insertions(+), 19 deletions(-)

New commits:
commit cb01957aa0ac3caea8e87522116086ac256d4ee2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Aug 29 14:26:11 2014 +0200

fdo#32613 RTF export: implemented anchored picture export

RTF originally didn't support anchored pictures: they were always
inline. Then it was invented that pictures can be exported anchored, if
they are in fact shapes, but their pib property is set to the hexdump
of the picture contents.

The RTF importer handled this situation for quite some time, but not the
exporter -- this commit implements that.

Change-Id: I173ad9f4f2e24620508ca63c0b892b7d5da4e5b2

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index dfd885c..c3628df 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -83,6 +83,7 @@ using namespace css;
 #define DECLARE_OOXMLIMPORT_TEST(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
 #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 #define DECLARE_RTFIMPORT_TEST(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
+#define DECLARE_RTFEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 
 // For testing during development of a test, you want to use
 // DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
@@ -91,11 +92,13 @@ using namespace css;
 #define DECLARE_OOXMLIMPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
 #define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 #define DECLARE_RTFIMPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
+#define DECLARE_RTFEXPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 
 #undef DECLARE_OOXMLEXPORT_TEST
 #define DECLARE_OOXMLIMPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
 #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName 
: public Test { void disabled(); }; void disabled##TestName::disabled()
 #define DECLARE_RTFIMPORT_TEST(TestName, filename) class disabled##TestName : 
public Test { void disabled(); }; void disabled##TestName::disabled()
+#define DECLARE_RTFEXPORT_TEST(TestName, filename) class disabled##TestName : 
public Test { void disabled(); }; void disabled##TestName::disabled()
 #endif
 
 #define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \
diff --git a/sw/qa/extras/rtfexport/data/fdo32613.odt 
b/sw/qa/extras/rtfexport/data/fdo32613.odt
new file mode 100644
index 000..bd1e950
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/fdo32613.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index cdbb06d..644abaa 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -17,11 +17,12 @@
 #include com/sun/star/frame/XStorable.hpp
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/ShadowFormat.hpp
+#include com/sun/star/text/RelOrientation.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
 #include com/sun/star/text/XFootnotesSupplier.hpp
 #include com/sun/star/text/XPageCursor.hpp
 #include com/sun/star/text/XTextViewCursorSupplier.hpp
 #include com/sun/star/view/XViewSettingsSupplier.hpp
-#include com/sun/star/text/RelOrientation.hpp
 
 #include vcl/svapp.hxx
 
@@ -51,8 +52,6 @@ public:
 }
 };
 
-#define DECLARE_RTFEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-
 DECLARE_RTFEXPORT_TEST(testZoom, zoom.rtf)
 {
 uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
@@ -659,6 +658,12 @@ DECLARE_RTFEXPORT_TEST(testFdo80167, fdo80167.rtf)
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+DECLARE_RTFEXPORT_TEST(testFdo32613, fdo32613.odt)
+{
+// This was AS_CHARACTER, RTF export did not support writing anchored 
pictures.
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getPropertytext::TextContentAnchorType(getShape(1), AnchorType));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 107aea3..7bd31cb 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2843,6 +2843,37 @@ void RtfAttributeOutput::FormatSurround(const 
SwFmtSurround rSurround)
 m_aRunText-append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT);

Re: WIP: some improvements in javadoc


On 08/29/2014 02:30 PM, Robert Antoni wrote:

I'm going to replace the javadoc tags code../code and tt../tt
with {@code ...}.
Next, I will replace package.html with package-info.java.


...just make sure that what gets installed to 
instdir/sdk/docs/java/ref/index.html keeps looking good


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

Re: Remaining dialogs ( was: Re: About the location of the Help forbidden word in dialogs)

On Fri, 2014-08-29 at 09:46 -0300, Olivier Hallot wrote:
 Hi Caolán
 
 On 29-08-2014 08:45, Caolán McNamara wrote:
  But now that all
  resource based dialogs are converted to .ui files
 
 The dialogs for 3D objects in Draw are soon to be released? I don't have
 them in my master (especially the 3D properties, which have an odd
 layout).

I don't know what you're referring to. What is the sequence to get to
see them via the UI ? There are no Dialogs in .src format, so they might
be some hard coded non .ui non .src dialogs, or a Floating Window, or
somthing else exciting.

C.

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

Re: WIP: some improvements in javadoc

2014-08-29 Thread Robert Antoni

Ok, now I'm working on xmerge module.


On Fri, Aug 29, 2014 at 3:45 PM, Stephan Bergmann sberg...@redhat.com
wrote:

 On 08/29/2014 02:30 PM, Robert Antoni wrote:

 I'm going to replace the javadoc tags code../code and tt../tt
 with {@code ...}.
 Next, I will replace package.html with package-info.java.


 ...just make sure that what gets installed to 
 instdir/sdk/docs/java/ref/index.html
 keeps looking good

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




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

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

 writerfilter/source/ooxml/factoryimpl_ns.py |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit cf5a6919e1da43cf9e0d0bdba986f6f203237cf9
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Aug 29 16:01:11 2014 +0200

coverity#705090 Unchecked dynamic_cast

Change-Id: I4cd2dcd457c8f41c1c7fd82e2c99d056cf2a8c37

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py 
b/writerfilter/source/ooxml/factoryimpl_ns.py
index b05fb94..b1fee58 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -424,24 +424,30 @@ def factoryChooseAction(actionNode):
 for condNode in getChildrenByName(actionNode, cond):
 ret.append({)
 ret.append(OOXMLPropertySetEntryToInteger aHandler(%s); % 
idToLabel(condNode.getAttribute(tokenid)))
-ret.append(
dynamic_castOOXMLFastContextHandlerStream*(pHandler)-getPropertySetAttrs()-resolve(aHandler);)
+ret.append(if (OOXMLFastContextHandlerStream* pStream = 
dynamic_castOOXMLFastContextHandlerStream*(pHandler)))
+ret.append(
pStream-getPropertySetAttrs()-resolve(aHandler);)
 ret.append()
 ret.append(if (sal::static_int_castId(aHandler.getValue()) 
== %s) % idToLabel(condNode.getAttribute(value)))
 ret.append({)
 extra_space = 
 
 if actionNode.getAttribute(action) in (handleXNotes, handleHdrFtr, 
handleComment, handlePicture, handleBreak, handleOLE, handleFontRel):
-ret.append(
%sdynamic_castOOXMLFastContextHandlerProperties*(pHandler)-%s(); % 
(extra_space, actionNode.getAttribute(action)))
+ret.append(%sif (OOXMLFastContextHandlerProperties* pProperties = 
dynamic_castOOXMLFastContextHandlerProperties*(pHandler)) % extra_space)
+ret.append(%spProperties-%s(); % (extra_space, 
actionNode.getAttribute(action)))
 elif actionNode.getAttribute(action) == 
propagateCharacterPropertiesAsSet:
 ret.append(%spHandler-propagateCharacterPropertiesAsSet(%s); % 
(extra_space, idToLabel(actionNode.getAttribute(sendtokenid
 elif actionNode.getAttribute(action) in (startCell, endCell):
-ret.append(
%sdynamic_castOOXMLFastContextHandlerTextTableCell*(pHandler)-%s(); % 
(extra_space, actionNode.getAttribute(action)))
+ret.append(%sif (OOXMLFastContextHandlerTextTableCell* 
pTextTableCell = 
dynamic_castOOXMLFastContextHandlerTextTableCell*(pHandler)) % extra_space)
+ret.append(%spTextTableCell-%s(); % (extra_space, 
actionNode.getAttribute(action)))
 elif actionNode.getAttribute(action) in (startRow, endRow):
-ret.append(
%sdynamic_castOOXMLFastContextHandlerTextTableRow*(pHandler)-%s(); % 
(extra_space, actionNode.getAttribute(action)))
+ret.append(%sif (OOXMLFastContextHandlerTextTableRow* 
pTextTableRow = dynamic_castOOXMLFastContextHandlerTextTableRow*(pHandler)) 
% extra_space)
+ret.append(%spTextTableRow-%s(); % (extra_space, 
actionNode.getAttribute(action)))
 elif actionNode.getAttribute(action) == handleGridBefore:
-ret.append(
%sdynamic_castOOXMLFastContextHandlerTextTableRow*(pHandler)-%s(); % 
(extra_space, actionNode.getAttribute(action)))
+ret.append(%sif (OOXMLFastContextHandlerTextTableRow* 
pTextTableRow = dynamic_castOOXMLFastContextHandlerTextTableRow*(pHandler)) 
% extra_space)
+ret.append(%spTextTableRow-%s(); % (extra_space, 
actionNode.getAttribute(action)))
 elif actionNode.getAttribute(action) in (sendProperty, 
handleHyperlink):
-ret.append(
%sdynamic_castOOXMLFastContextHandlerStream*(pHandler)-%s(); % 
(extra_space, actionNode.getAttribute(action)))
+ret.append(%sif (OOXMLFastContextHandlerStream* pStream = 
dynamic_castOOXMLFastContextHandlerStream*(pHandler)) % extra_space)
+ret.append(%spStream-%s(); % (extra_space, 
actionNode.getAttribute(action)))
 elif actionNode.getAttribute(action) == fieldstart:
 ret.append(%spHandler-startField(); % (extra_space))
 elif actionNode.getAttribute(action) == fieldsep:
@@ -449,7 +455,8 @@ def factoryChooseAction(actionNode):
 elif actionNode.getAttribute(action) == fieldend:
 ret.append(%spHandler-endField(); % (extra_space))
 elif actionNode.getAttribute(action) == printproperty:
-ret.append(
%sdynamic_castOOXMLFastContextHandlerStream*(pHandler)-sendProperty(%s); % 
(extra_space, idToLabel(actionNode.getAttribute(sendtokenid
+ret.append(%sif (OOXMLFastContextHandlerStream* pStream = 
dynamic_castOOXMLFastContextHandlerStream*(pHandler)) % extra_space)
+ret.append(%spStream-sendProperty(%s); % (extra_space, 
idToLabel(actionNode.getAttribute(sendtokenid
 elif actionNode.getAttribute(action) == sendPropertiesWithId:
 ret.append(

Re: Remaining dialogs ( was: Re: About the location of the Help forbidden word in dialogs)

2014-08-29 Thread Olivier Hallot

Hi Caolán

On 29-08-2014 10:50, Caolán McNamara wrote:
 On Fri, 2014-08-29 at 09:46 -0300, Olivier Hallot wrote:
 Hi Caolán

 On 29-08-2014 08:45, Caolán McNamara wrote:
 But now that all
 resource based dialogs are converted to .ui files

 The dialogs for 3D objects in Draw are soon to be released? I don't have
 them in my master (especially the 3D properties, which have an odd
 layout).
 
 I don't know what you're referring to. What is the sequence to get to
 see them via the UI ? There are no Dialogs in .src format, so they might
 be some hard coded non .ui non .src dialogs, or a Floating Window, or
 somthing else exciting.
 
 C.
 
Has to be something else exciting.

If attachments are accepted, here is a printscreen of the dialog.

Otherwise, the dialog is opened in Draw - draw a rectangle - button 2
- convert to 3d - button2 again - 3D Effects.

Regards
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/CppunitTest_sc_annotationshapeobj.mk

 sc/CppunitTest_sc_annotationshapeobj.mk |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit a13923afa5320f6b717a6fd777d751e8da270601
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 16:20:25 2014 +0200

Typo in CppunitTest name

Change-Id: Ibb683b50b68b8f982fa6e70e48608f2e574b0def

diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk 
b/sc/CppunitTest_sc_annotationshapeobj.mk
index 3e7d01d..d979d56 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -9,15 +9,15 @@
 #
 #*
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_annonationshapeobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_annotationshapeobj))
 
-$(eval $(call gb_CppunitTest_use_external,sc_annonationshapeobj,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,sc_annotationshapeobj,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationshapeobj, \
 sc/qa/extras/scannotationshapeobj \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_annotationshapeobj, \
 basegfx \
 comphelper \
 cppu \
@@ -53,20 +53,20 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_annotationshapeobj,\
 -I$(SRCDIR)/sc/source/ui/inc \
 -I$(SRCDIR)/sc/inc \
 $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sc_annonationshapeobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_annotationshapeobj,\
 offapi \
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sc_annonationshapeobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_annotationshapeobj))
 
-$(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\
 basic/util/sb \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
@@ -98,8 +98,8 @@ $(eval $(call 
gb_CppunitTest_use_components,sc_annonationshapeobj,\
 unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_annotationshapeobj))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationshapeobj))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit b2666f10e0f1bb42b1d124433eac219285c79d5b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 16:22:13 2014 +0200

Pass --enable-debug also down to external/libvisio

Change-Id: I1ac53910390d99ad9fca72270dd3b98e281c000e

diff --git a/external/libvisio/ExternalProject_libvisio.mk 
b/external/libvisio/ExternalProject_libvisio.mk
index 7d2c34a..3b02ad3 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--disable-shared \
--without-docs \
--disable-tools \
-   --disable-debug \
+   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) 
-I$(BUILDDIR)/config_$(gb_Side)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/CppunitTest_sd_export_tests.mk

 sd/CppunitTest_sd_export_tests.mk |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 74868d1928e6f3aa98dea96e17e4be1741fe563f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 16:37:05 2014 +0200

Fix CppunitTest name

Change-Id: Id93eadfd0a34f319f4f6302e1dd225ba71c42a4e

diff --git a/sd/CppunitTest_sd_export_tests.mk 
b/sd/CppunitTest_sd_export_tests.mk
index 967e802..68bdb32 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -9,15 +9,15 @@
 #
 #*
 
-$(eval $(call gb_CppunitTest_CppunitTest,sd_export_test))
+$(eval $(call gb_CppunitTest_CppunitTest,sd_export_tests))
 
-$(eval $(call gb_CppunitTest_use_external,sd_export_test,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,sd_export_tests,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sd_export_test, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_export_tests, \
 sd/qa/unit/export-tests \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sd_export_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sd_export_tests, \
$(call gb_Helper_optional,AVMEDIA,avmedia) \
 basegfx \
 comphelper \
@@ -51,21 +51,21 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_export_test, \
 $(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sd_export_test,\
+$(eval $(call gb_CppunitTest_set_include,sd_export_tests,\
 -I$(SRCDIR)/sd/source/ui/inc \
 -I$(SRCDIR)/sd/inc \
 $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_export_test,\
+$(eval $(call gb_CppunitTest_use_api,sd_export_tests,\
 offapi \
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sd_export_test))
-$(eval $(call gb_CppunitTest_use_vcl,sd_export_test))
+$(eval $(call gb_CppunitTest_use_ure,sd_export_tests))
+$(eval $(call gb_CppunitTest_use_vcl,sd_export_tests))
 
-$(eval $(call gb_CppunitTest_use_components,sd_export_test,\
+$(eval $(call gb_CppunitTest_use_components,sd_export_tests,\
 animations/source/animcore/animcore \
 basic/util/sb \
 chart2/source/chartcore \
@@ -106,11 +106,11 @@ $(eval $(call 
gb_CppunitTest_use_components,sd_export_test,\
 xmlsecurity/util/xmlsecurity \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sd_export_test))
+$(eval $(call gb_CppunitTest_use_configuration,sd_export_tests))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_export_test))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_export_tests))
 
-$(eval $(call gb_CppunitTest_add_arguments,sd_export_test,\
+$(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\
 -env:SVG_DISABLE_FONT_EMBEDDING=YEAH \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/CppunitTest_sc_tableautoformatfield.mk

 sc/CppunitTest_sc_tableautoformatfield.mk |  103 --
 1 file changed, 103 deletions(-)

New commits:
commit 5990beed9aba690ea9487e2c4a64615b7504a0a1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 16:37:43 2014 +0200

Dead code

...left over from 95780ec73990f96dc16fc677c895d00fa1360008 refactor 
concept for
c++ based subsequenttests

Change-Id: I8a661f00c122d75e3b71ca51692ba17b6bdb3c56

diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk 
b/sc/CppunitTest_sc_tableautoformatfield.mk
deleted file mode 100644
index 07d2724..000
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- 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,sc_tableautoformatfield))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \
-sc/qa/extras/tableautoformatfield \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
-basegfx \
-comphelper \
-cppu \
-cppuhelper \
-drawinglayer \
-editeng \
-for \
-forui \
-i18nlangtag \
-msfilter \
-oox \
-sal \
-salhelper \
-sax \
-sb \
-sc \
-sfx \
-sot \
-subsequenttest \
-svl \
-svt \
-svx \
-svxcore \
-   test \
-tk \
-tl \
-ucbhelper \
-   unotest \
-utl \
-vbahelper \
-vcl \
-xo \
-   $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\
--I$(SRCDIR)/sc/source/ui/inc \
--I$(SRCDIR)/sc/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\
-offapi \
-udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_tableautoformatfield))
-
-$(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
-basic/util/sb \
-comphelper/util/comphelp \
-configmgr/source/configmgr \
-dbaccess/util/dba \
-filter/source/config/cache/filterconfig1 \
-forms/util/frm \
-framework/util/fwk \
-i18npool/util/i18npool \
-oox/util/oox \
-package/source/xstor/xstor \
-package/util/package2 \
-sax/source/expatwrap/expwrap \
-scripting/source/basprov/basprov \
-scripting/util/scriptframe \
-sc/util/sc \
-sc/util/scd \
-sc/util/scfilt \
-$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
-   sc/util/vbaobj) \
-sfx2/util/sfx \
-sot/util/sot \
-svl/source/fsstor/fsstorage \
-toolkit/util/tk \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
-ucb/source/ucp/tdoc/ucptdoc1 \
-unotools/util/utl \
-unoxml/source/rdf/unordf \
-unoxml/source/service/unoxml \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield))
-
-$(eval $(call 
gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield))
-
-# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl external/firebird external/glew external/libebook external/libgltf external/libmspub external/libmwaw external/libodfgen external/liborcus external/librev

 external/curl/ExternalProject_curl.mk |4 ++--
 external/firebird/ExternalProject_firebird.mk |2 +-
 external/glew/ExternalProject_glew.mk |4 ++--
 external/libebook/ExternalProject_libebook.mk |2 +-
 external/libgltf/ExternalProject_libgltf.mk   |2 +-
 external/libmspub/ExternalProject_libmspub.mk |2 +-
 external/libmwaw/ExternalProject_libmwaw.mk   |2 +-
 external/libodfgen/ExternalProject_libodfgen.mk   |2 +-
 external/liborcus/ExternalProject_liborcus.mk |2 +-
 external/librevenge/ExternalProject_librevenge.mk |2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6bc81d4e78184cf57d6bc99f1f2dba6938b4fa85
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 17:14:53 2014 +0200

Simplify some $ENABLE_DEBUG expressions

Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index b012079..e8e1345 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-file --disable-ldap --disable-telnet 
--disable-dict --without-libssh2 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 cd lib \
 $(MAKE) \
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 
--disable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet 
--disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
CC=$(CC) -mthreads $(if 
$(MINGW_SHARED_GCCLIB),-shared-libgcc) \
LIBS=-lws2_32 -lwinmm $(if 
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP)) \
LDFLAGS=$(patsubst ;, -L,$(ILIB)) \
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 6e3f582..f557a361 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
 $(if $(filter WNT,$(OS)),\
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 7eec3e8..54348f5 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -24,8 +24,8 @@ else
 
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,glew,\
-   $(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD=$(CC) \
-   $(MAKE) STRIP= glew.lib $(if $(filter 
DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \
+   $(if $(ENABLE_DEBUG),STRIP=) LD=$(CC) \
+   $(MAKE) STRIP= glew.lib $(if $(filter 
DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \
)
 
 endif
diff --git a/external/libebook/ExternalProject_libebook.mk 
b/external/libebook/ExternalProject_libebook.mk
index 293028f..ca1c7e4 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
--without-docs \
--without-tools \
--disable-tests \
-   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
+   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk bridges/source configure.ac desktop/source jvmfwk/plugins solenv/gbuild

 bridges/Library_cpp_uno.mk|5 
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |  307 ++
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |   87 +
 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx |   66 +
 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx |   33 
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |  465 
++
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |  374 

 configure.ac  |8 
 desktop/source/deployment/misc/dp_platform.cxx|4 
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx  |2 
 solenv/gbuild/platform/LINUX_AARCH64_GCC.mk   |   14 
 11 files changed, 1363 insertions(+), 2 deletions(-)

New commits:
commit 235fa0334e0b45c736b636ba1689e2f8c7458697
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 17:17:42 2014 +0200

Linux AArch64 port

Change-Id: I37044a37348b203944a8eb9d2204e619055f069d

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index e971442..96bd293 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -35,6 +35,11 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
 endif
 
+else ifeq ($(OS)-$(CPUNAME),LINUX-AARCH64)
+
+bridges_SELECTED_BRIDGE := gcc3_linux_aarch64
+bridge_exception_objects := abi callvirtualfunction cpp2uno uno2cpp
+
 else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_alpha
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
new file mode 100644
index 000..b6d8cb6
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -0,0 +1,307 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include sal/config.h
+
+#include cassert
+#include cstddef
+#include cstring
+#include typeinfo
+
+#include cxxabi.h
+#include dlfcn.h
+
+#include boost/unordered_map.hpp
+#include com/sun/star/uno/RuntimeException.hpp
+#include com/sun/star/uno/genfunc.h
+#include rtl/strbuf.hxx
+#include rtl/ustrbuf.hxx
+#include rtl/ustring.hxx
+#include sal/types.h
+#include typelib/typeclass.h
+#include typelib/typedescription.h
+#include uno/any2.h
+#include uno/mapping.h
+
+#include abi.hxx
+
+namespace {
+
+OUString toUnoName(char const * name) {
+assert(name != 0);
+OUStringBuffer b;
+bool scoped = *name == 'N';
+if (scoped) {
+++name;
+}
+for (;;) {
+assert(*name = '0'  *name = '9');
+std::size_t n = *name++ - '0';
+while (*name = '0'  *name = '9') {
+n = 10 * n + (*name++ - '0');
+}
+b.appendAscii(name, n);
+name += n;
+if (!scoped) {
+assert(*name == 0);
+break;
+}
+if (*name == 'E') {
+assert(name[1] == 0);
+break;
+}
+b.append('.');
+}
+return b.makeStringAndClear();
+}
+
+class Rtti {
+public:
+Rtti(): app_(dlopen(0, RTLD_LAZY)) {}
+
+~Rtti() { dlclose(app_); }
+
+std::type_info * getRtti(typelib_TypeDescription const  type);
+
+private:
+typedef boost::unordered_mapOUString, std::type_info *, OUStringHash Map;
+
+void * app_;
+
+osl::Mutex mutex_;
+Map map_;
+};
+
+std::type_info * Rtti::getRtti(typelib_TypeDescription const  type) {
+OUString unoName(type.pTypeName);
+osl::MutexGuard g(mutex_);
+Map::iterator i(map_.find(unoName));
+if (i == map_.end()) {
+OStringBuffer b;
+b.append(_ZTIN);
+for (sal_Int32 j = 0; j != -1;) {
+OString t(
+OUStringToOString(
+unoName.getToken(0, '.', j), RTL_TEXTENCODING_ASCII_US));
+b.append(t.getLength());
+b.append(t);
+}
+b.append('E');

[Libreoffice-commits] core.git: 26 commits - avmedia/source chart2/inc chart2/Library_chartcontroller.mk chart2/source embeddedobj/Library_embobj.mk embeddedobj/source include/svtools include/svx incl

2014-08-29 Thread Markus Mohrhard

 avmedia/source/opengl/oglplayer.cxx  |4 
 chart2/Library_chartcontroller.mk|1 
 chart2/inc/ChartModel.hxx|2 
 chart2/source/controller/main/ChartController.cxx|3 
 chart2/source/controller/main/ChartWindow.cxx|   55 ++-
 chart2/source/controller/main/ChartWindow.hxx|9 -
 chart2/source/model/main/ChartModel.cxx  |8 -
 chart2/source/view/charttypes/GL3DBarChart.cxx   |  115 ++-
 chart2/source/view/inc/AbstractShapeFactory.hxx  |2 
 chart2/source/view/inc/GL3DBarChart.hxx  |   16 +-
 chart2/source/view/inc/OpenglShapeFactory.hxx|2 
 chart2/source/view/inc/ShapeFactory.hxx  |2 
 chart2/source/view/main/ChartView.cxx|   44 -
 chart2/source/view/main/DummyXShape.hxx  |1 
 chart2/source/view/main/OpenGLRender.cxx |4 
 chart2/source/view/main/OpenglShapeFactory.cxx   |6 
 embeddedobj/Library_embobj.mk|1 
 embeddedobj/source/general/docholder.cxx |7 
 include/svtools/embedhlp.hxx |4 
 include/svx/charthelper.hxx  |   10 -
 include/vcl/opengl/OpenGLHelper.hxx  |8 -
 offapi/com/sun/star/chart2/XChartDocument.idl|4 
 sc/source/ui/drawfunc/fuins2.cxx |   18 --
 sc/source/ui/inc/tabvwsh.hxx |3 
 sc/source/ui/view/tabvwsh4.cxx   |   33 
 sc/source/ui/view/tabvwshb.cxx   |5 
 sfx2/source/view/ipclient.cxx|6 
 sfx2/source/view/viewsh.cxx  |4 
 svtools/source/misc/embedhlp.cxx |   50 +-
 svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx |3 
 svx/source/svdraw/charthelper.cxx|   21 --
 svx/source/svdraw/svdoole2.cxx   |6 
 sw/source/core/doc/notxtfrm.cxx  |7 
 sw/source/core/layout/paintfrm.cxx   |3 
 sw/source/core/unocore/unochart.cxx  |3 
 vcl/source/opengl/OpenGLContext.cxx  |5 
 vcl/source/opengl/OpenGLHelper.cxx   |   14 -
 37 files changed, 303 insertions(+), 186 deletions(-)

New commits:
commit 89940633b43aa7ff136f73fcb3c78201d9cb4ef9
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Thu Aug 28 21:57:44 2014 +0200

replace sleep with two condition variables

Change-Id: I7611b5be7d462646a19ebfd86b8d6612dccafc71

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 11406bf..d199b50 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -79,6 +79,27 @@ double findMaxValue(const boost::ptr_vectorVDataSeries 
rDataSeriesContainer)
 return nMax;
 }
 
+class SharedResourceAccess
+{
+private:
+osl::Condition mrCond1;
+osl::Condition mrCond2;
+
+public:
+
+SharedResourceAccess(osl::Condition rCond1, osl::Condition rCond2):
+mrCond1(rCond1),
+mrCond2(rCond2)
+{
+mrCond1.set();
+}
+
+~SharedResourceAccess()
+{
+mrCond2.set();
+}
+};
+
 }
 
 class RenderThread : public salhelper::Thread
@@ -418,6 +439,7 @@ void RenderBenchMarkThread::execute()
 {
 {
 osl::MutexGuard aGuard(mpChart-maMutex);
+mpChart-maCond2.reset();
 if (mpChart-mbRenderDie)
 break;
 UpdateScreenText();
@@ -425,14 +447,11 @@ void RenderBenchMarkThread::execute()
 renderFrame();
 mpChart-miFrameCount++;
 }
-#ifdef WNT
-Sleep(1);
-#else
-TimeValue nTV;
-nTV.Seconds = 0;
-nTV.Nanosec = 100;
-osl_waitThread(nTV);
-#endif
+if (mpChart-maCond1.check())
+{
+mpChart-maCond1.reset();
+mpChart-maCond2.wait();
+}
 }
 }
 
@@ -517,6 +536,7 @@ GL3DBarChart::~GL3DBarChart()
 {
 if (mbBenchMarkMode)
 {
+SharedResourceAccess(maCond1, maCond2);
 osl::MutexGuard aGuard(maMutex);
 mbRenderDie = true;
 }
@@ -531,6 +551,7 @@ GL3DBarChart::~GL3DBarChart()
 void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries 
rDataSeriesContainer,
 ExplicitCategoriesProvider rCatProvider)
 {
+SharedResourceAccess(maCond1, maCond2);
 osl::MutexGuard aGuard(maMutex);
 mpRenderer-ReleaseShapes();
 // Each series of data flows from left to right, and multiple series are
@@ -803,6 +824,7 @@ void GL3DBarChart::moveToDefault()

[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/CustomTarget_source.mk writerfilter/documentation writerfilter/source

 sw/qa/extras/rtfimport/data/fdo79959.rtf   |4 
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 ++
 writerfilter/CustomTarget_source.mk|2 +-
 writerfilter/documentation/ooxml/model.rng |3 ---
 writerfilter/source/ooxml/model.xml|2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 +++--
 6 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 305ecd1848a802a6c43ecc6e76f4c6bc36a03418
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Aug 29 17:40:51 2014 +0200

fdo#79959 RTF import: trim whitespace around style names

Change-Id: Id23cbd62b057442c577fef124a5705e4d551076f

diff --git a/sw/qa/extras/rtfimport/data/fdo79959.rtf 
b/sw/qa/extras/rtfimport/data/fdo79959.rtf
new file mode 100644
index 000..231f39a
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo79959.rtf
@@ -0,0 +1,4 @@
+{\rtf1\ansi\ansicpg1251\deff0\deflang1049{\fonttbl{\f0\fnil\fcharset0 
Calibri;}}
+{\stylesheet{\s0  Test;}}
+\viewkind4\uc1\pard\s0\slmult1\lang9\f0\fs22 Hello world!\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2231e1f..64e2b04 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1928,6 +1928,12 @@ DECLARE_RTFIMPORT_TEST(testFdo74229, fdo74229.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(67)), 
getPropertysal_Int32(xCell, RightBorderDistance));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo79959, fdo79959.rtf)
+{
+// This was false, as the style was imported as  Test, i.e. no 
whitespace stripping.
+CPPUNIT_ASSERT_EQUAL(true, 
static_castbool(getStyles(ParagraphStyles)-hasByName(Test)));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d0f88ec..2441762 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1162,8 +1162,9 @@ void RTFDocumentImpl::text(OUString rString)
 case DESTINATION_STYLEENTRY:
 if 
(m_aStates.top().aTableAttributes.find(NS_ooxml::LN_CT_Style_type))
 {
-m_aStyleNames[m_nCurrentStyleIndex] = aName;
-RTFValue::Pointer_t pValue(new RTFValue(aName));
+// Word strips whitespace around style names.
+m_aStyleNames[m_nCurrentStyleIndex] = aName.trim();
+RTFValue::Pointer_t pValue(new RTFValue(aName.trim()));
 
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_styleId, pValue);
 
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
 
commit 9f05a8709232bdce78760636c6f6f03bf588a1ec
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Aug 29 16:58:03 2014 +0200

Remove unused url attribute

And also make sure that the model is re-checked when the schema changes.

Change-Id: I348d11aa770255329cd47535dff4b15a95e4bd8e

diff --git a/writerfilter/CustomTarget_source.mk 
b/writerfilter/CustomTarget_source.mk
index 09b2610..8d7b3d2 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -76,7 +76,7 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : 
$(writerfilter_SRC)/ooxml/factoryinc.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $ 
$(writerfilter_GEN_ooxml_Model_processed))  $@
 
-$(writerfilter_GEN_ooxml_Model_validated) : $(writerfilter_SRC_ooxml_Model)
+$(writerfilter_GEN_ooxml_Model_validated) : 
$(writerfilter_SRC)/../documentation/ooxml/model.rng 
$(writerfilter_SRC_ooxml_Model)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,VAL,1)
$(call gb_Helper_abbreviate_dirs,\
$(writerfilter_XMLLINTCOMMAND) --noout --relaxng 
$(writerfilter_SRC)/../documentation/ooxml/model.rng 
$(writerfilter_SRC_ooxml_Model)  $@ 21 \
diff --git a/writerfilter/documentation/ooxml/model.rng 
b/writerfilter/documentation/ooxml/model.rng
index 6f365ff..3c9c402 100644
--- a/writerfilter/documentation/ooxml/model.rng
+++ b/writerfilter/documentation/ooxml/model.rng
@@ -259,9 +259,6 @@ documentation for that file. The schema has two parts:
   optional
 attribute name=file/
   /optional
-  optional
-attribute name=url/
-  /optional
   zeroOrMore
 ref name=start-element/
   /zeroOrMore
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 42559b8..6d639c6 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -44,7 +44,7 @@
   token tokenid=ooxml:footerl/
   token tokenid=ooxml:footerr/
   token tokenid=ooxml:footerf/
-  namespace name=dml-stylesheet

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

2014-08-29 Thread Michael Stahl

 editeng/source/editeng/eerdll.cxx   |2 -
 sd/qa/unit/data/odp/masterpage_style_parent.odp |binary
 sd/qa/unit/import-tests.cxx |   43 
 sd/source/core/stlsheet.cxx |   13 ++-
 4 files changed, 55 insertions(+), 3 deletions(-)

New commits:
commit 5b63c12ace2aec9a659e4b9125f6aa9ff204ed09
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 29 19:09:29 2014 +0200

n#708518: sd: check that master page matches when setting parent style

In ODF import it happened that the parent style of outline2 etc.
was always set to the outline1 style of the first master page in
the document, but it should be the outline1 style of the same master
page as the outline2.

(regression from e955433c3574cb602dedba96bc645898f97858bf)

Change-Id: Ie563d5ee5c2040aeb6ca5c8bb25b195e15ea964e

diff --git a/sd/qa/unit/data/odp/masterpage_style_parent.odp 
b/sd/qa/unit/data/odp/masterpage_style_parent.odp
new file mode 100644
index 000..e9f6378
Binary files /dev/null and b/sd/qa/unit/data/odp/masterpage_style_parent.odp 
differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 3131937..33c5239 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -50,6 +50,8 @@
 #include com/sun/star/chart2/data/XDataSequence.hpp
 #include com/sun/star/chart2/data/XNumericalDataSequence.hpp
 
+#include stlpool.hxx
+
 using namespace ::com::sun::star;
 
 /// Impress import filters tests.
@@ -60,6 +62,7 @@ public:
 void testSmoketest();
 void testN759180();
 void testN778859();
+void testMasterPageStyleParent();
 void testFdo64512();
 void testFdo71075();
 void testN828390_2();
@@ -80,6 +83,7 @@ public:
 CPPUNIT_TEST(testSmoketest);
 CPPUNIT_TEST(testN759180);
 CPPUNIT_TEST(testN778859);
+CPPUNIT_TEST(testMasterPageStyleParent);
 CPPUNIT_TEST(testFdo64512);
 CPPUNIT_TEST(testFdo71075);
 CPPUNIT_TEST(testN828390_2);
@@ -344,6 +348,45 @@ void SdFiltersTest::testN828390_3()
 xDocShRef-DoClose();
 }
 
+void SdFiltersTest::testMasterPageStyleParent()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc(/sd/qa/unit/data/odp/masterpage_style_parent.odp), ODP );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+
+SdStyleSheetPool *const pPool(pDoc-GetSdStyleSheetPool());
+
+int parents(0);
+SfxStyleSheetIterator iter(pPool, SD_STYLE_FAMILY_MASTERPAGE);
+for (SfxStyleSheetBase * pStyle = iter.First(); pStyle; pStyle = 
iter.Next())
+{
+OUString const name(pStyle-GetName());
+OUString const parent(pStyle-GetParent());
+if (!parent.isEmpty())
+{
+++parents;
+// check that parent exists
+SfxStyleSheetBase *const pParentStyle(
+pPool-Find(parent, SD_STYLE_FAMILY_MASTERPAGE));
+CPPUNIT_ASSERT(pParentStyle);
+CPPUNIT_ASSERT_EQUAL(pParentStyle-GetName(), parent);
+// check that parent has the same master page as pStyle
+CPPUNIT_ASSERT(parent.indexOf(SD_LT_SEPARATOR) != -1);
+CPPUNIT_ASSERT(name.indexOf(SD_LT_SEPARATOR) != -1);
+CPPUNIT_ASSERT_EQUAL(
+parent.copy(0, parent.indexOf(SD_LT_SEPARATOR)),
+name.copy(0, name.indexOf(SD_LT_SEPARATOR)));
+}
+}
+// check that there are actually parents...
+CPPUNIT_ASSERT_EQUAL(16, parents);
+
+xDocShRef-DoClose();
+}
+
 void SdFiltersTest::testN778859()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/n778859.pptx), PPTX);
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4246e31..68075de 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -921,16 +921,25 @@ void SAL_CALL SdStyleSheet::setParentStyle( const 
OUString rParentName  ) throw
 
 if( !rParentName.isEmpty() )
 {
+OUString const name(GetName());
+sal_Int32 const sep(name.indexOf(SD_LT_SEPARATOR));
+OUString const master((sep == -1) ? OUString() : name.copy(0, sep));
 boost::shared_ptrSfxStyleSheetIterator aSSSI = 
boost::make_sharedSfxStyleSheetIterator(mxPool.get(), nFamily);
 for (SfxStyleSheetBase *pStyle = aSSSI-First(); pStyle; pStyle = 
aSSSI-Next())
 {
 // we hope that we have only sd style sheets
 SdStyleSheet* pSdStyleSheet = static_castSdStyleSheet*(pStyle);
-if (pSdStyleSheet-msApiName == rParentName)
+OUString const curName(pStyle-GetName());
+sal_Int32 const curSep(curName.indexOf(SD_LT_SEPARATOR));
+OUString const curMaster((curSep == -1)
+? OUString() : curName.copy(0, sep));
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/Library_avmedia.mk avmedia/source config_host/config_features.h.in config_host.mk.in configure.ac include/avmedia RepositoryExternal.

2014-08-29 Thread Zolnai Tamás

 RepositoryExternal.mk   |6 +-
 avmedia/Library_avmedia.mk  |5 +
 avmedia/source/framework/modeltools.cxx |9 ++---
 config_host.mk.in   |1 +
 config_host/config_features.h.in|5 +
 configure.ac|   23 +++
 include/avmedia/modeltools.hxx  |4 
 sd/source/ui/func/fuinsert.cxx  |9 +
 8 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 6d239ee19a4b1d9068fbd04b5a692c859142f613
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Aug 29 14:14:31 2014 +0200

Handle collada libraries seperately: --disable-collada

Depends on gltf support.

(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507)

Conflicts:
config_host.mk.in
sd/source/ui/func/fuinsert.cxx

Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Reviewed-on: https://gerrit.libreoffice.org/11193
Tested-by: Rene Engelhard r...@debian.org
Reviewed-by: Rene Engelhard r...@debian.org

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b42dce2..cd99108 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3324,6 +3324,8 @@ endef
 
 endif # SYSTEN_LIBGLTF
 
+ifeq ($(ENABLE_COLLADA),TRUE)
+
 define gb_LinkTarget__use_opencollada_parser
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call 
gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
@@ -3354,7 +3356,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 endef
 
-endif
+endif # ENABLE_COLLADA
+
+endif # ENABLE_GLTF
 
 ### Jars 
 
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 184c66c..7cc08fa 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 ))
 endif
 
-ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
+ifeq ($(ENABLE_COLLADA),TRUE)
 $(eval $(call gb_Library_set_warnings_not_errors,avmedia))
 
 ifeq ($(OS),LINUX)
@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\
png \
 ))
 
-$(eval $(call gb_Library_add_defs,avmedia,\
-   -DENABLE_COLLADA2GLTF \
-))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 6119cb7..8c4251e 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -29,7 +29,9 @@
 #include boost/foreach.hpp
 #include boost/optional.hpp
 
-#ifdef ENABLE_COLLADA2GLTF
+#include config_features.h
+
+#if HAVE_FEATURE_COLLADA
 #include COLLADA2GLTFWriter.h
 #include GLTFAsset.h
 #endif
@@ -42,7 +44,7 @@ using namespace boost::property_tree;
 
 namespace avmedia {
 
-#ifdef ENABLE_COLLADA2GLTF
+#if HAVE_FEATURE_COLLADA
 
 static void lcl_UnzipKmz(const OUString rSourceURL, const OUString 
rOutputFolderURL, OUString o_rDaeFileURL)
 {
@@ -242,7 +244,8 @@ bool Embed3DModel( const uno::Referenceframe::XModel 
xModel,
 const OUString rSourceURL, OUString o_rEmbeddedURL)
 {
 OUString sSource = rSourceURL;
-#ifdef ENABLE_COLLADA2GLTF
+
+#if HAVE_FEATURE_COLLADA
 if( !rSourceURL.endsWithIgnoreAsciiCase(.json) )
 KmzDae2Gltf(rSourceURL, sSource);
 #endif
diff --git a/config_host.mk.in b/config_host.mk.in
index aec0fa5..36a6866 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -109,6 +109,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
 export ENABLE_CMIS=@ENABLE_CMIS@
 export ENABLE_COINMP=@ENABLE_COINMP@
+export ENABLE_COLLADA=@ENABLE_COLLADA@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3fd1da5..f87ee27 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -142,4 +142,9 @@
  */
 #define HAVE_FEATURE_GLTF 0
 
+/*
+ * Whether we have COLLADA support.
+ */
+#define HAVE_FEATURE_COLLADA 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 63e067b..b6e8124 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1395,6 +1395,10 @@ AC_ARG_ENABLE(gltf,
 AS_HELP_STRING([--disable-gltf],
 [Determines whether to build libraries related to glTF 3D model 
rendering.]))
 
+AC_ARG_ENABLE(collada,
+AS_HELP_STRING([--disable-collada],
+[Disable collada support (Rendering 3D models stored in *.dae and 
*.kmz format).]))
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -10572,10 +10576,6 @@ if test x$enable_gltf != xno -a $_os != Darwin -a 
$_os != iOS -a $_os != And
 else
BUILD_TYPE=$BUILD_TYPE

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 80846, which changed state.

Bug 80846 Summary: Undo not updating dependent cell
https://bugs.freedesktop.org/show_bug.cgi?id=80846

   What|Removed |Added

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

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

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

2014-08-29 Thread Kohei Yoshida

 sc/qa/unit/data/xlsx/pivot-table/many-fields-in-cache.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx  |  147 +
 2 files changed, 147 insertions(+)

New commits:
commit e9cb48ff652ac2d4950ff9f1d3f41537bb1b5c80
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Aug 29 14:46:25 2014 -0400

Write export unit test for pivot table import / export with xlsx.

Change-Id: Idc4e9e9aafd3fe0a01758fe988ffacd76cb15784

diff --git a/sc/qa/unit/data/xlsx/pivot-table/many-fields-in-cache.xlsx 
b/sc/qa/unit/data/xlsx/pivot-table/many-fields-in-cache.xlsx
new file mode 100644
index 000..2b39849
Binary files /dev/null and 
b/sc/qa/unit/data/xlsx/pivot-table/many-fields-in-cache.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 01d1673..d20bf73 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -36,6 +36,9 @@
 #include postit.hxx
 #include tokenstringcontext.hxx
 #include chgtrack.hxx
+#include dpcache.hxx
+#include dpobject.hxx
+#include dpsave.hxx
 
 #include svx/svdoole2.hxx
 #include tabprotection.hxx
@@ -56,6 +59,8 @@
 #include test/xmltesttools.hxx
 
 #include com/sun/star/table/BorderLineStyle.hpp
+#include com/sun/star/sheet/DataPilotFieldOrientation.hpp
+#include com/sun/star/sheet/GeneralFunction.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -116,6 +121,8 @@ public:
 void testRelativePaths();
 void testSheetProtection();
 
+void testPivotTableXLSX();
+
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
 #if !defined(MACOSX)  !defined(DRAGONFLY)
@@ -152,6 +159,7 @@ public:
 CPPUNIT_TEST(testRelativePaths);
 #endif
 CPPUNIT_TEST(testSheetProtection);
+CPPUNIT_TEST(testPivotTableXLSX);
 CPPUNIT_TEST(testFunctionsExcel2010ODS);
 
 CPPUNIT_TEST_SUITE_END();
@@ -1955,6 +1963,7 @@ void testSheetProtection_Impl(ScDocument rDoc)
 }
 
 }
+
 void ScExportTest::testSheetProtection()
 {
 ScDocShellRef xDocSh = loadDoc(sheet-protection., ODS);
@@ -1974,6 +1983,144 @@ void ScExportTest::testSheetProtection()
 xDocSh2-DoClose();
 }
 
+void ScExportTest::testPivotTableXLSX()
+{
+struct
+{
+bool check( const ScDocument rDoc )
+{
+if (!rDoc.HasPivotTable())
+{
+cerr  The document should have pivot table.  endl;
+return false;
+}
+
+const ScDPCollection* pDPs = rDoc.GetDPCollection();
+if (!pDPs)
+{
+cerr  Pivot table container should exist.  endl;
+return false;
+}
+
+ScRange aSrcRange(0,0,0,9,2,0); // A1:J3 on Sheet1.
+const ScDPCache* pCache = 
pDPs-GetSheetCaches().getExistingCache(aSrcRange);
+if (!pCache)
+{
+cerr  The document should have a pivot cache for A1:J3 on 
Sheet1.  endl;
+return false;
+}
+
+// Cache should have fields from F1 through F10.
+
+const char* pNames[] = {
+F1, F2, F3, F4, F5, F6, F7, F8, F9, F10
+};
+
+size_t nCount = pCache-GetFieldCount();
+if (nCount != SAL_N_ELEMENTS(pNames))
+{
+cout  Incorrect number of fields in pivot cache.  endl;
+return false;
+}
+
+for (size_t i = 0; i  nCount; ++i)
+{
+OUString aCacheName = pCache-GetDimensionName(i);
+if (aCacheName != OUString::createFromAscii(pNames[i]))
+{
+cerr  Field   i   has label '  aCacheName  
' but expected '  pNames[i]  '  endl;
+return false;
+}
+}
+
+const ScDPObject* pDPObj = rDoc.GetDPAtCursor(0,10,0); // A11
+if (!pDPObj)
+{
+cerr  A pivot table should exist over A11.  endl;
+return false;
+}
+
+// Output range should be A8:D15.
+ScRange aOutRange = pDPObj-GetOutRange();
+if (ScRange(0,7,0,3,14,0) != aOutRange)
+{
+cerr  Incorrect output range.  endl;
+return false;
+}
+
+// Row field - F1
+// Column field - F4
+// Page fields - F7 and F6
+// Data field - F10
+
+const ScDPSaveData* pSaveData = pDPObj-GetSaveData();
+if (!pSaveData)
+{
+cerr  Save data should exist in each pivot table object. 
 endl;
+return false;
+}
+
+std::vectorconst ScDPSaveDimension* aDims;
+
pSaveData-GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_ROW, 
aDims);
+if (aDims.size() != 1 || aDims[0]-GetName() != F1)
+{
+

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

2014-08-29 Thread Lionel Elie Mamane

 svx/Library_svxcore.mk |1 +
 svx/source/fmcomp/gridcell.cxx |   18 +++---
 svx/source/inc/gridcell.hxx|1 -
 3 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 86bdb13704d9d85a247339071a86d301ce86cd7f
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Aug 29 21:04:26 2014 +0200

fdo#67615 TextField in table should use same formatting as floating 
TextField

Change-Id: Ia6333d12f9f1ecdd5a552089f0df8703c5fce88a
Reviewed-on: https://gerrit.libreoffice.org/11196
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 891744d..f66b2a0 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
 comphelper \
 cppuhelper \
 cppu \
+dbtools \
 drawinglayer \
 editeng \
 fwe \
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index f03604b..4f39140 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1071,7 +1071,6 @@ DbTextField::DbTextField(DbGridColumn _rColumn)
 :DbLimitedLengthField(_rColumn)
 ,m_pEdit( NULL )
 ,m_pPainterImplementation( NULL )
-,m_nKeyType(::com::sun::star::util::NumberFormat::TEXT)
 ,m_bIsSimpleEdit( true )
 {
 }
@@ -1148,9 +1147,6 @@ void DbTextField::Init( Window rParent, const Reference 
XRowSet  xCursor)
 
 implAdjustGenericFieldSetting( xModel );
 
-if (m_rColumn.GetParent().getNumberFormatter().is()  m_rColumn.GetKey())
-m_nKeyType  = 
comphelper::getNumberFormatType(m_rColumn.GetParent().getNumberFormatter()-getNumberFormatsSupplier()-getNumberFormats(),
 m_rColumn.GetKey());
-
 DbLimitedLengthField::Init( rParent, xCursor );
 }
 
@@ -1172,18 +1168,10 @@ void DbTextField::PaintFieldToCell( OutputDevice 
_rDev, const Rectangle _rRect
 
 OUString DbTextField::GetFormatText(const Reference XColumn  _rxField, 
const Reference XNumberFormatter  xFormatter, Color** /*ppColor*/)
 {
-OUString aString;
-if ( _rxField.is() )
-try
-{
-aString = getFormattedValue( _rxField, xFormatter, 
m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType);
-}
-catch( const Exception )
-{
-DBG_UNHANDLED_EXCEPTION();
-}
+const com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet 
xPS(_rxField, UNO_QUERY);
+::dbtools::FormattedColumnValue fmter( xFormatter, xPS );
 
-return aString;
+return fmter.getFormattedValue();
 }
 
 
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 268fa9b..2fc71c1 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -390,7 +390,6 @@ class DbTextField : public DbLimitedLengthField
 {
 ::svt::IEditImplementation* m_pEdit;
 ::svt::IEditImplementation* m_pPainterImplementation;
-sal_Int16   m_nKeyType;
 boolm_bIsSimpleEdit;
 
 protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-29 Thread Julien Nabet

 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 35e260c4a3e886c4177b232871f9f2775cd5c5f5
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Aug 29 21:38:37 2014 +0200

cppcheck: va_end_missing

Change-Id: I316830b56aba7874cff4a164925520a7b6c6131d

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index 8f5a032..7f23e1ef 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -357,6 +357,7 @@ extern C void vtableSlotCall(
 ldp d2, d3, [%[fpr_], #16]\n\t
 :: [gpr_]r (gpr), [fpr_]r (fpr)
 : r0, r1, v0, v1, v2, v3);
+va_end(ap);
 }
 #pragma GCC diagnostic pop
 
___
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' - wizards/source

2014-08-29 Thread Jean-Pierre Ledure

 wizards/source/access2base/Field.xba |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8718bcc3d74e5eed7499ec1359aff10659faaebc
Author: Jean-Pierre Ledure j...@ledure.be
Date:   Fri Aug 29 22:24:06 2014 +0200

Access2Base - PATCH-01 Field.setValue

Gives erroneously an  error message when argument is Null and field is 
nullable

https://forum.openoffice.org/en/forum/viewtopic.php?f=47t=61447sid=48e231a12084933d9da1b47e50b186ea#p323714

Change-Id: I37be06e5c30f1294756d28ba88d903f9fa28d8bb
Reviewed-on: https://gerrit.libreoffice.org/11198
Reviewed-by: Jean-Pierre Ledure j...@ledure.be
Tested-by: Jean-Pierre Ledure j...@ledure.be

diff --git a/wizards/source/access2base/Field.xba 
b/wizards/source/access2base/Field.xba
index 871133f..3e27216 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -514,7 +514,13 @@ Dim oParent As Object
If _ParentDatabase.Recordsets(_ParentName)._EditMode = 
dbEditNone Then Goto Trace_Error_Update
With com.sun.star.sdbc.DataType
If IsNull(pvValue) Then
-   If Column.IsNullable = 
com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto 
Trace_Null
+REMIf Column.IsNullable = 
com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto 
Trace_Null
+   If Column.IsNullable = 
com.sun.star.sdbc.ColumnValue.NULLABLE Then
+   Column.updateNull()
+   Goto Exit_Function
+   Else
+   Goto Trace_Null
+   End If
End If
Select Case Column.Type
Case .BIT, .BOOLEAN
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-29 Thread Tor Lillqvist

 sc/source/ui/view/tabvwsh4.cxx |   35 ---
 1 file changed, 35 deletions(-)

New commits:
commit 8d57c90b020dad4dd2a8218dd8d91d4040901e2e
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Aug 30 00:07:37 2014 +0300

WaE: unused function 'isGL3DDiagram'

Change-Id: I0af5bf5e7d36036b3f0c98d01c8549c2b8e1aa1f

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index bcc679e..9640e605 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -536,41 +536,6 @@ void ScTabViewShell::DoReadUserDataSequence( const 
uno::Sequence  beans::Proper
 //! if ViewData has more tables than document, remove tables in ViewData
 }
 
-namespace {
-
-bool isGL3DDiagram( const css::uno::Referencecss::chart2::XDiagram xDiagram 
)
-{
-uno::Referencechart2::XCoordinateSystemContainer 
xCooSysContainer(xDiagram, uno::UNO_QUERY);
-
-if (!xCooSysContainer.is())
-return false;
-
-uno::Sequence uno::Referencechart2::XCoordinateSystem  aCooSysList = 
xCooSysContainer-getCoordinateSystems();
-for (sal_Int32 nCS = 0; nCS  aCooSysList.getLength(); ++nCS)
-{
-uno::Referencechart2::XCoordinateSystem xCooSys = aCooSysList[nCS];
-
-//iterate through all chart types in the current coordinate system
-uno::Referencechart2::XChartTypeContainer 
xChartTypeContainer(xCooSys, uno::UNO_QUERY);
-OSL_ASSERT( xChartTypeContainer.is());
-if( !xChartTypeContainer.is() )
-continue;
-
-uno::Sequence uno::Referencechart2::XChartType  aChartTypeList = 
xChartTypeContainer-getChartTypes();
-for( sal_Int32 nT = 0; nT  aChartTypeList.getLength(); ++nT )
-{
-uno::Referencechart2::XChartType xChartType = aChartTypeList[nT];
-OUString aChartType = xChartType-getChartType();
-if( aChartType == com.sun.star.chart2.GL3DBarChartType )
-return true;
-}
-}
-
-return false;
-}
-
-}
-
 // DoReadUserData is also called from ctor when switching from print preview
 
 void ScTabViewShell::DoReadUserData( const OUString rData )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 writerfilter/source/ooxml/modelpreprocess.py |   26 +-
 1 file changed, 1 insertion(+), 25 deletions(-)

New commits:
commit 0da23c09222caecdf5944c1f2da17dddeb10f1c5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Aug 29 23:22:23 2014 +0200

Remove unused prefix attribute of namespace elements

Change-Id: I6fd33f9050eb3f7394315bbd0c617513767adce6

diff --git a/writerfilter/source/ooxml/modelpreprocess.py 
b/writerfilter/source/ooxml/modelpreprocess.py
index 1273b12..2f5 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -23,7 +23,7 @@ def prefixFromUrl(url):
 
 
 def prefixForGrammar(namespace):
-ns = nsForGrammar(namespace)
+ns = namespace.getElementsByTagName(grammar)[0].getAttribute(ns)
 if ns in list(ooxUrlAliases.keys()):
 prefix = ooxUrlAliases[ns]
 return prefix
@@ -31,10 +31,6 @@ def prefixForGrammar(namespace):
 return prefixFromUrl(ns)
 
 
-def nsForGrammar(namespace):
-return namespace.getElementsByTagName(grammar)[0].getAttribute(ns)
-
-
 def parseNamespaceAliases(node, ret):
 for k, v in list(node.attributes.items()):
 if k.startswith(xmlns:):
@@ -70,14 +66,7 @@ def check(model):
 
 def preprocess(model):
 for i in model.getElementsByTagName(namespace):
-ns = i.getElementsByTagName(grammar)[0].getAttribute(ns)
-if ns.startswith(http://schemas.openxmlformats.org/;):
-i.setAttribute(prefix, 
ns.replace('http://schemas.openxmlformats.org/', '').replace('/', 
'_').replace('-', '_'))
-else:
-i.setAttribute(prefix, )
-
 grammarprefix = prefixForGrammar(i)
-grammarns = nsForGrammar(i)
 
 grammarNamespaceAliases = defaultNamespaceAliases()
 grammar = i.getElementsByTagName(grammar)[0]
@@ -110,19 +99,6 @@ def preprocess(model):
 else:
 prefix = grammarprefix
 
-# ns
-ns = 
-if : in j.getAttribute(name):
-nameprefix = j.getAttribute(name).split(':')[0]
-if nameprefix in list(localNamespaceAliases.keys()):
-ns = localNamespaceAliases[nameprefix]
-elif j.localName == attribute:
-# if parent node is resource, then we're outside the grammar 
element
-if grammar.getAttribute(attributeFormDefault) == qualified 
and not j.parentNode.localName == resource:
-ns = grammarns
-else:
-ns = grammarns
-
 # localname
 if : in j.getAttribute(name):
 localname = j.getAttribute(name).split(':')[1]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk configure.ac distro-configs/LibreOfficeAndroidAarch64.conf sal/android solenv/gbuild

2014-08-29 Thread Tor Lillqvist

 bridges/Library_cpp_uno.mk|2 -
 configure.ac  |   45 ++
 distro-configs/LibreOfficeAndroidAarch64.conf |   19 ++
 sal/android/lo-bootstrap.c|   14 
 solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk |   19 ++
 5 files changed, 79 insertions(+), 20 deletions(-)

New commits:
commit 5c004922b2fc167c826350085f7d996d93b4398e
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Aug 30 00:33:42 2014 +0300

Start of support for Android on AArch64

The build does not get far before it runs into trouble in the GNU libstdc++
headers, though:


android-ndk-r10/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/opt_random.h:33:23:
fatal error: x86intrin.h: No such file or directory

Change-Id: I9d459c64980091ba8bf5b3d631d47342625f6be9

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 96bd293..33a5c00 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -35,7 +35,7 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
 endif
 
-else ifeq ($(OS)-$(CPUNAME),LINUX-AARCH64)
+else ifneq (,$(filter ANDROID-AARCH64 LINUX-AARCH64,$(OS)-$(CPUNAME)))
 
 bridges_SELECTED_BRIDGE := gcc3_linux_aarch64
 bridge_exception_objects := abi callvirtualfunction cpp2uno uno2cpp
diff --git a/configure.ac b/configure.ac
index c4fefea..c0b5658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,6 +317,9 @@ if test -n $with_android_ndk; then
 if test $host_cpu = arm; then
 android_cpu=arm
 android_platform_prefix=$android_cpu-linux-androideabi
+elif test $host_cpu = aarch64; then
+android_cpu=aarch64
+android_platform_prefix=$android_cpu-linux-android
 elif test $host_cpu = mips; then
 android_cpu=mips
 android_platform_prefix=$android_cpu-linux-androideabi
@@ -328,7 +331,7 @@ if test -n $with_android_ndk; then
 fi
 
 case $with_android_ndk_toolchain_version in
-4.6|4.7|4.8)
+4.6|4.7|4.8|4.9)
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
 ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
 ;;
@@ -383,8 +386,13 @@ if test -n $with_android_ndk; then
 ;;
 esac
 
+ANDROID_API_LEVEL=15
 if test $host_cpu = arm; then
 android_gnu_prefix=arm-linux-androideabi
+elif test $host_cpu = aarch64; then
+android_gnu_prefix=aarch64-linux-android
+
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=${with_android_ndk_toolchain_version}/
+ANDROID_API_LEVEL=L
 elif test $host_cpu = mips; then
 android_gnu_prefix=mipsel-linux-android
 elif test $ANDROID_NDK_VERSION = r8; then
@@ -394,13 +402,7 @@ if test -n $with_android_ndk; then
 android_gnu_prefix=i686-linux-android
 fi
 
-test -z $SYSBASE  export 
SYSBASE=$ANDROID_NDK_HOME/platforms/android-15/arch-$android_cpu
-test -z $AR  AR=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-ar
-test -z $NM  NM=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-nm
-test -z $OBJDUMP  
OBJDUMP=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-objdump
-test -z $RANLIB  
RANLIB=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-ranlib
-test -z $STRIP  STRIP=$ANDROID_BINUTILS_BIN/$android_gnu_prefix-strip
-
+ANDROID_ARCH=$android_cpu
 if test $host_cpu = arm; then
 ANDROID_APP_ABI=armeabi-v7a
 if test -n $ANDROID_USING_CLANG; then
@@ -412,6 +414,10 @@ if test -n $with_android_ndk; then
 fi
 ANDROIDCFLAGS=$ANDROIDCFLAGS -mthumb
 ANDROIDCFLAGS=$ANDROIDCFLAGS -march=armv7-a -mfloat-abi=softfp 
-mfpu=neon
+ANDROIDCFLAGS=$ANDROIDCFLAGS -Wl,--fix-cortex-a8
+elif test $host_cpu = aarch64; then
+ANDROID_APP_ABI=arm64-v8a
+ANDROID_ARCH=arm64
 elif test $host_cpu = mips; then
 ANDROID_APP_ABI=mips
 ANDROIDCFLAGS=
@@ -421,8 +427,7 @@ if test -n $with_android_ndk; then
 fi
 ANDROIDCFLAGS=$ANDROIDCFLAGS -ffunction-sections -fdata-sections
 ANDROIDCFLAGS=$ANDROIDCFLAGS 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI
-ANDROIDCFLAGS=$ANDROIDCFLAGS --sysroot 
$ANDROID_NDK_HOME/platforms/android-15/arch-$android_cpu
-ANDROIDCFLAGS=$ANDROIDCFLAGS -Wl,--fix-cortex-a8
+ANDROIDCFLAGS=$ANDROIDCFLAGS --sysroot 
$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}
 
 if test -n $ANDROID_USING_CLANG; then
 ANDROIDCFLAGS=$ANDROIDCFLAGS -Qunused-arguments
@@ -430,11 +435,17 @@ if test -n $with_android_ndk; then
 ANDROIDCFLAGS=$ANDROIDCFLAGS -Wno-psabi
 fi
 
+test -z $SYSBASE  export

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

2014-08-29 Thread Kohei Yoshida

 sc/qa/unit/data/xlsx/pivot-table/two-data-fields.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx |  122 ++
 sc/source/filter/excel/xepivotxml.cxx |   83 ++--
 sc/source/ui/unoobj/dapiuno.cxx   |   13 +
 4 files changed, 201 insertions(+), 17 deletions(-)

New commits:
commit 151d7a62230c98bb06628667170165f875788637
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Aug 29 18:07:29 2014 -0400

Write test for importing and exporting of pivot table with 2 data fields.

This is for xlsx format.

Change-Id: I8ef2ae41cc88eeeab610e1a89726c62acb9e2fcb

diff --git a/sc/qa/unit/data/xlsx/pivot-table/two-data-fields.xlsx 
b/sc/qa/unit/data/xlsx/pivot-table/two-data-fields.xlsx
new file mode 100644
index 000..793af59
Binary files /dev/null and 
b/sc/qa/unit/data/xlsx/pivot-table/two-data-fields.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index d20bf73..432bc75 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -39,6 +39,7 @@
 #include dpcache.hxx
 #include dpobject.hxx
 #include dpsave.hxx
+#include dputil.hxx
 
 #include svx/svdoole2.hxx
 #include tabprotection.hxx
@@ -122,6 +123,7 @@ public:
 void testSheetProtection();
 
 void testPivotTableXLSX();
+void testPivotTableTwoDataFieldsXLSX();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -160,6 +162,7 @@ public:
 #endif
 CPPUNIT_TEST(testSheetProtection);
 CPPUNIT_TEST(testPivotTableXLSX);
+CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
 CPPUNIT_TEST(testFunctionsExcel2010ODS);
 
 CPPUNIT_TEST_SUITE_END();
@@ -2121,6 +2124,125 @@ void ScExportTest::testPivotTableXLSX()
 xDocSh2-DoClose();
 }
 
+void ScExportTest::testPivotTableTwoDataFieldsXLSX()
+{
+struct
+{
+bool check( const ScDocument rDoc )
+{
+if (!rDoc.HasPivotTable())
+{
+cerr  The document should have pivot table.  endl;
+return false;
+}
+
+const ScDPCollection* pDPs = rDoc.GetDPCollection();
+if (!pDPs)
+{
+cerr  Pivot table container should exist.  endl;
+return false;
+}
+
+ScRange aSrcRange(1,1,1,2,8,1); // B2:C9 on the 2nd sheet.
+const ScDPCache* pCache = 
pDPs-GetSheetCaches().getExistingCache(aSrcRange);
+if (!pCache)
+{
+cerr  The document should have a pivot cache for B2:C9 on 
'Src'.  endl;
+return false;
+}
+
+const char* pNames[] = { Name, Value };
+
+size_t nCount = pCache-GetFieldCount();
+if (nCount != SAL_N_ELEMENTS(pNames))
+{
+cout  Incorrect number of fields in pivot cache.  endl;
+return false;
+}
+
+const ScDPObject* pDPObj = rDoc.GetDPAtCursor(0,2,0); // A3
+if (!pDPObj)
+{
+cerr  A pivot table should exist over A3.  endl;
+return false;
+}
+
+// Output range should be A3:C12.
+ScRange aOutRange = pDPObj-GetOutRange();
+if (ScRange(0,2,0,2,11,0) != aOutRange)
+{
+cerr  Incorrect output range.  endl;
+return false;
+}
+
+const ScDPSaveData* pSaveData = pDPObj-GetSaveData();
+if (!pSaveData)
+{
+cerr  Save data should exist in each pivot table object. 
 endl;
+return false;
+}
+
+std::vectorconst ScDPSaveDimension* aDims;
+
pSaveData-GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_ROW, 
aDims);
+if (aDims.size() != 1 || aDims[0]-GetName() != Name)
+{
+cerr  Pivot table should have one row field labeld 'Name' 
 endl;
+return false;
+}
+
+
pSaveData-GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_DATA, 
aDims);
+if (aDims.size() != 2 ||
+ScDPUtil::getSourceDimensionName(aDims[0]-GetName()) != 
Value ||
+ScDPUtil::getSourceDimensionName(aDims[1]-GetName()) != 
Value)
+{
+cerr  Pivot table should have two duplicated data fields 
both of which are named 'Value'.  endl;
+return false;
+}
+
+if (aDims[0]-GetFunction() != sheet::GeneralFunction_SUM)
+{
+cerr  First data field should be SUM.  endl;
+return false;
+}
+
+if (aDims[1]-GetFunction() != sheet::GeneralFunction_COUNT)
+{
+cerr  First data field should be COUNT.  endl;
+return false;
+}
+
+

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

2014-08-29 Thread Kohei Yoshida

 sc/source/filter/excel/xepivot.cxx |  214 -
 sc/source/filter/inc/xepivot.hxx   |3 
 2 files changed, 1 insertion(+), 216 deletions(-)

New commits:
commit fcc6e8ae56d539ef92bfb917a52ac0638b3db25f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Aug 29 18:35:44 2014 -0400

Remove the old xlsx pivot table export code.

Change-Id: I6725cbc331b51f66025a8294612c6a5918c07adf

diff --git a/sc/source/filter/excel/xepivot.cxx 
b/sc/source/filter/excel/xepivot.cxx
index 5878af8..34937da 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -724,38 +724,10 @@ void XclExpPivotCache::Save( XclExpStream rStrm )
 WriteCacheStream();
 }
 
-void XclExpPivotCache::SaveXml( XclExpXmlStream
-#ifdef XLSX_PIVOT_CACHE
- rStrm
-#endif
-)
+void XclExpPivotCache::SaveXml( XclExpXmlStream /*rStrm*/ )
 {
-OSL_ENSURE( mbValid, XclExpPivotCache::Save - invalid pivot cache );
-#ifdef XLSX_PIVOT_CACHE /* pivotCache without xl/pivotCaches/ cacheStream
-   results in a broken .xlsx */
-sax_fastparser::FSHelperPtr rWorkbook = rStrm.GetCurrentStream();
-OUString sId = OUStringBuffer()
-.appendAscii(rId)
-.append( rStrm.GetUniqueIdOUString() )
-.makeStringAndClear();
-rWorkbook-startElement( XML_pivotCache,
-XML_cacheId, OString::number( maPCInfo.mnStrmId ).getStr(),
-FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
-FSEND );
-// SXIDSTM
-XclExpUInt16Record( EXC_ID_SXIDSTM, maPCInfo.mnStrmId ).SaveXml( rStrm );
-// SXVS
-XclExpUInt16Record( EXC_ID_SXVS, EXC_SXVS_SHEET ).SaveXml( rStrm );
-// DCONREF
-// OOXTODO: WriteDconref( rStrm );
-// create the pivot cache storage stream
-// OOXTODO: WriteCacheStream();
-rWorkbook-endElement( XML_pivotCache );
-#endif /* XLSX_PIVOT_CACHE */
 }
 
-// private 
-
 XclExpPCField* XclExpPivotCache::GetFieldAcc( sal_uInt16 nFieldIdx )
 {
 return maFieldList.GetRecord( nFieldIdx ).get();
@@ -1317,152 +1289,6 @@ void XclExpPivotTable::Save( XclExpStream rStrm )
 }
 }
 
-void XclExpPivotTable::SaveXml( XclExpXmlStream rStrm )
-{
-if( !mbValid )
-return;
-sax_fastparser::FSHelperPtr aPivotTableDefinition = 
rStrm.CreateOutputStream(
-XclXmlUtils::GetStreamName( xl/, pivotTables/pivotTable, mnId 
+ 1),
-XclXmlUtils::GetStreamName( ../, pivotTables/pivotTable, mnId 
+ 1),
-rStrm.GetCurrentStream()-getOutputStream(),
-
application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml,
-
http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable;);
-rStrm.PushStream( aPivotTableDefinition );
-
-aPivotTableDefinition-startElement( XML_pivotTableDefinition,
-XML_xmlns,  
http://schemas.openxmlformats.org/spreadsheetml/2006/main;,
-XML_name,   XclXmlUtils::ToOString( 
maPTInfo.maTableName ).getStr(),
-XML_cacheId,OString::number(  
maPTInfo.mnCacheIdx ).getStr(),
-XML_dataOnRows, XclXmlUtils::ToPsz( 
maPTInfo.mnDataAxis == EXC_SXVD_AXIS_COL ),
-XML_dataPosition,   OString::number(  
maPTInfo.mnDataPos ).getStr(),
-XML_autoFormatId,   OString::number(  
maPTInfo.mnAutoFmtIdx ).getStr(),
-// OOXTODO: XML_applyNumberFormats, [ SXVIEW fAtrNum 
(maPTInfo.mnFlags) ]
-// OOXTODO: XML_applyBorderFormats, [ SXVIEW fAtrBdr 
(maPTInfo.mnFlags) ]
-// OOXTODO: XML_applyFontFormats,   [ SXVIEW fAtrFnt 
(maPTInfo.mnFlags) ]
-// OOXTODO: XML_applyPatternFormats,[ SXVIEW fAtrPat 
(maPTInfo.mnFlags) ]
-// OOXTODO: XML_applyAlignmentFormats,  [ SXVIEW fAtrAlc 
(maPTInfo.mnFlags) ]
-// OOXTODO: XML_applyWidthHeightFormats,[ SXVIEW fAtrProc 
(maPTInfo.mnFlags) ]
-XML_dataCaption,XclXmlUtils::ToOString( 
maPTInfo.maDataName ).getStr(),
-// OOXTODO: XML_grandTotalCaption,  [ SxViewEx9 chGrand ]
-// OOXTODO: XML_errorCaption,   [ SXEx stError ]
-// OOXTODO: XML_showError,  [ SXEx 
fDisplayErrorString ]
-// OOXTODO: XML_missingCaption, [ SXEx stDisplayNull ]
-// OOXTODO: XML_showMissing,[ SXEx 
fDisplayNullString ]
-// OOXTODO: XML_pageStyle,  [ SXEx 
stPageFieldStyle ]
-// OOXTODO: XML_pivotTableStyle,[ SXEx stTableStyle ]
-// OOXTODO: XML_vacatedStyle,   [ SXEx stVacateStyle ]
-// OOXTODO: XML_tag,[ SXEx stTag ]
-

User wants to say thanks

2014-08-29 Thread Joel Madero

Thought I'd pass this along as it meant something to me at least :)

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


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

Re: [Libreoffice-qa] Media Support in LibreOffice

Robinson Tryon wrote
For example, you did a test on OX X 10.9.3 with LO 4.4.0.0 (master) of
WebM, and able to insert, preview, and get sound playback. That
suggests that your QuickTime (and any added Components) supports
- MKV container
- Vorbis codec
But probably doesn't support
- VP8 video codec

Does anyone know whether the (any?) media framework provides container
support or does a related codec handle both the container AND audio/video
streams? I ask because I am worried that having tables on the Media Support
page with entries like:

File format: MP4 [MP4V/AAC]
Video plays?: YES

... is tending toward simplification, particularly in relation to container
formats. Unless the audio/video stream encoding in a particular
AVI/MPEG/MP4/MKV/etc is known it is difficult to tell if a container format
is going to play or not. Some container formats support quite a few
different stream encodings (one per stream per file).

If the media framework version (e.g., DirectShow included with XP/Vista/7/8)
also affects this, then the picture becomes very complicated very quickly
(with Apple less so b/c they just seem to drop support for old stuff ;-).
Dropping old gstreamer versions is also proving difficult due to a desire to
support a wide variety of GNU/Linux versions:

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

Presumably this affects what containers and stream encodings are supported?
Happy to hear what others have to say and whether or not I have gone barking
mad.

-
Best wishes, Owen.
--
View this message in context:
http://nabble.documentfoundation.org/Libreoffice-qa-Media-Support-in-LibreOffice-tp4119905p4120594.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

Robinson Tryon wrote
 In the future we might want to test with a source
 from the Prelinger collection at archive.org (or etc..) so that we can
 redistribute it.

I agree. I have tended to use a variety of smaller (filesize) files from
various archive.org pages that cover a modest variety of video codecs. The
Gnome Shotwell project used to have a freely available redmine containing a
good selection of small videos from popular model cameras, video camcorders,
and phones, but it seems to have gone offline / behind closed doors. I now
find the MPlayer samples repositories to be about the best in terms of codec
coverage:

http://samples.mplayerhq.hu/

The files are generally not too large and contain good information on what
codec is used, especially in container formats.



-
Best wishes, Owen.
--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Media-Support-in-LibreOffice-tp4119905p4120584.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

jphilipz wrote
 When it comes to svg, the svg insert library is quite good and
 constantly improving. When it comes to the svg open library that works
 in Draw, that one has quite alot of problems from the bug reports i've
 seen and i havent seen much work going into fixing those bugs.
 
 SVG Insert
 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=78554
 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=82221

There remain incompatibilities between the SVG and ODF specifications.
Outline of the history of these problems here:

http://www.w3.org/Graphics/SVG/WG/wiki/Proposals/SVG_in_ODF

I have tried to collect SVG-related OASIS (ODF) issues in a few posts (#22
and #24) in this forum thread:

http://en.libreofficeforum.org/node/293

It is also worth noting that SVGs created in Inkscape need to be saved using
the non-default Plain SVG file format for accurate compatibility testing
as Inkscape extended the SVG format.



-
Best wishes, Owen.
--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Media-Support-in-LibreOffice-tp4119905p4120581.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread m.a.riosv

I think could be of interest this link in the TDF planet 2014/08/20 to the
blog of Tamas Zolnai:

http://zolnaitamas.blogspot.com.es/2014/08/3d-models-in-impress-libreoffice-43.html

Miguel Ángel.



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Media-Support-in-LibreOffice-tp4119905p4120197.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

Robinson Tryon wrote
I've created the following wiki page to help to collect and provide
information about the status of media support in LibreOffice:
https://wiki.documentfoundation.org/Media_Support

Thanks for getting this started Robinson. I have made a few minor
consistency edits. I note on the linked Quicktime Wikipedia page it states:

As of the Mac OS X Lion, the underlying media framework for Quicktime,
QTKit, is deprecated in favor of a newer graphics framework, AV Foundation.

There seem to have been a number of commits (by Herbert Dürr and Tor
Lillqvist) on 2014-05-15 related to this:

http://cgit.freedesktop.org/libreoffice/core/log/?id=8bfbfc06fefb418269734cfb17c70a5ae5a42d2a

... but I am not clear about how (or if) this will affect the end user.

Is it worth including links to the official lists of containers / codecs
supported by each media framework? They are linked in this AskLO answer:

http://ask.libreoffice.org/en/question/854/what-video-formats-does-libreoffice-impress-support/?answer=1451#post-id-1451

-
Best wishes, Owen.
--
View this message in context:
http://nabble.documentfoundation.org/Libreoffice-qa-Media-Support-in-LibreOffice-tp4119905p4119982.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread Alex Thurgood

Le 28/08/2014 17:45, Owen Genat a écrit :

Hi Owen,

 

 File format:  MP4 [MP4V/AAC]
 Video plays?: YES
 
 ... is tending toward simplification, particularly in relation to container
 formats. Unless the audio/video stream encoding in a particular
 AVI/MPEG/MP4/MKV/etc is known it is difficult to tell if a container format
 is going to play or not. Some container formats support quite a few
 different stream encodings (one per stream per file).

Yes, you are correct, the table is an over-simplification because it
doesn't specify the codec used within the container. The problem is that
testing all of the available containers with all of the different
possible codecs supported by those containers is currently verging on
the impossible.


 https://bugs.freedesktop.org/show_bug.cgi?id=82359
 
 Presumably this affects what containers and stream encodings are supported?
 Happy to hear what others have to say and whether or not I have gone barking
 mad.

No, not mad just yet ;-)

Alex


___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] QA Call Time

2014-08-29 Thread Tommy

On Thu, 28 Aug 2014 17:53:45 +0200, Robinson Tryon  
bishop.robin...@gmail.com wrote:



On Thu, Aug 28, 2014 at 11:38 AM, Tommy ba...@quipo.it wrote:
I've joined 2 calls in the past but unfortunately it will not be  
possible to

join again.
I have 3 little kids at home (2, 5 and 7 years old) that make too much  
noise

in the background :-)


Hi Tommy,

Thanks for joining us previously. Would joining us via IRC would out
better for you?  (background noise isn't really a problem in the
chatroom)

Best,
--R



I could try to be on IRC only.
bye, Tommaso

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

On Thu, Aug 28, 2014 at 10:59 AM, Owen Genat owen.ge...@gmail.com wrote:
 ...I now
 find the MPlayer samples repositories to be about the best in terms of codec
 coverage:

 http://samples.mplayerhq.hu/

 The files are generally not too large and contain good information on what
 codec is used, especially in container formats.

Thanks -- I've added a section about test media here:
https://wiki.documentfoundation.org/Media_Support#Media_for_Tests

--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
Volunteer Coordinator - LibreOffice Community Outreach
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

On Sun, Aug 24, 2014 at 1:07 AM, Owen Genat owen.ge...@gmail.com wrote:


(Hmm... looks like some messages are taking a while to reach the list
(or at least reach me). I'll look into this)

 As of the Mac OS X Lion, the underlying media framework for Quicktime,
 QTKit, is deprecated in favor of a newer graphics framework, AV Foundation.

 There seem to have been a number of commits (by Herbert Dürr and Tor
 Lillqvist) on 2014-05-15 related to this:
 ... but I am not clear about how (or if) this will affect the end user.

Did my email yesterday help to clear up some of the confusion?

In a nutshell, it sounds like there are two frameworks supported in OS X 10.9:
- QuickTime (deprecated)
- AVFoundation

After the commits by Herbert and Tor, I believe that LibreOffice can
use either framework (defaulting to QuickTime, and falling back to
AVFoundation). The problem is that as of right now, there's no
documentation for adding 3rd party codecs to AVFoundation, so while
QuickTime should work for now (This needs more testing), our path
forward is unclear.

 Is it worth including links to the official lists of containers / codecs
 supported by each media framework? They are linked in this AskLO answer:

 http://ask.libreoffice.org/en/question/854/what-video-formats-does-libreoffice-impress-support/?answer=1451#post-id-1451

Official lists sound like a good addition to the wiki -- I'll add them!

Best,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
Volunteer Coordinator - LibreOffice Community Outreach
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread Jay Philips

Hi R,

I thought it wouldnt make a difference with xiph or ffdshow tryouts as
klite already uses ffdshow/lav libraries, and thats what it turned out
to be.

Regards,
Jay Philips

On 08/29/2014 02:18 AM, Robinson Tryon wrote:
 On Thu, Aug 28, 2014 at 5:22 PM, Jay Philips philip...@hotmail.com wrote:
 Hi R,

 Any info about Windows from the devs, as i'd like to do some testing for it.
 
 Jay -- It would be great if you could test on Windows with the Xiph
 and 'ffdshow tryouts' codec packs, that would be great. I stubbed-in
 some notes here:
 https://wiki.documentfoundation.org/Media_Support#Support_on_Windows
 
 Thanks,
 --R
 
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread Alexander Thurgood

Le 29/08/2014 16:19, Robinson Tryon a écrit :

Hi Robinson,

 
 Thanks -- I've added a section about test media here:
 https://wiki.documentfoundation.org/Media_Support#Media_for_Tests

The comments you attribute to me from IRC were in fact Tor's ;-)

I am currently building a new master, and will remove the quicktime AV
dylibs and test what is supported and what isn't.

I can confirm however that Perian, although it installs, doesn't seem to
change anything in the way QuickTime works on OSX 10.9.4.


Alex


___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread Aleksandr P

Hello.
Is it a good idea to use filter:xxx whiteboard tag for bugs with
images? For other media?

Best regards,
Alexandr
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

On Fri, Aug 29, 2014 at 11:44 AM, Alexander Thurgood
alex.thurg...@gmail.com wrote:
 Le 29/08/2014 16:19, Robinson Tryon a écrit :
 The comments you attribute to me from IRC were in fact Tor's ;-)


Oops! Fixed now :-)

 I am currently building a new master, and will remove the quicktime AV
 dylibs and test what is supported and what isn't.

Awesome. If I understand the technical situation, that should
theoretically still give us support for this stuff:
https://wiki.documentfoundation.org/Media_Support#QuickTime_default_codec_support

 I can confirm however that Perian, although it installs, doesn't seem to
 change anything in the way QuickTime works on OSX 10.9.4.

Is that QuickTime Player X, or QuickTime libraries, or?

Thanks,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
Volunteer Coordinator - LibreOffice Community Outreach
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

On Fri, Aug 29, 2014 at 11:46 AM, Aleksandr P alexpik...@gmail.com wrote:
 Hello.
 Is it a good idea to use filter:xxx whiteboard tag for bugs with
 images? For other media?

I think it's generally a good idea. We had some conversations, and the
naming got a lot of support from QA. Note that because of some
oddities such as having two separate SVG import filters, we end up
with
filter:svgOpen
filter:svgInsert

Not ideal, but it's serviceable for now :-)

--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
Volunteer Coordinator - LibreOffice Community Outreach
qu...@libreoffice.org
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Media Support in LibreOffice

2014-08-29 Thread Alexander Thurgood

Le 29/08/2014 16:19, Robinson Tryon a écrit :




Tested today in QuickTime 10.3 with Perian installed :

AVI (IV4L codec)
WMV (WMV3/WMV9, WMA2)
OGV (Xiph Theora, VORBIS)


None of the above video containers could be read by QuickTime, with or
without Perian.

Note that Perian over QT appears as a separate menu entry in the Open
with... context menu, howver, it doesn't take Perian's app icon, which
indicates that it probably isn't registered properly with QT. This would
coincide with other reports that Perian doesn't work on OSX 10.9.

All of the above can be played back successfully (full video and audio)
by both MPlayerX and VLC independently.

I would add that from my limited testing, QuickTime 10.3 on OSX 10.9.4
can convert WebM to MOV on the fly, but the audio gets lost in the process.

WEBM (VP8 video, Vorbis audio) - converted on fly, no audio

MP4 (H264 video, MP4A audio) - full video and audio playback without
conversion.



Alex

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Type of directories missing in Tools - Options - LibreOfficeDev - Paths in 4.4.0.0alpha0+

2014-08-29 Thread Thomas Hackert

Hello all,
while I was configuring my parallel installed Version: 
4.4.0.0.alpha0+ Build ID: 1298c1d13572c6fbfbabb813b2d6843368c6df1f
TinderBox: Linux-rpm_deb-x86@45-TDF, Branch:master, Time: 
2014-08-29_00:42:19 (following the instructions from 
https://wiki.documentfoundation.org/Installing_in_parallel) and with 
the en_US lang- as well as helppack under Debian Testing I 
discovered the following:

1. Start LO
2. Go to Tools – Options, then LibreOfficeDev – Paths

On my system, all of the different type of directories (AutoCorrect, 
AutoText, Backups, etc.) are missing there ... :(

Can someone confirm this with a different OS/architecture, please?
TIA
Thomas.

-- 
I have no right, by anything I do or say, to demean a human being in 
his own eyes. What matters is not what I think of him; it is what he 
thinks of himself. To undermine a man's self-respect is a sin.
-- Antoine de Saint-Exupery

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Type of directories missing in Tools - Options - LibreOfficeDev - Paths in 4.4.0.0alpha0+

2014-08-29 Thread Robert Großkopf

Hello Thomas,

 while I was configuring my parallel installed Version: 
 4.4.0.0.alpha0+ Build ID: 1298c1d13572c6fbfbabb813b2d6843368c6df1f
 TinderBox: Linux-rpm_deb-x86@45-TDF, Branch:master, Time: 
 2014-08-29_00:42:19 (following the instructions from 
 https://wiki.documentfoundation.org/Installing_in_parallel) and with 
 the en_US lang- as well as helppack under Debian Testing I 
 discovered the following:
 
 1. Start LO
 2. Go to Tools – Options, then LibreOfficeDev – Paths
 
 On my system, all of the different type of directories (AutoCorrect, 
 AutoText, Backups, etc.) are missing there ... :(

Same here with OpenSUSE 64bit rpm and LO 4.4.0.0alpa from 2014-08-23

Regards

Robert

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 81292] TABLE: Crashes on sorting table

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

Bart Hengeveld h...@xs4all.nl changed:

   What|Removed |Added

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

--- Comment #17 from Bart Hengeveld h...@xs4all.nl ---
With the update to 4.3.1.2 issue is fixed. Sorting now OK.

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

[Libreoffice-bugs] [Bug 80659] VIEWING: Scrolling becomes slow when pictures appear

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

--- Comment #16 from Garri g.djavad...@gmail.com ---
I tried to reproduce the issue using LibreOffice 3.5.7. There was no slow
scrolling in 3.5.7.

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

[Libreoffice-bugs] [Bug 83225] New: FILESAVE [DOCX] File can´t be reopened since LO doubles some attributs in DOCUMENT.XML

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

  Priority: medium
Bug ID: 83225
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILESAVE [DOCX] File can´t be reopened since LO
doubles some attributs in DOCUMENT.XML
  Severity: major
Classification: Unclassified
OS: Windows (All)
  Reporter: a_...@web.de
  Hardware: x86-64 (AMD64)
Status: UNCONFIRMED
   Version: 4.3.0.4 release
 Component: Writer
   Product: LibreOffice

I converted a PDF to a DOCX-file by using SolidConverter, which could be opened
by WRITER successfully inspite of some misformatting issues. (attachment:
GB_2013.docx)

After having edited the first page I saved the file and closed it. When I
reopened it, all I got was a blank page. MS Word Viewer stopped opening it with
an error message. (attachment: GB_2014_org.docx)

Reason: On saving the file WRITER doubled two attributes of the font Calibri in
File document.xml:

w:rFonts w:ascii=Calibri w:hAnsi=Calibri w:ascii=Calibri
w:hAnsi=Calibri/

Moreover the attribut val was doubled:

Attribute val bound to namespace
http://schemas.openxmlformats.org/wordprocessingml/2006/main; was already
specified for element w:color.

After having removed the doubled attributes, I could open the document. 
(attachment GB_2014_mod.docx)

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

[Libreoffice-bugs] [Bug 83225] FILESAVE [DOCX] File can´t be reopened since LO doubles some attributs in DOCUMENT.XML

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

--- Comment #1 from André van den Berg a_...@web.de ---
Created attachment 105409
  -- https://bugs.freedesktop.org/attachment.cgi?id=105409action=edit
ZIP-File with the files mentioned in the text

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

[Libreoffice-bugs] [Bug 82909] FORMATTING: Copying cells in inserted tables causes the program to crash (Impress)