date:20131112

[Libreoffice-commits] .: COPYING

2013-11-12 Thread Libreoffice Gerrit user

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

New commits:
commit 1cebdfc97b39961c2df68e84996f667d529eafc7
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Nov 12 08:59:19 2013 +0100

Update FSF address in LGPL license.

Since rpmlint was bitching, and indeed
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt features a
new address.

diff --git a/COPYING b/COPYING
index b1e3f5a..0a41847 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
   Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Tor Lillqvist

 external/libxml2/libxml2-android.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 439b518b1a96b8cffd96da6fd060e7be074a2035
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Nov 12 10:17:45 2013 +0200

No glob.h in the Android NDK

So don't bother building libxml2 programs for Android, we have no need for
them, there is no way to run them on normal devices, etc. While at it, don't
bother with scripts, manpages or data either. We just want the library.

Change-Id: Ic6553c4ed5b51feab40fed6bd62fd10795e9acf9

diff --git a/external/libxml2/libxml2-android.patch 
b/external/libxml2/libxml2-android.patch
index cc2c5ab..53011e1 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -25,3 +25,14 @@
  
  #elif defined(NAN)  defined(__STDC_IEC_559__)
 
+--- misc/libxml2-2.7.6/Makefile.in
 misc/build/libxml2-2.7.6/Makefile.in
+@@ -1635,7 +1635,7 @@
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+   $(MAKE) $(AM_MAKEFLAGS) check-recursive
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) \
+   config.h
+ install-binPROGRAMS: install-libLTLIBRARIES
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread sushil_shinde

 oox/source/export/vmlexport.cxx   |9 +++--
 sw/qa/extras/ooxmlexport/data/image_data.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |8 
 sw/source/filter/ww8/docxattributeoutput.cxx  |4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 965d29d00eb14250a994393f5d6b437e49760830
Author: sushil_shinde sushil.shi...@synerzip.com
Date:   Mon Oct 21 21:34:55 2013 +0530

 #65836- Fix for exporting image inside vml data was corrupting file.

- Handled exporting of image for all type of format in vmlexport.
- fixed issue - .rels file was not getting exported for vmlexport.
- Not handled for .wmf image (will work on it)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6369

Change-Id: I9ccf7a36ae316a658f06d1074caa4e4b2f5d271f

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 6274e19..8eeb9dc 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -555,6 +555,7 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
 impl_AddColor( pAttrList, XML_color2, nValue );
 
+bool imageData = false;
 EscherPropSortStruct aStruct;
 if ( rProps.GetOpt( ESCHER_Prop_fillBlip, aStruct )  
m_pTextExport)
 {
@@ -563,9 +564,10 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 aStream.Write(aStruct.pBuf + nHeaderSize, 
aStruct.nPropSize - nHeaderSize);
 aStream.Seek(0);
 Graphic aGraphic;
-GraphicConverter::Import(aStream, aGraphic, CVT_PNG);
+GraphicConverter::Import(aStream, aGraphic);
 OUString aImageId = 
m_pTextExport-GetDrawingML().WriteImage( aGraphic );
 pAttrList-add(FSNS(XML_r, XML_id), 
OUStringToOString(aImageId, RTL_TEXTENCODING_UTF8));
+imageData = true;
 }
 
 if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
@@ -575,7 +577,10 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 // Partly undo the transformation at the end of 
EscherPropertyContainer::CreateFillProperties(): VML opacity is 0..1.
 pAttrList-add(XML_opacity, 
OString::number(double((nValue * 100)  16) / 100));
 
-m_pSerializer-singleElementNS( XML_v, XML_fill, 
XFastAttributeListRef( pAttrList ) );
+if (imageData)
+m_pSerializer-singleElementNS( XML_v, XML_imagedata, 
XFastAttributeListRef( pAttrList ) );
+else
+m_pSerializer-singleElementNS( XML_v, XML_fill, 
XFastAttributeListRef( pAttrList ) );
 }
 bAlreadyWritten[ ESCHER_Prop_fillType ] = true;
 bAlreadyWritten[ ESCHER_Prop_fillColor ] = true;
diff --git a/sw/qa/extras/ooxmlexport/data/image_data.docx 
b/sw/qa/extras/ooxmlexport/data/image_data.docx
new file mode 100644
index 000..a2f89b1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/image_data.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c19a70a..94b48a0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1588,6 +1588,14 @@ DECLARE_OOXML_TEST(testVMLData, TestVMLData.docx)
 CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:hdr/w:p/w:r/w:pict/v:shape, 
stroked).match(f));
 }
 
+DECLARE_OOXML_TEST(testImageData, image_data.docx)
+{
+// The problem was exporter was exporting v:imagedata data for shape in 
w:pict as v:fill w element.
+
+xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/w:pict/v:shape/v:imagedata, detectmouseclick).match(t));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 19f80e7..2712f75 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1158,7 +1158,7 @@ void DocxAttributeOutput::EndRunProperties( const 
SwRedlineData* pRedlineData )
 //We need to write w:drawing tag after the w:rPr.
 WritePostponedChart();
 
-//We need to write w:drawing tag after the w:rPr.
+//We need to write w:pict tag after the w:rPr.
 WritePostponedVMLDrawing();
 
 // merge the properties _before_ the run text (strictly speaking, just
@@ -3260,7 +3260,7 @@ void DocxAttributeOutput::WriteVMLDrawing( const 
SdrObject* sdrObj,

RE: Handling of worksheet functions from Excel 2010 and newer

2013-11-12 Thread Winfried Donkers

Hi Markus, Kohei, Eike,

Kohei added the tests with 
http://cgit.freedesktop.org/libreoffice/core/commit/sc/qa?id=c40cbf189750f623e065b6ed9596d90977a2f631
 
but at least IMO it makes more sense to add test cases similar to 
testFunctionODS just for XLSX where you add corner cases for new functions. 
I suppose that you already have a set of corner cases for your tests and you 
can just use these for the import and export tests.

The tests Kohei added are of some functions I recently added (plus one that I'm 
still working on), so I will expand both the xlsx-file and the 
ScFiltersTest::testFunctionsExcel2010().
(The xlsx-file will have to checked by someone with Excel though, before 
getting pushed. I don't have Excel)

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

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

2013-11-12 Thread Tor Lillqvist

 external/libxslt/UnpackedTarball_xslt.mk   |1 +
 external/libxslt/libxslt-configure.patch.1 |   23 +++
 2 files changed, 24 insertions(+)

New commits:
commit 5a287c288aafa34a4a71657e27f20b2b5dd4e5d6
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Nov 12 10:59:36 2013 +0200

We need to recognize arm-unknown-linux-androideabi

Change-Id: I1992f3fc150a4e205a2247e210ce8af91664982c

diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index 4d79e1a..fd4212e 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-config.patch.1 \
+   external/libxslt/libxslt-configure.patch.1 \
external/libxslt/libxslt-freebsd.patch.1 \
external/libxslt/libxslt-internal-symbols.patch \
external/libxslt/libxslt-vc10.patch \
diff --git a/external/libxslt/libxslt-configure.patch.1 
b/external/libxslt/libxslt-configure.patch.1
new file mode 100644
index 000..11b3e58
--- /dev/null
+++ b/external/libxslt/libxslt-configure.patch.1
@@ -0,0 +1,23 @@
+-*- Mode: Diff -*-
+We need to recognize arm-unknown-linux-androideabi
+
+--- a/config.sub
 b/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-androideabi* | linux-gnu* | linux-dietlibc | linux-newlib* 
| linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1218,7 +1218,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++| -mingw32* | -linux-androideabi | -linux-gnu* | -linux-newlib* | 
-linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 7 commits - bin/lo-generate-source-tarball

2013-11-12 Thread Andras Timar

 bin/lo-generate-source-tarball |   53 +
 1 file changed, 28 insertions(+), 25 deletions(-)

New commits:
commit ef70fb9c2028aba7458453565a9f4b7ec0cc0ef8
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 10:23:04 2013 +0100

generate source tarballs for Debian/Singularity

Change-Id: Ic037654465d9286ecfa054319ebe49ddd87b5284

diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
index f020545..2d6d77d 100755
--- a/bin/lo-generate-source-tarball
+++ b/bin/lo-generate-source-tarball
@@ -137,7 +137,7 @@ pushd ${CORE_DIR}  /dev/null
 
 
 echo archiving core...
-git archive --format=tar --prefix=${base_name?}/ -o 
${OUT_DIR}/${base_name}.tar ${LABEL?}
+git archive --format=tar -o ${OUT_DIR}/${base_name}.tar ${LABEL?}
 
 
 concatenate_list=
@@ -146,34 +146,40 @@ for module in dictionaries helpcontent2 translations ; do
echo Warning: module $module is not present 12
 else
echo archiving ${module?}...
-   git archive --format=tar --prefix=${base_name?}/${module?} -o 
${OUT_DIR}/${base_name}-${module?}.tar ${LABEL?}
-   concatenate_list=${concatenate_list?} 
${OUT_DIR}/${base_name}-${module?}.tar
+cd ${module?}
+   git archive --format=tar --prefix=${module?}/ -o 
${OUT_DIR}/${base_name}-${module?}.tar ${LABEL?}
+cd ..
 fi
 done
 
-if [ -n ${concatenate_list?} ] ; then
-tar --concatenate --file=${OUT_DIR}/${base_name}.tar ${concatenate_list?}
-rm ${concatenate_list?}
-fi
-
 if ${GEN_BZ2?} ; then
 echo bzip2 compression...
-bzip2 -fkz ${OUT_DIR}/${base_name}.tar
+for i in ${OUT_DIR}/${base_name}*tar; do
+bzip2 -fkz $i
+done
 if ${GEN_MD5?} ; then
echo md5sum...
-   md5sum ${OUT_DIR}/${base_name}.tar.bz2  
${OUT_DIR}/${base_name}.tar.bz2.md5
+for i in ${OUT_DIR}/${base_name}*tar.bz2; do
+   md5sum $i  $i.md5
+done
 fi
 fi
 
 if ${GEN_XZ?} ; then
 echo xz compression...
-xz -fz ${OUT_DIR}/${base_name}.tar
+for i in ${OUT_DIR}/${base_name}*tar; do
+xz -fz $i
+done
 if ${GEN_MD5?} ; then
echo md5sum...
-   md5sum ${OUT_DIR}/${base_name}.tar.xz  
${OUT_DIR}/${base_name}.tar.xz.md5
+for i in ${OUT_DIR}/${base_name}*tar.xz; do
+   md5sum $i  $i.md5
+done
 fi
 else
-rm ${OUT_DIR}/${base_name}.tar
+for i in ${OUT_DIR}/${base_name}*tar; do
+rm $i
+done
 fi
 
 echo Done.
commit 5d56b81a79a1cf91c0b7cb12f92f4a7c08aee7be
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 09:00:19 2013 +0100

--core-dir is not implemented

Change-Id: Id12c36b6fc28f89e9e9d1aaedad5dc4f1a216313

diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
index 6d905e6..f020545 100755
--- a/bin/lo-generate-source-tarball
+++ b/bin/lo-generate-source-tarball
@@ -16,7 +16,7 @@ usage()
 {
 cat EOF
 Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=output location ]
-  [ --core-dir=core-repo-location ] [--version=package_version] label
+  [--version=package_version] label
 
 --xz generate a package compressed with xz (default)
 --bz2generate a package compressed with bz2. Note if you specify
@@ -24,9 +24,6 @@ Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=output 
location ]
  --xz is implied.
 --md5generate a md5 signature for the generated package(s)
 --output-dir where to put the generated packages
---core-dir   location of the core repo to extract sources from.
- By default this is one directory up from the position
- of this script.
 --versionversion string used to generate the name of the package
  the source package name is libreoffice-version.tar.[bz2|xz]
 
commit a21cb5bf8dbddde0c6a6955260f934c70278632e
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 08:59:08 2013 +0100

xz instead of zx

Change-Id: Ifcf95b2e2bc3eb6df8ec3a558ebac25154c1493a

diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
index 78a9a1b..6d905e6 100755
--- a/bin/lo-generate-source-tarball
+++ b/bin/lo-generate-source-tarball
@@ -173,7 +173,7 @@ if ${GEN_XZ?} ; then
 xz -fz ${OUT_DIR}/${base_name}.tar
 if ${GEN_MD5?} ; then
echo md5sum...
-   md5sum ${OUT_DIR}/${base_name}.tar.xz  
${OUT_DIR}/${base_name}.tar.zx.md5
+   md5sum ${OUT_DIR}/${base_name}.tar.xz  
${OUT_DIR}/${base_name}.tar.xz.md5
 fi
 else
 rm ${OUT_DIR}/${base_name}.tar
commit 571d6ad17b84c7ca222ff8470d5c9237ce863c9b
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 08:58:39 2013 +0100

set correct git archive prefix

Change-Id: Ieb58119c8c33277ef8cf1e8bc8afeff5c7c547f4

diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
index 1807e81..78a9a1b 100755
--- a/bin/lo-generate-source-tarball

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-11-12 Thread bugzilla-daemon

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

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on||62653

--- Comment #110 from Timur gti...@gmail.com ---
I add Bug 62653 - EDITING: Crash on nested table delete (previously titled
Copy Paste Crash). While the specific situation may not be too common, I
experience some crashes with recent LoDev 4.1 that I can't trace, so at least
solving this one would rule this out.

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

Alfresco summit report

2013-11-12 Thread Cedric Bosdonnat

Hello people,

Here is a small summary of my presence at Alfresco Summit last week. I
attended this event as a speaker but it was also good to listen to some
of the CMIS-related talks.

 * My session went pretty well. There wasn't a huge crowd in the room,
and it most of the attendees were LibreOffice users. We had quite some
time for questions. A few interesting ones were concerning SSO.

 * The connection between that proprietary office suite and Alfresco was
a theme that appeared in two of the keynotes. Good to know that we are
ahead of them on that front.

 * Went to all the companies having a booth there to tell them about
LibreOffice and CMIS. Gave them a few LibreOffice cards Jesus had home.
It was pretty interesting since quite a few of them weren't aware of the
feature.

 * Talked to many persons including RedPill LinPro guys reporting CMIS
bugs and Alfresco developers.

 * Mentioned the non-standard CMIS URLs to the CMIS guys at Alfresco.
Let's hope we'll find a way to get something done.

 * Discussed the Alfresco Cloud OAuth2 key limitations we could
encounter with Jeff Potts, Luis Sala and others. I'll first need to
finish integrating that feature in LO.

 * Discovered that Alfresco 4.2.e comes with a different binding URL to
support CMIS 1.1.

 * Code side:
* Quite a lot of improvements in libcmis to handle properties
* Fixed the GDrive connection from LO.

Many thanks TDF for sponsoring me to go to this event.

--
Cedric

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

Re: Thank

2013-11-12 Thread Marcos Souza

Hi Eike,

Em 11/11/2013 05:16 PM, Eike Rathke escreveu:
 Hi Marcos,
 
 On Monday, 2013-11-11 08:00:58 -0200, Marcos Souza wrote:
 
 So, again, a HUGE THANKS YOU for all you guys that helped me in Germany,
 and to the guys who invited me to visit them in their houses!
 
 You're welcome!
 I hope you had a calm / not too stormy flight and the cold didn't catch
 you too badly ... if it did, blame Sweetshark and St. Nikolai ;-)
Yes, our flight was very calm :) I could sleep this time!

And, my flu is under control, so I can't blame St. Nikolai or Bjoern :)
 
   Eike
 
 
 
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 




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

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

2013-11-12 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/fdo71302.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8 
 writerfilter/source/dmapper/StyleSheetTable.cxx |1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0215131e36fdabf0e2b02c2f8032d393f31195c3
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 12 10:34:52 2013 +0100

fdo#71302 writerfilter: remove Strong - Strong Emphasis style rename

Such renames only make sense if the exporter does the opposite of them,
but in this case the stiName array in the exporter explicitly looks for
the Strong character styles. So at the end it's better to not rename
it at all.

Change-Id: I69b699c76d287b1fe3b81ea3fe66b77992c6e2f1

diff --git a/sw/qa/extras/ooxmlexport/data/fdo71302.docx 
b/sw/qa/extras/ooxmlexport/data/fdo71302.docx
new file mode 100644
index 000..1f62e87
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71302.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 94b48a0..e3f60a9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1387,6 +1387,14 @@ DECLARE_OOXML_TEST(testQuicktables, quicktables.docx)
 assertXPath(pXmlStyles, 
/w:styles/w:style[@w:styleId='MediumShading2-Accent5']/w:tblStylePr[@w:type='firstRow']/w:tcPr/w:tcBorders/w:top,
 color, auto);
 }
 
+DECLARE_OOXML_TEST(testFdo71302, fdo71302.docx)
+{
+xmlDocPtr pXmlStyles = parseExport(word/styles.xml);
+
+// This got renamed to Strong Emphasis without a good reason.
+assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Strong'], 1);
+}
+
 DECLARE_OOXML_TEST(testSmartart, smartart.docx)
 {
 uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 941ab3e..2a672f7 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1440,7 +1440,6 @@ static const sal_Char* const aStyleNamePairs[] =
 Block Text,,
 Hyperlink, Internet link,
 Followed Hyperlink,Visited Internet Link,
-Strong,Strong Emphasis,
 Emphasis,  Emphasis,
 Document Map,  ,
 Plain Text,,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Miklos Vajna

 sw/CppunitTest_sw_htmlexport.mk|2 ++
 sw/qa/extras/htmlexport/htmlexport.cxx |   18 --
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 12fd49a2701f4d23f23f0770bd40c8cd20b523c7
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 12 11:00:24 2013 +0100

CppunitTest_sw_htmlexport: make this really test the exported model

There were two problems here:

1) The original testsuite just served as a crash-test for the HTML
export filter, but the second testcase assumed it also reloads the
document model. Once this is fixed, we notice that:

2) There are some nasty 'mm100 - in' rounding errors, work this around
by using cms unconditionally.

(Exact problem was that CharTopBorderDistance was 457, but was expected
to be 450.)

Change-Id: Iaa1f98486767e4dfa81c2ca3e456bc39131977eb

diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 603939a..5f0ed06 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
 comphelper \
 cppu \
cppuhelper \
+   i18nlangtag \
 sal \
 sw \
 test \
@@ -36,6 +37,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\
 
 $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
 -I$(SRCDIR)/sw/inc \
+   -I$(SRCDIR)/sw/source/ui/inc \
 -I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/qa/extras/inc \
 $$(INCLUDE) \
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 6ebaad5..b200cda 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -10,6 +10,8 @@
 #include swmodeltestbase.hxx
 #include com/sun/star/awt/Gradient.hpp
 #include com/sun/star/drawing/FillStyle.hpp
+#include swmodule.hxx
+#include usrpref.hxx
 
 class Test : public SwModelTestBase
 {
@@ -37,10 +39,22 @@ void Test::run()
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
 MethodEntryTest rEntry = aMethods[i];
+FieldUnit eUnit = FUNIT_NONE;
+if (OString(rEntry.pName) == charborder.odt)
+{
+// FIXME if padding-top gets exported as inches, not cms, we get 
rounding errors.
+SwMasterUsrPref* pPref = 
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
+eUnit = pPref-GetMetric();
+pPref-SetMetric(FUNIT_CM);
+}
 load(/sw/qa/extras/htmlexport/data/, rEntry.pName,
  false /* not doing layout is required for this test */);
-utl::TempFile aFile;
-save(HTML, aFile);
+reload(HTML (StarWriter));
+if (OString(rEntry.pName) == charborder.odt)
+{
+SwMasterUsrPref* pPref = 
const_castSwMasterUsrPref*(SW_MOD()-GetUsrPref(false));
+pPref-SetMetric(eUnit);
+}
 (this-*rEntry.pMethod)();
 finish();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configure.ac

2013-11-12 Thread Andras Timar

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

New commits:
commit 13e1294b0947118e2db307be3b46ec273275b025
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 11:18:47 2013 +0100

do not create help pack for hi, hr, id, is, uk (less than 50%)

Change-Id: I61c6f21a6498d477f0812da1bfc8c302d01db1dc

diff --git a/configure.ac b/configure.ac
index 5670c1e..57956a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11415,6 +11415,7 @@ if test -d $SRC_ROOT/translations/source; then
 WITH_POOR_HELP_LOCALIZATIONS=$WITH_POOR_HELP_LOCALIZATIONS $l
 fi
 done
+WITH_POOR_HELP_LOCALIZATIONS=$WITH_POOR_HELP_LOCALIZATIONS hr is hi uk id
 fi
 AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - distro-configs/CPLinux.conf distro-configs/CPOSX.conf distro-configs/CPWin32.conf

2013-11-12 Thread Andras Timar

 distro-configs/CPLinux.conf |2 +-
 distro-configs/CPOSX.conf   |2 +-
 distro-configs/CPWin32.conf |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 054d1b2b55593df3d5fff049c14f52aea980c354
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 11:31:04 2013 +0100

Collabora language list for 4.1

Change-Id: I30d405eb26aa6c549497abbf4346cef13a02e21c

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index c22bc94..ae840d3 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -47,4 +47,4 @@
 --disable-online-update
 --disable-odk
 --with-branding=icon-themes/galaxy/brand_cp
---with-lang=af ar bn ca cs da de el en-GB en-US en-ZA es fi fr gu he hi hu it 
ja ko mr nb nl nn pl pt-BR pt ru sk sl sv ta tr xh zh-CN zh-TW zu
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 0595bd3..3b1d768 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -18,4 +18,4 @@
 --enable-ext-google-docs
 --enable-ext-languagetool
 --enable-release-build
---with-lang=ar ca cs da de el en-US es fi fr he hu it ja ko nb nl nn pl pt-BR 
pt ru sk sl sv tr zh-CN zh-TW
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index bae8f92..c424dc5 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -20,5 +20,5 @@
 --enable-ext-languagetool
 --enable-release-build
 --enable-win-mozab-driver
---with-lang=af ar bn ca cs da de el en-GB en-US en-ZA es fi fr gu he hi hu it 
ja ko mr nb nl nn pl pt-BR pt ru sk sl sv ta tr xh zh-CN zh-TW zu
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
 --enable-windows-build-signing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/matus/sc-hacks' - sc/source

2013-11-12 Thread Matúš Kukan

 sc/source/ui/inc/datastreams.hxx |   15 ++---
 sc/source/ui/miscdlgs/datastreams.cxx|   48 ---
 sc/source/ui/miscdlgs/datastreamsdlg.cxx |   14 +++--
 3 files changed, 42 insertions(+), 35 deletions(-)

New commits:
commit 8168849381fb7bcff2d26e4d3310ecefb42445bc
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Tue Nov 12 10:49:18 2013 +0100

fix the move commit

Change-Id: Id37a27d0a671ce74d66d9cfa09cdafa8bceb9255

diff --git a/sc/source/ui/inc/datastreams.hxx b/sc/source/ui/inc/datastreams.hxx
index ae807df..d3f63b9 100644
--- a/sc/source/ui/inc/datastreams.hxx
+++ b/sc/source/ui/inc/datastreams.hxx
@@ -14,6 +14,7 @@
 
 #include boost/scoped_ptr.hpp
 
+namespace { class DataStreamsDlg; }
 class Dialog;
 class ScDocShell;
 class ScDocument;
@@ -24,10 +25,12 @@ namespace datastreams { class CallerThread; }
 
 class DataStreams
 {
+friend DataStreamsDlg;
+enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP };
 Dialog *mpDialog;
 ScDocShell *mpScDocShell;
 ScDocument *mpScDocument;
-enum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP } meMove;
+MoveEnum meMove;
 bool mbRunning;
 boost::scoped_ptrScRange mpRange;
 boost::scoped_ptrScRange mpStartRange;
