LibreOffice Gerrit News 2013-09-16
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#69091: Copying data from Base-table to Calc by drag and drop in https://gerrit.libreoffice.org/5952 from Julien Nabet + DOCX:fdo#43093 fix wrong alignment and directionality for RTL paragraph in https://gerrit.libreoffice.org/5944 from Faisal al-otaibi + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + Make scrolling in ThumbnailView smoother and not per-line in https://gerrit.libreoffice.org/5951 from Krisztian Pinter + list types added to Expert Config page in https://gerrit.libreoffice.org/5917 from Efe Gürkan Yalaman + no need for Library_regactivex in --disable-activex build in https://gerrit.libreoffice.org/5950 from Korrawit Pruegsanusak + Fix fdo#69381 by skipping empty option groups in https://gerrit.libreoffice.org/5949 from Arnaud Versini + Introduce --with-icupath to use custom external icu. in https://gerrit.libreoffice.org/5946 from Andrzej J.R. Hunt + Introduce ASCII case conversion and use more/rtl/character.hxx. in https://gerrit.libreoffice.org/5859 from Arnaud Versini * Merged changes on master for project core changed in the last 25 hours: None * Abandoned changes on master for project core changed in the last 25 hours: + Automatic conversion between Basic Date and UNO Date/Time in https://gerrit.libreoffice.org/5898 from Lionel Elie Mamane + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini * Open changes needing tweaks, but being untouched for more than a week: + fdo#39468: Translate German comments (first part) in include/svl/filerec. in https://gerrit.libreoffice.org/5793 from Philipp Riemer + fdo#44689: fix for specific case restart value 0 in https://gerrit.libreoffice.org/5681 from Adam CloudOn + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: docx locale
Hi Faisal, On Fri, Sep 13, 2013 at 02:15:30PM +, Faisal M. Alotaibi fmalota...@kacst.edu.sa wrote: what i want to know when this is happen i found the tag bidi that responsible for RTL are not there but the paragraph still appear as RTL. as you can see in first paragraph in the attachment. bidi is right-to-left paragraph layout. However, you can have RTL as a run property as well, see the rtl element (17.3.2.30 rtl (Right To Left Text) in the OOXML spec), which is the case here. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
Hi, On Sat, Sep 14, 2013 at 08:50:43AM +0200, Jean-Baptiste Faure jbf.fa...@sud-ouest.org wrote: Since this change (it seems) I get the following error message each time I launch the master after a make dev-install : fopen /home/.../LibO/master/solver/unxlngx6.pro/installation/opt/program/pagein-common: No such file or directory I got the same, just don't use dev-install anymore, it's not necessary. If you run instdir/*/program/soffice, that should work. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
On 16 September 2013 09:34, Miklos Vajna vmik...@collabora.co.uk wrote: fopen /home/.../LibO/master/solver/unxlngx6.pro/installation/opt/program/pagein-common: No such file or directory I got the same, just don't use dev-install anymore, it's not necessary. If you run instdir/*/program/soffice, that should work. I bet, that's because you don't use --disable-linkoo. linkoo is broken for sure. I will post to gerrit patch removing it later if nobody beats me to it. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
Hi Matus, On Mon, Sep 16, 2013 at 09:39:09AM +0200, Matúš Kukan matus.ku...@gmail.com wrote: I bet, that's because you don't use --disable-linkoo. linkoo is broken for sure. Sure, I have it enabled, as it's enabled by default. I will post to gerrit patch removing it later if nobody beats me to it. Also, if linkoo doesn't work on master anymore, probably https://wiki.documentfoundation.org/Development/BuildingOnLinux should be updated as well: it suggests dev-install + debugrun, but debugrun launches soffice from instdir, so I guess dev-install shouldn't be advertised anymore. Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 053e4635d816cb18a6098a58f6d275417a244ac0
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Sep 14 09:16:28 2013 +0400
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when
StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it
in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND
(which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
(cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036)
Reviewed-on: https://gerrit.libreoffice.org/5942
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e58ddae..62f2ee2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2545,7 +2545,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette )
+if ( bChoiceFromPalette nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/itemwin.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f4d3954fc6106b3ae0ee16ab0fcde15d8cb945e3
Author: Laurent BP jumbo4...@yahoo.fr
Date: Sat Sep 14 15:50:54 2013 +0200
fdo#39468 Translate German comments in itemwin.cxx
Change-Id: Iee5b21c728071769335b7315d93b13fd8239f922
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 7af34f1..4514d42 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -117,8 +117,8 @@ void SvxLineBox::Select()
SfxObjectShell::Current()
SfxObjectShell::Current()-GetItem( SID_DASH_LIST ) )
{
-// LineDashItem wird nur geschickt, wenn es auch einen
Dash besitzt.
-// Notify kummert sich darum!
+// LineDashItem will only be sent if it also has a dash.
+// Notify cares!
SvxDashListItem aItem( *(const SvxDashListItem*)(
SfxObjectShell::Current()-GetItem( SID_DASH_LIST ) )
);
XLineDashItem aLineDashItem( GetSelectEntry(),
@@ -497,7 +497,7 @@ void SvxMetricField::Down()
sal_Int64 nValue = GetValue();
nValue -= GetSpinSize();
-// Um unter OS/2 einen Sprung auf Max zu verhindern
+// To prevent OS/2 to jump on Max
if ( nValue = GetMin() )
MetricField::Down();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] [PATCH] fdo#39468 German comments for svx/source/tbxctrls/itemwin.cxx
Hi Laurent, thank you for your patch! It has been merged to LibreOffice. Christina On 14/09/13 15:54, Laurent BP wrote: Hello, Here is a patch to translate German comments on the file I'm working on. 0001-fdo-39468-Translate-German-comments-in-itemwin.cxx.patch http://nabble.documentfoundation.org/file/n4074171/0001-fdo-39468-Translate-German-comments-in-itemwin.cxx.patch Laurent BP - LibreOffice 4.1.1.2 -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-39468-German-comments-for-svx-source-tbxctrls-itemwin-cxx-tp4074171.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/qa
sc/qa/unit/ucalc.cxx | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit fd3908d780aae8c14769b12f27c6577593c33487
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Sep 16 10:06:41 2013 +0200
correctly comment failing unit test
to be re-worked
Change-Id: Ic688c2c2975d2240edb9a7899908a9acd77d973c
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 91cfafd..4891e13 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3693,9 +3693,7 @@ void Test::testSortWithFormulaRefs()
aSortData.maKeyState[0].bDoSort = true;
aSortData.maKeyState[0].nField = 0;
-std::cout Sort std::endl;
pDoc-Sort(0, aSortData, false, NULL);
-std::cout Sort done std::endl;
nEnd = SAL_N_ELEMENTS( aResults );
for ( SCROW i = nStart; i nEnd; ++i )
@@ -3744,18 +3742,16 @@ void Test::testSort()
aSortData.maKeyState[0].nField = 1;
aSortData.maKeyState[0].bAscending = true;
-std::cout Sort test std::endl;
-//m_pDoc-Sort(0, aSortData, false, NULL); // TODO : notes crash
-std::cout skipped std::endl;
+/* TODO : notes crash
+m_pDoc-Sort(0, aSortData, false, NULL); // TODO : notes crash
+
double nVal = m_pDoc-GetValue(1,0,0);
ASSERT_DOUBLES_EQUAL(nVal, 1.0);
-// check that note is also moved
-/* TODO : notes GetNotes
-pNote = m_pDoc-GetNote(1, 0, 0);
+// check that note is also moved after sorting
+pNote = m_pDoc-GetNote(1, 0, 0); //TODO : notes GetNotes
CPPUNIT_ASSERT(pNote);
*/
-
clearRange(m_pDoc, ScRange(0, 0, 0, 1, 9, 0)); // Clear A1:B10.
{
// 0 = empty cell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68771, which changed state. Bug 68771 Summary: Crash without warning launch on old OS X (10.5) https://bugs.freedesktop.org/show_bug.cgi?id=68771 What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- -- 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: ure/source
ure/source/uno.ini |5 -
ure/source/unorc |5 -
2 files changed, 10 deletions(-)
New commits:
commit a27d03a53b2e18a87a8c2be255d8592ee5e790de
Author: Tor Lillqvist t...@collabora.com
Date: Mon Sep 16 11:34:23 2013 +0300
Remove incorrect comments
Change-Id: I3e9b82001f92edc6e697a976db635af31e16d769
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
index 913a80c..6c04cae 100644
--- a/ure/source/uno.ini
+++ b/ure/source/uno.ini
@@ -15,11 +15,6 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-# This is the uno.ini file from ure/source. Note that this file is
-# copied into solver, but no longer copied into the installset, but
-# used in solver only during build. The URE uno.ini in the installset is
-# constructed from scp stanzas in scp2/source/ooo/ure.scp.
-#
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
diff --git a/ure/source/unorc b/ure/source/unorc
index 208b1d9..1efbfe2 100644
--- a/ure/source/unorc
+++ b/ure/source/unorc
@@ -15,11 +15,6 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-# This is the unorc file from ure/source. Note that this file is
-# copied into solver, but no longer copied into the installset, but
-# used in solver only during build. The URE unorc in the installset is
-# constructed from scp stanzas in scp2/source/ooo/ure.scp.
-#
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC]: Sidebar updates
Hi Prashant, Prashant Pandey píše v So 14. 09. 2013 v 23:28 +0530: Since for a GSoC student, 16th September would be a soft pencils-down date, I'd be utilizing this last (upcoming) week in completing my current working task [most probably by Tuesday, 17th Sept] making all these open patches tending more towards perfect/efficient/better if needed, so that they are pushed + time permitting I'd revert to some minor issue related with my work in [4]. Thank you for your great work - yes, this a perfect plan how to spend the rest of your GSoC time. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC]Firebird Integration Weekly Update 14
Hi all, Progress this week: - Some dbexception cleanup. - Fixed ColumnLocate::findColumn implementations (for all db drivers) and api definition. - Fixed index rebuilding. - Tried to experiment with different ICU versions, but haven't managed to actually produce any errors when switching ICU version (I specifically disabled index rebuilding locally as to be able to catch any errors here) -- afaict. you need to manually set the collation to get errors, which I suspect wouldn't be done within Base. - Fixed formatting of integers as a currency, integers now show as a number and not currency by default. - Fixed segfault when setting Null as first value in PreparedStatement. - Reintroduce statement specific Mutexes (instead of a connection-wide Mutex). - Implemented simple firebird unit tests to see that we can really transfer a .fdb between machines with different OS/CPU/bit-ness. - Some generic cleanups. - Tried to create a hsqldb cppunit-test, not directly usable yet since hsqldb can't be run in solver (see other threads), I was intending to use this as a basis for a performance test -- it seems I should be able to have this run for now by hardcoding the classpath in the HSQLDB driver. (I.e. to run the unit/performance tests you need to change a path in the HSQLDB driver, uncomment the dbaccess Module_*.mk and run the test.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Updates about Enhanced Database Ranges.
last week I have been away from development due to an injury. I will join development in this week. Having missed the soft pencils down date. I have to work on the final ui development for this feature. Like it was suggested I will be developing a ui that does not support live rendering of the table styles like you would see in microsoft excel. However I will be doing that in time to come and look at making the feature sleek and professional. Additionally I will try to squeeze in as much of development as possible to make up for the weeks gap. Thank you. On 3 Sep 2013 07:22, Akash Shetye shetyeak...@gmail.com wrote: What happened last week -background rendering completed. -calculation code written down. -size import code written for table style stripe size. -interface coding did not happen. Targets for this week. -develop ui for the feature. Little more down the road -test the feature. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [BUG] On shadow textbox frame
Hello,
The patch following is not good, you can see the bug and the good patch here:
https://bugs.freedesktop.org/show_bug.cgi?id=69407
-Message d'origine-
De : libreoffice-bounces+matthieu.gay=capgemini@lists.freedesktop.org
[mailto:libreoffice-bounces+matthieu.gay=capgemini@lists.freedesktop.org]
De la part de Gay, Matthieu
Envoyé : jeudi 12 septembre 2013 10:53
À : Cedric Bosdonnat
Cc : LibreOffice dev
Objet : RE:[BUG] On shadow textbox frame
Hello,
Sorry, I've just saw your answer.
In fact I have two bugs:
- The first one is about reading a *.doc (see the attached file
SIMPLE_TEST.doc), which has the shadow in the foreground.
I resolve this by applying the following patch (Version 3.5.7):
diff --git a/sw/source/filter/ww8/ww8par6.cxx
b/sw/source/filter/ww8/ww8par6.cxx
index 1677207..796497a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2360,7 +2360,7 @@ bool SwWW8ImplReader::IsDropCap() bool
SwWW8ImplReader::StartApo(const ApoTestResults rApo,
const WW8_TablePos *pTabPos)
{
-if (0 == (pWFlyPara = ConstructApo(rApo, pTabPos)))
+if (0 != (pWFlyPara = ConstructApo(rApo, pTabPos)))
return false;
// WW8SwFlyPara constructor has changed - new 4th parameter
I will put a new bug and the commit, but can you tell me if my patch will
provoke any regressions?
- The second one is the bug you answered, I will look in paintfrm.cxx.
Thanks very much for your answers.
Matthieu GAY
De : Cedric Bosdonnat [cbosdon...@suse.com] Envoyé : lundi 15 juillet 2013
09:56 À : Gay, Matthieu Cc : LibreOffice dev Objet : Re: [BUG] On shadow
textbox frame
Hello Matthieu,
On Fri, 2013-07-12 at 13:03 +, Gay, Matthieu wrote:
When I have a text box with shadow on the side, if the background of
the frame is transparent (more than 0%) the shadow come to the
foreground.
Con you tell me if this a bug ? If so where can I resolve it? If this
a UI bug?
That really sounds like a bug in the Frame painting. I would start looking at
SwFlyFrm::Paint:
http://opengrok.libreoffice.org/xref/core/sw/source/core/layout/paintfrm.cxx#3881
I hope this helps,
--
Cedric
This message contains information that may be privileged or confidential and is
the property of the Capgemini Group. It is intended only for the person to whom
it is addressed. If you are not the intended recipient, you are not authorized
to read, print, retain, copy, disseminate, distribute, or use this message or
any part thereof. If you receive this message in error, please notify the
sender immediately and delete all copies of this message.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
Le 09/09/13 22:18, Michael Stahl a écrit : Hi all, FWIW, my Mac OSX master DMG images now contain 2 *.app files, one called LibreOffice.app weighing in at 323Mb (normal build) and another called LibreOfficeDev.app weighing in at 964.8Mb (debug build). Both are contained within a folder called LibreOfficeDev_4.2.0.0.alpha0_MacOS_x86-64 Normal ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unit Test JVM Issues / URE_INTERNAL_JAVA_DIR
On 15/09/13 23:02, Andrzej Hunt wrote: On Sat, 2013-09-14 at 08:14 +0100, Andrzej Hunt wrote: stoc/source/javavm/javavm.cxx needs to find java which it does by expanding URE_INTERNAL_JAVA_DIR. This seems to be set within unorc, which is found automatically by cppuhelper (cppuhelper/source/paths.cxx -- getUnoIniuri()) -- this loads unorc from wherever cppuhelper library is found(called libuno_ccpuhlpergcc3.so -- not sure why this is the naming scheme?). Running LO from instdir: instdir/unxlngx6/ure/lib/unorc is used (generated by scp2/source/ooo/ure.scp) -- this contains the expected URE_INTERNAL_JAVA_DIR (It seems I was mistaken on this: the instdir unorc looks like it's copied directly from ure/source/unorc , the scp one is/was used for installation/) there is now some duplication there that needs to be cleaned up, probably by removing the scp2 definition of the rc files. What I'm still not able to do is have hsqldb itself load (fails on can't find org.hsqldb.jdbcDriver or similar) --this is since the driver has the hsqldb.jar path hardcoded in the sources as $BRAND_BASE_DIR/ LIBO_SHARE_JAVA_FOLDER /hsqldb.jar (and the jdbc drivers specifically only load classes from the driver specific classpath) -- I guess if unit tests were to be run in instdir then that would allow things to work, I'm still thinking about how best to let them run in the current solver though (although I hear solver is to be gotten rid of eventually). Would replacing LIBO_SHARE_JAVA_FOLDER with a macro/variable evaluated at runtime (not sure of the terminology) similar to the URE_INTERNAL_JAVA_DIR be acceptable? (I'll investigate the full details tomorrow.) Currently LIB_SHARE_JAVA_FOLDER is hardcoded as the instdir/installation specific path (e.g. program/classes) whereas in solver jars are located in bin/) i'd say working on this right now is mostly a waste of time since i already am working on removing solver; hopefully with results this week. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/benchmark-document-loading
bin/benchmark-document-loading |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9a07b739c896120ffa683536f9cbeb2c66e39b6c Author: Tor Lillqvist t...@collabora.com Date: Mon Sep 16 12:26:55 2013 +0300 Make the usage message even clearer I have to check it myself every time, I never remember which parameters are URLs and which plain pathnames. Change-Id: If2c33ef62653f4675db6c6b0947a1630d5a7cb80 diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading index 132cfea..6147a2e 100644 --- a/bin/benchmark-document-loading +++ b/bin/benchmark-document-loading @@ -484,8 +484,8 @@ def usage(): --userdir=URL specify user installation directory for 'path' method --valgrindpass --valgrind to soffice for 'path' method - 'location' is a pathname, not a URL. 'userdir' is a URL. the 'directory' parameters should be - full absolute pathnames, not URLs. + 'location' is a pathname, not a URL. 'outdir' and 'userdir' are URLs. + The 'directory' parameters should be full absolute pathnames, not URLs. print(message.format(program = os.path.basename(sys.argv[0]))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
Le 16/09/13 11:24, Alexander Thurgood a écrit : Le 09/09/13 22:18, Michael Stahl a écrit : FWIW, the LibreOfficeDev.app refuses to start, OSX saying it is corrupted. From the terminal, I see : MacBookPro:~ alex$ /Users/alex/Desktop/LibreOfficeDev.app/Contents/MacOS/soffice ; exit; 2013-09-16 11:29:48.691 soffice[29641:707] No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting logout Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - connectivity/source cppuhelper/source include/sal jvmfwk/Module_jvmfwk.mk jvmfwk/Package_jreproperties_solver.mk jvmfwk/Package_rcfiles_solver.mk
connectivity/source/drivers/hsqldb/HDriver.cxx | 16 ++-
connectivity/source/drivers/jdbc/JDriver.cxx | 15 ++
cppuhelper/source/unorc|1
include/sal/log-areas.dox |2 +
jvmfwk/Module_jvmfwk.mk|2 +
jvmfwk/Package_jreproperties_solver.mk | 20 ++
jvmfwk/Package_rcfiles_solver.mk | 35 +
7 files changed, 89 insertions(+), 2 deletions(-)
New commits:
commit 6eb840cc540bb6f2efcebc0349a8e6e7ba074cd8
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Sat Sep 14 08:09:38 2013 +0100
Set URE_INTERNAL_JAVA_DIR for unorc to allow jvm in unit tests.
Currently unit tests run in solver, the unorc in solver is simply
copied from cppuhelper/source/unorc, which doesn't set
URE_INTERNAL_JAVA_DIR, hence the jvm cannot be loaded in Unit tests.
(For comparison the URE unorc in instdir is copied from
ure/source/uno{rc,.ini}
and contains the appropriate java paths.)
(URE_INTERNAL_JAVA_CLASSPATH is not needed, at least currently.)
Change-Id: I5911c9a22c92e0e20c98d0e51d5b14e020c8ec10
Signed-off-by: Stephan Bergmann sberg...@redhat.com, slightly modified
diff --git a/cppuhelper/source/unorc b/cppuhelper/source/unorc
index d6bf696..48c8b0c 100644
--- a/cppuhelper/source/unorc
+++ b/cppuhelper/source/unorc
@@ -18,5 +18,6 @@
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
+URE_INTERNAL_JAVA_DIR=${ORIGIN}/../bin
UNO_SERVICES=${URE_MORE_SERVICES}
UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES}
commit 429042021590c80afb25ade833269635a24f2778
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 16 11:28:51 2013 +0200
Make Java-based connectivity drivers work with jvmfwk direct mode
...so they work from CppunitTests (which make use of that direct mode).
Change-Id: I92b72fb708ac1868644111b208f92ac58610ed11
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 5f053f3..f916658 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -400,7 +400,21 @@ namespace connectivity
sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString url )
throw (SQLException, RuntimeException)
{
sal_Bool bEnabled = sal_False;
-OSL_VERIFY_EQUALS( jfw_getEnabled( bEnabled ), JFW_E_NONE, error in
jfw_getEnabled );
+javaFrameworkError e = jfw_getEnabled(bEnabled);
+switch (e) {
+case JFW_E_NONE:
+break;
+case JFW_E_DIRECT_MODE:
+SAL_INFO(
+connectivity.hsqldb,
+jfw_getEnabled: JFW_E_DIRECT_MODE, assuming true);
+bEnabled = true;
+break;
+default:
+SAL_WARN(
+connectivity.hsqldb, jfw_getEnabled: error code +e);
+break;
+}
return bEnabled url.equals(sdbc:embedded:hsqldb);
}
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx
b/connectivity/source/drivers/jdbc/JDriver.cxx
index d0759c1..05424ae 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -117,7 +117,20 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const
OUString url ) throw(SQLEx
// don't ask the real driver for the url
// I feel responsible for all jdbc url's
sal_Bool bEnabled = sal_False;
-OSL_VERIFY_EQUALS( jfw_getEnabled( bEnabled ), JFW_E_NONE, error in
jfw_getEnabled );
+javaFrameworkError e = jfw_getEnabled(bEnabled);
+switch (e) {
+case JFW_E_NONE:
+break;
+case JFW_E_DIRECT_MODE:
+SAL_INFO(
+connectivity.jdbc,
+jfw_getEnabled: JFW_E_DIRECT_MODE, assuming true);
+bEnabled = true;
+break;
+default:
+SAL_WARN(connectivity.jdbc, jfw_getEnabled: error code +e);
+break;
+}
return bEnabled url.startsWith(jdbc:);
}
// -
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 6589382..ad99b89 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -58,6 +58,8 @@ certain functionality.
@li @c connectivity.commontools
@li @c connectivity.drivers
@li @c connectivity.firebird
+@li @c connectivity.hsqldb
+@li @c connectivity.jdbc
@li @c connectivity.mork
@li @c connectivity.flat
@li @c connectivity.parse
commit a041f518afe083f997660eb8f809df7f20c30fed
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 16 11:25:47 2013 +0200
Still copy jvmfwk support files to solver
...instead of only to instdir, as happened after
2e47462d076364725875e770a91a7bb6bbbec2c1 jvmfwk: install also into
instdir, so
that CppunitTests (which still run against solver) can use jvmfwk. This
will
GSOC - last VLC bits ...
Hi Minh, First - thanks for all the fixes :-) On Sat, 2013-09-14 at 22:47 +0300, Minh Ngo wrote: + audio during keyframe capture + intermittent play in a separate window Generally fixed. How could I manipulate with a video (stop/play) in the full screen mode? Great; so from our IRC conversation, here are the remaining bugs / issues that I can see: + video scaling + you've implemented the hard-coded 50% / 100% / 200% zooming nicely; but we need 'scaling' (IMHO this should be the default) + be more ideal to have a black vs. a grey background too where the video is smaller than the window, http://www.gnome.org/~michael/vlc1.png + mis-placing windows on F9 presentation + I load flying-boy.odp and get a grey window mis-aligned with the video: http://www.gnome.org/~michael/vlc1.png which is odd, drawing a rectangle around the scaled video and then hitting presenting mode shows: http://www.gnome.org/~michael/vlc3.png seems like the video is correctly positioned, albeit not scaled (cf. above) but that other X window is mis-positioned. + Projecting video Of course the primary use of video is to project it. Unfortunately, we're not getting the display / screen right for the multi-head presentation mode: ie. plug a VGA into your laptop, and don't clone the monitors: http://www.gnome.org/~michael/vlc4.png In theory we should have two concurrent displays of the video, one on each screen (when that is requested), although having just one on the presentation screen is fine too. Otherwise, this starts to look behave quite well :-) naturally this needs testing on Windows too (which is the primary platform for this), but this is encouraging progress. Thanks Minh ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc sc/source
sc/inc/column.hxx|2 -
sc/inc/document.hxx |1
sc/source/core/data/column2.cxx |2 -
sc/source/core/data/document.cxx |6 ++-
sc/source/core/data/table1.cxx | 62 +---
sc/source/core/data/table2.cxx | 24 -
sc/source/ui/navipi/content.cxx | 67 ++-
7 files changed, 105 insertions(+), 59 deletions(-)
New commits:
commit 0827d9ee3838d10feceea720bf54a2d6299b8353
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Sep 16 12:24:17 2013 +0200
optim cell notes loops
Change-Id: I08a8a85a4353f7c1b3edada947110d49cfc7dddf
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 76f5127..75270d6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -495,7 +495,7 @@ public:
const ScPostIt* GetCellNote( SCROW nRow ) const;
void DeleteCellNotes( sc::ColumnBlockPosition rBlockPos, SCROW nRow1,
SCROW nRow2 );
void DeleteCellNote( SCROW nRow );
-bool HasCellNote() const;
+bool HasCellNotes() const;
void SetCellNote( SCROW nRow, ScPostIt* pNote);
void SwapCellNotes( SCROW nRow1, SCROW nRow2 );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 971b377..825d83c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -904,6 +904,7 @@ public:
void SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab,
ScPostIt* pNote);
bool HasNote(const ScAddress rPos);
bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
+bool HasColNotes(SCCOL nCol, SCTAB nTab);
SC_DLLPUBLIC ScPostIt* ReleaseNote(const ScAddress rPos);
SC_DLLPUBLIC ScPostIt* ReleaseNote(SCCOL nCol, SCROW nRow, SCTAB
nTab);
SC_DLLPUBLIC ScPostIt* GetOrCreateNote(const ScAddress rPos);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c87a8a2..d7433a4 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1807,7 +1807,7 @@ void ScColumn::DeleteCellNotes( sc::ColumnBlockPosition
rBlockPos, SCROW nRow1,
maCellNotes.set_empty(rBlockPos.miCellNotePos, nRow1, nRow2);
}
-bool ScColumn::HasCellNote() const
+bool ScColumn::HasCellNotes() const
{
sc::CellNoteStoreType::const_iterator it = maCellNotes.begin(), itEnd =
maCellNotes.end();
for (; it != itEnd; ++it)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 91b1ccc..824bb3b 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6121,12 +6121,16 @@ bool ScDocument::HasNote(const ScAddress rPos)
{
return HasNote(rPos.Col(), rPos.Row(), rPos.Tab());
}
-
bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
{
ScPostIt* pNote = maTabs[nTab]-aCol[nCol].GetCellNote(nRow);
return pNote != NULL;
}
+bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab)
+{
+return maTabs[nTab]-aCol[nCol].HasCellNotes();
+}
+
ScPostIt* ScDocument::ReleaseNote(const ScAddress rPos)
{
return ReleaseNote(rPos.Col(), rPos.Row(), rPos.Tab());
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 8ca5d88..8823d6c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -528,17 +528,20 @@ bool ScTable::GetCellArea( SCCOL rEndCol, SCROW rEndRow
) const
if (nRow nMaxY)
nMaxY = nRow;
}
+if ( pDocument-HasColNotes(i, nTab) )
+{
sc::CellNoteStoreType maCellNotes = pDocument-GetColNotes(i,
nTab);
-for (SCROW r=nMaxY; r =MAXROW; r++) // TODO : notes suboptimal
+for (SCROW r=nMaxY; r =MAXROW; r++) // TODO : notes suboptimal ?
{
ScPostIt* pNote = maCellNotes.getScPostIt*(r);
if (pNote)
-{
-nMaxY = r;
-if (inMaxX)
-nMaxX = i;
-}
+{
+nMaxY = r;
+if (inMaxX)
+nMaxX = i;
+}
}
+ }
}
rEndCol = nMaxX;
@@ -581,15 +584,18 @@ bool ScTable::GetPrintArea( SCCOL rEndCol, SCROW
rEndRow, bool bNotes, bool bF
}
if (bNotes)
{
-sc::CellNoteStoreType maCellNotes = pDocument-GetColNotes(i,
nTab);
-for (SCROW r=nMaxY; r =MAXROW; r++) // TODO : notes suboptimal
+if ( pDocument-HasColNotes(i, nTab) )
{
-ScPostIt* pNote = maCellNotes.getScPostIt*(r);
-if (pNote)
+sc::CellNoteStoreType maCellNotes =
pDocument-GetColNotes(i, nTab);
+for (SCROW r=nMaxY;
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx |4
sw/inc/viewsh.hxx |2 ++
sw/source/core/crsr/crsrsh.cxx| 30 +-
sw/source/core/layout/trvlfrm.cxx |5 +
sw/source/core/view/vnew.cxx |2 ++
sw/source/ui/wrtsh/select.cxx |4
6 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Sep 16 12:12:42 2013 +0200
fdo#37606 SwWrtShell::SelAll(): initial support for doc starting with table
SwWrtShell::SelAll() can now detect if the body text starts with a
table, and if so, it explicitly selects the whole document, not just the
first cell of the starting table.
Also, SwCrsrShell::EndAction() now checks for this select all and doc
starts with table situation, and if that's the case, it activates a
special select all mode, so layout can act accordingly.
Change-Id: I8d634fc76b656a7513f067d1ce70f1930bb62dd4
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index df120f9..9166edc 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -327,6 +327,10 @@ public:
// if ExtendedSelect() is called afterwards, the whole nodes array is
selected
// only for usage in special cases allowed!
void ExtendedSelectAll();
+/// If ExtendedSelectAll() was called and selection didn't change since
then.
+bool ExtendedSelectedAll();
+/// If document body starts with a table.
+bool StartsWithTable();
SwPaM* GetCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
inline SwCursor* GetSwCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 92c5f0e..7fcd7d1 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -193,6 +193,7 @@ protected:
sal_uInt16 mnStartAction; /// != 0 if at least one
::com::sun::star::chaos::Action is active.
sal_uInt16 mnLockPaint; /// != 0 if Paint is locked.
+bool mbSelectAll; /// Special select all mode: whole document
selected, even if doc starts with table.
public:
TYPEINFO();
@@ -564,6 +565,7 @@ public:
bool IsHeaderFooterEdit() const { return mbHeaderFooterEdit; }
bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return
(eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool
bShow ) { if ( eControl == Header ) mbShowHeaderSeparator = bShow; else
mbShowFooterSeparator = bShow; }
+bool IsSelectAll() { return mbSelectAll; }
};
// class CurrShell manages global ShellPointer ---
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f9aa315..89698a9 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -57,6 +57,7 @@
#include vcl/svapp.hxx
#include numrule.hxx
#include IGrammarContact.hxx
+#include comphelper/flagguard.hxx
#include globals.hrc
#include comcore.hrc
@@ -226,6 +227,7 @@ void SwCrsrShell::StartAction()
void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
{
+comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable()
ExtendedSelectedAll());
sal_Bool bVis = m_bSVCrsrVis;
// Idle-formatting?
@@ -530,6 +532,32 @@ void SwCrsrShell::ExtendedSelectAll()
pPos-nContent.Assign( pCNd, pCNd ? pCNd-Len() : 0 );
}
+bool SwCrsrShell::ExtendedSelectedAll()
+{
+SwNodes rNodes = GetDoc()-GetNodes();
+SwNodeIndex nNode = rNodes.GetEndOfPostIts();
+SwCntntNode* pStart = rNodes.GoNext(nNode);
+
+nNode = rNodes.GetEndOfContent();
+SwCntntNode* pEnd = rNodes.GoPrevious(nNode);
+
+if (!pStart || !pEnd)
+return false;
+
+SwPosition aStart(*pStart, 0);
+SwPosition aEnd(*pEnd, pEnd-Len());
+SwShellCrsr* pShellCrsr = getShellCrsr(false);
+return aStart == *pShellCrsr-Start() aEnd == *pShellCrsr-End();
+}
+
+bool SwCrsrShell::StartsWithTable()
+{
+SwNodes rNodes = GetDoc()-GetNodes();
+SwNodeIndex nNode(rNodes.GetEndOfExtras());
+SwCntntNode* pCntntNode = rNodes.GoNext(nNode);
+return pCntntNode-FindTableNode();
+}
+
sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
{
sal_Bool bRet = sal_False;
@@ -1306,7 +1334,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
mpDoc-IsIdxInTbl( pTstCrsr-GetPoint()-nNode )
( m_pTblCrsr ||
pTstCrsr-GetNode( sal_True )-StartOfSectionNode() !=
-pTstCrsr-GetNode( sal_False )-StartOfSectionNode() ) )
+pTstCrsr-GetNode( sal_False )-StartOfSectionNode() )
!mbSelectAll)
{
SwShellCrsr* pITmpCrsr = getShellCrsr( true );
Point aTmpPt( pITmpCrsr-GetPtPos() );
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 2b5ca6e..438b001 100644
---
Re: Unit Test JVM Issues / URE_INTERNAL_JAVA_DIR
On 09/14/2013 09:14 AM, Andrzej Hunt wrote:
I've been trying to track down why the jvm isn't usable in unit tests
(attempted fix in https://gerrit.libreoffice.org/#/c/5936/ )
stoc/source/javavm/javavm.cxx needs to find java which it does by
expanding URE_INTERNAL_JAVA_DIR. This seems to be set within unorc,
which is found automatically by cppuhelper (cppuhelper/source/paths.cxx
-- getUnoIniuri()) -- this loads unorc from wherever cppuhelper library
is found(called libuno_ccpuhlpergcc3.so -- not sure why this is the
naming scheme?).
Running LO from instdir: instdir/unxlngx6/ure/lib/unorc is used
(generated by scp2/source/ooo/ure.scp) -- this contains the expected
URE_INTERNAL_JAVA_DIR
Running unit tests -- seems to happen in solver/, and
solver/unxlngx6/lib/unorc is used (directly copied from
cppuhelper/source/unorc), this one doesn't contain any JAVA paths so
the jvm can't be loaded.
I've just hardcoded the new path into cppuhelper/source/unorc .
I don't know enough about the instdir changes to know whether this is a
good long term solution though?
There is also the classpath variable -- in the instdir unorc this is set
as
URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
URE_MORE_JAVA_TYPES is set in fundamentalrc, of which there is also a
copy in solver (but under installation/program/...), I'm still looking
into whether this is loaded too in a unit test environment, but for the
moment I've just copied the same URE_INTERNAL_JAVA_CLASSPATH line: I
haven't tested yet whether this works -- I'll try that next.
Looks to me like using in-process Java-UNO has never worked in
CppunitTests (and has never been needed before). Adding
URE_INTERNAL_JAVA_CLASSPATH isn't currently needed (and there's no code
that sets URE_MORE_JAVA_TYPES in any of the cases that use solver's
unorc anyway), so I pushed https://gerrit.libreoffice.org/#/c/5936/
without that part now as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6eb840cc540bb6f2efcebc0349a8e6e7ba074cd8
Set URE_INTERNAL_JAVA_DIR for unorc to allow jvm in unit tests.
What I'm still not able to do is have hsqldb itself load (fails on can't
find org.hsqldb.jdbcDriver or similar) --this is since the driver has
the hsqldb.jar path hardcoded in the sources as
$BRAND_BASE_DIR/ LIBO_SHARE_JAVA_FOLDER /hsqldb.jar
(and the jdbc drivers specifically only load classes from the driver
specific classpath) -- I guess if unit tests were to be run in instdir
then that would allow things to work, I'm still thinking about how best
to let them run in the current solver though (although I hear solver is
to be gotten rid of eventually).
The real problems were that (1) recent instdir changes had broken the
ability to use solver's jvmfwk lib in direct mode, which instantiating
a JVM in the CppunitTest process would want to do, fixed with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a041f518afe083f997660eb8f809df7f20c30fed
Still copy jvmfwk support files to solver; and (2) the connectivity
drivers use jfw_getEnabled which does not work in that direct mode,
fixed with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=429042021590c80afb25ade833269635a24f2778
'Make Java-based connectivity drivers work with jvmfwk direct mode.'
With all those fixes in, https://gerrit.libreoffice.org/#/c/5934/
Implement hsqldb loading test now worked locally for me.
(Much of the above will become moot soon of course, when solver is done
away with.)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/colorconfigwin.ui | 268 +++--- 1 file changed, 135 insertions(+), 133 deletions(-) New commits: commit 342b1895d768dc633c3067df6618cd3567b72a6d Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 16 12:15:54 2013 +0100 Resolves: fdo#67730 Preview colors on Smart Tags Shadows are swapped Change-Id: I63916283c67b9acd79df96a48485dba6b25cf8cb diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index d4af11f..c0d7d0e 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.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=GtkGrid id=ColorConfigWindow property name=visibleTrue/property property name=can_focusFalse/property @@ -13,9 +14,9 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property +property name=margin_left6/property property name=xalign0/property property name=draw_indicatorTrue/property -property name=margin_left6/property /object packing property name=left_attach0/property @@ -28,9 +29,9 @@ object class=GtkLabel id=doccolor property name=visibleTrue/property property name=can_focusFalse/property +property name=margin_left6/property property name=xalign0/property property name=label translatable=yesDocument background/property -property name=margin_left6/property /object packing property name=left_attach0/property @@ -53,11 +54,10 @@ /child child object class=GtkDrawingArea id=doccolor_wn:border -property name=hexpandTrue/property property name=visibleTrue/property property name=can_focusFalse/property property name=margin_right6/property -property name=margin_right6/property +property name=hexpandTrue/property /object packing property name=left_attach2/property @@ -68,10 +68,10 @@ /child child object class=GtkDrawingArea id=docboundaries_wn:border -property name=hexpandTrue/property property name=visibleTrue/property property name=can_focusFalse/property property name=margin_right6/property +property name=hexpandTrue/property /object packing property name=left_attach2/property @@ -123,10 +123,10 @@ /child child object class=GtkDrawingArea id=appback_wn:border -property name=hexpandTrue/property property name=visibleTrue/property property name=can_focusFalse/property property name=margin_right6/property +property name=hexpandTrue/property /object packing property name=left_attach2/property @@ -139,9 +139,9 @@ object class=GtkLabel id=appback property name=visibleTrue/property property name=can_focusFalse/property +property name=margin_left6/property property name=xalign0/property property name=label translatable=yesApplication background/property -property name=margin_left6/property /object packing property name=left_attach0/property @@ -156,9 +156,9 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property +property name=margin_left6/property property name=xalign0/property property name=draw_indicatorTrue/property -property name=margin_left6/property /object packing property name=left_attach0/property @@ -181,10 +181,10 @@ /child child object class=GtkDrawingArea id=objboundaries_wn:border -property name=hexpandTrue/property property name=visibleTrue/property property name=can_focusFalse/property property name=margin_right6/property +property name=hexpandTrue/property /object packing property name=left_attach2/property @@ -199,9 +199,9 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property +property name=margin_left6/property property name=xalign0/property property name=draw_indicatorTrue/property -property name=margin_left6/property /object packing property name=left_attach0/property @@ -224,10 +224,10 @@ /child child object class=GtkDrawingArea id=tblboundaries_wn:border -property name=hexpandTrue/property property name=visibleTrue/property property name=can_focusFalse/property property name=margin_right6/property +property name=hexpandTrue/property
Re: Unit Test JVM Issues / URE_INTERNAL_JAVA_DIR
On 09/16/2013 11:27 AM, Michael Stahl wrote:
On 15/09/13 23:02, Andrzej Hunt wrote:
On Sat, 2013-09-14 at 08:14 +0100, Andrzej Hunt wrote:
stoc/source/javavm/javavm.cxx needs to find java which it does by
expanding URE_INTERNAL_JAVA_DIR. This seems to be set within unorc,
which is found automatically by cppuhelper (cppuhelper/source/paths.cxx
-- getUnoIniuri()) -- this loads unorc from wherever cppuhelper library
is found(called libuno_ccpuhlpergcc3.so -- not sure why this is the
naming scheme?).
Running LO from instdir: instdir/unxlngx6/ure/lib/unorc is used
(generated by scp2/source/ooo/ure.scp) -- this contains the expected
URE_INTERNAL_JAVA_DIR
(It seems I was mistaken on this: the instdir unorc looks like it's
copied directly from ure/source/unorc , the scp one is/was used for
installation/)
there is now some duplication there that needs to be cleaned up,
probably by removing the scp2 definition of the rc files.
There is currently three uno{rc,.ini} files:
(1) cppuhelper/source/unorc is copied to solver and used by anthing that
uses solver's cppuhelper library (built-time execution of various tools;
CppunitTests).
(2) ure/source/uno{rc,.ini} is included in LO installation sets (and in
instdir) as the URE uno{rc,.ini}, in the URE library directory.
(3) The LO-specific uno{rc,.ini}, sitting on top of the URE one, is
defined via scp2 ProfileItems and included in LO installation sets (and
in instdir) in the program directory.
[...]
i'd say working on this right now is mostly a waste of time since i
already am working on removing solver; hopefully with results this week.
One random caveat that comes to mind with running tests against instdir
instead of solver is that the current setup makes sure that any JRE used
by the tests is the one configured --with-jdk-home (by making use of
jvmfwk's direct mode), not one found via the jvmfwk search mechanisms.
Another caveat is that should any of those tests accidentally make
use of bootstrap{rc,.ini}s UserInstallation, we should override that to
make sure those tests do not interfere with the user's configuration.
(And at least for ELF with RPATH and for Mac OS X I would like to get
away from the need for any [DY]LD_LIBRARY_PATH, when executing tools at
build time and when running tests. The key for that would be that /all/
executables and dynamic libraries, including build-time tools and
CppunitTest dynamic libraries, are in well-known locations relative to
each other, so that they can reference each other via @ORIGIN RPATHs
(ELF) resp. @loader/executable_path paths (Mac OS X).)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - codemaker/source include/codemaker unodevtools/source unoidl/source
codemaker/source/codemaker/typemanager.cxx |8 +-
codemaker/source/cppumaker/cppumaker.cxx |6 +
codemaker/source/cppumaker/cppuoptions.cxx | 25 +
codemaker/source/javamaker/javamaker.cxx |4 +--
include/codemaker/typemanager.hxx |2 -
unodevtools/source/skeletonmaker/skeletonmaker.cxx |2 -
unoidl/source/unoidl.cxx | 12 ++
7 files changed, 22 insertions(+), 37 deletions(-)
New commits:
commit a80fb45fe4a260aea0876de86237e53b954fab20
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Sep 13 15:26:58 2013 +0200
Revert WIP: add cppumaker -U to directly read from .idl files
This reverts commit c4113906d7f15f8aa0eb385a4caf474b3505ede1, which is not
necessary after all with recent Hook SourceProvider into
unoidl::loadProvider.
diff --git a/codemaker/source/codemaker/typemanager.cxx
b/codemaker/source/codemaker/typemanager.cxx
index 13da4d3..ff0e6f9 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -27,19 +27,15 @@
#include codemaker/typemanager.hxx
#include rtl/ref.hxx
#include rtl/ustring.hxx
-#include unoidl/sourceprovider.hxx
#include unoidl/unoidl.hxx
TypeManager::TypeManager(): manager_(new unoidl::Manager) {}
TypeManager::~TypeManager() {}
-void TypeManager::loadProvider(OUString const uri, bool source, bool primary)
-{
+void TypeManager::loadProvider(OUString const uri, bool primary) {
rtl::Reference unoidl::Provider prov(
-source
-? new unoidl::SourceProvider(manager_, uri)
-: unoidl::loadProvider(manager_, uri));
+unoidl::loadProvider(manager_, uri));
manager_-addProvider(prov);
if (primary) {
primaryProviders_.push_back(prov);
diff --git a/codemaker/source/cppumaker/cppumaker.cxx
b/codemaker/source/cppumaker/cppumaker.cxx
index 733eb85..2a698f4 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -52,15 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
options.getExtraInputFiles().begin());
i != options.getExtraInputFiles().end(); ++i)
{
-typeMgr-loadProvider(
-convertToFileUrl(*i), options.isValid(-U), false);
+typeMgr-loadProvider(convertToFileUrl(*i), false);
}
for (std::vector OString ::const_iterator i(
options.getInputFiles().begin());
i != options.getInputFiles().end(); ++i)
{
-typeMgr-loadProvider(
-convertToFileUrl(*i), options.isValid(-U), true);
+typeMgr-loadProvider(convertToFileUrl(*i), true);
}
codemaker::GeneratedTypeSet generated;
if (options.isValid(-T)) {
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx
b/codemaker/source/cppumaker/cppuoptions.cxx
index 3643954..3e70b68 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -139,19 +139,6 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[],
sal_Bool bCmdFile)
m_options[-T] = OString(s);
}
break;
-case 'U':
-if (av[i][2] != '\0')
-{
-OString tmp('-U', please check);
-if (i = ac - 1)
-{
-tmp += your input ' + OString(av[i]) + ';
-}
-
-throw IllegalArgument(tmp);
-}
-m_options[-U] = ;
-break;
case 'L':
if (av[i][2] != '\0')
{
@@ -334,17 +321,9 @@ OString CppuOptions::prepareHelp()
help += -Opath = path describes the root directory for the
generated output.\n;
help += The output directory tree is generated under
this directory.\n;
help += -Tname = name specifies a type or a list of types. The
output for this\n;
-help += [t1;...] type and all dependent types are generated. If
no '-T' option is\n;
-help += specified, then output for all types is
generated.\n;
+help += [t1;...] type is generated. If no '-T' option is
specified,\n;
+help += then output for all types is generated.\n;
help += Example: 'com.sun.star.uno.XInterface' is a
valid type.\n;
-help += -U = instead of interpreting file_1 ... file_n as
type rdb files,\n;
-help += interpret them as (directories of) UNOIDL source
files. If no\n;
-help += '-T' option is given, each file_i must denote a
UNOIDL file, and\n;
-help += headers are generated for all entities
[Libreoffice-commits] core.git: cui/source
cui/source/options/optcolor.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit e2fc3ae88dafd13215019532845db76d726f151d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 16 12:49:54 2013 +0100
Related: fdo#67730 automatic turns the preview a blue color
Change-Id: I31c9129472ab64bfda283bb766fad949acb96754
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3866eb3..69a71f6 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -755,6 +755,7 @@ void ColorConfigWindow_Impl::ColorHdl (
// extended entries
unsigned const nExtCount = pExtConfig-GetComponentCount();
+i = ColorConfigEntryCount;
for (unsigned j = 0; j != nExtCount; ++j)
{
OUString sComponentName = pExtConfig-GetComponentName(j);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/cp-4.0'
New branch 'distro/collabora/cp-4.0' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'distro/collabora/cp-4.0'
New branch 'distro/collabora/cp-4.0' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'distro/collabora/cp-4.0'
New branch 'distro/collabora/cp-4.0' available with the following commits: commit 4c9818612a6359bfbdcd7a5ad57ad71bcd0e5877 Author: Andras Timar andras.ti...@collabora.com Date: Sun Sep 15 06:03:17 2013 -0700 add config file for Collabora Linux builds Change-Id: I0567d304b4e559d2e11f6a9c677930a368b79e70 commit 29e664304bb006b66527fa40e7c63cc0493d82fb Author: Andras Timar andras.ti...@collabora.com Date: Sun Sep 15 01:51:00 2013 -0700 Collabora branding Change-Id: I6d41e0e0331c0d57fe8b31931c070b0633dd3e63 commit c11fb183d6ff4194516245e4bf6272cae21f8a92 Author: Andras Timar andras.ti...@collabora.com Date: Sun Sep 15 01:40:20 2013 -0700 build full installset instead of patch Change-Id: I515d81a35659df36c90e40992fd0c21f59f0feaf commit 7abbe8b49249c640796d7488b09bd035e543d906 Author: Andras Timar andras.ti...@collabora.com Date: Sun Sep 15 01:39:29 2013 -0700 add config file for Collabora WIndows builds Change-Id: I3d33c53ab472ea96500c9c5d4940601f7e7dbf3d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'distro/collabora/cp-4.0'
New branch 'distro/collabora/cp-4.0' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 3 commits - officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7
sc/inc/calcconfig.hxx|3
sc/inc/formulagroup.hxx |1
sc/source/core/opencl/formulagroupcl.cxx | 16 -
sc/source/core/opencl/openclwrapper.cxx | 131 +--
sc/source/core/opencl/openclwrapper.hxx | 14 +
sc/source/core/tool/calcconfig.cxx |3
sc/source/core/tool/formulagroup.cxx | 90 ++
sc/source/core/tool/formulaopt.cxx | 24 ++
sc/source/ui/app/scmod.cxx |3
sc/source/ui/optdlg/calcoptionsdlg.cxx |1
11 files changed, 231 insertions(+), 62 deletions(-)
New commits:
commit 9f1002adea6c88d6553cf9ef4fc382e92b095200
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Sep 16 13:52:51 2013 +0200
store the opencl device id and propagate it from the ui to opencl code
Change-Id: I47ed4add16c804e598feebd84ae823a45d2f8dd9
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5950597..25fe724 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1344,6 +1344,13 @@
/info
valuetrue/value
/prop
+prop oor:name=OpenCLAutoDevice oor:type=xs:string
oor:nillable=false
+ !-- UIHints: Tools - Options Spreadsheet Formula --
+ info
+descThe Device ID of the OpenCL device selected if
OpenCLAutoSelect is false/desc
+ /info
+ value/value
+/prop
/group
group oor:name=Syntax
info
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 1477874..94a72cc 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -13,6 +13,8 @@
#include scdllapi.h
#include formula/grammar.hxx
+#include rtl/ustring.hxx
+
// have to match the registry values
enum ScRecalcOptions
{
@@ -30,6 +32,7 @@ struct SC_DLLPUBLIC ScCalcConfig
bool mbEmptyStringAsZero:1;
bool mbOpenCLEnabled:1;
bool mbOpenCLAutoSelect:1;
+OUString maOpenCLDevice;
ScCalcConfig();
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 72d1ab3..ea2d754 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2773,6 +2773,20 @@ namespace {
cl_device_id findDeviceIdByDeviceString(const OUString rString, const
std::vectorOpenclPlatformInfo rPlatforms)
{
+std::vectorOpenclPlatformInfo::const_iterator it = rPlatforms.begin(),
itEnd = rPlatforms.end();
+for(; it != itEnd; ++it)
+{
+std::vectorOpenclDeviceInfo::const_iterator itr =
it-maDevices.begin(), itrEnd = it-maDevices.end();
+for(; itr != itrEnd; ++itr)
+{
+OUString aDeviceId = it-maVendor + + itr-maName;
+if(rString == aDeviceId)
+{
+return static_castcl_device_id(itr-device);
+}
+}
+}
+
return NULL;
}
@@ -2851,6 +2865,10 @@ bool switchOpenclDevice(const OUString* pDevice, bool
bAutoSelect)
env.mpOclDevsID = pDeviceId;
env.mpOclCmdQueue = command_queue;
OpenclDevice::initOpenclAttr(env);
+
+// why do we need this at all?
+OpenclDevice::gpuEnv.mpArryDevsID = (cl_device_id*) malloc( 1 );
+OpenclDevice::gpuEnv.mpArryDevsID[0] = pDeviceId;
return !OpenclDevice::initOpenclRunEnv(0);
}
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index 1278402..f910bb1 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -27,7 +27,8 @@ bool ScCalcConfig::operator== (const ScCalcConfig r) const
return meStringRefAddressSyntax == r.meStringRefAddressSyntax
mbEmptyStringAsZero == r.mbEmptyStringAsZero
mbOpenCLEnabled == r.mbOpenCLEnabled
- mbOpenCLAutoSelect == r.mbOpenCLAutoSelect;
+ mbOpenCLAutoSelect == r.mbOpenCLAutoSelect
+ maOpenCLDevice == r.maOpenCLDevice;
}
bool ScCalcConfig::operator!= (const ScCalcConfig r) const
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 9b3ab9a..dd765a8 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -427,7 +427,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const
OUString rDeviceId, bool
if (!pModule)
return;
-oslGenericFunction fn = pModule-getFunctionSymbol(switchOpenclDevice);
+oslGenericFunction fn = pModule-getFunctionSymbol(switchOpenClDevice);
if (!fn)
return;
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index bf6b385..4c926e9 100644
RE: [Libreoffice-commits] core.git: formula/source: get rid of unnecessary warning
Hi Eike, Just got back from holidays, sorry I have kept you waiting. -DBG_ASSERT( 0 eOp sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode: OpCode out of range); -if (0 eOp sal_uInt16(eOp) mnSymbols) +DBG_ASSERT( sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode: OpCode out of range); +if (sal_uInt16(eOp) mnSymbols) I never saw that and I'm usually on a dbgutil build. May it be that it was caused by another change you did? It occurs with the changes as in https://gerrit.libreoffice.org/#/c/5691/ (your review on that one is highly appreciated), there may be a connection. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/shell/backing_right.png |binary 1 file changed New commits: commit 12ff414554a75c03130bdcc911157f2e89b77f2e Author: Andras Timar andras.ti...@collabora.com Date: Mon Sep 16 14:15:54 2013 +0200 remove visible artifact from CP startscreen image Change-Id: Ic9787df11c30292aaa05ed241350be65da5d0c5d diff --git a/icon-themes/galaxy/brand_cp/shell/backing_right.png b/icon-themes/galaxy/brand_cp/shell/backing_right.png index f339e26..7c760c7 100644 Binary files a/icon-themes/galaxy/brand_cp/shell/backing_right.png and b/icon-themes/galaxy/brand_cp/shell/backing_right.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optcolor.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit d6e9bb17675200e12777ed23d0c685fbd2bb4c59
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 16 13:41:43 2013 +0100
Related: fdo#67730 label overlaps listbox and steals its click
Change-Id: I9b803bb966916210495025e3811732224585c213
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 69a71f6..c6f50c7 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -346,7 +346,6 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid,
unsigned nYPos,
, m_aDefaultColor(rColorEntry.getDefaultColor())
{
m_pText = new FixedText(pGrid, WB_LEFT|WB_VCENTER|WB_3DLOOK);
-m_pText-set_grid_width(3);
m_pText-set_grid_left_attach(0);
m_pText-set_grid_top_attach(nYPos);
m_pText-set_margin_left(6 + nCheckBoxLabelOffset);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 2 commits - sc/source sc/uiconfig
sc/source/ui/optdlg/calcoptionsdlg.cxx| 40 ++
sc/source/ui/optdlg/calcoptionsdlg.hxx|2 +
sc/uiconfig/scalc/ui/formulacalculationoptions.ui | 12 ++
3 files changed, 48 insertions(+), 6 deletions(-)
New commits:
commit 3750977ceff4bd097a2b96ce610d2e94bf33786b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Sep 16 15:14:28 2013 +0200
select the correct entry when opening the dialog
Change-Id: Ib1f418e9f05ce2f57029e51ab6dfcd139d6f3f6d
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index fdf190b..9607fb6 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -211,12 +211,18 @@ void ScCalcOptionsDialog::fillOpenclList()
for(std::vectorsc::OpenclDeviceInfo::iterator
itr = it-maDevices.begin(), itrEnd = it-maDevices.end(); itr
!= itrEnd; ++itr)
{
-SvTreeListEntry* pEntry =
mpOpenclInfoList-InsertEntry(it-maVendor + + itr-maName);
+OUString aDeviceId = it-maVendor + + itr-maName;
+SvTreeListEntry* pEntry = mpOpenclInfoList-InsertEntry(aDeviceId);
+if(aDeviceId == aStoredDevice)
+{
+mpOpenclInfoList-GetModel()-GetView(0)-Select(pEntry);
+}
pEntry-SetUserData((*itr));
}
}
mpOpenclInfoList-SetUpdateMode(true);
+SelectedDeviceChanged();
}
#endif
@@ -371,6 +377,9 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
{
#if HAVE_FEATURE_OPENCL
SvTreeListEntry* pEntry =
mpOpenclInfoList-GetModel()-GetView(0)-FirstSelected();
+if(!pEntry)
+return;
+
sc::OpenclDeviceInfo* pInfo =
reinterpret_castsc::OpenclDeviceInfo*(pEntry-GetUserData());
if(pInfo)
{
commit 46fb39105cbe48497641d834a9d4370679afedf9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Sep 16 14:53:15 2013 +0200
add the software interpreter to the list
Change-Id: I1462b6321a195a6863746ce296575b64b140e0ec
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 6dd78fe..fdf190b 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -137,6 +137,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent,
const ScCalcConfig rC
maDescEmptyStringAsZero = getWindow(empty_str_as_zero_desc)-GetText();
maCaptionOpenCLEnabled = getWindow(opencl_enabled)-GetText();
maDescOpenCLEnabled = getWindow(opencl_enabled_desc)-GetText();
+maSoftware = getWindow(software)-GetText();
mpLbSettings-set_height_request(8 * mpLbSettings-GetTextHeight());
mpLbSettings-SetStyle(mpLbSettings-GetStyle() | WB_CLIPCHILDREN |
WB_FORCE_MAKEVISIBLE);
@@ -199,6 +200,10 @@ void ScCalcOptionsDialog::fillOpenclList()
{
mpOpenclInfoList-SetUpdateMode(false);
mpOpenclInfoList-Clear();
+mpOpenclInfoList-InsertEntry(maSoftware);
+
+OUString aStoredDevice = maConfig.maOpenCLDevice;
+
sc::FormulaGroupInterpreter::fillOpenCLInfo(maPlatformInfo);
for(std::vectorsc::OpenclPlatformInfo::iterator it =
maPlatformInfo.begin(),
itEnd = maPlatformInfo.end(); it != itEnd; ++it)
@@ -367,11 +372,25 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
#if HAVE_FEATURE_OPENCL
SvTreeListEntry* pEntry =
mpOpenclInfoList-GetModel()-GetView(0)-FirstSelected();
sc::OpenclDeviceInfo* pInfo =
reinterpret_castsc::OpenclDeviceInfo*(pEntry-GetUserData());
-assert(pInfo);
-mpFtFrequency-SetText(OUString::number(pInfo-mnFrequency));
-mpFtComputeUnits-SetText(OUString::number(pInfo-mnComputeUnits));
-mpFtMemory-SetText(OUString::number(pInfo-mnMemory/1024/1024));
-maConfig.maOpenCLDevice =
dynamic_castSvLBoxString*(pEntry-GetItem(1))-GetText();
+if(pInfo)
+{
+mpFtFrequency-SetText(OUString::number(pInfo-mnFrequency));
+mpFtComputeUnits-SetText(OUString::number(pInfo-mnComputeUnits));
+mpFtMemory-SetText(OUString::number(pInfo-mnMemory/1024/1024));
+}
+else
+{
+mpFtFrequency-SetText(OUString());
+mpFtComputeUnits-SetText(OUString());
+mpFtMemory-SetText(OUString());
+}
+
+OUString aDevice =
dynamic_castSvLBoxString*(pEntry-GetItem(1))-GetText();
+// use english string for configuration
+if(aDevice == maSoftware)
+aDevice = Software;
+
+maConfig.maOpenCLDevice = aDevice;
#endif
}
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 3d6b755..633c475 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -86,6 +86,8 @@ private:
OUString maCaptionOpenCLEnabled;
OUString maDescOpenCLEnabled;
+OUString maSoftware;
+
ScCalcConfig maConfig;
#if HAVE_FEATURE_OPENCL
std::vectorsc::OpenclPlatformInfo maPlatformInfo;
[Libreoffice-commits] core.git: cui/source
cui/source/inc/autocdlg.hxx |2 +-
cui/source/tabpages/autocdlg.cxx | 21 ++---
2 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 95e566b9a0df06d130e118181058273f034bcf2c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 16 15:04:47 2013 +0100
Resolves: fdo#67697 source formatting option list in autocorrect
regression from 0513e10635c85fc1aa214948de4992d4b76d555c
fdo#49350 Speedup OK action of auto-correct dialog
Change-Id: Iede6063729433beb3ac50dbdb45230c1d774cea0
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index b53b282..6e4454b 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -272,7 +272,7 @@ public:
voidSetLanguage(LanguageType eSet);
voidDeleteEntry(String sShort, String sLong);
-voidNewEntry(String sShort, String sLong);
+voidNewEntry(String sShort, String sLong, bool bKeepSourceFormatting);
};
// class OfaAutocorrExceptPage -
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 0eeb349..839b1f0 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -923,6 +923,17 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet )
for (sal_uInt32 i = 0; i rStringChangeList.aNewEntries.size(); i++)
{
DoubleString newEntry = rStringChangeList.aNewEntries[i];
+
+//fdo#67697 if the user data is set then we want to retain the
+//source formatting of the entry, so don't use the optimized
+//text-only MakeCombinedChanges for this entry
+bool bKeepSourceFormatting = newEntry.pUserData ==
bHasSelectionText;
+if (bKeepSourceFormatting)
+{
+pAutoCorrect-PutText(newEntry.sShort,
*SfxObjectShell::Current(), eCurrentLang);
+continue;
+}
+
SvxAutocorrWord aNewWord( newEntry.sShort, newEntry.sLong );
aNewWords.push_back( aNewWord );
}
@@ -1100,7 +,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl,
SvTabListBox*, pBox)
return 0;
};
-void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong)
+void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong, bool
bKeepSourceFormatting)
{
DoubleStringArray rNewArray = aChangesTable[eLang].aNewEntries;
for (sal_uInt32 i = 0; i rNewArray.size(); i++)
@@ -1126,6 +1137,8 @@ void OfaAutocorrReplacePage::NewEntry(String sShort,
String sLong)
aNewString.sShort = sShort;
aNewString.sLong = sLong;
rNewArray.push_back(aNewString);
+if (bKeepSourceFormatting)
+rNewArray.back().pUserData = bHasSelectionText;
}
void OfaAutocorrReplacePage::DeleteEntry(String sShort, String sLong)
@@ -1177,7 +1190,9 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*,
pBtn)
if(sEntry.Len() ( !m_pReplaceED-GetText().isEmpty() ||
( bHasSelectionText bSWriter ) ))
{
-NewEntry(m_pShortED-GetText(), m_pReplaceED-GetText());
+bool bKeepSourceFormatting = !bReplaceEditChanged
!m_pTextOnlyCB-IsChecked();
+
+NewEntry(m_pShortED-GetText(), m_pReplaceED-GetText(),
bKeepSourceFormatting);
m_pReplaceTLB-SetUpdateMode(sal_False);
sal_uInt32 nPos = UINT_MAX;
sEntry += '\t';
@@ -1201,7 +1216,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*,
pBtn)
SvTreeListEntry* pInsEntry = m_pReplaceTLB-InsertEntry(
sEntry, static_cast SvTreeListEntry *
(NULL), false,
nPos == UINT_MAX ? LIST_APPEND : nPos);
-if( !bReplaceEditChanged !m_pTextOnlyCB-IsChecked())
+if (bKeepSourceFormatting)
{
pInsEntry-SetUserData(bHasSelectionText); // new formatted
text
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/oox oox/source
include/oox/drawingml/shape.hxx |1 -
oox/source/drawingml/shape.cxx |7 ---
oox/source/ppt/extdrawingfragmenthandler.cxx | 13 -
oox/source/ppt/extdrawingfragmenthandler.hxx |1 -
4 files changed, 4 insertions(+), 18 deletions(-)
New commits:
commit ba511f8002a2da521f06c3a6a0c60aa6de79d170
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Sep 16 16:46:46 2013 +0200
Related bnc#819614: Set the position and name immediately.
Change-Id: I4c1046040f52e261004df95125b53e42dc8fca4b
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index 9fbf0a5..d2b892f 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -47,6 +47,9 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32
aElement,
break;
case DSP_TOKEN( spTree ):
mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation,
com.sun.star.drawing.GroupShape ) );
+mpShapePtr-setPosition( mpOrgShapePtr-getPosition() );
+mpShapePtr-setName( mpOrgShapePtr-getName() );
+
return new PPTShapeGroupContext(
*this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr,
mpShapePtr );
@@ -56,14 +59,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32
aElement,
return this;
}
-void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException)
-{
-if( mpShapePtr )
-{
-mpShapePtr-setPosition( mpOrgShapePtr-getPosition() );
-mpShapePtr-setName( mpOrgShapePtr-getName() );
-}
-}
} }
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx
b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 0b186eb..8de27ef 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -30,7 +30,6 @@ public:
oox::drawingml::ShapePtr pShapePtr ) throw();
virtual ~ExtDrawingFragmentHandler() throw();
-virtual void SAL_CALL endDocument() throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32
Element, const AttributeList rAttribs ) SAL_OVERRIDE;
private:
commit 59373b753902f69cd44d183568b084429322e7ab
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Sep 16 16:30:45 2013 +0200
Related bnc#819614: The diagram is a group.
It is not really desired to import diagrams broken into individual objects;
makes trouble with the hieararchy, and also the user wants to see it as a
group - can be ungrouped for modifications easily.
Change-Id: I0533a69af9e377804bf0e06b2ce873fd0c9bde02
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index dbe17c1..95108e7 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -101,7 +101,6 @@ public:
void setChildPosition(
com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
void setChildSize( com::sun::star::awt::Size
aSize ){ maChSize = aSize; }
-void moveAllToPosition( const
com::sun::star::awt::Point rPoint );
void setPosition( com::sun::star::awt::Point
nPosition ){ maPosition = nPosition; }
const com::sun::star::awt::Point getPosition() const { return maPosition;
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d8d127a..44a43ff 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -665,13 +665,6 @@ TextBodyPtr Shape::getTextBody()
return mpTextBody;
}
-void Shape::moveAllToPosition( const awt::Point rPoint )
-{
-setPosition( awt::Point( rPoint.X + maPosition.X, rPoint.Y + maPosition.Y
) );
-for( ::std::vectorShapePtr::const_iterator aIt = maChildren.begin(),
aEnd = maChildren.end();aIt != aEnd; ++aIt )
-(*aIt)-moveAllToPosition( rPoint );
-}
-
void Shape::setMasterTextListStyle( const TextListStylePtr
pMasterTextListStyle )
{
SAL_INFO(oox.drawingml, OSL_THIS_FUNC set master text list style to
shape id: msId);
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index e6d4b2f..9fbf0a5 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -48,7 +48,7 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32
aElement,
case DSP_TOKEN( spTree ):
mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation,
com.sun.star.drawing.GroupShape ) );
return new PPTShapeGroupContext(
-*this, mpSlidePersistPtr, meShapeLocation,
mpSlidePersistPtr-getShapes(),
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |1 +
sw/source/ui/wrtsh/select.cxx |7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Sep 16 16:25:15 2013 +0200
fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor
...
... is outside that table
Change-Id: Id61723a3b4c8265d822bccffe63b30038fcc5eab
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 89698a9..e64b63d 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1158,6 +1158,7 @@ sal_Bool SwCrsrShell::GoPrevCrsr()
void SwCrsrShell::Paint( const Rectangle rRect)
{
+comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable()
ExtendedSelectedAll());
SET_CURR_SHELL( this );
// always switch off all cursors when painting
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 4ad3f6a..149d299 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -160,7 +160,8 @@ long SwWrtShell::SelAll()
SttSelect();
GoEnd(sal_True, bMoveTable);
-if (StartsWithTable())
+bool bStartsWithTable = StartsWithTable();
+if (bStartsWithTable)
ExtendedSelectAll();
if( pStartPos )
@@ -173,9 +174,9 @@ long SwWrtShell::SelAll()
// if the last selection was behind the first section or
// if the last selection was already the first section
// In this both cases we select to the end of document
-if( *pTmpCrsr-GetPoint() *pEndPos ||
+if( ( *pTmpCrsr-GetPoint() *pEndPos ||
( *pStartPos == *pTmpCrsr-GetMark()
- *pEndPos == *pTmpCrsr-GetPoint() ) )
+ *pEndPos == *pTmpCrsr-GetPoint() ) )
!bStartsWithTable)
SwCrsrShell::SttEndDoc(sal_False);
}
delete pStartPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk solenv/gbuild unoidl/Executable_reg2unoidl.mk unoidl/Executable_unoidl-write.mk unoidl/Module_unoidl.mk unoidl/README unoidl/source
Repository.mk |2
solenv/gbuild/LinkTarget.mk |4
solenv/gbuild/UnoApiTarget.mk |4
unoidl/Executable_reg2unoidl.mk | 22
unoidl/Executable_unoidl-write.mk | 22
unoidl/Module_unoidl.mk |2
unoidl/README | 21
unoidl/source/reg2unoidl.cxx | 977 -
unoidl/source/sourceprovider.cxx | 111 ++-
unoidl/source/unoidl-write.cxx| 1112 ++
10 files changed, 1221 insertions(+), 1056 deletions(-)
New commits:
commit fc54915c461dc753866627bd52ea60b12b71a012
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 16 16:48:09 2013 +0200
Replace reg2unoidl with unoidl-write
...that can also generate an .rdb containing a specific set of entities,
intended to replace idlc (when reading directly from .idl source
registries).
Change-Id: I630ce4640828979d7952dc24dbbef80a42a8140a
diff --git a/Repository.mk b/Repository.mk
index cff654b..b3111fb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
pdfunzip \
pocheck \
propex \
- reg2unoidl \
regsvrex \
rsc \
saxparser \
@@ -60,6 +59,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
treex \
uiex \
ulfex \
+ unoidl-write \
xrmex \
))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 44fc886..b7150f0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -850,11 +850,11 @@ gb_BUILD_HELPER_LIBS := basegfx \
gb_BUILD_HELPER_TOOLS := cppumaker \
idlc \
- reg2unoidl \
regcompare \
regmerge \
rsc \
- svidl
+ svidl \
+ unoidl-write \
define gb_LinkTarget__is_build_lib
$(if $(filter $(1),$(foreach lib,$(gb_BUILD_HELPER_LIBS),$(call
gb_Library_get_linktargetname,$(lib,$(true),$(false))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 97ec264..92b812c 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -80,7 +80,7 @@ endif
gb_UnoApiTarget_REGCOMPAREDEPS := $(call
gb_Executable_get_runtime_dependencies,regcompare)
gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin
$(call gb_Executable_get_command,regcompare)
-gb_UnoApiTarget_REGMERGEDEPS := $(call
gb_Executable_get_runtime_dependencies,regmerge) $(call
gb_Executable_get_runtime_dependencies,reg2unoidl)
+gb_UnoApiTarget_REGMERGEDEPS := $(call
gb_Executable_get_runtime_dependencies,regmerge) $(call
gb_Executable_get_runtime_dependencies,unoidl-write)
gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call
gb_Executable_get_command,regmerge)
gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types)
@@ -90,7 +90,7 @@ RESPONSEFILE=$(call var2file,$(shell
$(gb_MKTEMP)),500,$(1).oldformat $(2) $(3))
$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} \
rm -f $${RESPONSEFILE} \
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin \
- $(call gb_Executable_get_command,reg2unoidl) \
+ $(call gb_Executable_get_command,unoidl-write) \
$(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) \
$(1).oldformat $(1)
endef
diff --git a/unoidl/Executable_reg2unoidl.mk b/unoidl/Executable_unoidl-write.mk
similarity index 65%
rename from unoidl/Executable_reg2unoidl.mk
rename to unoidl/Executable_unoidl-write.mk
index 7f21a08..8936955 100644
--- a/unoidl/Executable_reg2unoidl.mk
+++ b/unoidl/Executable_unoidl-write.mk
@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Executable_Executable,reg2unoidl))
+$(eval $(call gb_Executable_Executable,unoidl-write))
-$(eval $(call gb_Executable_add_exception_objects,reg2unoidl, \
-unoidl/source/reg2unoidl \
+$(eval $(call gb_Executable_add_exception_objects,unoidl-write, \
+unoidl/source/unoidl-write \
))
-$(eval $(call gb_Executable_use_libraries,reg2unoidl, \
+$(eval $(call gb_Executable_use_libraries,unoidl-write, \
sal \
salhelper \
unoidl \
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index 92a779e..c035257 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,unoidl, \
))
$(eval $(call gb_Module_add_targets_for_build,unoidl, \
-Executable_reg2unoidl \
+Executable_unoidl-write \
))
# vim: set noet sw=4 ts=4:
diff --git a/unoidl/README b/unoidl/README
index 84246e9..cf405a1 100644
--- a/unoidl/README
+++ b/unoidl/README
@@ -8,16 +8,16 @@ for both the new and the old types.rdb formats
(unoidl::loadProvider tries both
implementations in turn for a given file, so the old format is still supported
transparently for now).
-Executable_reg2unoidl is a helper tool to convert from the old to the new
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/PanelLayout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 19fd14a8ed09f1ab4c7bf9ae49df3131daea7d51
Author: Tor Lillqvist t...@collabora.com
Date: Mon Sep 16 18:43:08 2013 +0300
Correct use of where only makes sense
Shows up as a warning from Clang: use of logical '' with constant operand
I wonder how many cases we have where is used instead of but with both
operands non-constant, thus not causing any warning?
Change-Id: I8fbbcf9c08f54f8803a08a4e8c54d7bd873af800
diff --git a/svx/source/sidebar/PanelLayout.cxx
b/svx/source/sidebar/PanelLayout.cxx
index 9712b26..003ca3e 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -36,9 +36,9 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long
nWidth, long nHeight, s
if (bIsLayoutEnabled pChild-GetType() == WINDOW_SCROLLWINDOW)
{
WinBits nStyle = pChild-GetStyle();
-if (nStyle (WB_AUTOHSCROLL | WB_HSCROLL))
+if (nStyle (WB_AUTOHSCROLL | WB_HSCROLL))
bCanHandleSmallerWidth = true;
-if (nStyle (WB_AUTOVSCROLL | WB_VSCROLL))
+if (nStyle (WB_AUTOVSCROLL | WB_VSCROLL))
bCanHandleSmallerHeight = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc sc/source
sc/inc/postit.hxx |8
sc/source/core/data/postit.cxx | 29 +
2 files changed, 5 insertions(+), 32 deletions(-)
New commits:
commit 4f3275fc48a7aa22311b9824ed62276e450df8c2
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Sep 16 17:28:07 2013 +0200
clean unused methods
Change-Id: I249fa9acf2cab8217f859254a34b9073e7280b1d
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 26536a1..2b3fe01 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -271,11 +271,11 @@ public:
size_t size() const;
bool empty() const;
-ScPostIt* findByAddress(SCCOL nCol, SCROW nRow);
-const ScPostIt* findByAddress(SCCOL nCol, SCROW nRow) const;
+//ScPostIt* findByAddress(SCCOL nCol, SCROW nRow);
+//const ScPostIt* findByAddress(SCCOL nCol, SCROW nRow) const;
+//ScPostIt* findByAddress(const ScAddress rAddress);
+//const ScPostIt* findByAddress(const ScAddress rAddress) const;
-ScPostIt* findByAddress(const ScAddress rAddress);
-const ScPostIt* findByAddress(const ScAddress rAddress) const;
/**
* takes ownership of the
*/
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index f72da35..dc0ce56 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -992,34 +992,6 @@ bool ScNotes::empty() const
return maNoteMap.empty();
}
-ScPostIt* ScNotes::findByAddress(SCCOL nCol, SCROW nRow)
-{
-ScNoteMap::iterator itr = maNoteMap.find(std::pairSCCOL, SCROW(nCol,
nRow));
-if (itr != maNoteMap.end())
-return itr-second;
-
-return NULL;
-}
-
-const ScPostIt* ScNotes::findByAddress(SCCOL nCol, SCROW nRow) const
-{
-ScNoteMap::const_iterator itr = maNoteMap.find(std::pairSCCOL,
SCROW(nCol, nRow));
-if (itr != maNoteMap.end())
-return itr-second;
-
-return NULL;
-}
-
-ScPostIt* ScNotes::findByAddress(const ScAddress rPos)
-{
-return findByAddress(rPos.Col(), rPos.Row());
-}
-
-const ScPostIt* ScNotes::findByAddress(const ScAddress rPos) const
-{
-return findByAddress(rPos.Col(), rPos.Row());
-}
-
bool ScNotes::insert(SCCOL nCol, SCROW nRow, ScPostIt* pPostIt)
{
std::pairiterator, bool aResult =
maNoteMap.insert(std::pairScAddress2D, ScPostIt*(std::pairSCCOL,
SCROW(nCol, nRow), pPostIt));
@@ -1121,6 +1093,7 @@ void ScNotes::CopyFromClip(const ScNotes rNotes,
ScDocument* pDoc, SCCOL nCol1,
}
}
+
void ScNotes::erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool
bForgetCaption)
{
ScNotes::iterator itr = maNoteMap.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unoidl unoidl/source
include/unoidl/legacyprovider.hxx | 48
include/unoidl/sourceprovider.hxx | 48
include/unoidl/unoidlprovider.hxx | 60 -
unoidl/source/legacyprovider.cxx |7 +-
unoidl/source/legacyprovider.hxx | 45 +++
unoidl/source/sourceprovider.cxx | 10 ++--
unoidl/source/sourceprovider.hxx | 46 +++
unoidl/source/unoidl.cxx | 13 ++---
unoidl/source/unoidlprovider.cxx | 90 ++
unoidl/source/unoidlprovider.hxx | 48
10 files changed, 189 insertions(+), 226 deletions(-)
New commits:
commit 0ff9244d8aa8ba46025d8ae9d2e0f83385793165
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 16 17:36:42 2013 +0200
Clean up the unoidl Providers (no need to have them exported)
Change-Id: I96b99e96b44f12b7ad7f376e4b3a68d7e9531643
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index b92302d..3b38215 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -19,10 +19,11 @@
#include rtl/ref.hxx
#include rtl/ustring.hxx
#include sal/types.h
-#include unoidl/legacyprovider.hxx
#include unoidl/unoidl.hxx
-namespace unoidl {
+#include legacyprovider.hxx
+
+namespace unoidl { namespace detail {
namespace {
@@ -823,6 +824,6 @@ rtl::Reference Entity
LegacyProvider::findEntity(OUString const name)
LegacyProvider::~LegacyProvider() throw () {}
-}
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unoidl/legacyprovider.hxx
b/unoidl/source/legacyprovider.hxx
similarity index 84%
rename from include/unoidl/legacyprovider.hxx
rename to unoidl/source/legacyprovider.hxx
index cebdc1f..538b66f 100644
--- a/include/unoidl/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -14,14 +14,11 @@
#include registry/registry.hxx
#include rtl/ref.hxx
-#include sal/types.h
-#include unoidl/detail/dllapi.hxx
#include unoidl/unoidl.hxx
+namespace unoidl { namespace detail {
-namespace unoidl {
-
-class LO_DLLPUBLIC_UNOIDL LegacyProvider: public Provider {
+class LegacyProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
LegacyProvider(
@@ -35,13 +32,13 @@ public:
const;
private:
-virtual SAL_DLLPRIVATE ~LegacyProvider() throw ();
+virtual ~LegacyProvider() throw ();
rtl::Reference Manager manager_;
mutable RegistryKey ucr_;
};
-}
+} }
#endif
diff --git a/unoidl/source/sourceprovider.cxx b/unoidl/source/sourceprovider.cxx
index ea7f110..429f68f 100755
--- a/unoidl/source/sourceprovider.cxx
+++ b/unoidl/source/sourceprovider.cxx
@@ -20,14 +20,14 @@
#include rtl/ref.hxx
#include rtl/ustrbuf.hxx
#include rtl/ustring.hxx
-#include unoidl/sourceprovider.hxx
#include unoidl/unoidl.hxx
#include sourceprovider-parser-requires.hxx
#include sourceprovider-parser.hxx
#include sourceprovider-scanner.hxx
+#include sourceprovider.hxx
-namespace unoidl {
+namespace unoidl { namespace detail {
namespace {
@@ -35,7 +35,7 @@ rtl::ReferenceEntity parse(
rtl::ReferenceManager const manager, OUString const name,
OUString const uri, void const * address, sal_uInt64 size)
{
-detail::SourceProviderScannerData data(manager, address, size);
+SourceProviderScannerData data(manager, address, size);
yyscan_t yyscanner;
if (yylex_init_extra(data, yyscanner) != 0) {
// Checking errno for the specific EINVAL, ENOMEM documented for
@@ -50,7 +50,7 @@ rtl::ReferenceEntity parse(
switch (e) {
case 0:
{
-std::mapOUString, detail::SourceProviderEntity::const_iterator i(
+std::mapOUString, SourceProviderEntity::const_iterator i(
data.entities.find(name));
return i == data.entities.end()
? rtl::ReferenceEntity() : i-second.entity;
@@ -230,6 +230,6 @@ rtl::ReferenceEntity SourceProvider::findEntity(OUString
const name) const {
SourceProvider::~SourceProvider() throw () {}
-}
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unoidl/sourceprovider.hxx
b/unoidl/source/sourceprovider.hxx
similarity index 85%
rename from include/unoidl/sourceprovider.hxx
rename to unoidl/source/sourceprovider.hxx
index e596711..e7ee92f 100644
--- a/include/unoidl/sourceprovider.hxx
+++ b/unoidl/source/sourceprovider.hxx
@@ -15,13 +15,11 @@
#include map
#include rtl/ref.hxx
-#include sal/types.h
-#include unoidl/detail/dllapi.hxx
#include unoidl/unoidl.hxx
-namespace unoidl {
+namespace unoidl { namespace detail {
-class LO_DLLPUBLIC_UNOIDL SourceProvider: public Provider {
+class SourceProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
SourceProvider(
@@ -34,14 +32,14 @@ public:
virtual rtl::ReferenceEntity findEntity(OUString const name) const;
Re: [Libreoffice-commits] core.git: formula/source: get rid of unnecessary warning
Hi Winfried, On Monday, 2013-09-16 14:03:20 +0200, Winfried Donkers wrote: -DBG_ASSERT( 0 eOp sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode: OpCode out of range); -if (0 eOp sal_uInt16(eOp) mnSymbols) +DBG_ASSERT( sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode: OpCode out of range); +if (sal_uInt16(eOp) mnSymbols) I never saw that and I'm usually on a dbgutil build. May it be that it was caused by another change you did? It occurs with the changes as in https://gerrit.libreoffice.org/#/c/5691/ (your review on that one is highly appreciated), there may be a connection. Reviewed.. I still did not see that assertion, but I see a bunch of other assertions, formula/source/core/api/FormulaCompiler.cxx:501: OpCodeMap::putOpCode: reusing OpCode ... It is not related to your change. It occurs always when an UI language != en-US is active and the Use English function names option is activated. For en-US there are still four reuses with that option on, OpCode 256 (ZGZ) OpCode 362 (TABLE) OpCode 411 () OpCode 412 () The last two would be the new functions FILTERXML and WEBSERVICE I'll revert the other commit that excluded opcode 0 from the assertion and investigate what's going wrong else. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpJSGGORnTCW.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source
formula/source/core/api/FormulaCompiler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2f2ee162ac521b9ad90651429253b9bf569f1797
Author: Eike Rathke er...@redhat.com
Date: Mon Sep 16 19:09:17 2013 +0200
Revert get rid of unnecessary warning
This reverts commit e5321437322fd812b93fee266af309e782479488.
OpCode 0 (ocPush) was deliberately included in the assertion as it is
never a mapping to a function or operator name.
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index d9861cf..4cb1164 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -488,8 +488,8 @@ uno::Sequence sheet::FormulaOpCodeMapEntry
FormulaCompiler::OpCodeMap::create
void FormulaCompiler::OpCodeMap::putOpCode( const String rStr, const OpCode
eOp )
{
-DBG_ASSERT( sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode: OpCode out
of range);
-if (sal_uInt16(eOp) mnSymbols)
+DBG_ASSERT( 0 eOp sal_uInt16(eOp) mnSymbols, OpCodeMap::putOpCode:
OpCode out of range);
+if (0 eOp sal_uInt16(eOp) mnSymbols)
{
DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) ||
(eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
Hi, Le 16/09/2013 09:34, Miklos Vajna a écrit : Hi, On Sat, Sep 14, 2013 at 08:50:43AM +0200, Jean-Baptiste Faure jbf.fa...@sud-ouest.org wrote: Since this change (it seems) I get the following error message each time I launch the master after a make dev-install : fopen /home/.../LibO/master/solver/unxlngx6.pro/installation/opt/program/pagein-common: No such file or directory I got the same, just don't use dev-install anymore, it's not necessary. If you run instdir/*/program/soffice, that should work. Indeed that works. Thank you very much Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 72 +---
1 file changed, 49 insertions(+), 23 deletions(-)
New commits:
commit c7f043f5abaf19fce179ebf5f9b8053202e6841a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Sep 16 20:08:32 2013 +0200
only list opencl devices with double support
Change-Id: I90eec86fff08fd20f4567551932bf328adc85859
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index ea2d754..511c8df 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -729,6 +729,42 @@ int OpenclDevice::initOpenclRunEnv( int argc )
return 0;
}
+namespace {
+
+void checkDeviceForDoubleSupport(cl_device_id deviceId, bool bKhrFp64, bool
bAmdFp64)
+{
+bKhrFp64 = false;
+bAmdFp64 = false;
+
+// Check device extensions for double type
+size_t aDevExtInfoSize = 0;
+
+cl_uint clStatus = clGetDeviceInfo( deviceId, CL_DEVICE_EXTENSIONS, 0,
NULL, aDevExtInfoSize );
+if( clStatus != CL_SUCCESS )
+return;
+
+boost::scoped_arraychar pExtInfo(new char[aDevExtInfoSize]);
+
+clStatus = clGetDeviceInfo( deviceId, CL_DEVICE_EXTENSIONS,
+ sizeof(char) * aDevExtInfoSize, pExtInfo.get(), NULL);
+
+if( clStatus != CL_SUCCESS )
+return;
+
+if ( strstr( pExtInfo.get(), cl_khr_fp64 ) )
+{
+bKhrFp64 = true;
+}
+else
+{
+// Check if cl_amd_fp64 extension is supported
+if ( strstr( pExtInfo.get(), cl_amd_fp64 ) )
+bAmdFp64 = true;
+}
+}
+
+}
+
int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
{
size_t length;
@@ -859,32 +895,14 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
}
clStatus = clGetCommandQueueInfo( gpuInfo-mpCmdQueue,
CL_QUEUE_THREAD_HANDLE_AMD, 0, NULL, NULL );
-// Check device extensions for double type
-size_t aDevExtInfoSize = 0;
-
-clStatus = clGetDeviceInfo( gpuInfo-mpArryDevsID[0],
CL_DEVICE_EXTENSIONS, 0, NULL, aDevExtInfoSize );
-CHECK_OPENCL( clStatus, clGetDeviceInfo );
-
-char *aExtInfo = new char[aDevExtInfoSize];
-clStatus = clGetDeviceInfo( gpuInfo-mpArryDevsID[0], CL_DEVICE_EXTENSIONS,
- sizeof(char) * aDevExtInfoSize, aExtInfo, NULL);
-CHECK_OPENCL( clStatus, clGetDeviceInfo );
+bool bKhrFp64 = false;
+bool bAmdFp64 = false;
-gpuInfo-mnKhrFp64Flag = 0;
-gpuInfo-mnAmdFp64Flag = 0;
+checkDeviceForDoubleSupport(gpuInfo-mpArryDevsID[0], bKhrFp64, bAmdFp64);
-if ( strstr( aExtInfo, cl_khr_fp64 ) )
-{
-gpuInfo-mnKhrFp64Flag = 1;
-}
-else
-{
-// Check if cl_amd_fp64 extension is supported
-if ( strstr( aExtInfo, cl_amd_fp64 ) )
-gpuInfo-mnAmdFp64Flag = 1;
-}
-delete []aExtInfo;
+gpuInfo-mnKhrFp64Flag = bKhrFp64;
+gpuInfo-mnAmdFp64Flag = bAmdFp64;
return 0;
}
@@ -2675,6 +2693,14 @@ void createDeviceInfo(cl_device_id aDeviceId,
OpenclPlatformInfo rPlatformInfo)
if(nState != CL_SUCCESS)
return;
+bool bKhrFp64 = false;
+bool bAmdFp64 = false;
+checkDeviceForDoubleSupport(aDeviceId, bKhrFp64, bAmdFp64);
+
+// only list devices that support double
+if(!bKhrFp64 !bAmdFp64)
+return;
+
aDeviceInfo.mnComputeUnits = nComputeUnits;
rPlatformInfo.maDevices.push_back(aDeviceInfo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source
formula/source/core/api/FormulaCompiler.cxx | 399 +---
1 file changed, 193 insertions(+), 206 deletions(-)
New commits:
commit 2e60a634ec8ce939ec9dc3df10f12cee84bd7c7e
Author: Eike Rathke er...@redhat.com
Date: Mon Sep 16 20:46:41 2013 +0200
deuglified for readability
Change-Id: I81e09500dd8fe4e3af9fc2e9f623fb519635266d
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 4cb1164..4917eec 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -33,18 +33,15 @@
#include rtl/strbuf.hxx
#include stdio.h
-//
=
namespace formula
{
-//
=
using namespace ::com::sun::star;
static const sal_Char* pInternal[ 1 ] = { TTT };
-//
=
namespace
{
-//
=
+
class FormulaCompilerRecursionGuard
{
private:
@@ -120,7 +117,8 @@ short lcl_GetRetFormat( OpCode eOpCode )
}
}
-inline void lclPushOpCodeMapEntry( ::std::vector sheet::FormulaOpCodeMapEntry
rVec, const String* pTable, sal_uInt16 nOpCode )
+inline void lclPushOpCodeMapEntry( ::std::vector sheet::FormulaOpCodeMapEntry
rVec,
+const String* pTable, sal_uInt16 nOpCode )
{
sheet::FormulaOpCodeMapEntry aEntry;
aEntry.Token.OpCode = nOpCode;
@@ -128,13 +126,15 @@ inline void lclPushOpCodeMapEntry( ::std::vector
sheet::FormulaOpCodeMapEntry
rVec.push_back( aEntry);
}
-void lclPushOpCodeMapEntries( ::std::vector sheet::FormulaOpCodeMapEntry
rVec, const String* pTable, sal_uInt16 nOpCodeBeg, sal_uInt16 nOpCodeEnd )
+void lclPushOpCodeMapEntries( ::std::vector sheet::FormulaOpCodeMapEntry
rVec,
+const String* pTable, sal_uInt16 nOpCodeBeg, sal_uInt16 nOpCodeEnd )
{
for (sal_uInt16 nOpCode = nOpCodeBeg; nOpCode nOpCodeEnd; ++nOpCode)
lclPushOpCodeMapEntry( rVec, pTable, nOpCode );
}
-void lclPushOpCodeMapEntries( ::std::vector sheet::FormulaOpCodeMapEntry
rVec, const String* pTable, const sal_uInt16* pnOpCodes, size_t nCount )
+void lclPushOpCodeMapEntries( ::std::vector sheet::FormulaOpCodeMapEntry
rVec,
+const String* pTable, const sal_uInt16* pnOpCodes, size_t nCount )
{
for (const sal_uInt16* pnEnd = pnOpCodes + nCount; pnOpCodes pnEnd;
++pnOpCodes)
lclPushOpCodeMapEntry( rVec, pTable, *pnOpCodes );
@@ -160,16 +160,16 @@ private:
};
OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr
xMap ) :
-Resource( ResId(nRID,*ResourceManager::getResManager()) )
-,meSepType(SEMICOLON_BASE)
+Resource( ResId( nRID, *ResourceManager::getResManager()))
+, meSepType( SEMICOLON_BASE)
{
- for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
+for (sal_uInt16 i = 0; i = SC_OPCODE_LAST_OPCODE_ID; ++i)
{
String aOpStr;
-if ( getOpCodeString(aOpStr, i) )
-xMap-putOpCode(aOpStr, OpCode(i));
+if ( getOpCodeString( aOpStr, i) )
+xMap-putOpCode( aOpStr, OpCode(i));
else
-putDefaultOpCode(xMap, i);
+putDefaultOpCode( xMap, i);
}
FreeResource();
@@ -228,14 +228,14 @@ bool OpCodeList::getOpCodeString( String rStr,
sal_uInt16 nOp )
void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap,
sal_uInt16 nOp )
{
-ResId aRes(nOp,*ResourceManager::getResManager());
-aRes.SetRT(RSC_STRING);
-if (IsAvailableRes(aRes))
-xMap-putOpCode(aRes.toString(), OpCode(nOp));
+ResId aRes( nOp, *ResourceManager::getResManager());
+aRes.SetRT( RSC_STRING);
+if (IsAvailableRes( aRes))
+xMap-putOpCode( aRes.toString(), OpCode( nOp));
}
-//
-
+
// static
-const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr,sal_Unicode c )
+const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c )
{
if ( !pStr )
return NULL;
@@ -247,9 +247,9 @@ const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode*
pStr,sal_Unicode c )
}
return NULL;
}
-//
=
-} // empty
-//
=
+
+} // namespace
+
void FormulaCompiler::OpCodeMap::putExternal( const String rSymbol, const
String rAddIn )
{
@@ -274,7 +274,9 @@ void FormulaCompiler::OpCodeMap::putExternalSoftly( const
String rSymbol, cons
if (bOk)
mpExternalHashMap-insert( ExternalHashMap::value_type( rSymbol,
rAddIn));
}
-uno::Sequence sheet::FormulaToken
[Libreoffice-commits] core.git: 4 commits - xmloff/Library_xo.mk xmloff/source
xmloff/Library_xo.mk |5
xmloff/source/style/impastp1.cxx | 46 ---
xmloff/source/style/impastp2.cxx | 50 ---
xmloff/source/style/impastp3.cxx | 143 -
xmloff/source/style/impastp4.cxx | 404 ---
xmloff/source/style/impastpl.cxx | 574 +++
6 files changed, 575 insertions(+), 647 deletions(-)
New commits:
commit 69f08eda0bd999c827c76d3bf0b9c925b7eb25f7
Author: Tor Lillqvist t...@collabora.com
Date: Mon Sep 16 16:03:32 2013 +0300
Insert impastp4.cxx into impastpl.cxx
Change-Id: Iccd059e2d09666775f8391a1ac2a074518a5c111
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index d2d52a7..b72172b 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -247,7 +247,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/escphdl \
xmloff/source/style/fonthdl \
xmloff/source/style/impastpl \
-xmloff/source/style/impastp4 \
xmloff/source/style/kernihdl \
xmloff/source/style/lspachdl \
xmloff/source/style/numehelp \
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
deleted file mode 100644
index 8aa7214..000
--- a/xmloff/source/style/impastp4.cxx
+++ /dev/null
@@ -1,404 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include tools/debug.hxx
-#include xmloff/xmlaustp.hxx
-#include xmloff/xmltoken.hxx
-#include xmloff/nmspmap.hxx
-#include xmloff/xmlnmspe.hxx
-#include xmloff/attrlist.hxx
-#include impastpl.hxx
-#include xmloff/xmlexppr.hxx
-#include xmloff/xmlexp.hxx
-#include xmloff/families.hxx
-#include xmloff/PageMasterStyleMap.hxx
-
-using namespace ::std;
-
-using namespace ::com::sun::star;
-using namespace ::xmloff::token;
-
-// Class SvXMLAutoStylePool_Impl
-// ctor/dtor class SvXMLAutoStylePool_Impl
-
-SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport rExp)
-: rExport( rExp )
-{
-}
-
-SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
-{
-}
-
-// Adds stylefamily-information to sorted list
-
-void SvXMLAutoStylePoolP_Impl::AddFamily(
-sal_Int32 nFamily,
-const OUString rStrName,
-const UniReference SvXMLExportPropertyMapper rMapper,
- const OUString rStrPrefix,
-sal_Bool bAsFamily )
-{
-// store family in a list if not already stored
-sal_uInt16 nExportFlags = GetExport().getExportFlags();
-sal_Bool bStylesOnly = (nExportFlags EXPORT_STYLES) != 0
(nExportFlags EXPORT_CONTENT) == 0;
-
-OUString aPrefix( rStrPrefix );
-if( bStylesOnly )
-{
-aPrefix = OUString( 'M' );
-aPrefix += rStrPrefix;
-}
-
-#if OSL_DEBUG_LEVEL 0
-XMLAutoStyleFamily aTemporary( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
-if( aFind != maFamilyList.end() )
-{
-// FIXME: do we really intend to replace the previous nFamily
-// entry in this case ?
-SAL_WARN_IF( aFind-mxMapper != rMapper, xmloff,
- Adding duplicate family rStrName
- with mismatching mapper !
- typeid(*aFind-mxMapper.get()).name()
- typeid(*rMapper.get()).name() );
-}
-#endif
-
-XMLAutoStyleFamily *pFamily = new XMLAutoStyleFamily( nFamily, rStrName,
rMapper, aPrefix, bAsFamily );
-maFamilyList.insert(pFamily);
-}
-
-void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
-sal_Int32 nFamily,
-const UniReference SvXMLExportPropertyMapper rMapper )
-{
-
-XMLAutoStyleFamily aTemporary( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
-if (aFind != maFamilyList.end())
-aFind-mxMapper = rMapper;
-}
-
-// Adds a name to list
-void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const
OUString rName )
-{
-XMLAutoStyleFamily aTmp( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTmp);
-DBG_ASSERT( aFind != maFamilyList.end(),
-SvXMLAutoStylePool_Impl::RegisterName: unknown family );
-if (aFind !=
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ac819279eb4d7ec2f638099ce7d8f5ec1f1ed1b6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 14:33:35 2013 -0400
Need return statement here...
Change-Id: Id6a63ee106b50ccb5558c8c9aa7fe363e2a1ee29
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 370a72d..a02ba5d 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1091,7 +1091,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL
fillOpenCLInfo(sc::OpenclPlatformInfo* pInfos
SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice(const OUString*
pDeviceId, bool bAutoSelect)
{
-sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect);
+return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/iosremote
ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib | 117
--
ios/iosremote/InAppSettingsKit/Xibs/IASKSpecifierValuesView.xib | 92 ++-
ios/iosremote/iosremote/Timer.m |3
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m |2
ios/iosremote/iosremote/slideShow_vc_iphone.m | 19 -
5 files changed, 80 insertions(+), 153 deletions(-)
New commits:
commit a3abd12f1f20fed25f7719d613a8e287ec1e5e06
Author: Siqi LIU m...@siqi.fr
Date: Mon Sep 16 22:04:23 2013 +0200
change setting bundle background to stay consistent
Change-Id: Idf131349f91c949af57bdb79929f73b7a202ab93
diff --git a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
index 74720fa..7ba3bea 100755
--- a/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
+++ b/ios/iosremote/InAppSettingsKit/Xibs/IASKAppSettingsView.xib
@@ -1,14 +1,14 @@
?xml version=1.0 encoding=UTF-8?
archive type=com.apple.InterfaceBuilder3.CocoaTouch.XIB version=7.10
data
- int key=IBDocument.SystemTarget1280/int
- string key=IBDocument.SystemVersion11B26/string
- string key=IBDocument.InterfaceBuilderVersion1934/string
- string key=IBDocument.AppKitVersion1138/string
- string key=IBDocument.HIToolboxVersion566.00/string
+ int key=IBDocument.SystemTarget1552/int
+ string key=IBDocument.SystemVersion12E55/string
+ string key=IBDocument.InterfaceBuilderVersion3084/string
+ string key=IBDocument.AppKitVersion1187.39/string
+ string key=IBDocument.HIToolboxVersion626.00/string
object class=NSMutableDictionary
key=IBDocument.PluginVersions
string
key=NS.key.0com.apple.InterfaceBuilder.IBCocoaTouchPlugin/string
- string key=NS.object.0931/string
+ string key=NS.object.02083/string
/object
object class=NSArray
key=IBDocument.IntegratedClassDependencies
bool key=EncodedWithXMLCoderYES/bool
@@ -38,67 +38,10 @@
int key=NSvFlags274/int
string key=NSFrameSize{320, 460}/string
reference key=NSSuperview/
- reference key=NSNextKeyView/
+ reference key=NSWindow/
object class=NSColor
key=IBUIBackgroundColor
- int key=NSColorSpace10/int
- object class=NSImage key=NSImage
- int
key=NSImageFlags549453824/int
- string key=NSSize{512,
1}/string
- object class=NSMutableArray
key=NSReps
- bool
key=EncodedWithXMLCoderYES/bool
- object class=NSArray
- bool
key=EncodedWithXMLCoderYES/bool
- integer
value=0/
- object
class=NSBitmapImageRep
- object
class=NSData key=NSTIFFRepresentation
-
bytes
key=NS.bytesTU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
-y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
-xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
-xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
-xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
-xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
-y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/dbdocfun.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f499acb2af1d879c776987bdc2366acb5d5964e6 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Sep 15 22:39:23 2013 +0200 fdo#69091: Copying data from Base-table to Calc by drag and drop Depending on whether the data source is registered, either rDescriptor[svx::daDataSource] or rDescriptor[svx::daDatabaseLocation] will be filled in (and should be used). Luckily, ODataAccessDescriptor provides a utility function that will automatically return the one that is set. Use that instead of hardcoding svx::daDataSource. Thank you Lionel! Change-Id: I02673e7924c4323915dea579015326194c3f5077 diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 1c35fd6..dc31cd9 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1698,7 +1698,7 @@ void ScDBDocFunc::UpdateImport( const String rTarget, const svx::ODataAccessDes OUString sDBName; OUString sDBTable; sal_Int32 nCommandType = 0; -rDescriptor[svx::daDataSource] = sDBName; +sDBName = rDescriptor.getDataSource(); rDescriptor[svx::daCommand] = sDBTable; rDescriptor[svx::daCommandType] = nCommandType; ___ 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' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22909e644827e6d5bc98b64d581c0616ffb5483c Author: Julien Nabet serval2...@yahoo.fr Date: Sun Sep 15 22:39:23 2013 +0200 fdo#69091: Copying data from Base-table to Calc by drag and drop Depending on whether the data source is registered, either rDescriptor[svx::daDataSource] or rDescriptor[svx::daDatabaseLocation] will be filled in (and should be used). Luckily, ODataAccessDescriptor provides a utility function that will automatically return the one that is set. Use that instead of hardcoding svx::daDataSource. Thank you Lionel! Change-Id: I02673e7924c4323915dea579015326194c3f5077 Reviewed-on: https://gerrit.libreoffice.org/5959 Tested-by: Lionel Elie Mamane lio...@mamane.lu Reviewed-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 5a4b6fd..cd4e38a 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1698,7 +1698,7 @@ void ScDBDocFunc::UpdateImport( const String rTarget, const svx::ODataAccessDes OUString sDBName; OUString sDBTable; sal_Int32 nCommandType = 0; -rDescriptor[svx::daDataSource] = sDBName; +sDBName = rDescriptor.getDataSource(); rDescriptor[svx::daCommand] = sDBTable; rDescriptor[svx::daCommandType] = nCommandType; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a8b337b54690c6962994da8646064665b3f2009 Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 16 20:34:03 2013 +0100 Updated core Project: help 397491d21c2c306e9913ca2672ee968153bdcffe diff --git a/helpcontent2 b/helpcontent2 index b28f1c1..397491d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b28f1c1eafe23a8106592aeef0dfe0e235eb0b9a +Subproject commit 397491d21c2c306e9913ca2672ee968153bdcffe ___ 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
helpers/help_hid.lst |3 --- source/text/swriter/01/mm_copyto.xhp |5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 397491d21c2c306e9913ca2672ee968153bdcffe Author: Caolán McNamara caol...@redhat.com Date: Mon Sep 16 20:34:03 2013 +0100 update help ids for copy to (cc) dialog .ui conversion Change-Id: I5ed5a4ffdfab65a348fffbade5b2d96f3b198b84 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 47fd3f3..cd4ad8c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2384,7 +2384,6 @@ HID_MM_BODY_LB_FEMALECOLUMN,55031, HID_MM_BODY_LB_MALE,55029, HID_MM_BODY_PB_FEMALE,55028, HID_MM_BODY_PB_MALE,55030, -HID_MM_COPYTO,54975, HID_MM_CREATEADDRESSLIST,54966, HID_MM_CUSTOMFIELDS,54986, HID_MM_DBTABLEPREVIEWDIALOG,54965, @@ -7272,8 +7271,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977, sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969, sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960, -sw_Edit_DLG_MM_COPYTO_ED_BCC,1435387949, -sw_Edit_DLG_MM_COPYTO_ED_CC,1435387947, sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND,898287622, sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052, sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035, diff --git a/source/text/swriter/01/mm_copyto.xhp b/source/text/swriter/01/mm_copyto.xhp index 7cb3a96..e22cc15 100644 --- a/source/text/swriter/01/mm_copyto.xhp +++ b/source/text/swriter/01/mm_copyto.xhp @@ -31,12 +31,13 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/ccdialog/CCDialog id=bm_id2162235 localize=false/ paragraph role=heading id=par_idN10539 xml-lang=en-US level=1 l10n=NEWCopy To/paragraph paragraph role=paragraph id=par_idN1053D xml-lang=en-US l10n=NEWSpecify additional e-mail recipients for the link href=text/swriter/01/mailmerge08.xhpmail merge/link document./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_MM_COPYTO:ED_CC id=bm_id2162236 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/ccdialog/cc id=bm_id2162236 localize=false/ paragraph role=heading id=par_idN1054E xml-lang=en-US level=2 l10n=NEWCC/paragraph paragraph role=paragraph id=par_idN10552 xml-lang=en-US l10n=NEWahelp hid=.Enter the recipients of e-mail copies, separated by a semicolon (;)./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_MM_COPYTO:ED_BCC id=bm_id3037202 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/ccdialog/bcc id=bm_id3037202 localize=false/ paragraph role=heading id=par_idN10555 xml-lang=en-US level=2 l10n=NEWBCC/paragraph paragraph role=paragraph id=par_idN10559 xml-lang=en-US l10n=NEWahelp hid=.Enter the recipients of e-mail blind copies, separated by a semicolon (;)./ahelp/paragraph /body ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 16
sc/source/core/opencl/openclwrapper.hxx | 27 +--
2 files changed, 9 insertions(+), 34 deletions(-)
New commits:
commit d9b20e4440e3124aece7a55bd0f07ec175de6b35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 15:35:31 2013 -0400
Some cleanups.
Change-Id: I35bc92fc4bd5feb80b804d411fcd29feacab41ee
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 511c8df..a5dcd57 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -400,22 +400,6 @@ int OpenclDevice::initOpenclAttr( OpenCLEnv * env )
return 0;
}
-int OpenclDevice::createKernel( char * kernelname, KernelEnv * env )
-{
-int clStatus;
-
-env-mpkKernel = clCreateKernel( gpuEnv.mpArryPrograms[0], kernelname,
clStatus );
-env-mpkContext = gpuEnv.mpContext;
-env-mpkCmdQueue = gpuEnv.mpCmdQueue;
-return clStatus != CL_SUCCESS ? 1 : 0;
-}
-
-int OpenclDevice::releaseKernel( KernelEnv * env )
-{
-int clStatus = clReleaseKernel( env-mpkKernel );
-return clStatus != CL_SUCCESS ? 1 : 0;
-}
-
int OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo )
{
int i = 0;
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index e11bdfb..cefec0d 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -93,15 +93,15 @@ namespace sc { namespace opencl {
typedef unsigned int uint;
-typedef struct _OpenCLEnv
+struct OpenCLEnv
{
cl_platform_id mpOclPlatformID;
cl_context mpOclContext;
cl_device_id mpOclDevsID;
cl_command_queue mpOclCmdQueue;
-} OpenCLEnv;
+};
-typedef struct _GPUEnv
+struct GPUEnv
{
//share vb in all modules in hb library
cl_platform_id mpPlatformID;
@@ -119,15 +119,9 @@ typedef struct _GPUEnv
mnIsUserCreated; // 1: created , 0:no create and needed to create by
opencl wrapper
int mnKhrFp64Flag;
int mnAmdFp64Flag;
+};
-} GPUEnv;
-
-typedef struct
-{
-char kernelName[MAX_KERNEL_NAME_LEN + 1];
-char *kernelStr;
-} kernel_node;
-typedef struct _SingleVectorFormula
+struct SingleVectorFormula
{
const double *mdpInputLeftData;
const double *mdpInputRightData;
@@ -137,9 +131,9 @@ typedef struct _SingleVectorFormula
uint mnInputRightStartPosition;
int mnInputLeftOffset;
int mnInputRightOffset;
-} SingleVectorFormula;
+};
-typedef struct _DoubleVectorFormula
+struct DoubleVectorFormula
{
const double *mdpInputData;
size_t mnInputDataSize;
@@ -147,7 +141,8 @@ typedef struct _DoubleVectorFormula
uint mnInputEndPosition;
int mnInputStartOffset;
int mnInputEndOffset;
-} DoubleVectorFormula;
+};
+
class OpenclCalcBase
{
public:
@@ -169,8 +164,6 @@ public:
virtual int oclGroundWaterGroup( uint *eOp, uint eOpNum, const double
*pOpArray, const double *pSubtractSingle, size_t nSrcDataSize,size_t nElements,
double delta,uint *nStartPos,uint *nEndPos ,double *deResult)=0;
virtual double *oclSimpleDeltaOperation( OpCode eOp, const double
*pOpArray, const double *pSubtractSingle, size_t nElements, double delta )=0;
-
-
};
@@ -196,9 +189,7 @@ public:
static int compileKernelFile( const char *filename, GPUEnv *gpuInfo, const
char *buildOption );
static int initOpenclAttr( OpenCLEnv * env );
-int releaseKernel( KernelEnv * env );
int setKernelEnv( KernelEnv *envInfo );
-int createKernel( char * kernelname, KernelEnv * env );
int runKernel( const char *kernelName, void **userdata );
int convertToString( const char *filename, char **source );
int checkKernelName( KernelEnv *envInfo, const char *kernelName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4deb3ec0d5d94a36b3941176b30e662184d2297a Author: Julien Nabet serval2...@yahoo.fr Date: Sun Sep 15 22:39:23 2013 +0200 fdo#69091: Copying data from Base-table to Calc by drag and drop Depending on whether the data source is registered, either rDescriptor[svx::daDataSource] or rDescriptor[svx::daDatabaseLocation] will be filled in (and should be used). Luckily, ODataAccessDescriptor provides a utility function that will automatically return the one that is set. Use that instead of hardcoding svx::daDataSource. Thank you Lionel! Change-Id: I02673e7924c4323915dea579015326194c3f5077 Reviewed-on: https://gerrit.libreoffice.org/5960 Tested-by: Lionel Elie Mamane lio...@mamane.lu Reviewed-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 9f4d58d..79130fd 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1535,7 +1535,7 @@ void ScDBDocFunc::UpdateImport( const String rTarget, const svx::ODataAccessDes rtl::OUString sDBName; rtl::OUString sDBTable; sal_Int32 nCommandType = 0; -rDescriptor[svx::daDataSource] = sDBName; +sDBName = rDescriptor.getDataSource(); rDescriptor[svx::daCommand] = sDBTable; rDescriptor[svx::daCommandType] = nCommandType; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|2
sw/inc/helpid.h|1
sw/source/ui/dbui/mmoutputpage.cxx | 57 ++
sw/source/ui/dbui/mmoutputpage.hrc |4
sw/source/ui/dbui/mmoutputpage.src | 72 -
sw/source/ui/envelp/envfmt.cxx |8 -
sw/uiconfig/swriter/ui/ccdialog.ui | 197 +
8 files changed, 217 insertions(+), 125 deletions(-)
New commits:
commit bc01ebe47c04228cf729a8f87af3efeab213dc3a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 16 20:25:59 2013 +0100
convert copy to (cc) dialog to .ui
Change-Id: I1d5ef0410a0e3d325fb6cf42dad2c07eeb89a87a
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b118f47..9df8021 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/cardformatpage \
sw/uiconfig/swriter/ui/cardmediumpage \
+ sw/uiconfig/swriter/ui/ccdialog \
sw/uiconfig/swriter/ui/characterproperties \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columndialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 361b7da..0ced6d1 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -42,7 +42,7 @@
#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
#define DLG_MM_LAYOUT_PAGE(RC_DBUI_BEGIN + 22)
-#define DLG_MM_COPYTO (RC_DBUI_BEGIN + 23)
+
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 34f861e..344a790 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -381,7 +381,6 @@
#define HID_MM_CREATEADDRESSLIST
SW_HID_MM_CREATEADDRESSLIST
#define HID_MM_ASSIGNFIELDS
SW_HID_MM_ASSIGNFIELDS
#define HID_MM_LAYOUT_PAGE
SW_HID_MM_LAYOUT_PAGE
-#define HID_MM_COPYTO
SW_HID_MM_COPYTO
#define HID_MM_ADDRESSLIST_HB
SW_HID_MM_ADDRESSLIST_HB
#define HID_MM_TESTACCOUNTSETTINGS
SW_HID_MM_TESTACCOUNTSETTINGS
#define HID_MM_TESTACCOUNTSETTINGS_TLB
SW_HID_MM_TESTACCOUNTSETTINGS_TLB
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx
b/sw/source/ui/dbui/mmoutputpage.cxx
index 2a5de59..bf1ec91 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -213,56 +213,25 @@ IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit*, pEdit)
class SwCopyToDialog : public SfxModalDialog
{
-FixedInfo m_aDescriptionFI;
-FixedText m_aCCFT;
-Editm_aCCED;
-FixedText m_aBCCFT;
-Editm_aBCCED;
-
-FixedInfo m_aNoteFI;
-FixedLine m_aSeparatorFL;
-
-OKButtonm_aOK;
-CancelButtonm_aCancel;
-HelpButton m_aHelp;
+Edit* m_pCCED;
+Edit* m_pBCCED;
public:
-SwCopyToDialog(Window* pParent);
-~SwCopyToDialog();
+SwCopyToDialog(Window* pParent)
+: SfxModalDialog(pParent, CCDialog,
+modules/swriter/ui/ccdialog.ui)
+{
+get(m_pCCED, cc);
+get(m_pBCCED, bcc);
+}
-String GetCC() {return m_aCCED.GetText();}
-voidSetCC(const String rSet) {m_aCCED.SetText(rSet);}
+OUString GetCC() {return m_pCCED-GetText();}
+void SetCC(const OUString rSet) {m_pCCED-SetText(rSet);}
-String GetBCC() {return m_aBCCED.GetText();}
-voidSetBCC(const String rSet) {m_aBCCED.SetText(rSet);}
+OUString GetBCC() {return m_pBCCED-GetText();}
+void SetBCC(const OUString rSet) {m_pBCCED-SetText(rSet);}
};
-SwCopyToDialog::SwCopyToDialog(Window* pParent) :
-SfxModalDialog(pParent, SW_RES(DLG_MM_COPYTO)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
-m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION )),
-m_aCCFT( this, SW_RES(FT_CC )),
-m_aCCED( this, SW_RES(ED_CC )),
-m_aBCCFT( this, SW_RES( FT_BCC )),
-m_aBCCED( this, SW_RES( ED_BCC )),
-m_aNoteFI( this, SW_RES( FI_NOTE)),
-m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
-m_aOK( this, SW_RES( PB_OK )),
-m_aCancel( this, SW_RES( PB_CANCEL )),
-m_aHelp( this, SW_RES(PB_HELP))
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
-{
-FreeResource();
-}
-
-SwCopyToDialog::~SwCopyToDialog()
-{
-}
-
SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard*
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/writerwordglue.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 65e8e4c62afc1203f61fa8f0595b216ed0bbab3c
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Sep 15 22:42:43 2013 +0200
Remove two temporary variables
Change-Id: Iaff9cea6038be51fdc7468bef4cd254af475a9d3
Reviewed-on: https://gerrit.libreoffice.org/5966
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 323ac36..4bc0182 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -755,9 +755,7 @@ namespace sw
short nType = NUMBERFORMAT_DEFINED;
sal_uInt32 nKey = 0;
-OUString sParams(rParams);
-SwapQuotesInField(sParams);
-rParams = sParams;
+SwapQuotesInField(rParams);
// Force to Japanese when finding one of 'geaE'
bool bForceJapanese = (-1 != rParams.indexOf('g')
@@ -966,9 +964,7 @@ namespace sw
if (bHijri)
rParams = [~hijri] + rParams;
-OUString sTemp(rParams);
-pFormatter-PutEntry(sTemp, nCheckPos, nType, nKey, rLang);
-rParams = sTemp;
+pFormatter-PutEntry(rParams, nCheckPos, nType, nKey, rLang);
return nKey;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/writerwordglue.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 15968833d5f3b6b89029774b384f92ca115dfe2d
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Mon Sep 16 07:58:02 2013 +0200
Prefer a 'for' loop to a 'while' one
Change-Id: Ic3d36dbe1cf596d9eab3cc919bc2596f2e89a98c
Reviewed-on: https://gerrit.libreoffice.org/5967
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 4bc0182..34e64a6 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -796,8 +796,7 @@ namespace sw
}
sal_Int32 nLen = rParams.getLength();
-sal_Int32 nI = 0;
-while (nI nLen)
+for (sal_Int32 nI = 0; nI nLen; ++nI)
{
if (rParams[nI] == '\\')
nI++;
@@ -949,7 +948,6 @@ namespace sw
}
}
}
-++nI;
}
if (bForceNatNum)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 443bcef31b3dc0f00ec93d39cce1b3302fc912c7 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Sep 16 18:29:37 2013 -0400 I didn't mean to change that. Change-Id: I0da67563b93ead9ffc3350cd01733b0a6d094f05 diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx index bd0fb4f..3327f1c 100644 --- a/sc/source/core/opencl/openclwrapper.hxx +++ b/sc/source/core/opencl/openclwrapper.hxx @@ -59,7 +59,7 @@ if( status != CL_SUCCESS )\ } #define MAX_KERNEL_STRING_LEN 64 -#define MAX_CLFILE_NUM 100 +#define MAX_CLFILE_NUM 50 #define MAX_CLKERNEL_NUM 200 #define MAX_KERNEL_NAME_LEN 64 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 2 commits - sc/source
sc/source/core/opencl/openclwrapper.cxx | 173 ++--
sc/source/core/opencl/openclwrapper.hxx | 16 --
2 files changed, 61 insertions(+), 128 deletions(-)
New commits:
commit 6670b6456a5b34cf32128f0b0a36183a34bd6f80
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 18:21:28 2013 -0400
Remove unused methods.
Change-Id: Idfb6acde20e883e4c20e0f640fdb96ac50bb349f
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 7d34b95..df35f3d 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -436,17 +436,6 @@ int OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo )
return 1;
}
-int OpenclDevice::runKernelWrapper( cl_kernel_function function, const char *
kernelName, void **usrdata )
-{
-printf(oclwrapper:runKernel_wrapper...\n);
-if ( registerKernelWrapper( kernelName, function ) != 1 )
-{
-fprintf(stderr, Error:runKernel_wrapper:registerKernelWrapper
fail!\n);
-return -1;
-}
-return ( runKernel( kernelName, usrdata ) );
-}
-
int OpenclDevice::cachedOfKernerPrg( const GPUEnv *gpuEnvCached, const char *
clFileName )
{
int i;
@@ -625,43 +614,6 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo,
const char *buildOption )
return 1;
}
-int OpenclDevice::getKernelEnvAndFunc( const char *kernelName, KernelEnv *env,
cl_kernel_function *function)
-{
-for (size_t i = 0, n = gpuEnv.maKernelNames.size(); i n; ++i)
-{
-const char* pName = gpuEnv.maKernelNames[i];
-if (!strcasecmp(kernelName, pName))
-{
-env-mpkContext = gpuEnv.mpContext;
-env-mpkCmdQueue = gpuEnv.mpCmdQueue;
-env-mpkProgram = gpuEnv.mpArryPrograms[0];
-env-mpkKernel = gpuEnv.mpArryKernels[i];
-*function = gpuEnv.mpArryKnelFuncs[i];
-return 1;
-}
-}
-
-return 0;
-}
-
-int OpenclDevice::runKernel( const char *kernelName, void **userdata)
-{
-KernelEnv kEnv;
-cl_kernel_function function;
-int status;
-
-memset( kEnv, 0, sizeof( KernelEnv ) );
-status = getKernelEnvAndFunc( kernelName, kEnv, function );
-strcpy( kEnv.mckKernelName, kernelName );
-if ( status == 1 )
-{
-if ( kEnv == (KernelEnv *) NULL || function == (cl_kernel_function
*) NULL)
-return 0;
-return ( function( userdata, kEnv ) );
-}
-return 0;
-}
-
int OpenclDevice::initOpenclRunEnv( int argc )
{
if ( MAX_CLKERNEL_NUM = 0 )
@@ -891,18 +843,6 @@ int OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
return 0;
}
-int OpenclDevice::registerKernelWrapper( const char *kernelName,
cl_kernel_function function )
-{
-for (size_t i = 0, n = gpuEnv.maKernelNames.size(); i n; ++i)
-{
-if (!strcasecmp(kernelName, gpuEnv.maKernelNames[i]))
-{
-gpuEnv.mpArryKnelFuncs[i] = function;
-return 1;
-}
-}
-return 0;
-}
void OpenclDevice::setOpenclState( int state )
{
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 1dfed15..bd0fb4f 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -114,7 +114,6 @@ struct GPUEnv
cl_program mpArryPrograms[MAX_CLFILE_NUM]; //one program object maps one
kernel source file
char mArryKnelSrcFile[MAX_CLFILE_NUM][256]; //the max len of kernel file
name is 256
std::vectorconst char* maKernelNames;
-cl_kernel_function mpArryKnelFuncs[MAX_CLKERNEL_NUM];
int mnFileCount; // only one kernel file
int mnIsUserCreated; // 1: created , 0:no create and needed to create by
opencl wrapper
int mnKhrFp64Flag;
@@ -190,12 +189,8 @@ public:
static int initOpenclAttr( OpenCLEnv * env );
int setKernelEnv( KernelEnv *envInfo );
-int runKernel( const char *kernelName, void **userdata );
int convertToString( const char *filename, char **source );
int checkKernelName( KernelEnv *envInfo, const char *kernelName );
-int registerKernelWrapper( const char *kernelName, cl_kernel_function
function );
-int runKernelWrapper( cl_kernel_function function, const char *
kernelName, void **usrdata );
-int getKernelEnvAndFunc( const char *kernelName, KernelEnv *env,
cl_kernel_function *function );
int getOpenclState();
void setOpenclState( int state );
commit 1061d671236c8e10d1e4dfcd86a630d6615c794c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 16:32:25 2013 -0400
Use std::vector to store pre-defined kernel names.
Change-Id: I5de148a98411f85f5318ee6e5b0b41786d152a83
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index a5dcd57..7d34b95 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -64,15 +64,51 @@ int
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 mariosv mari...@miguelangel.mobi changed: What|Removed |Added Depends on||69440 -- 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: 3 commits - formula/source include/formula
formula/source/core/api/FormulaCompiler.cxx| 77 -
formula/source/core/resource/core_resource.src | 10 ++-
include/formula/FormulaCompiler.hxx| 17 +
3 files changed, 86 insertions(+), 18 deletions(-)
New commits:
commit 3ec486639befae454eebfd5b8f5dbc88aa357404
Author: Eike Rathke er...@redhat.com
Date: Tue Sep 17 01:01:58 2013 +0200
introduced putCopyOpCode() to handle copyFrom()
... and added bOverrideKnownBad handling
Change-Id: I1b669771ec1aa0cdfa1c1bef0bcfccfad96fe727
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index c624eee..6389313 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -820,17 +820,68 @@ FormulaCompiler::OpCodeMap::~OpCodeMap()
delete mpHashMap;
}
-void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap r )
+void FormulaCompiler::OpCodeMap::putCopyOpCode( const String rSymbol, OpCode
eOp )
+{
+SAL_WARN_IF( mpTable[eOp].Len() !rSymbol.Len(), formula.core,
+OpCodeMap::putCopyOpCode: NOT replacing OpCode eOp '
mpTable[eOp] ' with empty name!);
+if (mpTable[eOp].Len() !rSymbol.Len())
+mpHashMap-insert( OpCodeHashMap::value_type( mpTable[eOp], eOp));
+else
+{
+mpTable[eOp] = rSymbol;
+mpHashMap-insert( OpCodeHashMap::value_type( rSymbol, eOp));
+}
+}
+
+void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap r, bool
bOverrideKnownBad )
{
delete mpHashMap;
mpHashMap = new OpCodeHashMap( mnSymbols);
sal_uInt16 n = r.getSymbolCount();
-for (sal_uInt16 i = 0; i n; ++i)
+SAL_WARN_IF( n != mnSymbols, formula.core,
+OpCodeMap::copyFrom: unequal size, this: mnSymbols
that: n);
+if (n mnSymbols)
+n = mnSymbols;
+
+// OpCode 0 (ocPush) should never be in a map.
+SAL_WARN_IF( mpTable[0].Len() || r.mpTable[0].Len(), formula.core,
+OpCodeMap::copyFrom: OpCode 0 assigned, this: '
+ mpTable[0] ' that: ' r.mpTable[0] ');
+
+// For bOverrideKnownBad when copying from the English core map (ODF 1.1
+// and API) to the native map (UI use English function names) replace the
+// known bad legacy function names with correct ones.
+if (bOverrideKnownBad r.mbCore
+FormulaGrammar::extractFormulaLanguage( meGrammar) ==
sheet::FormulaLanguage::NATIVE
+FormulaGrammar::extractFormulaLanguage( r.meGrammar) ==
sheet::FormulaLanguage::ENGLISH)
{
-OpCode eOp = OpCode(i);
-const String rSymbol = r.getSymbol( eOp);
-putOpCode( rSymbol, eOp);
+for (sal_uInt16 i = 1; i n; ++i)
+{
+String aSymbol;
+OpCode eOp = OpCode(i);
+switch (eOp)
+{
+case ocZGZ:
+aSymbol = OUString(RRI);
+break;
+case ocTableOp:
+aSymbol = OUString(MULTIPLE.OPERATIONS);
+break;
+default:
+aSymbol = r.mpTable[i];
+}
+putCopyOpCode( aSymbol, eOp);
+}
+}
+else
+{
+for (sal_uInt16 i = 1; i n; ++i)
+{
+OpCode eOp = OpCode(i);
+const String rSymbol = r.mpTable[i];
+putCopyOpCode( rSymbol, eOp);
+}
}
// TODO: maybe copy the external maps too?
@@ -1847,7 +1898,7 @@ void FormulaCompiler::SetNativeSymbols( const
OpCodeMapPtr xMap )
{
NonConstOpCodeMapPtr xSymbolsNative;
lcl_fillNativeSymbols( xSymbolsNative);
-xSymbolsNative-copyFrom(*xMap);
+xSymbolsNative-copyFrom( *xMap, true);
}
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index 6e271ca..28bf5f92 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -114,7 +114,14 @@ public:
}
virtual ~OpCodeMap();
-void copyFrom( const OpCodeMap r );
+/** Copy mappings from r into this map, effectively replacing this map.
+
+@param bOverrideKnownBad
+If TRUE, override known legacy bad function names with
+correct ones if the conditions can be derived from the
+current maps.
+ */
+void copyFrom( const OpCodeMap r, bool bOverrideKnownBad );
/// Get the symbol String - OpCode hash map for finds.
inline const OpCodeHashMap* getHashMap() const { return mpHashMap; }
@@ -180,6 +187,14 @@ public:
/** The value used in createSequenceOfAvailableMappings() and thus in
XFormulaOpCodeMapper::getMappings() for an unknown symbol. */
static sal_Int32 getOpCodeUnknown();
+
+private:
+
+/** Conditionally put a mapping in copyFrom() context.
+
+Does NOT check eOp range!
+
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 2 commits - sc/source
sc/source/core/opencl/openclwrapper.cxx | 10
sc/source/core/opencl/openclwrapper.hxx | 39
2 files changed, 6 insertions(+), 43 deletions(-)
New commits:
commit 08fe4b32a18e034c317736ec219ad948799e7e48
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 18:54:04 2013 -0400
This base class is pointless.
Change-Id: I16094fa3aea2ac31b5289367dac21bc901bc9f23
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index a055f25..0ecca64 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -142,30 +142,6 @@ struct DoubleVectorFormula
int mnInputEndOffset;
};
-class OpenclCalcBase
-{
-public:
-OpenclCalcBase(){};
-virtual ~OpenclCalcBase(){};
-virtual int oclHostArithmeticOperator64Bits( const char* aKernelName,
double *rResult, int nRowSize )=0;
-virtual int oclMoreColHostArithmeticOperator64Bits( int nDataSize,int
neOpSize,double *rResult, int nRowSize )=0;
-virtual int oclHostFormulaStatistics64Bits( const char* aKernelName,double
*output, int outputSize )=0;
-virtual int oclHostFormulaCount64Bits( uint *npStartPos, uint *npEndPos,
double *dpOutput, int nSize)=0;
-virtual int oclHostFormulaSumProduct64Bits( double *fpSumProMergeLfData,
double *fpSumProMergeRrData, uint *npSumSize, double *dpOutput, int nSize )=0;
-virtual int oclHostMatrixInverse64Bits( const char* aKernelName, double
*dpOclMatrixSrc, double *dpOclMatrixDst,std::vectordoubledpResult, uint
nDim)=0;
-virtual int oclMoreColHostArithmeticOperator32Bits( int nDataSize,int
neOpSize,double *rResult, int nRowSize )=0;
-
-virtual int oclHostArithmeticOperator32Bits( const char* aKernelName,
double *rResult, int nRowSize )=0;
-virtual int oclHostFormulaStatistics32Bits( const char* aKernelName,double
*output, int outputSize )=0;
-virtual int oclHostFormulaCount32Bits( uint *npStartPos, uint *npEndPos,
double *dpOutput, int nSize)=0;
-virtual int oclHostFormulaSumProduct32Bits( float *fpSumProMergeLfData,
float *fpSumProMergeRrData, uint *npSumSize, double *dpOutput, int nSize )=0;
-virtual int oclHostMatrixInverse32Bits( const char* aKernelName, float
*fpOclMatrixSrc, float *fpOclMatrixDst, std::vectordouble dpResult, uint
nDim )=0;
-
-virtual int oclGroundWaterGroup( uint *eOp, uint eOpNum, const double
*pOpArray, const double *pSubtractSingle, size_t nSrcDataSize,size_t nElements,
double delta,uint *nStartPos,uint *nEndPos ,double *deResult)=0;
-virtual double *oclSimpleDeltaOperation( OpCode eOp, const double
*pOpArray, const double *pSubtractSingle, size_t nElements, double delta )=0;
-};
-
-
class OpenclDevice
{
public:
@@ -193,7 +169,7 @@ public:
static void setOpenclState( int state );
};
-class OclCalc: public OpenclDevice,OpenclCalcBase
+class OclCalc: public OpenclDevice
{
public:
commit 7680f2431f7ae35e4eae799215970c69b26a10f4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 16 18:51:51 2013 -0400
OpenclDevice is a stateless class. Make all its methods static.
Change-Id: I5eb1bead219ec9ffd759a26d8d5f1abe499f1ee1
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index df35f3d..b99dd12 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -124,16 +124,6 @@ int OpenclDevice::registOpenclKernel()
return 0;
}
-OpenclDevice::OpenclDevice()
-{
-//initEnv();
-}
-
-OpenclDevice::~OpenclDevice()
-{
-//releaseOpenclRunEnv();
-}
-
int OpenclDevice::setKernelEnv( KernelEnv *envInfo )
{
envInfo-mpkContext = gpuEnv.mpContext;
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 3327f1c..a055f25 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -168,12 +168,9 @@ public:
class OpenclDevice
{
-
public:
static GPUEnv gpuEnv;
static int isInited;
-OpenclDevice();
-~OpenclDevice();
static int initEnv();
static int registOpenclKernel();
static int releaseOpenclRunEnv();
@@ -188,12 +185,12 @@ public:
static int compileKernelFile( const char *filename, GPUEnv *gpuInfo, const
char *buildOption );
static int initOpenclAttr( OpenCLEnv * env );
-int setKernelEnv( KernelEnv *envInfo );
-int convertToString( const char *filename, char **source );
-int checkKernelName( KernelEnv *envInfo, const char *kernelName );
+static int setKernelEnv( KernelEnv *envInfo );
+static int convertToString( const char *filename, char **source );
+static int checkKernelName( KernelEnv *envInfo, const char *kernelName );
-int getOpenclState();
-void setOpenclState( int state );
+static int getOpenclState();
+static void setOpenclState( int state );
};
class OclCalc: public
Re: [Libreoffice-commits] core.git: formula/source: get rid of unnecessary warning
Hi Winfried, On Monday, 2013-09-16 19:08:29 +0200, Eike Rathke wrote: I still did not see that assertion, Ok, I did.. but I see a bunch of other assertions, and reimplemented OpCodeMap::copyFrom() to take care of these things. You'd need to rebase or cherry-pick these commits: 2f2ee162ac521b9ad90651429253b9bf569f1797 2e60a634ec8ce939ec9dc3df10f12cee84bd7c7e 4fc4a3f2e5f82ed473fc6e9c22aa3fdf9178c6ff 24726fe2de005fe9532487907f8867259f61260c 3ec486639befae454eebfd5b8f5dbc88aa357404 I wonder if the AddIn symbols shouldn't be replaced in OpCodeMap::copyFrom() as well.. there's even a TODO comment suggesting so ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpKS3c9H2_Gp.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 mariosv mari...@miguelangel.mobi changed: What|Removed |Added Depends on|69440 | --- Comment #83 from mariosv mari...@miguelangel.mobi --- Added Bug 60270 Crash when click Help bottom after select some functions in formula wizard. I think the issue is with the new functions in 4 like AVERAGEIF( ) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit da5711cffb02aff91a20fd4d0d12ebcd8e5aabc2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Sep 16 21:05:41 2013 +0200
reintroduce changes from Tor
Change-Id: I3b32e6754f8b86e7875ff6dd09b4dd0f38f8df4e
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index b99dd12..9519018 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -268,7 +268,8 @@ int OpenclDevice::generatBinFromKernelSource( cl_program
program, const char * c
{
unsigned int i = 0;
cl_int clStatus;
-size_t *binarySizes, numDevices;
+size_t *binarySizes;
+cl_uint numDevices;
cl_device_id *mpArryDevsID;
char **binaries, *str = NULL;
@@ -451,7 +452,7 @@ int OpenclDevice::compileKernelFile( GPUEnv *gpuInfo, const
char *buildOption )
const char *source;
size_t source_size[1];
int b_error, binary_status, binaryExisted, idx;
-size_t numDevices;
+cl_uint numDevices;
cl_device_id *mpArryDevsID;
FILE *fd, *fd1;
const char* filename = kernel.cl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 6 commits - sc/source
sc/source/core/opencl/openclwrapper.cxx | 183
sc/source/core/opencl/openclwrapper.hxx |6 -
2 files changed, 73 insertions(+), 116 deletions(-)
New commits:
commit 4a95f74ceb02cfa30ba2c6b286aa30d7a01110f1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Sep 17 04:25:38 2013 +0200
remove unused method
Change-Id: Id33348c76297583e843af2a1ea43f7f755b86033
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 327ba70..7c245b9 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -180,43 +180,6 @@ Kernel* OpenclDevice::checkKernelName( const char
*kernelName )
return NULL;
}
-int OpenclDevice::convertToString( const char *filename, char **source )
-{
-int file_size;
-size_t result;
-FILE *file = NULL;
-file_size = 0;
-result = 0;
-file = fopen( filename, rb+ );
-printf(open kernel file %s.\n,filename);
-
-if ( file != NULL )
-{
-printf(Open ok!\n);
-fseek( file, 0, SEEK_END );
-
-file_size = ftell( file );
-rewind( file );
-*source = (char*) malloc( sizeof(char) * file_size + 1 );
-if ( *source == (char*) NULL )
-{
-return 0;
-}
-result = fread(*source, 1, file_size, file);
-if ( result != (size_t) file_size )
-{
-free( *source );
-return 0;
-}
-(*source)[file_size] = '\0';
-fclose( file );
-
-return 1;
-}
-printf(open kernel file failed.\n);
-return 0;
-}
-
namespace {
OString createFileName(cl_device_id deviceId, const char* clFileName)
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 001dc0e..7677f4d 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -178,7 +178,6 @@ public:
static int initOpenclAttr( OpenCLEnv * env );
static int setKernelEnv( KernelEnv *envInfo );
-static int convertToString( const char *filename, char **source );
static Kernel* checkKernelName( const char *kernelName );
static int getOpenclState();
commit 05e43ea4cb9aa5274fbef2a3a7b721faff9b143e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Sep 17 04:24:36 2013 +0200
introduce strong versioning of the kernel sources
Change-Id: If42711467b1c8cae4b1044464c7254792ddcd6ad
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index a04447a..327ba70 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -10,6 +10,8 @@
#include openclwrapper.hxx
#include rtl/ustring.hxx
+#include rtl/strbuf.hxx
+#include rtl/digest.h
#include boost/scoped_array.hpp
#include sal/config.h
@@ -50,6 +52,31 @@ Kernel::Kernel( const char* pName ) : mpName(pName),
mpKernel(NULL) {}
GPUEnv OpenclDevice::gpuEnv;
int OpenclDevice::isInited =0;
+namespace {
+
+OString generateHashForSource()
+{
+size_t nLength = strlen(kernel_src);
+sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_MD5];
+rtlDigestError aError = rtl_digest_MD5(kernel_src, nLength,
+pBuffer, RTL_DIGEST_LENGTH_MD5);
+assert(aError == rtl_Digest_E_None);
+
+OStringBuffer aBuffer;
+const char* pString = 0123456789ABCDEF;
+for(size_t i = 0; i RTL_DIGEST_LENGTH_MD5; ++i)
+{
+sal_uInt8 val = pBuffer[i];
+aBuffer.append(pString[val/16]);
+aBuffer.append(pString[val%16]);
+}
+return aBuffer.makeStringAndClear();
+}
+
+}
+
+OString OpenclDevice::maSourceHash = generateHashForSource();
+
int OpenclDevice::initEnv()
{
// TODO: This part needs more platform specific handling. On Windows,
@@ -190,12 +217,28 @@ int OpenclDevice::convertToString( const char *filename,
char **source )
return 0;
}
+namespace {
+
+OString createFileName(cl_device_id deviceId, const char* clFileName)
+{
+OString fileName(clFileName);
+sal_Int32 nIndex = fileName.lastIndexOf(.cl);
+if(nIndex 0)
+fileName = fileName.copy(0, nIndex);
+
+char deviceName[DEVICE_NAME_LENGTH] = {0};
+clGetDeviceInfo(deviceId, CL_DEVICE_NAME,
+sizeof(deviceName), deviceName, NULL);
+return fileName + - + deviceName + - + OpenclDevice::maSourceHash +
.bin;
+}
+
+}
+
int OpenclDevice::binaryGenerated( const char * clFileName, FILE ** fhandle )
{
unsigned int i = 0;
cl_int clStatus;
int status = 0;
-char *str = NULL;
FILE *fd = NULL;
cl_uint numDevices=0;
if ( getenv(SC_OPENCLCPU) )
@@ -215,19 +258,13 @@ int OpenclDevice::binaryGenerated( const char *
clFileName, FILE ** fhandle )
numDevices);
}
CHECK_OPENCL( clStatus, clGetDeviceIDs );
+
for ( i = 0; i numDevices; i++ )
{
-char fileName[256] = { 0 },
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 12
sc/source/core/opencl/openclwrapper.hxx |1 -
2 files changed, 13 deletions(-)
New commits:
commit 4adf00e5e5ab7bc96202ff3751feac5f6cbaf255
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Sep 17 04:38:34 2013 +0200
we no longer use that method for initializing opencl
Change-Id: I779adb453cfe91328d5583f990b7c57d482fb7dc
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 7c245b9..3994029 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -77,18 +77,6 @@ OString generateHashForSource()
OString OpenclDevice::maSourceHash = generateHashForSource();
-int OpenclDevice::initEnv()
-{
-// TODO: This part needs more platform specific handling. On Windows,
-// the GPU Driver itself installs OpenCL.dll in the system folder.
-int status = clewInit(OPENCL_DLL_NAME);
-if (status 0)
-return 1;
-
-initOpenclRunEnv( 0 );
-return 1;
-}
-
int OpenclDevice::releaseOpenclRunEnv()
{
releaseOpenclEnv( gpuEnv );
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 7677f4d..057f02b 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -162,7 +162,6 @@ class OpenclDevice
public:
static GPUEnv gpuEnv;
static int isInited;
-static int initEnv();
static OString maSourceHash;
static int registOpenclKernel();
static int releaseOpenclRunEnv();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] LibreOffice Conference - Registration is now open
Hi all, I've booked for Milan from Monday until Friday morning (have to leave early). Wonder who else involved in QA - either sometimes or frequently - will be there too ?? Cheers, Cor Florian Effenberger wrote (30-08-13 14:27) Dear community, in less than four weeks, the LibreOffice Conference 2013 will take place [...] -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ 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 Conference - Registration is now open
Hi Cor, Le 16/09/2013 07:15, Cor Nouws a écrit : Hi all, I've booked for Milan from Monday until Friday morning (have to leave early). Wonder who else involved in QA - either sometimes or frequently - will be there too ?? I will be there from Tuesday until Friday. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ 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] The garbage into the dev-builds.libreoffice.org
Hi ape ape wrote Hi, all Server at dev-builds.libreoffice.org: http://dev-builds.libreoffice.org/daily/master/ This part of the site contains many empty and outdated directories. Can anyone from the project managers remove garbage? -- ape I think you have not signed correctly to this mailing list or you are somehow blacklisted :) As you can see in your previous topic http://nabble.documentfoundation.org/Why-no-daily-master-builds-td4073881.html none of your messages reached the list. They are only posted on Nabble... Regarding your question, I made a similar request over a month ago but nobody bothered to answer... I hope someone answers to you... Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4074332.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 Conference - Registration is now open
Hi all, I will be there too :) Liebe Grüße, / Yours, Florian Reisinger Am 16.09.2013 um 10:32 schrieb Jean-Baptiste Faure jbf.fa...@sud-ouest.org: Hi Cor, Le 16/09/2013 07:15, Cor Nouws a écrit : Hi all, I've booked for Milan from Monday until Friday morning (have to leave early). Wonder who else involved in QA - either sometimes or frequently - will be there too ?? I will be there from Tuesday until Friday. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ 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] bug for Ubuntu ppa - how to?
Hi Thomas, On Sun, Sep 15, 2013 at 07:48:21AM +0200, Thomas Hackert wrote: Good morning Cor, *, On Samstag, 14. September 2013 21:25 Cor Nouws wrote: See this comment https://bugs.freedesktop.org/show_bug.cgi?id=69337#c8 on https://help.ubuntu.com/community/ReportingBugs there is the paragraph quote Please do not report bugs about software in PPAs on Launchpad. This is because software in PPAs are not provided by the official Ubuntu repositories. Instead, the PPA homepage would have a contact point and preference of the PPA provider. /quote This recently changed(*), please file a bug with tag ppa on Launchpad. I just updated the documentation. Best, Bjoern (*) https://lists.launchpad.net/libreoffice/msg00072.html http://summit.ubuntu.com/uds-1308/meeting/21942/client-1308-rolling-libreoffice/ ___ 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] bug for Ubuntu ppa - how to?
Hello Bjoern, *, On Montag, 16. September 2013 14:26 bjoern wrote: On Sun, Sep 15, 2013 at 07:48:21AM +0200, Thomas Hackert wrote: On Samstag, 14. September 2013 21:25 Cor Nouws wrote: See this comment https://bugs.freedesktop.org/show_bug.cgi?id=69337#c8 on https://help.ubuntu.com/community/ReportingBugs there is the paragraph quote Please do not report bugs about software in PPAs on Launchpad. This is because software in PPAs are not provided by the official Ubuntu repositories. Instead, the PPA homepage would have a contact point and preference of the PPA provider. /quote This recently changed(*), please file a bug with tag ppa on Launchpad. I just updated the documentation. ah, OK, thanks for your information and for changing the documentation :) (*) https://lists.launchpad.net/libreoffice/msg00072.html You mention https://wiki.ubuntu.com/Bugs/Tags at the end of the mail. Will there be a more precise description there, too, in the near future? Maybe we should add this description to the QA-FAQ and/or to the wiki then ... ;) http://summit.ubuntu.com/uds-1308/meeting/21942/client-1308-rolling-libreoffice/ As I am not familiar with Ubuntu's summit process (and not having the time to watch the video now, sorry ... :( ): You and the other guys have talked about it, and now you will bring it to Ubuntu's/Canonical's tech board, where they will decide it? Or did I understood https://blueprints.launchpad.net/ubuntu/+spec/client-1308-rolling-libreoffice (below Work Items) wrong? Or does it apply directly? Have a nice afternoon Thomas. ___ 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 69402] New: FORMATTING: rectangle
https://bugs.freedesktop.org/show_bug.cgi?id=69402 Priority: medium Bug ID: 69402 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: rectangle Severity: normal Classification: Unclassified OS: Windows (All) Reporter: ulf.bernsto...@proservices-gmbh.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.1.2 release Component: Drawing Product: LibreOffice Problem description: In the properties of an rectangle you don't can input the radius of the edges. Steps to reproduce: 1. Generate a new rectangle 2. Open the property dialog position size last tab 3. Try to edit the radius Current behavior: field is disabled Expected behavior: field is enabled Operating System: Windows XP Version: 4.1.1.2 release -- 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 66455] Chart looses properties when it is copied/pasted to other spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=66455 David Tardon dtar...@redhat.com changed: What|Removed |Added CC||dtar...@redhat.com See Also||https://bugzilla.redhat.com ||/show_bug.cgi?id=1008102 -- 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 69313] Fixed date field in template gets doubled while first document saving
https://bugs.freedesktop.org/show_bug.cgi?id=69313 --- Comment #2 from fidel+libreoff...@vido.info --- Created attachment 85893 -- https://bugs.freedesktop.org/attachment.cgi?id=85893action=edit LibreOffice Writer Template - Open the template in LO 4.x - Take a look at the date-field - Save it as .odt - Realize that you NOW (after saving) have 2 date-fields Best regards fidel -- 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 69313] Fixed date field in template gets doubled while first document saving
https://bugs.freedesktop.org/show_bug.cgi?id=69313 --- Comment #3 from fidel+libreoff...@vido.info --- Hi - see the attached template. Best regards fidel -- 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 66455] Chart looses properties when it is copied/pasted to other spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=66455 David Tardon dtar...@redhat.com changed: What|Removed |Added See Also|https://bugzilla.redhat.com | |/show_bug.cgi?id=1008102| -- 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 66455] Chart looses properties when it is copied/pasted to other spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=66455 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from David Tardon dtar...@redhat.com --- *** This bug has been marked as a duplicate of bug 62057 *** -- 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 69392] Chinese Conversion will crash Wirter when text contains Chinese characters and English words
https://bugs.freedesktop.org/show_bug.cgi?id=69392 David Tardon dtar...@redhat.com changed: What|Removed |Added See Also||https://bugzilla.redhat.com ||/show_bug.cgi?id=1008248 -- 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 68706] Crash on undo in Writer when Record is on and Show is off
https://bugs.freedesktop.org/show_bug.cgi?id=68706 --- Comment #11 from Timur gti...@gmail.com --- Any change this gets fixed for 4.1.2? It's a recent regression of major importance. -- 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 68874] Highlighter icon doesn't change color if no text is selected
https://bugs.freedesktop.org/show_bug.cgi?id=68874 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|target:4.2.0|target:4.2.0 target:4.1.3 --- Comment #6 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Ivan Timofeev committed a patch related to this issue. It has been pushed to libreoffice-4-1: http://cgit.freedesktop.org/libreoffice/core/commit/?id=053e4635d816cb18a6098a58f6d275417a244ac0h=libreoffice-4-1 fdo#68874: Highlighter icon doesn't change color if no text is selected It will be available in LibreOffice 4.1.3. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 68771] Crash on launch on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=68771 --- Comment #26 from Michael Meeks michael.me...@collabora.com --- The outcome of crashing is a bit unexpected :-) is there any flag we can set in some Mac app description that gives a minimum OS version - to get a friendly OS provided error ? and/or could we have a shell-script in our wrapper (if we have one on Mac) that checks the OS version warns in a friendly way for older OS/X ? Surely other people have this problem; a quick google showed: https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html and: LSMinimumSystemVersion but perhaps we have to be running to set that ? -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68771, which changed state. Bug 68771 Summary: Crash without warning launch on old OS X (10.5) https://bugs.freedesktop.org/show_bug.cgi?id=68771 What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- -- You are receiving this mail because: You are on the CC list for the bug. 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 68771] Crash without warning launch on old OS X (10.5)
https://bugs.freedesktop.org/show_bug.cgi?id=68771 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- Summary|Crash on launch on OS X |Crash without warning ||launch on old OS X (10.5) --- Comment #27 from Michael Meeks michael.me...@collabora.com --- re-opening with a new title. I'm no OS/X expert but would something like this help (sadly I've no way of testing it): diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist index 5a682dc..13500d7 100755 --- a/sysui/desktop/macosx/Info.plist +++ b/sysui/desktop/macosx/Info.plist @@ -1422,6 +1422,8 @@ stringVCL_NSApplication/string keyLSApplicationCategoryType/key stringpublic.app-category.productivity/string -/dict +keyLSMinimumSystemVersion/key +string10.6.0/string +/dict2 /plist -- 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 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #88 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Laurent BP committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f4d3954fc6106b3ae0ee16ab0fcde15d8cb945e3 fdo#39468 Translate German comments in itemwin.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- Hmm, I don't have a birthday field in my OSX address book to be able to compare... Alex -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #4 from Alex Thurgood ipla...@yahoo.co.uk --- At least, not in the French version of Contacts.app and this consequently does not appear in my LO MacAb ODB connection. Alex -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #5 from Alex Thurgood ipla...@yahoo.co.uk --- (In reply to comment #4) At least, not in the French version of Contacts.app and this consequently does not appear in my LO MacAb ODB connection. Alex Contacts.app V7.1(1170) -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #6 from Alex Thurgood ipla...@yahoo.co.uk --- Is this some kind of personalized field that you added, or is it the default ? -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #7 from Alex Thurgood ipla...@yahoo.co.uk --- OK, I could reproduce the problem with any of the Creation or Modification date fields. These are also indicated as timestamp, yet they show up blank in a query. How to reproduce : 1) Create an ODB file that connects to the Mac addressbook using the db creation wizard. 2) Open the ODB and the GUI query designer wizard. 3) Choose FirstName, Creation and Modification as the fields for display. 4) Validate or run query - only the FirstName field shows any data despite data being available in the Table view mode. The SQL that is displayed : SELECT Address Book.Prénom AS Prénom, Address Book.Creation AS Creation, Address Book.Modification AS Modification FROM Address Book Address Book Note that despite specifically querying on 3 fields, 2 of which are timestamp type, only one timestamp field gets displayed and no data is shown for this field. Adding Lionel, Julien to CC. Alex -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #8 from Alex Thurgood ipla...@yahoo.co.uk --- Is this a problem with the Mork driver ? Alex -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #9 from Alex Thurgood ipla...@yahoo.co.uk --- I tested in LO 4.1.1.2 I can not create a connection to a MacAB with LO-dev 4.2, it systematically causes a crash of the whole app, but will report that separately. Alex -- 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 65454] HTML PDF Conversion Hangs When HTML Table Contains Large Number of Rows with Formatting Info
https://bugs.freedesktop.org/show_bug.cgi?id=65454 --- Comment #6 from James james.gro...@tessella.com --- I will re-test it when I get a chance, but it might be a few days before I have the time. -- 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 69371] FILEOPEN: Incorrectly displays the contents of the table.
https://bugs.freedesktop.org/show_bug.cgi?id=69371 Mike Kaganski mikekagan...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME Version|4.1.1.2 release |4.1.1.1 rc --- Comment #9 from Mike Kaganski mikekagan...@hotmail.com --- Ok, I see. Reproducible with 4.1.1.1 and 4.1.1.2. Not reproducible with 4.1.2.1 - it looks like it has been fixed in between. Don't know which commit fixes it (but maybe it's Bug 68581) - WORKSFORME. Please upgrade to 4.1.2.1 or wait for the new stable version. If the problem returns, please reopen the bug. Thank you for reporting! -- 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 50626] EDITING: Queries of Mac OS X Addressbook don't show date (birthday)
https://bugs.freedesktop.org/show_bug.cgi?id=50626 --- Comment #10 from Alex Thurgood ipla...@yahoo.co.uk --- It also won't show a query that uses the ABPersonFlags field. These are defined as INT in Table design mode and yet do not show up in a query, so the problem seems to be that the Query parser or the returned display fails to handle anything other than CHAR datatype. Alex -- 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