@@ -37,14 +40,16 @@ class DataStreams
 
 public:
 DataStreams(ScDocShell *pScDocShell);
-virtual ~DataStreams();
+~DataStreams();
 bool ImportData();
-void MoveData();
 void ShowDialog(Window *pParent);
+
+private:
+void MoveData();
+void Set(const OUString rUrl, bool bIsScript, const OUString rRange,
+sal_Int32 nLimit, MoveEnum eMove);
 void Start();
 void Stop();
-void Set(const OUString rUrl, bool bIsScript, const OUString rRange);
-void SetMove(sal_Int32 nLimit, bool bMoveRangeDown);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/datastreams.cxx 
b/sc/source/ui/miscdlgs/datastreams.cxx
index 61e211d..587fddb 100644
--- a/sc/source/ui/miscdlgs/datastreams.cxx
+++ b/sc/source/ui/miscdlgs/datastreams.cxx
@@ -83,7 +83,8 @@ void DataStreams::Stop()
 mpScDocument-EnableUndo(true);
 }
 
-void DataStreams::Set(const OUString rUrl, bool bIsScript, const OUString 
rRange)
+void DataStreams::Set(const OUString rUrl, bool bIsScript,
+const OUString rRange, sal_Int32 nLimit, MoveEnum eMove)
 {
 mpRange.reset ( new ScRange() );
 mpRange-Parse(rRange, mpScDocument);
@@ -92,12 +93,9 @@ void DataStreams::Set(const OUString rUrl, bool bIsScript, 
const OUString rRan
 mpStream.reset( new SvScriptStream(rUrl) );
 else
 mpStream.reset( new SvFileStream(rUrl, STREAM_READ) );
-}
 
-void DataStreams::SetMove(sal_Int32 nLimit, bool bMoveRangeDown)
-{
 mpEndRange.reset( NULL );
-meMove = bMoveRangeDown ? RANGE_DOWN : MOVE_DOWN;
+meMove = eMove;
 sal_Int32 nHeight = mpRange-aEnd.Row() - mpRange-aStart.Row() + 1;
 nLimit = nHeight * (nLimit / nHeight);
 if (nLimit  mpRange-aStart.Row() + nLimit - 1  MAXROW)
@@ -109,22 +107,23 @@ void DataStreams::SetMove(sal_Int32 nLimit, bool 
bMoveRangeDown)
 
 void DataStreams::MoveData()
 {
-if (meMove == MOVE_DOWN)
-{
-if (mpEndRange.get())
-mpScDocument-DeleteRow(*mpEndRange.get());
-mpScDocument-InsertRow(*mpRange.get());
-}
-else if (meMove == RANGE_DOWN)
-{
-mpRange-Move(0, mpRange-aEnd.Row() - mpRange-aStart.Row() + 1, 0);
-if (mpRange-aStart == mpEndRange-aStart)
-meMove = MOVE_UP;
-}
-else if (meMove == MOVE_UP)
+switch (meMove)
 {
-mpScDocument-DeleteRow(*mpStartRange.get());
-mpScDocument-InsertRow(*mpEndRange.get());
+case RANGE_DOWN:
+if (mpRange-aStart == mpEndRange-aStart)
+meMove = MOVE_UP;
+break;
+case MOVE_UP:
+mpScDocument-DeleteRow(*mpStartRange.get());
+mpScDocument-InsertRow(*mpEndRange.get());
+break;
+case MOVE_DOWN:
+if (mpEndRange.get())
+mpScDocument-DeleteRow(*mpEndRange.get());
+mpScDocument-InsertRow(*mpRange.get());
+break;
+case NO_MOVE:
+break;
 }
 }
 
@@ -147,6 +146,7 @@ bool DataStreams::ImportData()
 aBuf.append('\n');
 }
 SolarMutexGuard aGuard;
+MoveData();
 SvMemoryStream aMemoryStream((void *)aBuf.getStr(), aBuf.getLength(), 
STREAM_READ);
 ScImportExport aImport(mpScDocument, *mpRange.get());
 ScAsciiOptions aOptions;
@@ -158,8 +158,12 @@ bool DataStreams::ImportData()
 if (meMove == NO_MOVE)
 return mbRunning;
 
-MoveData();
-
mpScDocShell-GetViewData()-GetView()-AlignToCursor(mpRange-aStart.Col(), 
mpRange-aStart.Row(), SC_FOLLOW_JUMP);
+if (meMove == RANGE_DOWN)
+{
+mpRange-Move(0, mpRange-aEnd.Row() - mpRange-aStart.Row() + 1, 0);
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - solenv/bin

2013-11-12 Thread Andras Timar

 solenv/bin/modules/installer/simplepackage.pm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 00413d8269ad2cc50cd6bc835b6b5453fdf7f5c2
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 11:34:47 2013 +0100

do not fail the build, if codesign returns non-zero

Change-Id: Ic3c25af11f6d723ab0aff845dd28eae343a4df78

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index bf769f4..9d579be 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -432,8 +432,10 @@ sub create_package
 
 if ($returnvalue)
 {
-$infoline = ERROR: Could not execute \$systemcall\!\n;
+$infoline = WARNING: \$systemcall\ returned with 
non-zero!\n;
+$infoline .= Return value:  . ($returnvalue  8) . \n;
 push( @installer::globals::logfileinfo, $infoline);
+print $infoline;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - distro-configs/CPLinux.conf distro-configs/CPOSX.conf distro-configs/CPWin32.conf

2013-11-12 Thread Andras Timar

 distro-configs/CPLinux.conf |2 +-
 distro-configs/CPOSX.conf   |2 +-
 distro-configs/CPWin32.conf |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7d2b2f276a28e01f75796ae07c380b05bfbe8913
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 11:41:20 2013 +0100

Turkish is tr not tu

Change-Id: Ie9051ac438d0b91059f1d91e298f72ed7643cc27

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index ae840d3..14d9a17 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -47,4 +47,4 @@
 --disable-online-update
 --disable-odk
 --with-branding=icon-themes/galaxy/brand_cp
---with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW
diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 3b1d768..cf8a092 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -18,4 +18,4 @@
 --enable-ext-google-docs
 --enable-ext-languagetool
 --enable-release-build
---with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index c424dc5..1473590 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -20,5 +20,5 @@
 --enable-ext-languagetool
 --enable-release-build
 --enable-win-mozab-driver
---with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tu uk vi zh-CN zh-TW
+--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US es et eu fi fr 
ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN 
pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW
 --enable-windows-build-signing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

2013-11-12 Thread Manal Alhassoun

 include/sfx2/newstyle.hxx   |8 +-
 sfx2/UIConfig_sfx.mk|1 
 sfx2/source/dialog/newstyle.cxx |   24 +++-
 sfx2/source/dialog/newstyle.hrc |4 -
 sfx2/source/dialog/newstyle.src |   36 
 sfx2/uiconfig/ui/newstyle.ui|  120 
 6 files changed, 135 insertions(+), 58 deletions(-)

New commits:
commit eb505c259d0d7bd05d1bb5be5a14ad8613c2a9c7
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Thu Nov 7 15:12:10 2013 +0300

Convert New Style dialog to widget UI

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

diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 9584396..368d154 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -33,10 +33,8 @@ class SfxStyleSheetBasePool;
 class SFX2_DLLPUBLIC SfxNewStyleDlg : public ModalDialog
 {
 private:
-FixedLine   aColFL;
-ComboBoxaColBox;
-OKButtonaOKBtn;
-CancelButtonaCancelBtn;
+ComboBox* m_pColBox;
+OKButton* m_pOKBtn;
 
 QueryBoxaQueryOverwriteBox;
 SfxStyleSheetBasePool  rPool;
@@ -48,7 +46,7 @@ public:
 SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool );
 ~SfxNewStyleDlg();
 
-OUStringGetName() const { return 
comphelper::string::stripStart(aColBox.GetText(), ' '); }
+OUStringGetName() const { return 
comphelper::string::stripStart(m_pColBox-GetText(), ' '); }
 };
 
 #endif
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a2629d2..1ae9091 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
+   sfx2/uiconfig/ui/newstyle \
sfx2/uiconfig/ui/optprintpage \
sfx2/uiconfig/ui/password \
sfx2/uiconfig/ui/printeroptionsdialog \
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 2995a71..5f8e24e 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -31,7 +31,7 @@
 IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
 {
 (void)pControl; //unused
-const OUString aName( aColBox.GetText() );
+const OUString aName( m_pColBox-GetText() );
 SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily(), 
SFXSTYLEBIT_ALL );
 if ( pStyle )
 {
@@ -54,7 +54,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
 
 IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
 {
-aOKBtn.Enable( !comphelper::string::remove(pBox-GetText(), ' ').isEmpty() 
);
+m_pOKBtn-Enable( !comphelper::string::remove(pBox-GetText(), ' 
').isEmpty() );
 return 0;
 }
 IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
@@ -63,28 +63,26 @@ IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox 
*, pBox )
 
 SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool 
rInPool ) :
 
-ModalDialog( pParent, SfxResId( DLG_NEW_STYLE_BY_EXAMPLE ) ),
+ModalDialog( pParent, CreateStyleDialog, sfx/ui/newstyle.ui ),
 
-aColFL  ( this, SfxResId( FL_COL ) ),
-aColBox ( this, SfxResId( LB_COL ) ),
-aOKBtn  ( this, SfxResId( BT_OK ) ),
-aCancelBtn  ( this, SfxResId( BT_CANCEL ) ),
 aQueryOverwriteBox  ( this, SfxResId( MSG_OVERWRITE ) ),
 
 rPool( rInPool )
 
 {
-FreeResource();
+get(m_pColBox, stylename);
+m_pColBox-set_width_request(m_pColBox-approximate_char_width() * 25);
+m_pColBox-set_height_request(m_pColBox-GetTextHeight() * 10);
+get(m_pOKBtn, ok);
 
-aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
-aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl));
-aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
-//aColBox.SetAccessibleName(SfxResId(FL_COL).toString());
+m_pOKBtn-SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
+m_pColBox-SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl));
+m_pColBox-SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
 
 SfxStyleSheetBase *pStyle = rPool.First();
 while ( pStyle )
 {
-aColBox.InsertEntry(pStyle-GetName());
+m_pColBox-InsertEntry(pStyle-GetName());
 pStyle = rPool.Next();
 }
 }
diff --git a/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc
index 0262c89..4725dbd 100644
--- a/sfx2/source/dialog/newstyle.hrc
+++ b/sfx2/source/dialog/newstyle.hrc
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define BT_OK   100
-#define BT_CANCEL   101
-#define LB_COL  1

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-11-12 Thread Andre Fischer

 solenv/bin/modules/installer/globals.pm   |1 
 solenv/bin/modules/installer/windows/media.pm |   37 --
 solenv/bin/modules/installer/windows/msiglobal.pm |4 +-
 3 files changed, 2 insertions(+), 40 deletions(-)

New commits:
commit 41e4096dd00c29aff7dbbac2ab0fad38bc3509bc
Author: Andre Fischer a...@apache.org
Date:   Tue Nov 12 12:04:47 2013 +

123678: Removed ::globals::one_cab_file

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index f4dcd0f..c5909db 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -420,7 +420,6 @@ BEGIN
 
 $one_cab_file = 0;
 $fix_number_of_cab_files = 1;
-$cab_file_per_component = 0;
 $cabfilecompressionlevel = 2;
 $number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
 $include_cab_in_msi = 0;
diff --git a/solenv/bin/modules/installer/windows/media.pm 
b/solenv/bin/modules/installer/windows/media.pm
index 0dc57b3..bebacd4 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -304,43 +304,6 @@ sub create_media_table
 }
 
 }
-elsif ( $installer::globals::cab_file_per_component )
-{
-for ( my $i = 0; $i = $#{$filesref}; $i++ )
-{
-my $onefile = ${$filesref}[$i];
-my $nextfile = ${$filesref}[$i+1];
-
-my $filecomponent = ;
-my $nextcomponent = ;
-
-if ( $onefile-{'componentname'} ) { $filecomponent = 
$onefile-{'componentname'}; }
-if ( $nextfile-{'componentname'} ) { $nextcomponent = 
$nextfile-{'componentname'}; }
-
-if ( $filecomponent eq $nextcomponent )
-{
-next;   # nothing to do, this is not the last file of a 
component
-}
-
-my %media = ();
-$diskid++;
-
-$media{'DiskId'} = get_media_diskid($diskid);
-$media{'LastSequence'} = get_media_lastsequence($onefile);
-$media{'DiskPrompt'} = get_media_diskprompt();
-$media{'Cabinet'} = get_media_cabinet($diskid);
-$media{'VolumeLabel'} = get_media_volumelabel();
-$media{'Source'} = get_media_source();
-
-my $oneline = $media{'DiskId'} . \t . $media{'LastSequence'} . 
\t . $media{'DiskPrompt'} . \t
-. $media{'Cabinet'} . \t . $media{'VolumeLabel'} . \t 
. $media{'Source'} . \n;
-
-push(@mediatable, $oneline);
-
-$media{'Cabinet'} =~ s/^\s*\#//;# removing leading hash
-
set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'}, 
$filesref, $filecomponent, $i);
-}
-}
 elsif ( $installer::globals::fix_number_of_cab_files )
 {
 # number of cabfiles
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 2434293..e6a1d26 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -259,7 +259,7 @@ sub generate_cab_file_list
 push(@installer::globals::allddffiles, $ddffilename);
 }
 }
-elsif ((( $installer::globals::cab_file_per_component ) || ( 
$installer::globals::fix_number_of_cab_files ))  ( 
$installer::globals::updatedatabase ))
+elsif (( $installer::globals::fix_number_of_cab_files )  ( 
$installer::globals::updatedatabase ))
 {
 my $sequenceorder = get_sequenceorder($filesref);
 
@@ -352,7 +352,7 @@ sub generate_cab_file_list
 push(@installer::globals::allddffiles, $ddffilename);
 }
 }
-elsif (( $installer::globals::cab_file_per_component ) || ( 
$installer::globals::fix_number_of_cab_files ))
+elsif ( $installer::globals::fix_number_of_cab_files )
 {
 for ( my $i = 0; $i = $#{$filesref}; $i++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Stephan Bergmann

 unotools/source/config/securityoptions.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ee3782d5f21c9dc3fcc52072160e4f857691e97
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 11 10:31:33 2013 +0100

Fix CompareIgnoreCaseToAscii - matchIgnoreAsciiCaseAsciiL regression

...introduced with 19ebc215d19ed9c7c5c6fdabf2f4acd5af02cbc4 INTEGRATION: 
CWS
ineturl1: #i34006# modify INetURLObject to use rtl::OUString and
rtl::OUStringBuffer, where String::CompareIgnoreCaseToAscii returns
StringCompare but rtl::OUString::matchIgnoreAsciiCaseAsciiL return sal_Bool.

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

diff --git a/unotools/source/config/securityoptions.cxx 
b/unotools/source/config/securityoptions.cxx
index cd0e6c7..153004f 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -880,7 +880,7 @@ sal_Bool SvtSecurityOptions_Impl::IsSecureURL(  const   
OUString   sURL,
 
 // All other URLs must checked in combination with referer and internal 
information about security
 if ( (aProtocol != INET_PROT_MACRO  aProtocol !=  INET_PROT_SLOT) ||
- aURL.GetMainURL( INetURLObject::NO_DECODE 
).matchIgnoreAsciiCaseAsciiL( macro:///, 9 ) == 0)
+ aURL.GetMainURL( INetURLObject::NO_DECODE 
).matchIgnoreAsciiCaseAsciiL( macro:///, 9 ) )
 {
 // security check only for macro ( without app basic ) or slot 
protocols
 bState = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Stephan Bergmann

 cppuhelper/source/typemanager.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0812816458256dcbd268cb2d2cb9eb10b91f61f2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 11 13:18:49 2013 +0100

Don't call Manager::addProvider(null) upon optional NoSuchFileException

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

diff --git a/cppuhelper/source/typemanager.cxx 
b/cppuhelper/source/typemanager.cxx
index 672e377..08c6fb9 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -2141,9 +2141,8 @@ void cppuhelper::TypeManager::readRdbDirectory(
 void cppuhelper::TypeManager::readRdbFile(
 rtl::OUString const  uri, bool optional)
 {
-rtl::Reference unoidl::Provider  prov;
 try {
-prov = unoidl::loadProvider(manager_, uri);
+manager_-addProvider(unoidl::loadProvider(manager_, uri));
 } catch (unoidl::NoSuchFileException ) {
 if (!optional) {
 throw css::uno::DeploymentException(
@@ -2157,7 +2156,6 @@ void cppuhelper::TypeManager::readRdbFile(
  + e.getDetail()),
 static_cast cppu::OWeakObject * (this));
 }
-manager_-addProvider(prov);
 }
 
 css::uno::Any cppuhelper::TypeManager::getSequenceType(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig svx/uiconfig

2013-11-12 Thread Maxim Monastirsky

 sc/uiconfig/scalc/ui/sidebaralignment.ui |  170 ++-
 svx/uiconfig/ui/sidebarparagraph.ui  |  130 +++
 2 files changed, 145 insertions(+), 155 deletions(-)

New commits:
commit 0315626909c39da0bd4395c16ba571212f1bb6df
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Nov 7 15:31:12 2013 +0200

Avoid too wide sidebar when writedirection controls are activated

Achieved by placing the nearby controls into the same box.

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

diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui 
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index 228a25e..d65560e 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -18,109 +18,63 @@
   object class=GtkBox id=box3
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=spacing12/property
+property name=spacing6/property
 child
-  object class=GtkBox id=box8
+  object class=GtkToolbar id=horizontalalignment
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=has_tooltipTrue/property
+property name=tooltip_markup translatable=yesHorizontal 
Alignment/property
+property name=tooltip_text translatable=yesHorizontal 
Alignment/property
+property name=halignstart/property
+property name=show_arrowFalse/property
 child
-  object class=GtkToolbar id=horizontalalignment
+  object class=GtkToolButton id=substleft
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=tooltip_text 
translatable=yesHorizontal Alignment/property
-property name=show_arrowFalse/property
-child
-  object class=GtkToolButton id=substleft
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=valignstart/property
-property name=action_name.uno:AlignLeft/property
-property name=use_underlineTrue/property
-  /object
-  packing
-property name=expandFalse/property
-property name=homogeneousTrue/property
-  /packing
-/child
-child
-  object class=GtkToolButton id=substcenter
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property 
name=action_name.uno:AlignHorizontalCenter/property
-property name=use_underlineTrue/property
-  /object
-  packing
-property name=expandFalse/property
-property name=homogeneousTrue/property
-  /packing
-/child
-child
-  object class=GtkToolButton id=substright
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=action_name.uno:AlignRight/property
-property name=use_underlineTrue/property
-  /object
-  packing
-property name=expandFalse/property
-property name=homogeneousTrue/property
-  /packing
-/child
-child
-  object class=GtkToolButton id=substjustify
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=action_name.uno:AlignBlock/property
-property name=use_underlineTrue/property
-  /object
-  packing
-property name=expandFalse/property
-property name=homogeneousTrue/property
-  /packing
-/child
+property name=valignstart/property
+property name=action_name.uno:AlignLeft/property
+property name=use_underlineTrue/property
   /object
   packing
 property name=expandFalse/property
-property

[Libreoffice-commits] core.git: helpcontent2

2013-11-12 Thread Caolán McNamara

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

New commits:
commit da95f88463ae6f6f539c1d744eb7bb3f611cab46
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 12:20:26 2013 +

Updated core
Project: help  0e38ece364fb55b51e77ffb40ba166180b75f864

diff --git a/helpcontent2 b/helpcontent2
index d0a1187..0e38ece 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d0a1187fe4a823d1ee670f989d82b75abc0b9091
+Subproject commit 0e38ece364fb55b51e77ffb40ba166180b75f864
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

 helpers/help_hid.lst   |1 -
 source/text/shared/01/05140100.xhp |8 
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 0e38ece364fb55b51e77ffb40ba166180b75f864
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 12:20:26 2013 +

update help ids for new style .ui conversion

Change-Id: I3ab8c5ea5d593f180da8cfb114b47b9833e08df2

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c3b2443..7b9dadf 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6463,7 +6463,6 @@ sfx2_CheckBox_RID_DLG_SEARCH_CB_WRAPAROUND,2187084815,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
-sfx2_ComboBox_DLG_NEW_STYLE_BY_EXAMPLE_LB_COL,805953,
 sfx2_ComboBox_RID_DLG_SEARCH_ED_SEARCH,2187087883,
 sfx2_ComboBox_TP_HELP_INDEX_CB_INDEX,546983947,
 sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331,
diff --git a/source/text/shared/01/05140100.xhp 
b/source/text/shared/01/05140100.xhp
index a44dcdc..477df8c 100644
--- a/source/text/shared/01/05140100.xhp
+++ b/source/text/shared/01/05140100.xhp
@@ -33,11 +33,11 @@
 body
   
   
-  bookmark xml-lang=en-US branch=hid/.uno:StyleNewByExample 
id=bm_id7425973 localize=false/!-- HID added by script --
-bookmark branch=hid/.uno:StyleNewByExample xml-lang=en-US 
id=bm_id3152942 localize=false/paragraph role=heading level=1 
id=hd_id3152823 l10n=U xml-lang=en-US oldref=1Create Style/paragraph
+bookmark xml-lang=en-US branch=hid/.uno:StyleNewByExample 
id=bm_id7425973 localize=false/
+bookmark branch=hid/sfx/ui/newstyle/CreateStyleDialog xml-lang=en-US 
id=bm_id3152942 localize=false/paragraph role=heading level=1 
id=hd_id3152823 l10n=U xml-lang=en-US oldref=1Create Style/paragraph
   commentThis command is a Styl_ist icon/comment
-  bookmark branch=hid/sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL 
xml-lang=en-US id=bm_id3155069 localize=false/paragraph role=heading 
level=2 id=hd_id3152790 l10n=U xml-lang=en-US oldref=4Style 
name/paragraph
-  paragraph l10n=U role=paragraph id=par_id3155599 xml-lang=en-US 
oldref=5ahelp hid=SFX2:COMBOBOX:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL 
visibility=visibleEnter a name for the new Style./ahelp/paragraph
+  bookmark branch=hid/sfx/ui/newstyle/stylename xml-lang=en-US 
id=bm_id3155069 localize=false/paragraph role=heading level=2 
id=hd_id3152790 l10n=U xml-lang=en-US oldref=4Style name/paragraph
+  paragraph l10n=U role=paragraph id=par_id3155599 xml-lang=en-US 
oldref=5ahelp hid=sfx/ui/newstyle/stylename visibility=visibleEnter a 
name for the new Style./ahelp/paragraph
   paragraph role=heading level=3 id=hd_id3154682 l10n=U 
xml-lang=en-US oldref=6List of Custom Styles/paragraph
   paragraph role=paragraph id=par_id3154894 l10n=U xml-lang=en-US 
oldref=7Lists the user-defined styles that are attached to the current 
document./paragraph
  /body
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

 sfx2/uiconfig/ui/newstyle.ui |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 729c8508474b61151d9aad64addb3bc9b38a069a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 12:15:49 2013 +

reorient ok/cancel buttons to normal positions

Change-Id: If562d09862cf8fee2c64e6c1b0c90f5b6527b6df

diff --git a/sfx2/uiconfig/ui/newstyle.ui b/sfx2/uiconfig/ui/newstyle.ui
index e44b94f..4c8de54 100644
--- a/sfx2/uiconfig/ui/newstyle.ui
+++ b/sfx2/uiconfig/ui/newstyle.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkDialog id=CreateStyleDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -11,12 +12,12 @@
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=orientationvertical/property
 property name=spacing12/property
 child internal-child=action_area
   object class=GtkButtonBox id=dialog-action_area3
 property name=can_focusFalse/property
-property name=orientationvertical/property
-property name=layout_stylestart/property
+property name=layout_styleend/property
 child
   object class=GtkButton id=ok
 property name=labelgtk-ok/property
@@ -25,7 +26,6 @@
 property name=can_defaultTrue/property
 property name=has_defaultTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
@@ -40,7 +40,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need for starmath expert

2013-11-12 Thread Marcos Souza

Hi abdulaziz,

Em 11/11/2013 07:11 AM, abdulaziz escreveu:
 Hi all ;
 
 we have an idea for RTL (arabic) support in Math and we want someone who 
 expert in starmath to answering   the following questions : 
I'm not the expert, but maybe I know somethings that can help you :)

 
 1- is it possible to add an arabic mathematical unicode (*nowadays , there
 is no full mathematical  unicode for arabic* )to the module /starmath ?
If I understood it correctly, it seems to be our OLD problem of adding
new symbols to Math. Currently we're using the OpenSymbol to draw the
Math symbols, and OpenSymbol don't have all Math symbols. Maybe we need
to exchange OpenSymbol (and do a LOT of tests on it, because OpenSymbol
is used in bullets too) to STIX fonts... just an idea. This topic is
very old, and we talked about this maybe 4 months ago, or more...

 
 2-is it possible to rearrange the formula from Right to Left in both edit
 and formula windows?
I believe yes. There are some parts of Math edit that we disables the
RTL support. Maybe we can add RTL support by changing all pieces of Math
that read/write data to edits... Math is a very small module so maybe
this is not a difficult task.

 
 3- what is the good way to add this feature to /starmath module , as an
 extiontion or as optsion in menu ?
As I said above, maybe we can put this as an option.

It's nice to see that others guys are thinking about to improve Math :)

If I could help in this task, please let me know!

Sorry for the late reply...

 
 
 *Thanks in advance ...*
 
 
 
 
 --
 View this message in context: 
 http://nabble.documentfoundation.org/Need-for-starmath-expert-tp4082485.html
 Sent from the Dev mailing list archive at Nabble.com.
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 




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

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

2013-11-12 Thread Jan Holesovsky

 sw/qa/extras/ooxmlimport/data/n830205.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |6 ++
 sw/source/core/doc/docredln.cxx|   10 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit c0bed3147c472acc18736b764798324880a23163
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Nov 12 13:35:56 2013 +0100

bnc#830205: Stop-gap solution to avoid crash.

This improves the situation, because previously, the document would just 
crash
due to infinite recursion.

Deeper checking why do we end up with an invalid range would be good; but it
was impossible to check with the bugdoc, as it was too complex, and trying 
to
cut it down was crashing MSO :-)  Hopefully we'll get a better document at
some stage.

Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2

diff --git a/sw/qa/extras/ooxmlimport/data/n830205.docx 
b/sw/qa/extras/ooxmlimport/data/n830205.docx
new file mode 100644
index 000..89cf1d8
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n830205.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5c072ea..f2c3b70 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1244,6 +1244,12 @@ DECLARE_OOXMLIMPORT_TEST(testN820504, n820504.docx)
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getPropertytext::TextContentAnchorType(getShape(1), AnchorType));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testN830205, n830205.docx)
+{
+// Previously import just crashed (due to infinite recursion).
+getParagraph(1, XXX);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo43641, fdo43641.docx)
 {
 uno::Referencecontainer::XIndexAccess xGroupShape(getShape(1), 
uno::UNO_QUERY);
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index d67e9b5..3e737b0 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2682,7 +2682,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRedline* p, 
sal_uInt16* pInsPos )
 #if OSL_DEBUG_LEVEL  0
 CheckPosition( pNew-GetPoint(), pNew-GetMark() );
 #endif
+
 if( *pNew-GetPoint() != *pNew-GetMark() 
+pNew-HasValidRange() 
 Insert( pNew, nInsPos ) )
 {
 pNew-CallDisplayFunc();
commit 0385e736523b52087d96587f399fb3e61f911766
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Nov 12 09:41:16 2013 +0100

Less confusing variable name.

Change-Id: I8a6c9a037b3863d913583f5be3d7c0c6b96f29f8

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 2620ce8..d67e9b5 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -287,7 +287,7 @@ Behaviour of Delete-Redline:
 */
 bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
 {
-bool bError = true;
+bool bMerged = false;
 _CHECK_REDLINE( this )
 
 if( IsRedlineOn()  !IsShowOriginal( meRedlineMode ) 
@@ -404,7 +404,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool 
bCallDelete )
 mpRedlineTbl-Insert( pRedl );
 }
 
-bError = false;
+bMerged = true;
 bDelete = true;
 }
 else if( (( POS_BEFORE == eCmpPos 
@@ -420,7 +420,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool 
bCallDelete )
 mpRedlineTbl-Remove( n );
 mpRedlineTbl-Insert( pRedl );
 
-bError = false;
+bMerged = true;
 bDelete = true;
 }
 else if ( POS_OUTSIDE == eCmpPos )
@@ -1227,7 +1227,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool 
bCallDelete )
 }
 _CHECK_REDLINE( this )
 
-return ( 0 != pNewRedl ) || !bError;
+return ( 0 != pNewRedl ) || bMerged;
 }
 
 void SwDoc::CompressRedlines()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations

2013-11-12 Thread Andras Timar

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

New commits:
commit 44952d7e621c43b43163b15e4af7f452e35a0114
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 13:49:29 2013 +0100

Updated core
Project: translations  b278d9fa9559c5cf7feb31b81d93353303e556b1

diff --git a/translations b/translations
index 2e0897a..b278d9f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2e0897ab9320fc258d9e2b47e1c33a6c524bf742
+Subproject commit b278d9fa9559c5cf7feb31b81d93353303e556b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/hu

2013-11-12 Thread Andras Timar

 source/hu/librelogo/source/pythonpath.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b278d9fa9559c5cf7feb31b81d93353303e556b1
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 13:49:29 2013 +0100

decimal comma for hu

Change-Id: I8c416f3c34c43104c5c168a39906bb21c87fa5c1

diff --git a/source/hu/librelogo/source/pythonpath.po 
b/source/hu/librelogo/source/pythonpath.po
index eac7d07..aff7ea8 100644
--- a/source/hu/librelogo/source/pythonpath.po
+++ b/source/hu/librelogo/source/pythonpath.po
@@ -742,7 +742,7 @@ msgctxt 
 DECIMAL\n
 property.text
 msgid .
-msgstr .
+msgstr ,
 
 #: LibreLogo_en_US.properties
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

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

New commits:
commit d3b49a68f40615aecc6368fbb4b954ffc9ada178
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 12:27:07 2013 +

drop commented out DLG_OPTIONS use

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

diff --git a/filter/source/svg/impsvgdialog.cxx 
b/filter/source/svg/impsvgdialog.cxx
index 7e7c5b9..efcb763 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -35,8 +35,8 @@ inline sal_Int32 implMap( Window /*rWnd*/, sal_Int32 nVal )
 // - ImpSVGDialog -
 // 
 
-ImpSVGDialog::ImpSVGDialog( Window* pParent/*, ResMgr rResMgr*/, Sequence 
PropertyValue  rFilterData ) :
-ModalDialog( pParent/*KA, ResId( DLG_OPTIONS, rResMgr*/ ),
+ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence PropertyValue  
rFilterData ) :
+ModalDialog( pParent ),
 maFI( this ),
 maCBTinyProfile( this ),
 maCBEmbedFonts( this ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk

2013-11-12 Thread Laurent Balland-Poirier

 chart2/AllLangResTarget_chartcontroller.mk |1 
 chart2/UIConfig_chart2.mk  |1 
 chart2/source/controller/dialogs/res_Trendline.cxx |  176 +++
 chart2/source/controller/dialogs/res_Trendline.hxx |   56 --
 chart2/source/controller/dialogs/tp_Trendline.cxx  |3 
 chart2/source/controller/dialogs/tp_Trendline.hrc  |   52 --
 chart2/source/controller/dialogs/tp_Trendline.src  |  226 
 chart2/uiconfig/ui/tp_Trendline.ui |  528 +
 8 files changed, 636 insertions(+), 407 deletions(-)

New commits:
commit d8dc136bbf4298c739a9691b41d8c4234183d4cc
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Mon Nov 11 15:55:47 2013 +0100

Convert tp_Trendline.src to .ui

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

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 3c0cde9..4c94128 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/tp_PolarOptions.src \
 chart2/source/controller/dialogs/tp_RangeChooser.src \
 chart2/source/controller/dialogs/tp_Scale.src \
-chart2/source/controller/dialogs/tp_Trendline.src \
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
 ))
 
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 999547c..a1e6b3c 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/titlerotationtabpage \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_SeriesToAxis \
+   chart2/uiconfig/ui/tp_Trendline \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index a8882fd..f8ba0fa 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -18,13 +18,13 @@
  */
 
 #include res_Trendline.hxx
-#include tp_Trendline.hrc
 #include ResId.hxx
 #include Strings.hrc
 #include Bitmaps.hrc
 #include chartview/ChartSfxItemIds.hxx
 
 #include svl/intitem.hxx
+#include sfx2/tabdlg.hxx
 
 #include vector
 #include algorithm
@@ -33,52 +33,44 @@ namespace chart
 {
 
 TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet 
rInAttrs ) :
-m_aFLType( pParent, SchResId( FL_TYPE )),
-
-m_aRBLinear(pParent, SchResId( RB_LINEAR)),
-m_aRBLogarithmic(   pParent, SchResId( RB_LOGARITHMIC   )),
-m_aRBExponential(   pParent, SchResId( RB_EXPONENTIAL   )),
-m_aRBPower( pParent, SchResId( RB_POWER )),
-m_aRBPolynomial(pParent, SchResId( RB_POLYNOMIAL)),
-m_aRBMovingAverage( pParent, SchResId( RB_MOVING_AVERAGE)),
-
-m_aFILinear(pParent, SchResId( FI_LINEAR)),
-m_aFILogarithmic(   pParent, SchResId( FI_LOGARITHMIC   )),
-m_aFIExponential(   pParent, SchResId( FI_EXPONENTIAL   )),
-m_aFIPower( pParent, SchResId( FI_POWER )),
-m_aFIPolynomial(pParent, SchResId( FI_POLYNOMIAL   )),
-m_aFIMovingAverage( pParent, SchResId( FI_MOVING_AVERAGE)),
-
-m_aFT_Degree(   pParent, SchResId( FT_DEGREE)),
-m_aNF_Degree(   pParent, SchResId( NF_DEGREE)),
-m_aFT_Period(   pParent, SchResId( FT_PERIOD)),
-m_aNF_Period(   pParent, SchResId( NF_PERIOD)),
-
-m_aFT_ExtrapolateForward(   pParent, SchResId( FT_EXTRAPOLATE_FORWARD  
  )),
-m_aNF_ExtrapolateForward(   pParent, SchResId( NF_EXTRAPOLATE_FORWARD  
  )),
-m_aFT_ExtrapolateBackward(  pParent, SchResId( FT_EXTRAPOLATE_BACKWARD 
  )),
-m_aNF_ExtrapolateBackward(  pParent, SchResId( NF_EXTRAPOLATE_BACKWARD 
  )),
-m_aCB_SetIntercept( pParent, SchResId( CB_SET_INTERCEPT
  )),
-m_aNF_InterceptValue(   pParent, SchResId( NF_INTERCEPT_VALUE  
  )),
-
-m_aFLEquation( pParent, SchResId( FL_EQUATION  
 )),
-m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION 
 )),
-m_aCBShowCorrelationCoeff( pParent, SchResId( 
CB_SHOW_CORRELATION_COEFF )),
-
 m_eTrendLineType( CHREGRESS_LINEAR ),
 m_bTrendLineUnique( true )
 {
+((SfxTabPage*)pParent)-get(m_pRB_Linear,linear);
+((SfxTabPage*)pParent)-get(m_pRB_Logarithmic,logarithmic);
+

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

2013-11-12 Thread Andres Gomez

 include/rtl/string.hxx  |6 --
 include/rtl/ustring.hxx |   12 
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 39f14fc00128e5bac72c474c7466cab9916598f0
Author: Andres Gomez ago...@igalia.com
Date:   Tue Nov 12 12:29:04 2013 +0200

rtl: starts-/endsWith* new second parameter since 4.2

Updated the documentation for the new optional second parameter in the
O(U)String startsWith* and endsWith* methods so it is explicitly said
that it is only available since LibreOffice 4.2

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

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index b0d64d7..04d89cb 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -682,7 +682,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   start of this string
@@ -720,7 +721,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   end of this string
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 0dee880..826727f 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -923,7 +923,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   start of this string
@@ -968,7 +969,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   start of this string, ignoring the case of ASCII letters (A--Z and
@@ -1013,7 +1015,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   end of this string
@@ -1083,7 +1086,8 @@ public:
   @param str the substring to be compared
 
   @param rest if non-null, and this function returns true, then assign a
-  copy of the remainder of this string to *rest
+  copy of the remainder of this string to *rest. Available since
+  LibreOffice 4.2
 
   @return true if and only if the given str appears as a substring at the
   end of this string, ignoring the case of ASCII letters (A--Z and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: what is this error

2013-11-12 Thread Michael Stahl

On 11/11/13 10:57, Christian Lohmaier wrote:
 Hi *,
 
 Am 11.11.2013 10:44 schrieb soliman Eldebaky soliman.mou...@gmail.com
 mailto:soliman.mou...@gmail.com:

 but i didn't receive any warning   message

the reason for that is that the warning message exists only on master
and not on the libreoffice-4-1 release branch.

  and i installed  vs2012 update 3 and still as it is
 
 Yes, as visual studio itself doesn't contain the file. You need to
 download the windows SDK separately. You'll find a link on the wiki page.
 
 Just coping the file into the existing SDK might work or not.. Never
 tried. I suggest to use the separate SDK. That is what the release
 builds do, and also what configure picks up by default (at least when
 using the defaults in the vs/SDK installers).
 
 So so download and install the windows SDK and run autogen.sh again. It
 should find the vbs file (look in config_host.mk http://config_host..mk).

configure only looks for the VBS file on master, not on the
libreoffice-4-1 branch.

reading the relevant parts of configure.ac on master i get the idea that
the problem could probably be avoided with Visual Studio 2012 by using
the configure option --with-windows-sdk=7.1A  (which is needed anyway if
the builds should run on Win XP).

the commits that introduce the WiLangId configure checks on master are:

08337321e655a3b4991c895de98d96858e60d863
265cc578b0a27c44fda115407d841aa821384b71
3bfe3bfca27dcc4cb00a85c2b30a5a50f5bad689
f351c1399313aab9533bd9b0451a1e7fd76e2204

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

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

2013-11-12 Thread Caolán McNamara

 chart2/source/controller/dialogs/ResourceIds.hrc |1 -
 chart2/source/controller/inc/HelpIds.hrc |   10 --
 helpcontent2 |2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit c5c786163473ff0b37b7487bafbbbc25f133b40a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 12:58:18 2013 +

drop unnecessary hids

Change-Id: I9aefbdad5f4b21f926f1c9bad0c545852b604f94

diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc 
b/chart2/source/controller/dialogs/ResourceIds.hrc
index 209cee0..ddd03f4 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -33,7 +33,6 @@
 #define DLG_TITLE   834
 #define DLG_3D_VIEW 752
 #define DLG_SPLINE_PROPERTIES 904
-#define DLG_DATA_TRENDLINE  841
 #define DLG_DATA_YERRORBAR  842
 #define DLG_SHAPE_FONT  921
 #define DLG_SHAPE_PARAGRAPH 922
diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index c80fea9..6370905 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -103,16 +103,6 @@
 
 #define HID_SCH_STARTING_ANGLE_DIAL 
CHART2_HID_SCH_STARTING_ANGLE_DIAL
 
-#define HID_SCH_TRENDLINE_RB_NONE   
CHART2_HID_SCH_TRENDLINE_RB_NONE
-#define HID_SCH_TRENDLINE_RB_LINEAR 
CHART2_HID_SCH_TRENDLINE_RB_LINEAR
-#define HID_SCH_TRENDLINE_RB_LOGARITHMIC
CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC
-#define HID_SCH_TRENDLINE_RB_EXPONENTIAL
CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL
-#define HID_SCH_TRENDLINE_RB_POWER  
CHART2_HID_SCH_TRENDLINE_RB_POWER
-#define HID_SCH_TRENDLINE_RB_POLYNOMIC  
CHART2_HID_SCH_TRENDLINE_RB_POLYNOMIC
-#define HID_SCH_TRENDLINE_RB_MOVING_AVERAGE 
CHART2_HID_SCH_TRENDLINE_RB_MOVING_AVERAGE
-#define HID_SCH_TRENDLINE_SHOW_EQUATION 
CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION
-#define HID_SCH_TRENDLINE_SHOW_R_SQUARED
CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED
-
 #define HID_SCH_STATISTIK_FUNCTION  
CHART2_HID_SCH_STATISTIK_FUNCTION
 #define HID_SCH_STATISTIK_RANGE 
CHART2_HID_SCH_STATISTIK_RANGE
 #define HID_SCH_STATISTIK_FUNCTION_LB   
CHART2_HID_SCH_STATISTIK_FUNCTION_LB
commit 8937de95f4266e67999c939d022396f34584df27
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:10:35 2013 +

Updated core
Project: help  54e2721b1e11389aedb06a3e8960a6cbcb290428

diff --git a/helpcontent2 b/helpcontent2
index 0e38ece..54e2721 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0e38ece364fb55b51e77ffb40ba166180b75f864
+Subproject commit 54e2721b1e11389aedb06a3e8960a6cbcb290428
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

 helpers/help_hid.lst   |8 
 source/text/schart/01/04050100.xhp |   31 +++
 2 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 54e2721b1e11389aedb06a3e8960a6cbcb290428
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:10:35 2013 +

update help ids for trendline .ui conversion

Change-Id: Ica7d205317529269442881de049c48ef8f647901

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7b9dadf..578b536 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3084,13 +3084,6 @@ HID_SCH_TITLE_SUB,63361,
 HID_SCH_TITLE_X,63362,
 HID_SCH_TITLE_Y,63363,
 HID_SCH_TITLE_Z,63364,
-HID_SCH_TRENDLINE_RB_EXPONENTIAL,63378,
-HID_SCH_TRENDLINE_RB_LINEAR,63376,
-HID_SCH_TRENDLINE_RB_LOGARITHMIC,63377,
-HID_SCH_TRENDLINE_RB_NONE,63375,
-HID_SCH_TRENDLINE_RB_POWER,63379,
-HID_SCH_TRENDLINE_SHOW_EQUATION,63380,
-HID_SCH_TRENDLINE_SHOW_R_SQUARED,63381,
 HID_SCH_WIN_DOCUMENT,63289,
 HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
@@ -5733,7 +5726,6 @@ chart2_TabPage_TP_LOCATION,551829504,
 chart2_TabPage_TP_POLAROPTIONS,551763968,
 chart2_TabPage_TP_RANGECHOOSER,551796736,
 chart2_TabPage_TP_SCALE,551665664,
-chart2_TabPage_TP_TRENDLINE,551911424,
 chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120,
 chart2_TabPage_TP_YERRORBAR,551927808,
 dbaccess_CheckBox_DLG_COLWIDTH_CB_STANDARD,1388463106,
diff --git a/source/text/schart/01/04050100.xhp 
b/source/text/schart/01/04050100.xhp
index 4bdf9de..fe9a516 100644
--- a/source/text/schart/01/04050100.xhp
+++ b/source/text/schart/01/04050100.xhp
@@ -34,6 +34,7 @@
 /bookmark
 commentonly use trend line, not regression curve: i89823/comment
 bookmark xml-lang=en-US branch=hid/.uno:InsertMenuTrendlines 
id=bm_id2001709 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_Trendline/TP_TRENDLINE id=bm_id2001710 
localize=false/
 paragraph xml-lang=en-US id=hd_id5409405 role=heading level=1 
l10n=CHGvariable id=regressionlink 
href=text/schart/01/04050100.xhpTrend Lines/link
 /variable/paragraph
   paragraph xml-lang=en-US id=par_id7272255 role=paragraph 
l10n=CHGvariable id=trendlinestextahelp hid=.Trend lines can be 
added to all 2D chart types except for Pie and Stock charts./ahelp
@@ -41,20 +42,18 @@
   embed href=text/schart/01/0403.xhp#context/
   section id=howtoget
  embed href=text/schart/00/0004.xhp#trendlines/
-  /sectioncommentNone/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TRENDLINE_RB_NONE 
id=bm_id2659077 localize=false/
-paragraph xml-lang=en-US id=par_id143436 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenNo trend line is 
shown./ahelp/paragraphcommentLinear/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TRENDLINE_RB_LINEAR 
id=bm_id6944181 localize=false/
-paragraph xml-lang=en-US id=par_id5716727 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenA linear trend line is 
shown./ahelp/paragraphcommentLogarithmic/comment
-bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC id=bm_id886257 
localize=false/
-paragraph xml-lang=en-US id=par_id5840021 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenA logarithmic trend line is 
shown./ahelp/paragraphcommentExponential/comment
-bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL id=bm_id8892483 
localize=false/
-paragraph xml-lang=en-US id=par_id9417096 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenAn exponential trend line is 
shown./ahelp/paragraphcommentPower/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TRENDLINE_RB_POWER 
id=bm_id7198400 localize=false/
-paragraph xml-lang=en-US id=par_id8482924 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenA power trend line is 
shown./ahelp/paragraphcommentShow equation/comment
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION 
id=bm_id4724875 localize=false/
-paragraph xml-lang=en-US id=par_id8962370 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenShows the trend line equation 
next to the trend line./ahelp/paragraphcommentShow correlation 
coefficient (R2)/comment
-bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED id=bm_id9068880 
localize=false/
+  /section
+commentLinear/commentbookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_Trendline/linear id=bm_id6944181 
localize=false/
+paragraph xml-lang=en-US id=par_id5716727 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenA linear trend line is 
shown./ahelp/paragraph
+commentLogarithmic/commentbookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_Trendline/logarithmic id=bm_id886257 
localize=false/
+paragraph xml-lang=en-US id=par_id5840021 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenA logarithmic trend line is 
shown./ahelp/paragraph
+commentExponential/commentbookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_Trendline/exponential id=bm_id8892483

[Libreoffice-commits] core.git: download.lst

2013-11-12 Thread Khaled Hosny

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b88c36f34b81f11bc79f26ac63f3de07fe18038
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 10 14:43:54 2013 +0200

Update the bundled HarfBuzz to 0.9.23

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

diff --git a/download.lst b/download.lst
index ccd2b5f..2ae6dad 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5
 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz
-HARFBUZZ_MD5SUM := 9782581ee6ef972554772e84ca448131
-export HARFBUZZ_TARBALL := harfbuzz-0.9.19.tar.bz2
+HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
+export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Michael Meeks

 scripts/esc-bug-stats.pl |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 973de2a358b44e68115dc4ea9fc5453781dfaf4a
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Nov 12 13:28:36 2013 +

cleanup output  hide a few names.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index c8210b0..0b739ff 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -10,6 +10,9 @@ my %sadly_non_libreoffice = (
 'SÃ¸ren Sandmann Pedersen' = 1,
 'Daniel Vetter' = 1,
 'Sergey V. Udaltsov' = 1,
+'Marek OlÅ¡Ã¡k' = 1,
+'Emil Velikov' = 1,
+'ajax at nwnk dot net' = 1,
 );
 
 # use me for testing XML pretty printing etc.
@@ -134,7 +137,7 @@ sub crunch_bugstat_lines(@)
 
} elsif ($region eq 'top-closer-name'  $line =~ m/span 
class=.*(.*)\/span/) {
$closer_name = $1;
-   print $closer_name\n;
+#  print $closer_name\n;
$region = 'top-closer-count';
 
} elsif ($region eq 'top-closer-count'  $line =~ 
m/([0-9]+)\/a\/td/) {
@@ -146,7 +149,7 @@ sub crunch_bugstat_lines(@)
 
 $region eq 'end' || die Failed to parse weekly bug summary - in region 
'$region';
 
-print STDERR many thanks to the top five bug squashers:\n;
+print STDERR many thanks to the top bug squashers:\n;
 for my $name (sort { $closed_stats{$b} = $closed_stats{$a} } keys 
%closed_stats) {
next if (defined $sadly_non_libreoffice{$name});
printf STDERR %-20s%2s\n, $name, $closed_stats{$name};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

2013-11-12 Thread Caolán McNamara

 download.lst |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 68ad762db3f27c75798b35e1ce197e6e3f428740
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:33:11 2013 +

add libeot to download.lst

Change-Id: I7d26d4935d1de4a8381420382da4e02e15586b77

diff --git a/download.lst b/download.lst
index 2ae6dad..a74d0bc 100644
--- a/download.lst
+++ b/download.lst
@@ -22,6 +22,8 @@ HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
+LOBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6
+export LIBEOT_TARBALL := libeot.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

2013-11-12 Thread Caolán McNamara

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a71afa2ffc1e6f048d32ffbdb7d5c47560d9b01d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:34:05 2013 +

LOBEOT_MD5SUM-LIBEOT_MD5SUM

Change-Id: I38890b81785d5ee03f5b90d369da01700f3b8a50

diff --git a/download.lst b/download.lst
index a74d0bc..a34b6c2 100644
--- a/download.lst
+++ b/download.lst
@@ -22,7 +22,7 @@ HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
-LOBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6
+LIBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6
 export LIBEOT_TARBALL := libeot.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 73/e257f9a9c4f05bd499a79bc98a6bd8829a9afa d0/cbcdea092248cc8c267e9813257a24381719ac

2013-11-12 Thread Caolán McNamara

 73/e257f9a9c4f05bd499a79bc98a6bd8829a9afa |1 +
 d0/cbcdea092248cc8c267e9813257a24381719ac |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e9f47c927da5b095159462b8fec903f856638ee8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:35:34 2013 +

Notes added by 'git notes add'

diff --git a/d0/cbcdea092248cc8c267e9813257a24381719ac 
b/d0/cbcdea092248cc8c267e9813257a24381719ac
new file mode 100644
index 000..86340168
--- /dev/null
+++ b/d0/cbcdea092248cc8c267e9813257a24381719ac
@@ -0,0 +1 @@
+prefer: f7197cd244f5d49d96eba32bd843280b2bd040ff
commit e82afcfa9acfe74342fc6872aae0a89b6af0efc7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:35:23 2013 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 23/16b1fa9a32d4bf997208f684264668568f88d8 5f/e69a4407cdf53f22c38ae4405b3243fa955171

2013-11-12 Thread Caolán McNamara

 23/16b1fa9a32d4bf997208f684264668568f88d8 |1 +
 5f/e69a4407cdf53f22c38ae4405b3243fa955171 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 02c319ee1bf4f8aa8eab741125559cd44d908b11
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:38:54 2013 +

Notes added by 'git notes add'

diff --git a/5f/e69a4407cdf53f22c38ae4405b3243fa955171 
b/5f/e69a4407cdf53f22c38ae4405b3243fa955171
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/5f/e69a4407cdf53f22c38ae4405b3243fa955171
@@ -0,0 +1 @@
+ignore: obsolete
commit f65c7492e4a0de5318d34cded52b148ad9ee6464
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:38:43 2013 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 41/e4096dd00c29aff7dbbac2ab0fad38bc3509bc

2013-11-12 Thread Caolán McNamara

 41/e4096dd00c29aff7dbbac2ab0fad38bc3509bc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 50b569a1380ebf9cba2dbd388421f4d09e4ddf0a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:37:50 2013 +

Notes added by 'git notes add'

diff --git a/41/e4096dd00c29aff7dbbac2ab0fad38bc3509bc 
b/41/e4096dd00c29aff7dbbac2ab0fad38bc3509bc
new file mode 100644
index 000..3fdd601
--- /dev/null
+++ b/41/e4096dd00c29aff7dbbac2ab0fad38bc3509bc
@@ -0,0 +1 @@
+prefer: 1a2cd886786f52635136009ac4fd6f61e1b120bc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 36/211d26ee20c9e46054e965e199f1af81d946ee 79/7198822eed356c3a5a6b6cf65c749cd342d564

2013-11-12 Thread Caolán McNamara

 36/211d26ee20c9e46054e965e199f1af81d946ee |1 +
 79/7198822eed356c3a5a6b6cf65c749cd342d564 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 22f1d42b3d4ded7160067bd9fccdbde0a99b9aeb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:38:27 2013 +

Notes added by 'git notes add'

diff --git a/79/7198822eed356c3a5a6b6cf65c749cd342d564 
b/79/7198822eed356c3a5a6b6cf65c749cd342d564
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/79/7198822eed356c3a5a6b6cf65c749cd342d564
@@ -0,0 +1 @@
+ignore: obsolete
commit bd838612d78c1301627e62014e49aa7765a62b7e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:38:16 2013 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 39/00f6efd06107bf4d07ca7e04d3f5c10d0444c1

2013-11-12 Thread Caolán McNamara

 39/00f6efd06107bf4d07ca7e04d3f5c10d0444c1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ecc4de47eabdf3038c7c545260c8de29eb62d5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:39:02 2013 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/71c93f0273262278f720c21c7fb375a0e6fedf

2013-11-12 Thread Caolán McNamara

 4f/71c93f0273262278f720c21c7fb375a0e6fedf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b261200c73a6a9a1c918e91103ebdaf8e220738
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 13:39:22 2013 +

Notes added by 'git notes add'

diff --git a/4f/71c93f0273262278f720c21c7fb375a0e6fedf 
b/4f/71c93f0273262278f720c21c7fb375a0e6fedf
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/4f/71c93f0273262278f720c21c7fb375a0e6fedf
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Laurent Balland-Poirier

 filter/source/flash/swffilter.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2cf96ae334491733a2bdbeb003da6e49df19cc9f
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Wed Nov 6 17:57:09 2013 +0100

Resolves: fdo#71309 Export SWF with Multiple files crashes

In case of unamed file, creation of sPresentationName crash.
This patch forces creation of empty name

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

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index e08667e..4d0ace8 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -285,16 +285,20 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const 
Sequence PropertyValue
 
 // AS: sPath is the parent directory, where everything else exists (like 
the sxi,
 //  the -swf-files folder, the -audio files, etc.
-int lastslash = sOriginalPath.lastIndexOf('/');
+sal_Int32 lastslash = sOriginalPath.lastIndexOf('/');
 OUString sPath( sOriginalPath.copy(0, lastslash) );
 
 OUString sPresentation(xStorable-getLocation());
 
 lastslash = sPresentation.lastIndexOf('/') + 1;
-int lastdot = sPresentation.lastIndexOf('.');
+sal_Int32 lastdot = sPresentation.lastIndexOf('.');
 
 // AS: The name of the presentation, without 3 character extension.
-OUString sPresentationName = sPresentation.copy(lastslash, lastdot - 
lastslash);
+OUString sPresentationName;
+if (lastdot  0)  // fdo#71309 in case file has no name
+sPresentationName = sPresentation.copy(lastslash);
+else
+sPresentationName = sPresentation.copy(lastslash, lastdot - lastslash);
 
 OUString fullpath, swfdirpath, backgroundfilename, objectsfilename;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 35862] Increase font and decrease font could work even if the selection contains differing font sizes

2013-11-12 Thread bugzilla-daemon

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

Daniel Brown da...@dannybrown.net changed:

   What|Removed |Added

 Status|ASSIGNED|NEW
   Assignee|da...@dannybrown.net|libreoffice-b...@lists.free
   ||desktop.org

--- Comment #20 from Daniel Brown da...@dannybrown.net ---
Sorry, going to have to let this part of the project go. My University final
year project has taken more and more of my time recently, and that has to come
first...

-- 
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: sysui/desktop

2013-11-12 Thread David Tardon

 sysui/desktop/menus/math.desktop |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0da9b2793d5323494d0cc5ada9d7efbf1aa2f7fb
Author: David Tardon dtar...@redhat.com
Date:   Tue Nov 12 15:49:51 2013 +0100

add missing semicolon

Change-Id: I69d7fbb1f1700779bc7ebbf419edf807b6b2dba9

diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index e13f466..4822166 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -23,13 +23,13 @@ Icon=math
 Type=Application
 
Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
 Exec=${UNIXBASISROOTNAME} --math %%FILE%%
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml
+MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
 Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
 StartupNotify=true
 X-GIO-NoFuse=true
-Keywords=Equation;OpenDocument Formula;Formula;odf;MathML
+Keywords=Equation;OpenDocument Formula;Formula;odf;MathML;
 InitialPreference=5
 StartupWMClass=libreoffice-math
 X-KDE-Protocols=file,http,smb,ftp,webdav
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

 vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf |binary
 vcl/source/filter/wmf/enhwmf.cxx  |5 +
 2 files changed, 5 insertions(+)

New commits:
commit cdd351b1487a8a97f481a9165d9cd361aaee2ca4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 14:56:43 2013 +

Resolves: fdo#71307 out polygons are limited to 16bit point count

Change-Id: I4dbe9145466d6d93ebd3dea7f4fe434c9ee3de19

diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf
new file mode 100644
index 000..b89db21
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/emf/fail/fdo71307-2.emf differ
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 6ceecc9..be4e8f6 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -346,6 +346,11 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const 
sal_Bool skipFirst)
 template class T
 Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints)
 {
+bool bRecordOk = nPoints = SAL_MAX_UINT16;
+SAL_WARN_IF(!bRecordOk, svtools.filter, polygon record has more 
polygons than we can handle);
+if (!bRecordOk)
+return Polygon();
+
 Polygon aPolygon(nPoints);
 for (sal_uInt16 i = nStartIndex ; i  nPoints  pWMF-good(); i++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Caolán McNamara

 include/sal/log-areas.dox   |1 -
 vcl/source/filter/graphicfilter.cxx |   10 +-
 vcl/source/filter/wmf/enhwmf.cxx|2 +-
 vcl/source/filter/wmf/winwmf.cxx|4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 2af31d84ad6eb6d02c02e013418b1a77037f966a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 12 15:30:16 2013 +

svtools.filter - vcl.filter

Change-Id: I26bbef9cadd890728f685053230e12408be3557e

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e85a498..73f88094a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -251,7 +251,6 @@ certain functionality.
 @li @c svtools.contnr
 @li @c svtools.control
 @li @c svtools.dialogs
-@li @c svtools.filter
 @li @c svtools.misc
 @li @c svtools.table
 @li @c svtools.uno
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 6229a77..dfebd37 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -122,15 +122,15 @@ static bool DirEntryExists( const INetURLObject rObj )
 }
 catch(const css::ucb::CommandAbortedException)
 {
-SAL_WARN( svtools.filter, CommandAbortedException );
+SAL_WARN( vcl.filter, CommandAbortedException );
 }
 catch(const css::ucb::ContentCreationException)
 {
-SAL_WARN( svtools.filter, ContentCreationException );
+SAL_WARN( vcl.filter, ContentCreationException );
 }
 catch( ... )
 {
-SAL_WARN( svtools.filter, Any other exception );
+SAL_WARN( vcl.filter, Any other exception );
 }
 return bExists;
 }
@@ -148,11 +148,11 @@ static void KillDirEntry( const OUString rMainUrl )
 }
 catch(const css::ucb::CommandAbortedException)
 {
-SAL_WARN( svtools.filter, CommandAbortedException );
+SAL_WARN( vcl.filter, CommandAbortedException );
 }
 catch( ... )
 {
-SAL_WARN( svtools.filter, Any other exception );
+SAL_WARN( vcl.filter, Any other exception );
 }
 }
 
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index be4e8f6..2e79081 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -347,7 +347,7 @@ template class T
 Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints)
 {
 bool bRecordOk = nPoints = SAL_MAX_UINT16;
-SAL_WARN_IF(!bRecordOk, svtools.filter, polygon record has more 
polygons than we can handle);
+SAL_WARN_IF(!bRecordOk, vcl.filter, polygon record has more polygons 
than we can handle);
 if (!bRecordOk)
 return Polygon();
 
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 7796a90..ff97d10 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -372,7 +372,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 nPoints += pnPoints[a];
 }
 
-SAL_WARN_IF(!bRecordOk, svtools.filter, polypolygon record 
has more polygons than we can handle);
+SAL_WARN_IF(!bRecordOk, vcl.filter, polypolygon record has 
more polygons than we can handle);
 
 bRecordOk = pWMF-good();
 
@@ -1375,7 +1375,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle 
rPlaceableBound, SvStream* pSt
 nPoints += nP;
 }
 
-SAL_WARN_IF(!bRecordOk, svtools.filter, polypolygon 
record has more polygons than we can handle);
+SAL_WARN_IF(!bRecordOk, vcl.filter, polypolygon record 
has more polygons than we can handle);
 
 bRecordOk = pStm-good();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Laurent Balland-Poirier

 filter/source/flash/swffilter.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 484b1e6ea4e65f225f4694de006a22a69d734c76
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Wed Nov 6 17:57:09 2013 +0100

Resolves: fdo#71309 Export SWF with Multiple files crashes

In case of unamed file, creation of sPresentationName crash.
This patch forces creation of empty name

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

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index e08667e..4d0ace8 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -285,16 +285,20 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const 
Sequence PropertyValue
 
 // AS: sPath is the parent directory, where everything else exists (like 
the sxi,
 //  the -swf-files folder, the -audio files, etc.
-int lastslash = sOriginalPath.lastIndexOf('/');
+sal_Int32 lastslash = sOriginalPath.lastIndexOf('/');
 OUString sPath( sOriginalPath.copy(0, lastslash) );
 
 OUString sPresentation(xStorable-getLocation());
 
 lastslash = sPresentation.lastIndexOf('/') + 1;
-int lastdot = sPresentation.lastIndexOf('.');
+sal_Int32 lastdot = sPresentation.lastIndexOf('.');
 
 // AS: The name of the presentation, without 3 character extension.
-OUString sPresentationName = sPresentation.copy(lastslash, lastdot - 
lastslash);
+OUString sPresentationName;
+if (lastdot  0)  // fdo#71309 in case file has no name
+sPresentationName = sPresentation.copy(lastslash);
+else
+sPresentationName = sPresentation.copy(lastslash, lastdot - lastslash);
 
 OUString fullpath, swfdirpath, backgroundfilename, objectsfilename;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-12 Thread Noel Grandin

 sal/rtl/string.cxx  |   19 +++
 sal/rtl/ustring.cxx |   32 ++--
 2 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 1db1d9ecadf10788f5b310942e0128344ad2c8aa
Author: Noel Grandin n...@peralex.com
Date:   Thu Oct 31 11:26:25 2013 +0200

document the use of the strtmpl.cxx and remove unnecessary macro usage

Document the calling macros for the strtmpl.cxx template file.
And remove unnecessary use of those macros in the calling file.

Change-Id: I20e0dd74150773363b9fb557884b84692ce22f11
Reviewed-on: https://gerrit.libreoffice.org/6504
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 313706d..ce7fa31 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -52,7 +52,10 @@ static rtl_String const aImplEmpty_rtl_String =
 };
 
 /* === */
-
+/* These macros are for the poor-man templates included from
+ * the strtmpl.cxx just below, used to share code between here and
+ * ustring.cxx
+ */
 #define IMPL_RTL_STRCODEsal_Char
 #define IMPL_RTL_USTRCODE( c )  ((unsigned char)c)
 #define IMPL_RTL_STRNAME( n )   rtl_str_ ## n
@@ -205,10 +208,10 @@ sal_Bool SAL_CALL 
rtl_impl_convertUStringToString(rtl_String ** pTarget,
the buffer faster */
 if ( nNewLen == (sal_Size)nLength )
 {
-IMPL_RTL_STRCODE* pBuffer;
+sal_Char* pBuffer;
 if ( *pTarget )
-IMPL_RTL_STRINGNAME( release )( *pTarget );
-*pTarget = IMPL_RTL_STRINGNAME( ImplAlloc )( nLength );
+rtl_string_release( *pTarget );
+*pTarget = rtl_string_ImplAlloc( nLength );
 OSL_ASSERT(*pTarget != NULL);
 pBuffer = (*pTarget)-buffer;
 do
@@ -217,7 +220,7 @@ sal_Bool SAL_CALL 
rtl_impl_convertUStringToString(rtl_String ** pTarget,
 OSL_ENSURE( *pSource = 127,
 rtl_uString2String() - UTF8 test is encoding 
is wrong );
 
-*pBuffer = (IMPL_RTL_STRCODE)(unsigned char)*pSource;
+*pBuffer = (sal_Char)(unsigned char)*pSource;
 pBuffer++;
 pSource++;
 nLength--;
@@ -247,7 +250,7 @@ sal_Bool SAL_CALL 
rtl_impl_convertUStringToString(rtl_String ** pTarget,
 
 for (;;)
 {
-pTemp = IMPL_RTL_STRINGNAME( ImplAlloc )( nNewLen );
+pTemp = rtl_string_ImplAlloc( nNewLen );
 OSL_ASSERT(pTemp != NULL);
 nDestBytes = rtl_convertUnicodeToText( hConverter, 0,
pSource, nLength,
@@ -277,7 +280,7 @@ sal_Bool SAL_CALL 
rtl_impl_convertUStringToString(rtl_String ** pTarget,
much overhead, reallocate to the correct size */
 if ( nNewLen  nDestBytes+8 )
 {
-rtl_String* pTemp2 = IMPL_RTL_STRINGNAME( ImplAlloc )( nDestBytes 
);
+rtl_String* pTemp2 = rtl_string_ImplAlloc( nDestBytes );
 OSL_ASSERT(pTemp2 != NULL);
 rtl_str_ImplCopy( pTemp2-buffer, pTemp-buffer, nDestBytes );
 rtl_freeMemory( pTemp );
@@ -291,7 +294,7 @@ sal_Bool SAL_CALL 
rtl_impl_convertUStringToString(rtl_String ** pTarget,
 
 rtl_destroyUnicodeToTextConverter( hConverter );
 if ( *pTarget )
-IMPL_RTL_STRINGNAME( release )( *pTarget );
+rtl_string_release( *pTarget );
 *pTarget = pTemp;
 
 /* Results the conversion in an empty buffer -
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index e27a1dd..7b266ed 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -58,6 +58,10 @@ static rtl_uString const aImplEmpty_rtl_uString =
 };
 
 /* === */
+/* These macros are for the poor-man templates included from
+ * the strtmpl.cxx just below, used to share code between here and
+ * string.cxx
+ */
 
 #define IMPL_RTL_STRCODEsal_Unicode
 #define IMPL_RTL_USTRCODE( c )  (c)
@@ -467,18 +471,18 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** 
ppThis,
 
 if ( !nLen )
 {
-IMPL_RTL_STRINGNAME( new )( ppThis );
+rtl_uString_new( ppThis );
 return;
 }
 
 if ( *ppThis )
-IMPL_RTL_STRINGNAME( release )( *ppThis );
+rtl_uString_release( *ppThis );
 
-*ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( nLen );
+*ppThis = rtl_uString_ImplAlloc( nLen );
 OSL_ASSERT(*ppThis != NULL);
 if ( (*ppThis) )
 {
-IMPL_RTL_STRCODE* pBuffer = (*ppThis)-buffer;
+sal_Unicode* pBuffer = (*ppThis)-buffer;
 do
 {
 /* Check ASCII range */
@@ -603,13 +607,13 @@ static

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/libeot external/Module_external.mk Makefile.fetch RepositoryExternal.mk

2013-11-12 Thread David Tardon

 Makefile.fetch |1 
 RepositoryExternal.mk  |   43 
 config_host.mk.in  |4 +
 configure.ac   |   39 ++
 external/Module_external.mk|1 
 external/libeot/ExternalProject_libeot.mk  |   28 +
 external/libeot/Makefile   |7 +++
 external/libeot/Module_libeot.mk   |   17 
 external/libeot/README |2 
 external/libeot/UnpackedTarball_libeot.mk  |   18 
 external/libeot/libeot-avoid-autotools-run.patch.0 |   44 +
 11 files changed, 204 insertions(+)

New commits:
commit 49a4d366ee7c298e547955344001f3d95622106a
Author: David Tardon dtar...@redhat.com
Date:   Tue Nov 12 16:44:40 2013 +0100

integrate libeot

Change-Id: I0f28ff1680026d883909cc12efabb54f705cecb4

diff --git a/Makefile.fetch b/Makefile.fetch
index 752a934..ae76cf7 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -81,6 +81,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
+   $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1fd0850..4ec63ae 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2639,6 +2639,49 @@ gb_LinkTarget__use_orcus-parser :=
 
 endif
 
+ifeq ($(ENABLE_EOT),TRUE)
+
+ifeq ($(SYSTEM_LIBEOT),TRUE)
+
+define gb_LinkTarget__use_libeot
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(LIBEOT_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBEOT_LIBS))
+
+endef
+
+gb_ExternalProject__use_libeot :=
+
+else # !SYSTEM_LIBEOT
+
+define gb_LinkTarget__use_libeot
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,libeot)/inc \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,libeot)/.libs/libeot$(gb_StaticLibrary_PLAINEXT) \
+)
+$(call gb_LinkTarget_use_external_project,$(1),libeot)
+
+endef
+
+define gb_ExternalProject__use_libeot
+$(call gb_ExternalProject_use_external_project,$(1),libeot)
+
+endef
+
+endif # SYSTEM_LIBEOT
+
+else # !ENABLE_EOT
+
+gb_LinkTarget__use_libeot :=
+gb_ExternalProject__use_libeot :=
+
+endif # ENABLE_EOT
+
 ### X11 stuff ###
 
 ifeq ($(GUIBASE),unx)
diff --git a/config_host.mk.in b/config_host.mk.in
index 30df49c..0da03be 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -114,6 +114,7 @@ export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
 export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@
 export ENABLE_DIRECTX=@ENABLE_DIRECTX@
+export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_GCONF=@ENABLE_GCONF@
@@ -299,6 +300,8 @@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
 export LFS_CFLAGS=@LFS_CFLAGS@
 export LIBBASE_JAR=@LIBBASE_JAR@
 export LIBDIR=@LIBDIR@
+export LIBEOT_CFLAGS=$(gb_SPACE)@LIBEOT_CFLAGS@
+export LIBEOT_LIBS=$(gb_SPACE)@LIBEOT_LIBS@
 export LIBEXSLT_CFLAGS=$(gb_SPACE)@LIBEXSLT_CFLAGS@
 export LIBEXSLT_LIBS=$(gb_SPACE)@LIBEXSLT_LIBS@
 export LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@
@@ -510,6 +513,7 @@ export SYSTEM_EBOOK=@SYSTEM_EBOOK@
 export SYSTEM_ETONYEK=@SYSTEM_ETONYEK@
 export SYSTEM_FREEHAND=@SYSTEM_FREEHAND@
 export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@
+export SYSTEM_LIBEOT=@SYSTEM_LIBEOT@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
diff --git a/configure.ac b/configure.ac
index 817e4da..e2a79bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1100,6 +1100,11 @@ AC_ARG_ENABLE(neon,
 [Disable neon and the compilation of webdav binding.]),
 ,)
 
+AC_ARG_ENABLE([eot],
+[AS_HELP_STRING([--enable-eot],
+[Enable support for Embedded OpenType fonts.])],
+, [enable_eot=no])
+
 AC_ARG_ENABLE(cve-tests,
 AS_HELP_STRING([--disable-cve-tests],
 [Prevent CVE tests to be executed]),
@@ -1479,6 +1484,11 @@ AC_ARG_WITH(system-expat,
 [Use expat already on system.]),,
 [with_system_expat=$with_system_libs])
 
+AC_ARG_WITH(system-libeot,
+AS_HELP_STRING([--with-system-libeot],
+[Use libeot already on system.]),,
+[with_system_libeot=$with_system_libs])
+
 AC_ARG_WITH(system-libxml,
 AS_HELP_STRING([--with-system-libxml],
 [Use libxml/libxslt

Re: astyle / uncrustify

2013-11-12 Thread Miklos Vajna

Hi Thorsten,

On Tue, Nov 12, 2013 at 05:22:29PM +0100, Thorsten Behrens 
t...@documentfoundation.org wrote:
 And along the 'have more mass-changes' idea - what about uncrustify /
 astyle finally? Fscked-up aligned is at least what irks me the most
 these days. :)

Did you manage to create an astyle config that matches our coding style?

Two random examples:

1) As far as I see in case a method has many parameters our codebase
just indents the next line with 4 spaces. astyle will pad the parameters
to match the leading (.

Example:
http://opengrok.libreoffice.org/xref/core/sw/source/filter/ww8/rtfattributeoutput.cxx#1064

2) astyle also insists on indenting multi-line assignment (so that the
next line is padded to match the leading =).

Example:
http://opengrok.libreoffice.org/xref/core/writerfilter/source/rtftok/rtfsdrimport.cxx#621

In neither of these cases it's possible to disable this behavior of
astyle; and obviously reformatting code that has a sane (no idea if we
have strong disagreements on what is sane :) ) formatting is obviously a
bad thing.

I'm happy with following some style rules, but that'll cause some pain
during backporting, so I think the reformatting shouldn't do more than
absolutely necessary.

Miklos


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

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

2013-11-12 Thread Julien Nabet

 sd/source/core/drawdoc4.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 53f69058789eee1215a07d65c4b14ac096458905
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Nov 9 20:17:37 2013 +0100

fdo#71428: Spelling of turquise in Impress Table Design

Thanks to Owen Genat for pointing the bug + location of the problem

Change-Id: I5f385f6cb5e9241f4fa65159df1f8bbefd2f383b
Reviewed-on: https://gerrit.libreoffice.org/6624
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 5084044..e99f289 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -632,11 +632,11 @@ void SdDrawDocument::CreateDefaultCellStyles()
 
 //  Turquoise --
 
-Any aTurquise1( implMakeSolidCellStyle( pSSPool, turquise1 , 
aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
-Any aTurquise2( implMakeSolidCellStyle( pSSPool, turquise2 , 
aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
-Any aTurquise3( implMakeSolidCellStyle( pSSPool, turquise3 , 
aDefaultCellStyleName, RGB_COLORDATA(25,138,138)));
+Any aTurquoise1( implMakeSolidCellStyle( pSSPool, turquoise1 , 
aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
+Any aTurquoise2( implMakeSolidCellStyle( pSSPool, turquoise2 , 
aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
+Any aTurquoise3( implMakeSolidCellStyle( pSSPool, turquoise3 , 
aDefaultCellStyleName, RGB_COLORDATA(25,138,138)));
 
-implCreateTableTemplate( xTableFamily, turquise , aTurquise1, 
aTurquise3, aTurquise2 );
+implCreateTableTemplate( xTableFamily, turquoise , aTurquoise1, 
aTurquoise3, aTurquoise2 );
 
 //  Gray 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configure.ac

2013-11-12 Thread Andras Timar

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

New commits:
commit a983848df0b600485be09ba23906fb1e54e1ac16
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 08:59:59 2013 -0800

Bump version to 4.1-2

Change-Id: I1d0cfe5a143b7b07886ba2943f8bd7cb1c00a41b

diff --git a/configure.ac b/configure.ac
index 57956a1..d7eee5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.10.1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.2],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 68871] Disable View -- Elements by default

2013-11-12 Thread bugzilla-daemon

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

Thomas Arnhold thomas-l...@arnhold.org changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #1 from Thomas Arnhold thomas-l...@arnhold.org ---
Unhappily this is already shipped within the 4.1 releases. Those bugs need some
attention especially for 4.2. For 4.1 it's maybe better to disable it entirely.

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

Re: astyle / uncrustify

2013-11-12 Thread bjoern

On Tue, Nov 12, 2013 at 05:35:51PM +0100, Miklos Vajna wrote:
 Hi Thorsten,
 
 On Tue, Nov 12, 2013 at 05:22:29PM +0100, Thorsten Behrens 
 t...@documentfoundation.org wrote:
  And along the 'have more mass-changes' idea - what about uncrustify /
  astyle finally? Fscked-up aligned is at least what irks me the most
  these days. :)
 
 Did you manage to create an astyle config that matches our coding style?

I think I had an uncrustify style create at some point in time that mostly met
our conventions. Still, I was shy to move forward with that, as the topic
invites a huge bikeshedding flamefest.

But if there is interest, I can see if I can dig it out again as a starting
point.

Best,

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

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

2013-11-12 Thread Philipp Weissenbacher

 sc/source/filter/rtf/eeimpars.cxx |   79 ++
 sc/source/filter/rtf/rtfexp.cxx   |   11 +
 sc/source/filter/rtf/rtfparse.cxx |   71 --
 3 files changed, 76 insertions(+), 85 deletions(-)

New commits:
commit 7c320e1a2518707dcdefc4680db67030f4c31386
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Sun Nov 10 17:54:14 2013 +0100

Translate German comments

Change-Id: I7e0ece1089edad3065e794a4c0e138ffa858bfc2
Reviewed-on: https://gerrit.libreoffice.org/6631
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index fbcdd9d..bff7c71 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -60,8 +60,6 @@
 // in fuins1.cxx
 extern void ScLimitSizeOnDrawPage( Size rSize, Point rPos, const Size rPage 
);
 
-//
-
 ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange rRange ) :
 maRange( rRange ),
 mpDoc( pDocP ),
@@ -77,9 +75,9 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange 
rRange ) :
 
 ScEEImport::~ScEEImport()
 {
-// Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem 
Dtor!
-// Ist gewaehrleistet, da ScEEImport Basisklasse ist
-delete mpEngine;// nach Parser!
+// Sequence important, or else we crash in some dtor!
+// Is guaranteed as ScEEImport is base class
+delete mpEngine; // After Parser!
 }
 
 
@@ -151,8 +149,8 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 if ( nRow != nLastMergedRow )
 nMergeColAdd = 0;
 SCCOL nCol = nStartCol + pE-nCol + nMergeColAdd;
-// RowMerge feststellen, pures ColMerge und ColMerge der ersten
-// MergeRow bereits beim parsen
+// Determine RowMerge
+// Pure ColMerge and ColMerge of the first MergeRow already done 
during parsing
 if ( nRow = nOverlapRowMax )
 {
 while ( nCol = MAXCOL  mpDoc-HasAttrib( nCol, nRow, nTab,
@@ -163,20 +161,21 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 }
 nLastMergedRow = nRow;
 }
-// fuer zweiten Durchlauf eintragen
+// Add for second run
 pE-nCol = nCol;
 pE-nRow = nRow;
 if ( ValidCol(nCol)  ValidRow(nRow) )
 {
 SfxItemSet aSet = mpEngine-GetAttribs( pE-aSel );
-// Default raus, wir setzen selber links/rechts je nachdem ob Text
-// oder Zahl; EditView.GetAttribs liefert immer kompletten Set
-// mit Defaults aufgefuellt
+// Remove default: we set left/right ourselves depending on Text or
+// Number
+// EditView.GetAttribs always returns complete Set filled with
+// defaults
 const SfxPoolItem rItem = aSet.Get( EE_PARA_JUST );
 if ( ((const SvxAdjustItem)rItem).GetAdjust() == SVX_ADJUST_LEFT )
 aSet.ClearItem( EE_PARA_JUST );
 
-// Testen, ob einfacher String ohne gemischte Attribute
+// Test whether simple String without mixed attributes
 sal_Bool bSimple = ( pE-aSel.nStartPara == pE-aSel.nEndPara );
 for (sal_uInt16 nId = EE_CHAR_START; nId = EE_CHAR_END  
bSimple; nId++)
 {
@@ -186,7 +185,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 bSimple = false;
 else if (eState == SFX_ITEM_SET)
 {
-if ( nId == EE_CHAR_ESCAPEMENT )// 
Hoch-/Tiefstellen immer ueber EE
+if ( nId == EE_CHAR_ESCAPEMENT ) // Super-/Subscript 
always via EE
 {
 if ( (SvxEscapement)((const 
SvxEscapementItem*)pItem)-GetEnumValue()
 != SVX_ESCAPEMENT_OFF )
@@ -195,7 +194,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 }
 }
 if ( bSimple )
-{   //  Feldbefehle enthalten?
+{   //  Contains field commands?
 SfxItemState eFieldState = aSet.GetItemState( 
EE_FEATURE_FIELD, false );
 if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == 
SFX_ITEM_SET )
 bSimple = false;
@@ -207,7 +206,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 sal_uInt32 nNumForm = 0;
 LanguageType eNumLang = LANGUAGE_NONE;
 if ( pE-pNumStr )
-{   // SDNUM muss sein wenn SDVAL
+{   // SDNUM needs to be if SDVAL
 aNumStr = *pE-pNumStr;
 if ( pE-pValStr )
 aValStr =

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - formula/source sc/inc sc/source

2013-11-12 Thread Kohei Yoshida

 formula/source/core/resource/core_resource.src |   23 ++-
 sc/inc/formulagroup.hxx|2 --
 sc/source/core/data/formulacell.cxx|6 ++
 sc/source/core/opencl/formulagroupcl.cxx   |   12 
 sc/source/core/tool/formulagroup.cxx   |   10 --
 sc/source/filter/oox/formulabuffer.cxx |4 
 6 files changed, 24 insertions(+), 33 deletions(-)

New commits:
commit a2a99633067f25e0d2e30974f9af903485ea2c90
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Nov 12 14:43:41 2013 -0500

Reduce the amount of RPM token generation.

Change-Id: I03941690114b17d8ab63cfb9b1b23a2ff1741b10

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 24e26d9..fb7692b 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -85,8 +85,6 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
 FormulaGroupInterpreter() {}
 virtual ~FormulaGroupInterpreter() {}
 
-static void generateRPNCode(ScDocument rDoc, const ScAddress rPos, 
ScTokenArray rCode);
-
  public:
 static FormulaGroupInterpreter *getStatic();
 static void fillOpenCLInfo(std::vectorOpenclPlatformInfo rPlatforms);
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 5e92efa..07f8656 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3468,6 +3468,7 @@ public:
 
 bool convert(ScTokenArray rCode)
 {
+#if 0
 { // debug to start with:
 ScCompiler aComp( mrDoc, mrPos, rCode);
 aComp.SetGrammar(formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1);
@@ -3475,6 +3476,7 @@ public:
 aComp.CreateStringFromTokenArray(aAsString);
 SAL_DEBUG(interpret formula:   aAsString.makeStringAndClear());
 }
+#endif
 
 rCode.Reset();
 for (const formula::FormulaToken* p = rCode.First(); p; p = 
rCode.Next())
@@ -3614,6 +3616,10 @@ public:
 }
 }
 
+ScCompiler aComp(mrDoc, mrPos, mrGroupTokens);
+aComp.SetGrammar(mrDoc.GetGrammar());
+aComp.CompileTokenArray(); // Regenerate RPN tokens.
+
 return true;
 }
 };
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 228df59..66a28ce 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1408,20 +1408,9 @@ public:
 virtual ScMatrixRef inverseMatrix( const ScMatrix rMat );
 virtual bool interpret( ScDocument rDoc, const ScAddress rTopPos,
 const ScFormulaCellGroupRef xGroup, ScTokenArray rCode );
-void generateRPNCode(ScDocument rDoc,
-const ScAddress rPos, ScTokenArray rCode);
 DynamicKernel *mpKernel;
 };
 
-void FormulaGroupInterpreterOpenCL::generateRPNCode(ScDocument rDoc,
-const ScAddress rPos, ScTokenArray rCode)
-{
-// First, generate an RPN (reverse polish notation) token array.
-ScCompiler aComp(rDoc, rPos, rCode);
-aComp.SetGrammar(rDoc.GetGrammar());
-aComp.CompileTokenArray(); // Create RPN token array.
-}
-
 ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix( const ScMatrix )
 {
 return NULL;
@@ -1431,7 +1420,6 @@ bool FormulaGroupInterpreterOpenCL::interpret( 
ScDocument rDoc,
 const ScAddress rTopPos, const ScFormulaCellGroupRef xGroup,
 ScTokenArray rCode )
 {
-generateRPNCode(rDoc, rTopPos, rCode);
 // printf(Vector width = %d\n, xGroup-mnLength);
 // Constructing AST
 FormulaTokenIterator aCode = rCode;
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 2573359..8d87e24 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -425,7 +425,6 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument 
rDoc, const ScAddres
 if (!pDest)
 return false;
 
-generateRPNCode(rDoc, aTmpPos, aCode2);
 ScInterpreter aInterpreter(pDest, rDoc, aTmpPos, aCode2);
 aInterpreter.Interpret();
 aResults.push_back(aInterpreter.GetResultToken());
@@ -676,15 +675,6 @@ void FormulaGroupInterpreter::enableOpenCL(bool bEnable)
 ScInterpreter::SetGlobalConfig(aConfig);
 }
 
-void FormulaGroupInterpreter::generateRPNCode(ScDocument rDoc, const 
ScAddress rPos, ScTokenArray rCode)
-{
-// First, generate an RPN (reverse polish notation) token array.
-ScCompiler aComp(rDoc, rPos, rCode);
-aComp.SetGrammar(rDoc.GetGrammar());
-aComp.CompileTokenArray(); // Create RPN token array.
-// Now, calling FirstRPN() and NextRPN() will return tokens from the RPN 
token array.
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/formulabuffer.cxx 
b/sc/source/filter/oox/formulabuffer.cxx
index 4bdb6ae..6f0c991 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++

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

2013-11-12 Thread Andras Timar

 sw/source/core/edit/edtox.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d3ffdf5e7db40ab026a4d55bfe231ab5817c4142
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 12 20:55:23 2013 +0100

fdo#46410 fix FindRange

Change-Id: I7aada76bc2e8e767f36016eee5e57267b3718b13

diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 49c1c20..9059e17 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -389,8 +389,7 @@ void SwEditShell::ApplyAutoMark()
 // todo/mba: assuming that notes shouldn't be searched
 sal_Bool bSearchInNotes = sal_False;
 sal_uLong nRet = Find( aSearchOpt,  bSearchInNotes, 
DOCPOS_START, DOCPOS_END, bCancel,
-
(FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY|FND_IN_OTHER),
-sal_False );
+(FindRanges)(FND_IN_SELALL), sal_False );
 
 if(nRet)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-11-12 Thread bugzilla-daemon

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

Bug 54157 depends on bug 46410, which changed state.

Bug 46410 Summary: EDITING: Alphabetical index with concordance file
https://bugs.freedesktop.org/show_bug.cgi?id=46410

   What|Removed |Added

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

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

Re: Handling of worksheet functions from Excel 2010 and newer

2013-11-12 Thread Markus Mohrhard

Hey Winfried,


2013/11/12 Winfried Donkers w.donk...@dci-electronics.nl

 Hi Markus, Kohei, Eike,

 Kohei added the tests with
 http://cgit.freedesktop.org/libreoffice/core/commit/sc/qa?id=c40cbf189750f623e065b6ed9596d90977a2f631
 but at least IMO it makes more sense to add test cases similar to
 testFunctionODS just for XLSX where you add corner cases for new functions.
 I suppose that you already have a set of corner cases for your tests and
 you can just use these for the import and export tests.

 The tests Kohei added are of some functions I recently added (plus one
 that I'm still working on), so I will expand both the xlsx-file and the
 ScFiltersTest::testFunctionsExcel2010().
 (The xlsx-file will have to checked by someone with Excel though, before
 getting pushed. I don't have Excel)


So Kohei just tested that the functions are imported without an error
(which made sense as he was writing a test for a bug). What I was
suggesting for your case is that you take some of the corner cases that you
know and write a test for them. This is what I started once for ODS with
testFunctionsODS. That way we can test that we import the function and that
the function behaves correctly in the corner cases. Hopefully this helps to
make sure that nobody ever breaks this function.

Btw if your only problem with writing test cases is that you don't have
access to Excel just ask for help. Kohei, Eike and I have access to Excel
and can surely create the test file that you need or check that your file
imports correctly.

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

Re: 4.2.0.0.alpha1 build error

2013-11-12 Thread Andreas Radke

Am Mon, 11 Nov 2013 09:57:56 +0100
schrieb Miklos Vajna vmik...@collabora.co.uk:

 I would bet that it's more about some missing font. Are you building
 in a chroot? If so, can you check if Arial, or a metrically
 equivalent font (i.e. Liberation Sans) is available when the test
 runs?

Thanks for the hint. Replacing dejavu-fonts with liberation fonts made
the build finish.

Now it fails in a different way:

... installing module gid_Module_Root_SDK ...
DestDir: /build/libreoffice/src/fakeinstall 
Rootpath: /usr/lib/libreoffice 
ln: failed to create symbolic link 
'/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll':
 No such file or directory
ERROR: Failure in installer.pm
ERROR: Failed ln -sf 
'/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll' 
'/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll'
 at 
/build/libreoffice/src/libreoffice-4.2.0.0.alpha1/solenv/bin/modules/installer/worker.pm
 line 374.

... cleaning the output tree ...
... removing directory /tmp/ooopackagingemsMrY/i_57281384279210 ...
ERROR, saved
logfile /tmp/LibreOffice_SDK//logging/en-US/log_OOO420_en-US.log is:

...

: PACKAGEPREFIX=
: PRODUCTMINOR=
: 
: 
: 
: Setting Root Module: gid_Module_Root_SDK
: 
: *
: ERROR: Failed ln -sf 
'/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll' 
'/build/libreoffice/src/fakeinstall/usr/lib/libreoffice/sdk/classes/win/unowinreg.dll'
 at 
/build/libreoffice/src/libreoffice-4.2.0.0.alpha1/solenv/bin/modules/installer/worker.pm
 line 374.
: *

Tue Nov 12 19:00:14 2013 (00:04 min.)
Failed to install: No such file or directory at 
/build/libreoffice/src/libreoffice-4.2.0.0.alpha1/solenv/bin/ooinstall line 108.
Makefile:259: recipe for target 'install' failed
make: *** [install] Error 2



I haven't changed anything related to 
185d60944ea767075d27247c3162b3bc-unowinreg.dll

The file is linked into the main source directory and this worked so far. Or 
need to be linked/copied now 
into the external directory?

 find /home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/ | grep 
unowinreg.dll
/home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/libreoffice-4.2.0.0.alpha1/instdir/unxlngx6.pro/sdk/classes/win/unowinreg.dll
/home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
/home/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll


-Andy
ArchLinux


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

Re: menu question

2013-11-12 Thread Cor Nouws


Hi Caolan,

Cor Nouws wrote (21-08-13 10:21)


So, for you file-templates-save as template and file-templates-new
doc from template do not bring up any dialogs ? They do for me.


Yep.


As from yesterday evening I have the 420alpha1 installed and I see that 
it works as expected there.
(Was reported also by Thomas on the QA-list. So there must be something 
odd in my local repo...)


I'll provide a patch for the different text of the menu entry.
And maybe should update the Help too .. ?

Cheers,

--
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: config_host/config_eot.h.in configure.ac

2013-11-12 Thread David Tardon

 config_host/config_eot.h.in |6 ++
 configure.ac|1 +
 2 files changed, 7 insertions(+)

New commits:
commit a621bdb0aad19a3a5ee4ff7089fca7cfe0ba1467
Author: David Tardon dtar...@redhat.com
Date:   Tue Nov 12 21:14:32 2013 +0100

add config header for EOT

Change-Id: I1a3e01243c6f98fb5f055a1783bb13a1cbfc1efe

diff --git a/config_host/config_eot.h.in b/config_host/config_eot.h.in
new file mode 100644
index 000..d1c87a0
--- /dev/null
+++ b/config_host/config_eot.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_EOT_H
+#define CONFIG_EOT_H
+
+#define ENABLE_EOT 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index e2a79bb..6d7dcf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12664,6 +12664,7 @@ AC_CONFIG_FILES([config_host.mk
  ios/lo.xcconfig])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
+AC_CONFIG_HEADERS([config_host/config_eot.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_folders.h])
 AC_CONFIG_HEADERS([config_host/config_gcc.h])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-11-12 Thread bugzilla-daemon

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

--- Comment #17 from ape os...@yandex.ru ---
Bug 62461 added because the API does not use a PNG image that is embedded in
the ODF file in addition to SVG drawing.

-- 
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 65675] LibreOffice 4.2 most annoying bugs

2013-11-12 Thread bugzilla-daemon

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

ape os...@yandex.ru changed:

   What|Removed |Added

 Depends on||62461

-- 
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] help.git: Changes to 'refs/tags/cp-4.1-2'

2013-11-12 Thread Lionel Elie Mamane

Tag 'cp-4.1-2' created by Andras Timar andras.ti...@collabora.com at 
2013-11-12 20:18 -0800

cp-4.1-2

Changes since cp-4.1-1-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.1-2'

2013-11-12 Thread Christian Lohmaier

Tag 'cp-4.1-2' created by Andras Timar andras.ti...@collabora.com at 
2013-11-12 20:18 -0800

cp-4.1-2

Changes since libreoffice-4-1-branch-point-38:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.1-2'

2013-11-12 Thread Caolán McNamara

Tag 'cp-4.1-2' created by Andras Timar andras.ti...@collabora.com at 
2013-11-12 20:18 -0800

cp-4.1-2

Changes since cp-4.1-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.1-2'

2013-11-12 Thread Andras Timar

Tag 'cp-4.1-2' created by Andras Timar andras.ti...@collabora.com at 
2013-11-12 20:18 -0800

cp-4.1-2

Changes since cp-4.1-1-51:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/source

2013-11-12 Thread Kohei Yoshida

 sc/source/filter/oox/sheetdatabuffer.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit b3ae8934a57e3edb4f01d1558f615c0e573a8276
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Nov 12 15:29:36 2013 -0500

Avoid using UNO API formula tokens.

Change-Id: Ide89b06a64405d006ac4b88cd3ae88b696f981f2

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 2b340c5..c4dcc2d 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -53,6 +53,7 @@
 #include docpool.hxx
 #include paramisc.hxx
 #include documentimport.hxx
+#include formulabuffer.hxx
 
 namespace oox {
 namespace xls {
@@ -199,7 +200,9 @@ void SheetDataBuffer::setDateTimeCell( const CellModel 
rModel, const ::com::sun
 
 void SheetDataBuffer::setBooleanCell( const CellModel rModel, bool bValue )
 {
-setCellFormula( rModel.maCellAddr, 
getFormulaParser().convertBoolToFormula( bValue ) );
+getFormulaBuffer().setCellFormula(
+rModel.maCellAddr, bValue ? OUString(TRUE()) : OUString(FALSE()));
+
 // #108770# set 'Standard' number format for all Boolean cells
 setCellFormat( rModel, 0 );
 }
@@ -211,7 +214,12 @@ void SheetDataBuffer::setErrorCell( const CellModel 
rModel, const OUString rEr
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, sal_uInt8 
nErrorCode )
 {
-setCellFormula( rModel.maCellAddr, 
getFormulaParser().convertErrorToFormula( nErrorCode ) );
+OUStringBuffer aBuf;
+aBuf.append(sal_Unicode('{'));
+aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
+aBuf.append(sal_Unicode('}'));
+
+getFormulaBuffer().setCellFormula(rModel.maCellAddr, 
aBuf.makeStringAndClear());
 setCellFormat( rModel );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/matus/sc-hacks' - 3 commits - officecfg/registry postprocess/packimages sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk

2013-11-12 Thread Matúš Kukan

Rebased ref, commits from common ancestor:
commit 90fc43ff39e9bfe1bfc397bf3d6e7b232972d573
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Tue Nov 12 19:58:29 2013 +0100

datastreams: add toolbar buttons to stop / resume importing

Change-Id: I601a4a174ea191c799623d29ed6eb229f9f372da

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index b04b2e2..d7866ca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1277,6 +1277,22 @@
   value xml:lang=en-USStrea~ms.../value
 /prop
   /node
+  node oor:name=.uno:DataStreamsPlay oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USResume importing/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
+  node oor:name=.uno:DataStreamsStop oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USStop importing/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:ManageXMLSource oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-US~XML Source.../value
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 4b201a1..8ef44d3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -54,6 +54,17 @@
   valuetrue/value
 /prop
   /node
+  node oor:name=private:resource/toolbar/datastreams oor:op=replace
+prop oor:name=Docked oor:type=xs:boolean
+  valuefalse/value
+/prop
+prop oor:name=UIName oor:type=xs:string
+  value xml:lang=en-USData Streams/value
+/prop
+prop oor:name=Visible oor:type=xs:boolean
+  valuetrue/value
+/prop
+  /node
   node oor:name=private:resource/toolbar/drawobjectbar oor:op=replace
 prop oor:name=DockPos oor:type=xs:string
   value0,1/value
diff --git a/postprocess/packimages/image-sort.lst 
b/postprocess/packimages/image-sort.lst
index 223668c..823528a 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -103,6 +103,7 @@ modules/scalc/toolbar/arrowshapes.xml
 modules/scalc/toolbar/basicshapes.xml
 modules/scalc/toolbar/calloutshapes.xml
 modules/scalc/toolbar/colorbar.xml
+modules/scalc/toolbar/datastreams.xml
 modules/scalc/toolbar/drawbar.xml
 modules/scalc/toolbar/drawobjectbar.xml
 modules/scalc/toolbar/extrusionobjectbar.xml
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index dceaf9a..0da612e 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
sc/uiconfig/scalc/toolbar/basicshapes \
sc/uiconfig/scalc/toolbar/calloutshapes \
sc/uiconfig/scalc/toolbar/colorbar \
+   sc/uiconfig/scalc/toolbar/datastreams \
sc/uiconfig/scalc/toolbar/drawbar \
sc/uiconfig/scalc/toolbar/drawobjectbar \
sc/uiconfig/scalc/toolbar/extrusionobjectbar \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 40c43a6..b0e20a5 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -91,6 +91,8 @@
 #define SID_SCFORMULAOPTIONS(SC_VIEW_START + 20)
 #define SID_SCDEFAULTSOPTIONS   (SC_VIEW_START + 21)
 
+#define SID_DATA_STREAMS_PLAY   (SC_VIEW_START + 33)
+#define SID_DATA_STREAMS_STOP   (SC_VIEW_START + 34)
 #define SID_DATA_STREAMS(SC_VIEW_START + 35)
 
 // slot-IDs for attributes
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index f06d848..9b82d0d 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -52,6 +52,8 @@ interface CellSelection
 SID_SBA_BRW_INSERT  [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_SELECT_DB   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_DATA_STREAMS[ ExecMethod = ExecuteDB; ]
+SID_DATA_STREAMS_PLAY   [ ExecMethod = ExecuteDB; ]
+SID_DATA_STREAMS_STOP   [ ExecMethod = ExecuteDB; ]
 SID_MANAGE_XML_SOURCE   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_SORT[ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_DATA_FORM   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 8d1a4e7..149f058 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -6100,6 +6100,52 @@ SfxVoidItem DataStreams SID_DATA_STREAMS
 GroupId = GID_DATA;
 ]
 
+SfxVoidItem DataStreamsPlay SID_DATA_STREAMS_PLAY
+[
+/* flags: */
+AutoUpdate = FALSE,
+

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-11-12 Thread bugzilla-daemon

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

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Depends on||68600

--- Comment #111 from Cor Nouws c...@nouenoff.nl ---
adding bug 68600 -  properties dialog expands to screen size if long comment is
entered

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

Re: menu question

2013-11-12 Thread Cor Nouws


Cor Nouws wrote (12-11-13 21:15)


I'll provide a patch for the different text of the menu entry.


https://gerrit.libreoffice.org/#/c/6659/


And maybe should update the Help too .. ?


(hints for finding that appreciated ..)


--
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-11-12 Thread Kohei Yoshida

 sc/inc/formulagroup.hxx  |2 --
 sc/source/core/data/formulacell.cxx  |6 ++
 sc/source/core/opencl/formulagroupcl.cxx |   12 
 sc/source/core/tool/formulagroup.cxx |   10 --
 sc/source/filter/oox/formulabuffer.cxx   |4 
 sc/source/filter/oox/sheetdatabuffer.cxx |   12 ++--
 6 files changed, 20 insertions(+), 26 deletions(-)

New commits:
commit 30a20743ae17e6e02183a65603d38968253b3ffb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Nov 12 15:29:36 2013 -0500

Avoid using UNO API formula tokens.

Change-Id: Ide89b06a64405d006ac4b88cd3ae88b696f981f2

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 2b340c5..c4dcc2d 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -53,6 +53,7 @@
 #include docpool.hxx
 #include paramisc.hxx
 #include documentimport.hxx
+#include formulabuffer.hxx
 
 namespace oox {
 namespace xls {
@@ -199,7 +200,9 @@ void SheetDataBuffer::setDateTimeCell( const CellModel 
rModel, const ::com::sun
 
 void SheetDataBuffer::setBooleanCell( const CellModel rModel, bool bValue )
 {
-setCellFormula( rModel.maCellAddr, 
getFormulaParser().convertBoolToFormula( bValue ) );
+getFormulaBuffer().setCellFormula(
+rModel.maCellAddr, bValue ? OUString(TRUE()) : OUString(FALSE()));
+
 // #108770# set 'Standard' number format for all Boolean cells
 setCellFormat( rModel, 0 );
 }
@@ -211,7 +214,12 @@ void SheetDataBuffer::setErrorCell( const CellModel 
rModel, const OUString rEr
 
 void SheetDataBuffer::setErrorCell( const CellModel rModel, sal_uInt8 
nErrorCode )
 {
-setCellFormula( rModel.maCellAddr, 
getFormulaParser().convertErrorToFormula( nErrorCode ) );
+OUStringBuffer aBuf;
+aBuf.append(sal_Unicode('{'));
+aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
+aBuf.append(sal_Unicode('}'));
+
+getFormulaBuffer().setCellFormula(rModel.maCellAddr, 
aBuf.makeStringAndClear());
 setCellFormat( rModel );
 }
 
commit 177c0adede9ba4b34aa3f4a80cf7021e327c9d20
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Nov 12 14:43:41 2013 -0500

Reduce the amount of RPM token generation.

Change-Id: I03941690114b17d8ab63cfb9b1b23a2ff1741b10

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 24e26d9..fb7692b 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -85,8 +85,6 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
 FormulaGroupInterpreter() {}
 virtual ~FormulaGroupInterpreter() {}
 
-static void generateRPNCode(ScDocument rDoc, const ScAddress rPos, 
ScTokenArray rCode);
-
  public:
 static FormulaGroupInterpreter *getStatic();
 static void fillOpenCLInfo(std::vectorOpenclPlatformInfo rPlatforms);
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 5e92efa..07f8656 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3468,6 +3468,7 @@ public:
 
 bool convert(ScTokenArray rCode)
 {
+#if 0
 { // debug to start with:
 ScCompiler aComp( mrDoc, mrPos, rCode);
 aComp.SetGrammar(formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1);
@@ -3475,6 +3476,7 @@ public:
 aComp.CreateStringFromTokenArray(aAsString);
 SAL_DEBUG(interpret formula:   aAsString.makeStringAndClear());
 }
+#endif
 
 rCode.Reset();
 for (const formula::FormulaToken* p = rCode.First(); p; p = 
rCode.Next())
@@ -3614,6 +3616,10 @@ public:
 }
 }
 
+ScCompiler aComp(mrDoc, mrPos, mrGroupTokens);
+aComp.SetGrammar(mrDoc.GetGrammar());
+aComp.CompileTokenArray(); // Regenerate RPN tokens.
+
 return true;
 }
 };
diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 60b126c..c6ae8e8 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1416,20 +1416,9 @@ public:
 virtual ScMatrixRef inverseMatrix( const ScMatrix rMat );
 virtual bool interpret( ScDocument rDoc, const ScAddress rTopPos,
 const ScFormulaCellGroupRef xGroup, ScTokenArray rCode );
-void generateRPNCode(ScDocument rDoc,
-const ScAddress rPos, ScTokenArray rCode);
 DynamicKernel *mpKernel;
 };
 
-void FormulaGroupInterpreterOpenCL::generateRPNCode(ScDocument rDoc,
-const ScAddress rPos, ScTokenArray rCode)
-{
-// First, generate an RPN (reverse polish notation) token array.
-ScCompiler aComp(rDoc, rPos, rCode);
-aComp.SetGrammar(rDoc.GetGrammar());
-aComp.CompileTokenArray(); // Create RPN token array.
-}
-
 ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix( const ScMatrix )
 {
 return NULL;
@@ -1439,7 +1428,6 @@ bool FormulaGroupInterpreterOpenCL::interpret(

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

2013-11-12 Thread xinjiang

 sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls |binary
 sc/qa/unit/opencl-test.cxx|   25 +++
 sc/source/core/opencl/formulagroupcl.cxx  |6 +
 sc/source/core/opencl/op_financial.cxx|   60 ++
 sc/source/core/opencl/op_financial.hxx|   14 
 sc/source/core/opencl/opinlinefun_finacial.cxx|   32 +
 6 files changed, 136 insertions(+), 1 deletion(-)

New commits:
commit 20029a72b3bb9a119e99bff7974bf6bb20e17924
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 09:31:14 2013 +0800

GPU Calc: unit test cases for DURATION_ADD

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-121 BUG

Change-Id: Id78c89f77cdfe14d368831c22ff708b968e8fee2
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls 
b/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls
new file mode 100644
index 000..18e5ddb
Binary files /dev/null and 
b/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index b593174..b040e32 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -131,6 +131,7 @@ public:
 void testStatisticalFormulaStandard();
 void testStatisticalFormulaWeibull();
 void testStatisticalFormulaMedian();
+void testFinancialDuration_ADDFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -193,6 +194,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaStandard);
 CPPUNIT_TEST(testStatisticalFormulaWeibull);
 CPPUNIT_TEST(testStatisticalFormulaMedian);
+CPPUNIT_TEST(testFinancialDuration_ADDFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1902,7 +1904,28 @@ void ScOpenclTest:: testFinacialPPMTFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
-
+//[AMLOEXT-121]
+void ScOpenclTest:: testFinancialDuration_ADDFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Duration_ADD., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Duration_ADD., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(6, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(6, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 ScOpenclTest::ScOpenclTest()
   : ScBootstrapFixture( /sc/qa/unit/data )
 {
commit 9425b3a938faf2df4d58acdcaf4437dc52ebd23c
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 09:47:10 2013 +0800

GPU Calc: implement fix for DURATION_ADD

AMLOEXT-121 FIX

Change-Id: Ie6b10eacc4e5fc0b2dcfe816982836b8b244af05
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index c6ae8e8..6d613a4 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1179,6 +1179,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
 new OpCoupnum));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getDuration
+{
+mvSubArguments.push_back(
+SoPHelper(ts, ft-Children[i], new OpDuration_ADD));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index cb31cd1..1db9119 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -574,6 +574,66 @@ void 
OpDuration::GenSlidingWindowFunction(std::stringstream ss,
 ss  };
 }
 
+void OpDuration_ADD::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(GetDurationDecl);decls.insert(lcl_GetcoupnumDecl);
+decls.insert(GetYearFracDecl);decls.insert(DaysToDateDecl);
+decls.insert(GetNullDateDecl);decls.insert(DateToDaysDecl);
+decls.insert(DaysInMonthDecl);decls.insert(IsLeapYearDecl);
+funs.insert(GetDuration);funs.insert(lcl_Getcoupnum);
+funs.insert(GetYearFrac);funs.insert(DaysToDate);
+

Merging files to one

2013-11-12 Thread Jose Guilherme Vanz

Hi, All!

These days when studying the source code to try solve the #43089 -
Syntax highlighting for Math. I found 5 source files with the same name
impedit.cxx. Like this:
http://opengrok.libreoffice.org/search?q=impeditproject=coredefs=refs=path=hist=

Can we merge theses 5 files to just one source file?

-- 
All the best, :wq
Vanz




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

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa sc/source

2013-11-12 Thread xinjiang

 sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls |binary
 sc/qa/unit/opencl-test.cxx|   25 +++
 sc/source/core/opencl/formulagroupcl.cxx  |6 +
 sc/source/core/opencl/op_financial.cxx|   60 ++
 sc/source/core/opencl/op_financial.hxx|   14 
 sc/source/core/opencl/opinlinefun_finacial.cxx|   32 +
 6 files changed, 136 insertions(+), 1 deletion(-)

New commits:
commit 163fd27708ab56baf731d9c65ccc7a5120024f45
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 09:31:14 2013 +0800

GPU Calc: unit test cases for DURATION_ADD

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-121 BUG

Change-Id: Id78c89f77cdfe14d368831c22ff708b968e8fee2
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls 
b/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls
new file mode 100644
index 000..18e5ddb
Binary files /dev/null and 
b/sc/qa/unit/data/xls/opencl/financial/Duration_ADD.xls differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 69c8c3e..3ecd34c 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -133,6 +133,7 @@ public:
 void testStatisticalFormulaStandard();
 void testStatisticalFormulaWeibull();
 void testStatisticalFormulaMedian();
+void testFinancialDuration_ADDFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -195,6 +196,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaStandard);
 CPPUNIT_TEST(testStatisticalFormulaWeibull);
 CPPUNIT_TEST(testStatisticalFormulaMedian);
+CPPUNIT_TEST(testFinancialDuration_ADDFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1904,7 +1906,28 @@ void ScOpenclTest:: testFinacialPPMTFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
-
+//[AMLOEXT-121]
+void ScOpenclTest:: testFinancialDuration_ADDFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Duration_ADD., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Duration_ADD., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(6, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(6, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 ScOpenclTest::ScOpenclTest()
   : ScBootstrapFixture( /sc/qa/unit/data )
 {
commit 159bc70c590e2efb74fc1234480b43cff220731b
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 09:47:10 2013 +0800

GPU Calc: implement fix for DURATION_ADD

AMLOEXT-121 FIX

Change-Id: Ie6b10eacc4e5fc0b2dcfe816982836b8b244af05
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 96e8f0f..fec3a68 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1179,6 +1179,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
 new OpCoupnum));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getDuration
+{
+mvSubArguments.push_back(
+SoPHelper(ts, ft-Children[i], new OpDuration_ADD));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 3597f9f..0b46835 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -574,6 +574,66 @@ void 
OpDuration::GenSlidingWindowFunction(std::stringstream ss,
 ss  };
 }
 
+void OpDuration_ADD::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(GetDurationDecl);decls.insert(lcl_GetcoupnumDecl);
+decls.insert(GetYearFracDecl);decls.insert(DaysToDateDecl);
+decls.insert(GetNullDateDecl);decls.insert(DateToDaysDecl);
+decls.insert(DaysInMonthDecl);decls.insert(IsLeapYearDecl);
+funs.insert(GetDuration);funs.insert(lcl_Getcoupnum);
+funs.insert(GetYearFrac);funs.insert(DaysToDate);
+

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

2013-11-12 Thread minwang

 sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls |binary
 sc/qa/unit/opencl-test.cxx |   24 ++
 sc/source/core/opencl/formulagroupcl.cxx   |6 
 sc/source/core/opencl/op_financial.cxx |  171 +
 sc/source/core/opencl/op_financial.hxx |   10 +
 5 files changed, 211 insertions(+)

New commits:
commit 4bad711ff532bfc1f64b584e8c5cf8fbef38e2ca
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:02:29 2013 +0800

GPU Calc: unit test cases for AMORDEGRC in GPU calc

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-98 BUG

Change-Id: I0867627c69eefdbc7127d19559af23fbd70b3ccc
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls 
b/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls
new file mode 100644
index 000..7cb9e47
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index b040e32..3c395c4 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -132,6 +132,7 @@ public:
 void testStatisticalFormulaWeibull();
 void testStatisticalFormulaMedian();
 void testFinancialDuration_ADDFormula();
+void testFinancialAmordegrcFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -195,6 +196,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaWeibull);
 CPPUNIT_TEST(testStatisticalFormulaMedian);
 CPPUNIT_TEST(testFinancialDuration_ADDFormula);
+CPPUNIT_TEST(testFinancialAmordegrcFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1514,6 +1516,28 @@ void ScOpenclTest::testFinacialXNPVFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-98]
+void ScOpenclTest::testFinancialAmordegrcFormula()
+{
+   if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Amordegrc., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Amordegrc., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(7, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(7, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 //[AMLOEXT-99]
 void ScOpenclTest:: testFinancialISPMTFormula()
 {
commit 153bb4cc1e7009f2e2fa5fe277c397d5ad9a1730
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:16:40 2013 +0800

GPU Calc: implement fix for AMORDEGRC in GPU calc

AMLOEXT-98 FIX

Change-Id: I9f63d023161e5ad7981374dedffb6f00663a1c66
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 6d613a4..fe0b8f8 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1185,6 +1185,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(
 SoPHelper(ts, ft-Children[i], new OpDuration_ADD));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getAmordegrc
+{
+mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
+new OpAmordegrc));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 1db9119..5e2509a 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -2892,6 +2892,177 @@ void 
OpCoupnum::GenSlidingWindowFunction(std::stringstream ss,
 ss  return tmp;\n;
 ss  };
 }
+void OpAmordegrc::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(nKorrValDecl); decls.insert(RoundDecl);
+decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl);
+decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl);
+decls.insert(GetNullDateDecl); decls.insert(GetYearFracDecl);
+funs.insert(Round);
+funs.insert(IsLeapYear);funs.insert(DaysInMonth);
+funs.insert(DaysToDate);funs.insert(DateToDays);
+funs.insert(GetNullDate);funs.insert(GetYearFrac);
+}
+void OpAmordegrc::GenSlidingWindowFunction(std::stringstream ss,
+

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa sc/source

2013-11-12 Thread minwang

 sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls |binary
 sc/qa/unit/opencl-test.cxx |   24 ++
 sc/source/core/opencl/formulagroupcl.cxx   |6 
 sc/source/core/opencl/op_financial.cxx |  171 +
 sc/source/core/opencl/op_financial.hxx |   10 +
 5 files changed, 211 insertions(+)

New commits:
commit 8aee57d797ac1e6e34c5a689103195dfd6c8251c
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:02:29 2013 +0800

GPU Calc: unit test cases for AMORDEGRC in GPU calc

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-98 BUG

Change-Id: I0867627c69eefdbc7127d19559af23fbd70b3ccc
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls 
b/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls
new file mode 100644
index 000..7cb9e47
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/Amordegrc.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 3ecd34c..75d28ca 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -134,6 +134,7 @@ public:
 void testStatisticalFormulaWeibull();
 void testStatisticalFormulaMedian();
 void testFinancialDuration_ADDFormula();
+void testFinancialAmordegrcFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -197,6 +198,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaWeibull);
 CPPUNIT_TEST(testStatisticalFormulaMedian);
 CPPUNIT_TEST(testFinancialDuration_ADDFormula);
+CPPUNIT_TEST(testFinancialAmordegrcFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1516,6 +1518,28 @@ void ScOpenclTest::testFinacialXNPVFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-98]
+void ScOpenclTest::testFinancialAmordegrcFormula()
+{
+   if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Amordegrc., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Amordegrc., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(7, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(7, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 //[AMLOEXT-99]
 void ScOpenclTest:: testFinancialISPMTFormula()
 {
commit 55c2a05521e3bc7281abf1fefb345bce50549152
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:16:40 2013 +0800

GPU Calc: implement fix for AMORDEGRC in GPU calc

AMLOEXT-98 FIX

Change-Id: I9f63d023161e5ad7981374dedffb6f00663a1c66
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index fec3a68..d68b17b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1185,6 +1185,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(
 SoPHelper(ts, ft-Children[i], new OpDuration_ADD));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getAmordegrc
+{
+mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
+new OpAmordegrc));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 0b46835..6681b78 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -2894,6 +2894,177 @@ void 
OpCoupnum::GenSlidingWindowFunction(std::stringstream ss,
 ss  return tmp;\n;
 ss  };
 }
+void OpAmordegrc::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(nKorrValDecl); decls.insert(RoundDecl);
+decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl);
+decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl);
+decls.insert(GetNullDateDecl); decls.insert(GetYearFracDecl);
+funs.insert(Round);
+funs.insert(IsLeapYear);funs.insert(DaysInMonth);
+funs.insert(DaysToDate);funs.insert(DateToDays);
+funs.insert(GetNullDate);funs.insert(GetYearFrac);
+}
+void OpAmordegrc::GenSlidingWindowFunction(std::stringstream ss,
+

Re: Merging files to one

2013-11-12 Thread Norbert Thiebaud

On Tue, Nov 12, 2013 at 8:52 PM, Jose Guilherme Vanz
v...@libreoffice.org wrote:
 Hi, All!

 These days when studying the source code to try solve the #43089 -
 Syntax highlighting for Math. I found 5 source files with the same name
 impedit.cxx. Like this:
 http://opengrok.libreoffice.org/search?q=impeditproject=coredefs=refs=path=hist=

 Can we merge theses 5 files to just one source file?

It was broken in 5 files most like to keep the file at a 'reasonable' length...
combined they would represent a 16143 lines for 664K

a quick scan of the source show the source that are above 6K lines


6068 ./sw/source/ui/docvw/edtwin.cxx
6149 ./vcl/source/window/menu.cxx
6174 ./package/source/xstor/xstorage.cxx
6182 ./sc/source/ui/view/gridwin.cxx
6182 ./sw/source/filter/ww8/ww8par6.cxx
6202 ./vcl/win/source/window/salframe.cxx
6218 ./workdir/CustomTarget/i18npool/collator/collator_zh_zhuyin.cxx
6219 ./sc/source/core/data/document.cxx
6240 ./sw/source/filter/ww8/docxattributeoutput.cxx
6293 ./sw/source/filter/ww8/ww8par.cxx
6340 ./sal/qa/osl/file/osl_File.cxx
6418 ./workdir/CustomTarget/i18npool/collator/collator_zh_charset.cxx
6418 ./workdir/CustomTarget/i18npool/collator/collator_zh_stroke.cxx
6419 ./workdir/CustomTarget/i18npool/collator/collator_zh_pinyin.cxx
6613 ./toolkit/source/awt/vclxwindows.cxx
6866 
./workdir/CustomTarget/i18npool/collator/collator_ja_phonetic_alphanumeric_first.cxx
6898 ./workdir/CustomTarget/i18npool/collator/collator_ja_charset.cxx
7024 
./workdir/CustomTarget/i18npool/collator/collator_ja_phonetic_alphanumeric_last.cxx
7027 ./workdir/LexTarget/connectivity/source/parse/sqlflex.cxx
7332 ./filter/source/msfilter/msdffimp.cxx
7391 ./sw/source/filter/ww8/ww8scan.cxx
7427 ./workdir/CustomTarget/i18npool/collator/collator_zh_TW_charset.cxx
7547 ./sw/source/core/layout/paintfrm.cxx
7745 ./vcl/source/gdi/outdev3.cxx
7755 ./filter/source/msfilter/svdfppt.cxx
8059 ./workdir/CustomTarget/i18npool/collator/collator_zh_TW_radical.cxx
8059 ./workdir/CustomTarget/i18npool/collator/collator_zh_radical.cxx
8066 ./workdir/CustomTarget/i18npool/collator/collator_zh_TW_stroke.cxx
8417 ./sc/source/core/tool/interpr1.cxx
8565 ./oox/source/drawingml/customshapepresets4.cxx
8565 ./svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
8936 ./oox/source/drawingml/customshapepresets2.cxx
9288 ./oox/source/drawingml/customshapepresets3.cxx
9453 ./workdir/CustomTarget/writerfilter/source/OOXMLFactory_wml.cxx
9714 ./oox/source/drawingml/customshapepresets5.cxx
9760 ./vcl/source/window/window.cxx
9792 ./oox/source/drawingml/customshapepresets1.cxx
9876 ./sc/source/ui/unoobj/cellsuno.cxx
   10745 ./workdir/CustomTarget/i18npool/collator/collator_ko_charset.cxx
   10884 ./workdir/YaccTarget/connectivity/source/parse/sqlbison.cxx
   12028 ./vcl/source/gdi/pdfwriter_impl.cxx
   16355 ./sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
   19676 ./workdir/UnpackedTarball/hunspell/src/hunspell/utf_info.cxx
   24509 ./workdir/CustomTarget/i18npool/breakiterator/dict_ja.cxx
   54048 ./workdir/CustomTarget/i18npool/breakiterator/dict_zh.cxx

here the source that are 300k+
304./oox/source/drawingml/customshapepresets4.cxx
312./filter/source/msfilter/msdffimp.cxx
320./oox/source/drawingml/customshapepresets2.cxx
328./filter/source/msfilter/svdfppt.cxx
328./oox/source/drawingml/customshapepresets3.cxx
328./workdir/CustomTarget/i18npool/collator/collator_my_dictionary.cxx
344./oox/source/drawingml/customshapepresets5.cxx
344./vcl/source/window/window.cxx
352./oox/source/drawingml/customshapepresets1.cxx
368./svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
408./sc/source/ui/unoobj/cellsuno.cxx
456./vcl/source/gdi/pdfwriter_impl.cxx
512./sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
528./workdir/YaccTarget/connectivity/source/parse/sqlbison.cxx
544./workdir/UnpackedTarball/hunspell/src/hunspell/utf_info.cxx
552./workdir/CustomTarget/i18npool/textconversion/stc_char.cxx
648./workdir/CustomTarget/writerfilter/source/OOXMLFactory_wml.cxx
792./workdir/CustomTarget/i18npool/collator/collator_zh_zhuyin.cxx
816./workdir/CustomTarget/i18npool/collator/collator_zh_charset.cxx
816./workdir/CustomTarget/i18npool/collator/collator_zh_pinyin.cxx
816./workdir/CustomTarget/i18npool/collator/collator_zh_stroke.cxx
872
./workdir/CustomTarget/i18npool/collator/collator_ja_phonetic_alphanumeric_first.cxx
880./workdir/CustomTarget/i18npool/collator/collator_ja_charset.cxx
896
./workdir/CustomTarget/i18npool/collator/collator_ja_phonetic_alphanumeric_last.cxx
944./workdir/CustomTarget/i18npool/collator/collator_zh_TW_charset.cxx
1024./workdir/CustomTarget/i18npool/collator/collator_zh_TW_radical.cxx
1024./workdir/CustomTarget/i18npool/collator/collator_zh_TW_stroke.cxx
1024

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

2013-11-12 Thread minwang

 sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls |binary
 sc/qa/unit/opencl-test.cxx|   24 +++
 sc/source/core/opencl/formulagroupcl.cxx  |6 
 sc/source/core/opencl/op_financial.cxx|  154 +-
 sc/source/core/opencl/op_financial.hxx|9 +
 5 files changed, 192 insertions(+), 1 deletion(-)

New commits:
commit 89ed6a0e150549fb5aa00f06216637ea71b04f30
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:28:57 2013 +0800

GPU Calc: unit test cases for AMORLINC in GPU calc

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-110 BUG

Change-Id: Ia6e1333e7d1c91ff9b8a916109a8aa60f4725e03
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls 
b/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls
new file mode 100644
index 000..5962334
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 3c395c4..bc26113 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -133,6 +133,7 @@ public:
 void testStatisticalFormulaMedian();
 void testFinancialDuration_ADDFormula();
 void testFinancialAmordegrcFormula();
+void testFinancialAmorlincFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -197,6 +198,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaMedian);
 CPPUNIT_TEST(testFinancialDuration_ADDFormula);
 CPPUNIT_TEST(testFinancialAmordegrcFormula);
+CPPUNIT_TEST(testFinancialAmorlincFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1583,6 +1585,28 @@ void ScOpenclTest::testStatisticalFormulaMedian()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-110]
+void ScOpenclTest::testFinancialAmorlincFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Amorlinc., XLS);
+ScDocument *pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Amorlinc., XLS);
+ScDocument *pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(7, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(7, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 void ScOpenclTest::testFinacialPriceMatFormula()
 {
 if (!detectOpenCLDevice())
commit 7b33d0c12d487d953634fa1e06c6902124455e38
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:33:53 2013 +0800

GPU Calc: implement fix for AMORLINC in GPU calc

AMLOEXT-110 FIX

Change-Id: I068924cc83288261102ea03e29449e0faf8686f9
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index fe0b8f8..55d2f25 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1191,6 +1191,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
 new OpAmordegrc));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getAmorlinc
+{
+mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
+new OpAmorlinc));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 5e2509a..92a7f14 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -3063,7 +3063,159 @@ void 
OpAmordegrc::GenSlidingWindowFunction(std::stringstream ss,
 ss return tmp;\n;
 ss };
 }
-
+void OpAmorlinc::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(nKorrValDecl); decls.insert(RoundDecl);
+decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl);
+decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl);
+decls.insert(GetNullDateDecl); decls.insert(GetYearFracDecl);
+funs.insert(Round);
+funs.insert(IsLeapYear);funs.insert(DaysInMonth);
+funs.insert(DaysToDate);funs.insert(DateToDays);
+funs.insert(GetNullDate);funs.insert(GetYearFrac);
+}
+void

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa sc/source

2013-11-12 Thread minwang

 sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls |binary
 sc/qa/unit/opencl-test.cxx|   24 +++
 sc/source/core/opencl/formulagroupcl.cxx  |6 
 sc/source/core/opencl/op_financial.cxx|  154 +-
 sc/source/core/opencl/op_financial.hxx|9 +
 5 files changed, 192 insertions(+), 1 deletion(-)

New commits:
commit 1e6fb09e53ea88d494d428d1fbabab2ab952d24b
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:28:57 2013 +0800

GPU Calc: unit test cases for AMORLINC in GPU calc

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-110 BUG

Change-Id: Ia6e1333e7d1c91ff9b8a916109a8aa60f4725e03
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls 
b/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls
new file mode 100644
index 000..5962334
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/Amorlinc.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 75d28ca..c62d82e 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -135,6 +135,7 @@ public:
 void testStatisticalFormulaMedian();
 void testFinancialDuration_ADDFormula();
 void testFinancialAmordegrcFormula();
+void testFinancialAmorlincFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -199,6 +200,7 @@ public:
 CPPUNIT_TEST(testStatisticalFormulaMedian);
 CPPUNIT_TEST(testFinancialDuration_ADDFormula);
 CPPUNIT_TEST(testFinancialAmordegrcFormula);
+CPPUNIT_TEST(testFinancialAmorlincFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1585,6 +1587,28 @@ void ScOpenclTest::testStatisticalFormulaMedian()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-110]
+void ScOpenclTest::testFinancialAmorlincFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/Amorlinc., XLS);
+ScDocument *pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/Amorlinc., XLS);
+ScDocument *pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(7, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(7, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 void ScOpenclTest::testFinacialPriceMatFormula()
 {
 if (!detectOpenCLDevice())
commit 8ecf00aecd2c40a7e1bdbfedc0379178004808c8
Author: minwang m...@multicorewareinc.com
Date:   Tue Nov 5 10:33:53 2013 +0800

GPU Calc: implement fix for AMORLINC in GPU calc

AMLOEXT-110 FIX

Change-Id: I068924cc83288261102ea03e29449e0faf8686f9
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index d68b17b..e3e5d6b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1191,6 +1191,12 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
 new OpAmordegrc));
 }
+else if ( !(pChild-GetExternal().compareTo(OUString(
+   com.sun.star.sheet.addin.Analysis.getAmorlinc
+{
+mvSubArguments.push_back(SoPHelper(ts, ft-Children[i],
+new OpAmorlinc));
+}
 break;
 default:
 throw UnhandledToken(pChild, unhandled opcode);
diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 6681b78..dcf882c 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -3065,7 +3065,159 @@ void 
OpAmordegrc::GenSlidingWindowFunction(std::stringstream ss,
 ss return tmp;\n;
 ss };
 }
-
+void OpAmorlinc::BinInlineFun(std::setstd::string decls,
+std::setstd::string funs)
+{
+decls.insert(nKorrValDecl); decls.insert(RoundDecl);
+decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl);
+decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl);
+decls.insert(GetNullDateDecl); decls.insert(GetYearFracDecl);
+funs.insert(Round);
+funs.insert(IsLeapYear);funs.insert(DaysInMonth);
+funs.insert(DaysToDate);funs.insert(DateToDays);
+funs.insert(GetNullDate);funs.insert(GetYearFrac);
+}
+void

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

2013-11-12 Thread xinjiang

 sc/qa/unit/data/xls/opencl/financial/FV.xls|binary
 sc/qa/unit/data/xls/opencl/financial/MDuration.xls |binary
 sc/qa/unit/data/xls/opencl/financial/ddb.xls   |binary
 sc/qa/unit/opencl-test.cxx |   72 ++
 sc/source/core/opencl/formulagroupcl.cxx   |   14 +
 sc/source/core/opencl/op_financial.cxx |  229 -
 sc/source/core/opencl/op_financial.hxx |   34 +++
 sc/source/core/tool/token.cxx  |2 
 8 files changed, 347 insertions(+), 4 deletions(-)

New commits:
commit c396d531ad2a076885d91fa38e8c5f000cb61ea7
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 13:15:24 2013 +0800

GPU Calc: unit test cases for MDURATION

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-126 BUG

Change-Id: If308a54a79f9a093a845e53e65b9fae3b050c4e5
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/MDuration.xls 
b/sc/qa/unit/data/xls/opencl/financial/MDuration.xls
new file mode 100644
index 000..807ca2d
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/MDuration.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 5890c62..6fd60a4 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -136,6 +136,7 @@ public:
 void testFinancialAmorlincFormula();
 void testFinancialDDBFormula();
 void testFinancialFVFormula();
+void testFinancialMDurationFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -203,6 +204,7 @@ public:
 CPPUNIT_TEST(testFinancialAmorlincFormula);
 CPPUNIT_TEST(testFinancialDDBFormula);
 CPPUNIT_TEST(testFinancialFVFormula);
+CPPUNIT_TEST(testFinancialMDurationFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2000,6 +2002,28 @@ void ScOpenclTest:: testFinancialDuration_ADDFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-126]
+void ScOpenclTest:: testFinancialMDurationFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/MDuration., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/MDuration., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(6, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(6, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 //[AMLOEXT-131]
 void ScOpenclTest:: testFinancialFVFormula()
 {
commit 63c897a672c1522896822c4a92f65c61d96872a6
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date:   Tue Nov 12 22:27:34 2013 -0600

GPU Calc: fix compilation error in calling GetNullDate()

Fix OpenCL compiler internal errors triggered by wrong # of args,
on NVIDIA.

Change-Id: Ifcc29d6fb59ac41d8e54ace348d02c942343ca5b

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 34f8ebd..30d4c85 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -365,7 +365,7 @@ void OpDISC::GenSlidingWindowFunction(
 ssmode = ;
 ss  vSubArguments[4]-GenSlidingWindowDeclRef();
 ss;\n\t;
-ss  int nNullDate = GetNullDate( 30 , 12 , 1899 );\n\t;
+ss  int nNullDate = GetNullDate();\n\t;
 ss  tmp = 1.0 - price / redemp;\n\t;
 ss  tmp /= GetYearFrac( nNullDate , settle , maturity , mode );\n\t;
 ss  return tmp;\n;
@@ -481,7 +481,7 @@ void OpINTRATE::GenSlidingWindowFunction(
 ss  mode = ;
 ss  vSubArguments[4]-GenSlidingWindowDeclRef();
 ss  ;\n\t;
-ss  int nNullDate = GetNullDate(30,12,1899);\n\t;
+ss  int nNullDate = GetNullDate();\n\t;
 ss  tmp = (redemp / price - 1.0) / GetYearDiff(nNullDate, settle, 
maturity, mode);\n\t;
 ss  return tmp;\n;
 ss  };
@@ -678,7 +678,7 @@ void 
OpDuration_ADD::GenSlidingWindowFunction(std::stringstream ss,
 ss  ;\n;
 }
 }
-ss  int nNullDate = GetNullDate(30, 12, 1899);\n;
+ss  int nNullDate = GetNullDate();\n;
 ss  tmp = GetDuration( nNullDate, (int)arg0, (int)arg1, arg2,;
 ss   arg3, (int)arg4, (int)arg5);\n;
 ss  return tmp;\n;
commit 9ad4cca4a031fbcc8a1def7172b8596489616b06
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 13:57:18 2013 +0800

GPU Calc: implemented for MDURATION

AMLOEXT-126 FIX

Change-Id: Ie246a39aab64c98497df07e866c77ccd0b26b308
Signed-off-by: haochen

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 7 commits - sc/qa sc/source

2013-11-12 Thread xinjiang

 sc/qa/unit/data/xls/opencl/financial/FV.xls|binary
 sc/qa/unit/data/xls/opencl/financial/MDuration.xls |binary
 sc/qa/unit/data/xls/opencl/financial/ddb.xls   |binary
 sc/qa/unit/opencl-test.cxx |   72 ++
 sc/source/core/opencl/formulagroupcl.cxx   |   14 +
 sc/source/core/opencl/op_financial.cxx |  229 -
 sc/source/core/opencl/op_financial.hxx |   34 +++
 sc/source/core/tool/token.cxx  |2 
 8 files changed, 347 insertions(+), 4 deletions(-)

New commits:
commit c6987eb1ddde4c4f474e2940773c7e5069c1f154
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 13:15:24 2013 +0800

GPU Calc: unit test cases for MDURATION

Need open macro NO_FALLBACK_TO_SWINTERP in formulagroupcl.cxx for test

AMLOEXT-126 BUG

Change-Id: If308a54a79f9a093a845e53e65b9fae3b050c4e5
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/qa/unit/data/xls/opencl/financial/MDuration.xls 
b/sc/qa/unit/data/xls/opencl/financial/MDuration.xls
new file mode 100644
index 000..807ca2d
Binary files /dev/null and b/sc/qa/unit/data/xls/opencl/financial/MDuration.xls 
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 0c575ad..e733217 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -138,6 +138,7 @@ public:
 void testFinancialAmorlincFormula();
 void testFinancialDDBFormula();
 void testFinancialFVFormula();
+void testFinancialMDurationFormula();
 CPPUNIT_TEST_SUITE(ScOpenclTest);
 CPPUNIT_TEST(testSharedFormulaXLS);
 CPPUNIT_TEST(testFinacialFormula);
@@ -205,6 +206,7 @@ public:
 CPPUNIT_TEST(testFinancialAmorlincFormula);
 CPPUNIT_TEST(testFinancialDDBFormula);
 CPPUNIT_TEST(testFinancialFVFormula);
+CPPUNIT_TEST(testFinancialMDurationFormula);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2002,6 +2004,28 @@ void ScOpenclTest:: testFinancialDuration_ADDFormula()
 xDocSh-DoClose();
 xDocShRes-DoClose();
 }
+//[AMLOEXT-126]
+void ScOpenclTest:: testFinancialMDurationFormula()
+{
+if (!detectOpenCLDevice())
+return;
+ScDocShellRef xDocSh = loadDoc(opencl/financial/MDuration., XLS);
+ScDocument* pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+enableOpenCL();
+pDoc-CalcAll();
+ScDocShellRef xDocShRes = loadDoc(opencl/financial/MDuration., XLS);
+ScDocument* pDocRes = xDocShRes-GetDocument();
+CPPUNIT_ASSERT(pDocRes);
+for (SCROW i = 0; i = 9; ++i)
+{
+double fLibre = pDoc-GetValue(ScAddress(6, i, 0));
+double fExcel = pDocRes-GetValue(ScAddress(6, i, 0));
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+}
+xDocSh-DoClose();
+xDocShRes-DoClose();
+}
 //[AMLOEXT-131]
 void ScOpenclTest:: testFinancialFVFormula()
 {
commit 45e97047a23e610f93bb6023b55999b03e4bb6ea
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date:   Tue Nov 12 22:27:34 2013 -0600

GPU Calc: fix compilation error in calling GetNullDate()

Fix OpenCL compiler internal errors triggered by wrong # of args,
on NVIDIA.

Change-Id: Ifcc29d6fb59ac41d8e54ace348d02c942343ca5b

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 82fe534..0c592d5 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -365,7 +365,7 @@ void OpDISC::GenSlidingWindowFunction(
 ssmode = ;
 ss  vSubArguments[4]-GenSlidingWindowDeclRef();
 ss;\n\t;
-ss  int nNullDate = GetNullDate( 30 , 12 , 1899 );\n\t;
+ss  int nNullDate = GetNullDate();\n\t;
 ss  tmp = 1.0 - price / redemp;\n\t;
 ss  tmp /= GetYearFrac( nNullDate , settle , maturity , mode );\n\t;
 ss  return tmp;\n;
@@ -481,7 +481,7 @@ void OpINTRATE::GenSlidingWindowFunction(
 ss  mode = ;
 ss  vSubArguments[4]-GenSlidingWindowDeclRef();
 ss  ;\n\t;
-ss  int nNullDate = GetNullDate(30,12,1899);\n\t;
+ss  int nNullDate = GetNullDate();\n\t;
 ss  tmp = (redemp / price - 1.0) / GetYearDiff(nNullDate, settle, 
maturity, mode);\n\t;
 ss  return tmp;\n;
 ss  };
@@ -678,7 +678,7 @@ void 
OpDuration_ADD::GenSlidingWindowFunction(std::stringstream ss,
 ss  ;\n;
 }
 }
-ss  int nNullDate = GetNullDate(30, 12, 1899);\n;
+ss  int nNullDate = GetNullDate();\n;
 ss  tmp = GetDuration( nNullDate, (int)arg0, (int)arg1, arg2,;
 ss   arg3, (int)arg4, (int)arg5);\n;
 ss  return tmp;\n;
commit 2e8bc3bcfca7e8f9264977e6c4432e8513a02898
Author: xinjiang xinji...@multicorewareinc.com
Date:   Tue Nov 5 13:57:18 2013 +0800

GPU Calc: implemented for MDURATION

AMLOEXT-126 FIX

Change-Id: Ie246a39aab64c98497df07e866c77ccd0b26b308
Signed-off-by: haochen

LibreOffice Gerrit News for core on 2013-11-13

2013-11-12 Thread gerrit

Moin!

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

+ fdo#59427 next step template menu: change string New Document.. to Manage
  in https://gerrit.libreoffice.org/6659 from Cor Nouws
+ fdo#35712 Correct update of equation in status bar
  in https://gerrit.libreoffice.org/6658 from Laurent BP
+ Convert ImpSWFDialog.src to ui
  in https://gerrit.libreoffice.org/6592 from Laurent BP
+ Respect svg:font-face-format element.
  in https://gerrit.libreoffice.org/6144 from Brennan T Vincent
+ [docx] activeX files saved in InteropGrabBag and exported.
  in https://gerrit.libreoffice.org/6654 from Sushil Shinde
+ fdo#65295 - add export of text-box gradient fill angle
  in https://gerrit.libreoffice.org/6653 from Adam CloudOn
+ fdo#65295 : swap gradient text-box colors only in case of axis
  in https://gerrit.libreoffice.org/6646 from Adam CloudOn
+ Turn on LTO for MSVC when optimising unless told not to
  in https://gerrit.libreoffice.org/6652 from Tor Lillqvist
+ LibreOffice Corrupts DOCX files containing Footnotes after Roundtrip
  in https://gerrit.libreoffice.org/6644 from Pallavi Jadhav
+ fdo#70345 Reuse XStream for Windows platform create a new one for others.
  in https://gerrit.libreoffice.org/6580 from matthieu gay
+ What is a thread-local mutex?
  in https://gerrit.libreoffice.org/6651 from Tor Lillqvist
+ Save downloaded tarballs under external/tarballs/
  in https://gerrit.libreoffice.org/6597 from Khaled Hosny
+ [docx] CustomXml relationship files saved in InteropGrabBag and exported.
  in https://gerrit.libreoffice.org/6603 from Sushil Shinde
+ Fixed missing hyperlink end tag
  in https://gerrit.libreoffice.org/6619 from Yogesh Bharate
+ Fixed for spacing between lines in paragraph.
  in https://gerrit.libreoffice.org/6645 from Priyanka Gaikwad
+ fdo#70838: Add unit test for docx export
  in https://gerrit.libreoffice.org/6434 from Jacobo Aragunde Pérez
+ fdo#70838: Fix position issue when exporting shapes to docx.
  in https://gerrit.libreoffice.org/6433 from Jacobo Aragunde Pérez
+ fdo#70838: Fix size issue when exporting shapes to docx.
  in https://gerrit.libreoffice.org/6432 from Jacobo Aragunde Pérez
+ ooxml: Remove white artifact inside exported pictures
  in https://gerrit.libreoffice.org/6648 from Jacobo Aragunde Pérez
+ fdo#65295 - fix gradient focus issue
  in https://gerrit.libreoffice.org/6647 from Adam CloudOn
+ fdo#71350 add Excel 2010 function CONFIDENCE.NORM and CONFIDENCE.T
  in https://gerrit.libreoffice.org/6625 from Winfried Donkers


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

+ Translate German comments
  in https://gerrit.libreoffice.org/6631 from Philipp Weissenbacher
+ fdo#71428: Spelling of turquise in Impress Table Design
  in https://gerrit.libreoffice.org/6624 from Julien Nabet
+ document the use of the strtmpl.cxx and remove unnecessary macro usage
  in https://gerrit.libreoffice.org/6504 from Noel Grandin
+ Resolves: fdo#71309 Export SWF with Multiple files crashes
  in https://gerrit.libreoffice.org/6598 from Laurent BP
+ Update the bundled HarfBuzz to 0.9.23
  in https://gerrit.libreoffice.org/6628 from Khaled Hosny
+ rtl: starts-/endsWith* new second parameter since 4.2
  in https://gerrit.libreoffice.org/6649 from Andres Gomez
+ drop commented out DLG_OPTIONS use
  in https://gerrit.libreoffice.org/6650 from Caolán McNamara
+ Convert tp_Trendline.src to .ui
  in https://gerrit.libreoffice.org/6638 from Laurent BP
+ Avoid too wide sidebar when writedirection controls are activated
  in https://gerrit.libreoffice.org/6609 from Maxim Monastirsky
+ Convert New Style dialog to widget UI
  in https://gerrit.libreoffice.org/6607 from Manal Alhassoun
+  #65836- Fix for exporting image inside vml data was corrupting file.
  in https://gerrit.libreoffice.org/6369 from Sushil Shinde
+ less if-nesting in ThumnailView
  in https://gerrit.libreoffice.org/6643 from Rodolfo Ribeiro Gomes


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

None

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

+ fdo#70978 Improve Word Count display
  in https://gerrit.libreoffice.org/6479 from Samuel Mehrbrodt
+ new cell-border handling in calc
  in https://gerrit.libreoffice.org/6093 from Viktor Varga
+ Make ./autogen.sh --help work again
  in https://gerrit.libreoffice.org/6100 from Arnaud Versini
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ Remove more unusedcode
  in https://gerrit.libreoffice.org/5937 from Marcos Souza
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in

RE: Handling of worksheet functions from Excel 2010 and newer

2013-11-12 Thread Winfried Donkers

Hi Markus,

So Kohei just tested that the functions are imported without an error (which 
made sense as he was writing a test for a bug). What I was suggesting for 
your case is that you take some of the corner cases that you know and write a 
test for them. This is what I started once for ODS with testFunctionsODS. 
That way we can test that we import the function and that the function behaves 
correctly in the corner cases. Hopefully this helps to make sure that nobody 
ever breaks this function.

The new Excel 2010 functions are mostly renamed existing functions and new 
functions with minor differences, so far all quite straightforward.
IMHO I don't think there are corner cases specifically for most of these 
functions, as the 'corners' are already handled by the existing calc functions. 
Testing will mostly be limited to the correct handling of the import.

Btw if your only problem with writing test cases is that you don't have access 
to Excel just ask for help. Kohei, Eike and I have access to Excel and can 
surely create the test file that you need or check that your file imports 
correctly.
I was thinking to create an xlsx document with all the renamed and new Excel 
functions 
(http://office.microsoft.com/en-us/excel-help/what-s-new-changes-made-to-excel-functions-HA010355760.aspx)
 and add a test line in /sc/qa/unit/subsequent_filters-test.cxx, 
ScFiltersTest::testFunctionsExcel2010() each time I add new functions. That way 
the xlsx document is changed only once (don't know how well binary changes look 
in git/gerrit), but this approach necessitates the presence of Excel 2010/2013. 
On the other hand, as I seem to read that you offer help in creating the test 
file, that may not be a problem after all.:)
Once I have a function with real corner cases that ought to be tested, I can 
add these corner cases myself.
OTOH if you think only corner cases need to be tested, I can put them in an 
xlsx document (exported from calc) myself and ask for an Excel-check of the 
document when submitting.

Winfried

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

[Libreoffice-commits] core.git: 3 commits - framework/source include/sfx2 sc/source sfx2/source svx/source sw/source

2013-11-12 Thread Noel Grandin

 framework/source/services/ContextChangeEventMultiplexer.cxx |   16 ++---
 include/sfx2/sidebar/Tools.hxx  |   16 +
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |8 +-
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx|8 +-
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx  |8 +-
 sc/source/ui/sidebar/ScPanelFactory.cxx |   11 +--
 sfx2/source/sidebar/CommandInfoProvider.cxx |4 -
 sfx2/source/sidebar/Context.cxx |6 --
 sfx2/source/sidebar/ControllerFactory.cxx   |   16 ++---
 sfx2/source/sidebar/ControllerItem.cxx  |8 +-
 sfx2/source/sidebar/Deck.cxx|   10 +--
 sfx2/source/sidebar/DeckTitleBar.cxx|2 
 sfx2/source/sidebar/EnumContext.cxx |   34 +---
 sfx2/source/sidebar/MenuButton.cxx  |2 
 sfx2/source/sidebar/Panel.cxx   |2 
 sfx2/source/sidebar/PanelTitleBar.cxx   |2 
 sfx2/source/sidebar/ResourceManager.cxx |8 +-
 sfx2/source/sidebar/SidebarController.cxx   |6 +-
 sfx2/source/sidebar/SidebarToolBox.cxx  |2 
 sfx2/source/sidebar/TabBar.cxx  |2 
 sfx2/source/sidebar/TabItem.cxx |2 
 sfx2/source/sidebar/Theme.cxx   |   18 +++---
 svx/source/sidebar/PanelFactory.cxx |   10 +--
 svx/source/sidebar/area/AreaPropertyPanel.cxx   |8 +-
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |8 +-
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |   32 +--
 svx/source/sidebar/text/TextPropertyPanel.cxx   |   34 +---
 sw/source/ui/sidebar/PagePropertyPanel.cxx  |   18 ++
 sw/source/ui/sidebar/SwPanelFactory.cxx |   11 +--
 29 files changed, 140 insertions(+), 172 deletions(-)

New commits:
commit 7219a08b5f637497652008f9ea4376d011ced423
Author: Noel Grandin n...@peralex.com
Date:   Tue Nov 12 13:12:09 2013 +0200

use standard css namespace prefix

Change-Id: I820faaa0dac1707f3224b981dae0bc6be5894503

diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 17e4414..0df6d17 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -31,9 +31,6 @@
 #include com/sun/star/util/URL.hpp
 
 
-namespace cssu = ::com::sun::star::uno;
-
-
 namespace sfx2 { namespace sidebar {
 
 class SFX2_DLLPUBLIC Tools
@@ -42,22 +39,22 @@ public:
 static Image GetImage (
 const ::rtl::OUString rsImageURL,
 const ::rtl::OUString rsHighContrastImageURL,
-const cssu::Referencecss::frame::XFrame rxFrame);
+const css::uno::Referencecss::frame::XFrame rxFrame);
 
 static Image GetImage (
 const ::rtl::OUString rsURL,
-const cssu::Referencecss::frame::XFrame rxFrame);
+const css::uno::Referencecss::frame::XFrame rxFrame);
 
 static css::awt::Gradient VclToAwtGradient (const Gradient aGradient);
 static Gradient AwtToVclGradient (const css::awt::Gradient aGradient);
 
 static css::util::URL GetURL (const ::rtl::OUString rsCommand);
-static cssu::Referencecss::frame::XDispatch GetDispatch (
-const cssu::Referencecss::frame::XFrame rxFrame,
+static css::uno::Referencecss::frame::XDispatch GetDispatch (
+const css::uno::Referencecss::frame::XFrame rxFrame,
 const css::util::URL rURL);
 
 static ::rtl::OUString GetModuleName (
-const cssu::Referencecss::frame::XFrame rxFrame);
+const css::uno::Referencecss::frame::XFrame rxFrame);
 };
 
 
commit ba137a363c23e301e4d530567cb7c352d284514e
Author: Noel Grandin n...@peralex.com
Date:   Tue Nov 12 13:10:56 2013 +0200

S2A macro is unused

Change-Id: Ia0caf81179289e565d69215d32cc132337b806cd

diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 9ba363d..17e4414 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -31,8 +31,6 @@
 #include com/sun/star/util/URL.hpp
 
 
-#define S2A(s) rtl::OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr()
-
 namespace cssu = ::com::sun::star::uno;
 
 
commit 9c5a91efdb41cd340936846169da130d855a335a
Author: Noel Grandin n...@peralex.com
Date:   Tue Nov 12 09:33:27 2013 +0200

expand out the A2S macro

Which is not doing anything useful anymore.

Change-Id: I83422e811d52a77b65655924c07b55dd7229449c

diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx 
b/framework/source/services/ContextChangeEventMultiplexer.cxx
index cf3174a..db8f8f1 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++

Re: [Libreoffice-qa] [libreoffice-website] Re: [libreoffice-users] Re: Engaging users: initial results of the survey

2013-11-12 Thread Robinson Tryon

On Tue, Nov 12, 2013 at 8:53 AM, Tanstaafl tansta...@libertytrek.org wrote:
 CC'ing the website list because it is about the website, but I'm not
 subscribed, so please CC me on replies if you really want to discuss this
 complaint.

I've also cc'd the QA team (who manage/work on the bugtracker,
including Rob Snelders, the lead dev for the Bug Submission Assistant
(BSA))

 This prompted me to go file a bug (Feature Request) for something I've been
 meaning to file for some time now, then I couldn't remember if I'd already
 done it before, so I wanted to check and see...
 ...
 The 'new' website is extraordinarily difficult to navigate if you want to do
 anything other than download the latest version.

 My simple goal was to log into the Bug system, check 'My Bugs' and see if
 I'd reported this yet, and if not, report it...

Fair enough. So you were expecting a link to the bugtracker either on
the main page or from the BSA?

(Rob - Thinking a bit broader, it would be nice if we could give users
a single page that would display information about their activity on
Bugzilla, the Ask site, etc. Using some form of SSO like OpenID or at
least shared credentials (e.g. LDAP) could make this easier)

 2. After going to the main website, I clicked on 'Get Help', and then
 clicked on 'Bug'...

 The only option here is to report a bug.

 What if I don't want to report a bug, but only want to search for bugs?

 Even after I log in, the only next step available is to continue reporting a
 bug I don't want/need to report!?

Rob - Any thoughts here?

 This is HORRIBLY BROKEN.

 How do I just log into the bug reporting system and search it? Anyone?

To log in, navigate to http://bugs.freedesktop.org/ and click on the
Log In link. To search the bugs, click on the Search link.

I agree that we should make it easier for users to find and use
Bugzilla. Tanstaafl -- we're actually right in the middle of some
backend infrastructure improvements for Bugzilla, but I'll make sure
that we spend some time on the frontend of things as well.

Best,
--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/

[Libreoffice-qa] How long before a released build is notified by Update?

2013-11-12 Thread Pedro

Hi all

Does any one know what is the rule for a released build to be detected by
Auto-update (or manual update) check?

Version 4.1.3 was released on November 1st but my LO 4.1.2.3 still reports
LibreOffice 4.1 is up to date.

Is there a problem with version 4.1.3? Or is simply the version on the
server that wasn't updated? Is this still done manually by Kendy?

Regards,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/How-long-before-a-released-build-is-notified-by-Update-tp4082780.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] [libreoffice-website] Re: [libreoffice-users] Re: Engaging users: initial results of the survey

2013-11-12 Thread Rob Snelders


Fair enough. So you were expecting a link to the bugtracker either on
the main page or from the BSA?


I think he means that the 4.0-banner isn't what he expects. I don't know 
what is better.

The banner has many uses for people that just want to download 4.0.



(Rob - Thinking a bit broader, it would be nice if we could give users
a single page that would display information about their activity on
Bugzilla, the Ask site, etc. Using some form of SSO like OpenID or at
least shared credentials (e.g. LDAP) could make this easier)


you do realist that's a lot of work, also on systems we have no real 
knowledge about.
But the idea would be great. However we do have more suggestions that 
can be added to ask, for example integration with OpenID and move a 
question to a bug (and visa-versa).





2. After going to the main website, I clicked on 'Get Help', and then
clicked on 'Bug'...

The only option here is to report a bug.

What if I don't want to report a bug, but only want to search for 
bugs?


Even after I log in, the only next step available is to continue 
reporting a

bug I don't want/need to report!?


Rob - Any thoughts here?


There is already a enhancement-request to add the URL of bugzilla to the 
BSA. I didn't come around to it but we _really_ should implement that 
soon. I'll look into it.





This is HORRIBLY BROKEN.

How do I just log into the bug reporting system and search it? Anyone?


To log in, navigate to http://bugs.freedesktop.org/ and click on the
Log In link. To search the bugs, click on the Search link.

I agree that we should make it easier for users to find and use
Bugzilla. Tanstaafl -- we're actually right in the middle of some
backend infrastructure improvements for Bugzilla, but I'll make sure
that we spend some time on the frontend of things as well.


Some requests for better UI in BSA are dependent on that work so it 
really needs to be done. But I think we can have the quick improvement 
of at least add the link.




Best,
--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/

___
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] How long before a released build is notified by Update?

2013-11-12 Thread Robinson Tryon

On Tue, Nov 12, 2013 at 11:19 AM, Pedro pedl...@gmail.com wrote:
 Hi all

 Does any one know what is the rule for a released build to be detected by
 Auto-update (or manual update) check?

 Version 4.1.3 was released on November 1st but my LO 4.1.2.3 still reports
 LibreOffice 4.1 is up to date.

 Is there a problem with version 4.1.3? Or is simply the version on the
 server that wasn't updated? Is this still done manually by Kendy?

AFAIK the update system is (still) handled manually. I think Cloph is
the one in charge of it right now. I'm not sure exactly how we could
automate the process, but I think it's worth our investigation.

In any case, I'll try to get some documentation up on the wiki.

Cheers,
--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] How long before a released build is notified by Update?

2013-11-12 Thread Pedro

Hi Robinson (Rob? qubit?)


Robinson Tryon wrote
 AFAIK the update system is (still) handled manually. I think Cloph is
 the one in charge of it right now. I'm not sure exactly how we could
 automate the process, but I think it's worth our investigation.

As you know I'm not a Developer so you can tell me to shut up at any
point...

Wouldn't it be possible to have a script checking on
http://download.documentfoundation.org/libreoffice/stable/
and if your version is 4.0.5 and 4.0.6 is available (where 65 :) ) or your
version is 4.1.2.3 and 4.1.3 is available...

Is this something absurd or impossible?

Cheers,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/How-long-before-a-released-build-is-notified-by-Update-tp4082780p4082793.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] How long before a released build is notified by Update?

2013-11-12 Thread Robinson Tryon

On Tue, Nov 12, 2013 at 12:09 PM, Pedro pedl...@gmail.com wrote:
 Hi Robinson (Rob? qubit?)


Well 'Rob' - Rob Snelders, in the QA namespace, but the other two are
collision-free, AFAIK :-)

 Wouldn't it be possible to have a script checking on
 http://download.documentfoundation.org/libreoffice/stable/
 and if your version is 4.0.5 and 4.0.6 is available (where 65 :) ) or your
 version is 4.1.2.3 and 4.1.3 is available...

 Is this something absurd or impossible?

It doesn't sound to absurd to me. I really don't know too much about
the mechanisms of the updater, so let me get some info on the current
state of things, and then I can see the feasibility of particular
improvements.

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

2013-11-12 Thread Terrence Enger

On Mon, 2013-11-11 at 11:58 -0500, Robinson Tryon wrote:
 Hi folks,
 
 Here's my current plan for merging all of our bibisect repos into one:
 https://wiki.documentfoundation.org/QA/Bibisect/Bibisectzilla

Thank you for the summary of the state-of-play.  A couple random
thoughts, if I may:

 1. It is good to see acknowledgement that some of us have flaky
internet connections.  I was worried that I might be entirely
locked out of bibisecting.

 2. Here are some bug counts to shed some (but not much!) light on the
value of bibisect coverage.  Selection criteria are on the
Whiteboard field, using a regular expression where you see a
wildcard.  Open means resolution = ---; non-open is just a
calculated difference.

selection  all open   non-open
   -      

bibisected or  249 74 175 (70%)
prebibisect

prebibisect or 92  29 63  (68%)
bibisected.*older

bibisected and not 153 43 110 (62%)
( prebibisect or 
bibisected.*older or
bibisected.*newer )

bibisected.*newer  4   0  4   (100%)

 3. As coverage extends at both ends, we will have more cases of
not-commonly-satisfied requirements for system libraries.  Wiki
page How to bibisect already mentions a jpeg library, and I have
had problems with glibc.  I have no idea what we can do except
wait until the problem becomes significant.  Hopefully, that will
never happen.

Thank you for letting me run on.

Terry.


___
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] [libreoffice-website] Re: [libreoffice-users] Re: Engaging users: initial results of the survey

2013-11-12 Thread Robinson Tryon

On Tue, Nov 12, 2013 at 11:48 AM, Rob Snelders r...@ertai.nl wrote:
 (Rob - Thinking a bit broader, it would be nice if we could give users
 a single page that would display information about their activity on
 Bugzilla, the Ask site, etc. Using some form of SSO like OpenID or at
 least shared credentials (e.g. LDAP) could make this easier)


 you do realist that's a lot of work, also on systems we have no real
 knowledge about.

True -- I was just doing a little brainstorming on big-picture ideas
for improving our user/new volunteer experience.

 But the idea would be great. However we do have more suggestions that can be
 added to ask, for example integration with OpenID and move a question to a
 bug (and visa-versa).

Right. Getting Bugzilla migrated is necessary for a number of our
tasks, so I've been working hard to get all of our ducks in a row
there.

 There is already a enhancement-request to add the URL of bugzilla to the
 BSA. I didn't come around to it but we _really_ should implement that soon.
 I'll look into it.

Even if it's a bit clunky at first, I suggest that you stub something
in there and then we can make it look pretty when the UI folks have
the time.

Cheers,
--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] LibreOffice Bugzilla (migration) Proposal

2013-11-12 Thread Robinson Tryon

On Mon, Nov 11, 2013 at 11:36 AM, Robinson Tryon
bishop.robin...@gmail.com wrote:
 On Mon, Nov 11, 2013 at 5:25 AM, Christian Lohmaier
 lohma...@googlemail.com wrote:
 Websites/wiki however can point directly to the target, that's no problem.
 I'll setup the bug.LibreOffice.org redirect when I'm back home in a few
 hours.

 Aand, it works! :-)

Sophie - Could you please try changing the URL in one of the Pootle files?

Danke,
--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/

[Libreoffice-bugs] [Bug 70242] FILEOPEN: Libreoffice Calc menu : file / open appears double

2013-11-12 Thread bugzilla-daemon

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #5 from tommy27 ba...@quipo.it ---
in private mail Peter told me that the issue is gone after upgrade and profile
reset. marking RESOLVED WFM

-- 
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 71349] Add option to allow user to have more than 10 Most Recent Documents listed

2013-11-12 Thread bugzilla-daemon

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

Stefan Knorr (astron) heinzless...@gmail.com changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED
 CC|libreoffice-ux-advise@lists |
   |.freedesktop.org|

--- Comment #14 from Stefan Knorr (astron) heinzless...@gmail.com ---
(Removing UX-advise from CC to avoid spamming it.)

MrBean: For 4.2, the limit had already been raised to 25 files. Thus this bug
was fixed already. This bug will not be retroactively fixed in 4.1 or earlier.

25 seems like a pretty sensible limit to me. It's not useful to make
LibreOffice remember every file it has ever opened – LibreOffice is not
supposed to become a full-fledged file manager.

Note that the 8 or 10 files limit was probably not there because hard drives
were small, but because 7 +/- 2 items is somewhat of a magical number in terms
of human memory and perception.

So, while the new limit is probably great in the new Start Center, actually I'd
rather not see 25 items in the Recently-Opened-Documents menu. That's just
imho, though.

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

1 2 3 4 >

1 - 100 of 310 matches

Mail list logo