LibreOffice Gerrit News for core on 2014-05-20
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/9400 from Mukhiddin Yusupov about module sal + fdo#39631: Add SAL_LIKELY, SAL_UNLIKELY, SAL_HOT and SAT COLD macros. in https://gerrit.libreoffice.org/9407 from Michal Strnad about module include + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt about module sd + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt about module connectivity + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam about module chart2, oox + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam about module chart2, include, offapi, oox, xmloff + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt about module officecfg + care for Java 1.5 support in external packages in https://gerrit.libreoffice.org/9312 from Douglas Mencken about module build, external, reportbuilder, swext + fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing tool in https://gerrit.libreoffice.org/9392 from Rajashri Udhoji about module sw End of freshness + fdo#78833 Improve AutoTexts for all languages (mainly FN Autotext) in https://gerrit.libreoffice.org/9408 from Laurent BP about module extras + upgrade to python-3.3.5 in https://gerrit.libreoffice.org/9311 from Thomas Arnhold about module build, external + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith about module include, sw, tools + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter about module writerfilter + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar about module filter, sw, writerfilter + enhance pass-by-ref plugin to detect large arguments in https://gerrit.libreoffice.org/9403 from Noel Grandin about module bridges, codemaker, compilerplugins, cui, dbaccess, include, sc, sd, sfx2, stoc, sw, tools, unotools, uui, vcl, writerfilter * Merged changes on master for project core changed in the last 25 hours: + libavmedia.so needs to link to librt under Linux in https://gerrit.libreoffice.org/9402 from Jeroen Nijhof + fdo78474:Corruption a:graphicData has no info for the image. in https://gerrit.libreoffice.org/9363 from Sourav Mahajan * Abandoned changes on master for project core changed in the last 25 hours: + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms * Open changes needing tweaks, but being untouched for more than a week: + fdo#60338: Saved files have incorrect permissions on linux in https://gerrit.libreoffice.org/9287 from Ulrich Kitzinger + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes 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: do NOT immediately remove files from dev-downloads.libreoffice.org on update of externals!
On 05/19/2014 09:45 PM, Bjoern Michaelsen wrote: please do NOT remove files from dev-downloads when updating externals, keep those files around for at least 12 months! Otherwise you will break bibisect building hard (apart from also breaking people on local branches). So please keep whatever tarball was ever used in a LibreOffice build on the server for at least 12 months. Where does the value 12 come from? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Compilation error
Hello! I have just downloaded the source code and make but I got compilation error. Why? I didn't modify anything. warn:linguistic:1011:1:linguistic/source/lngsvcmgr.cxx:489: no extension manager - should fire on mobile only warn:chart2:1011:1:chart2/source/view/main/ShapeFactory.cxx:2132: Exception caught. Type: N3com3sun4star3uno9ExceptionE, Message: warn:vcl.window:1011:1:vcl/source/window/window.cxx:6869: ignoring DeploymentException component context fails to supply service 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type 'com.sun.star.datatransfer.clipboard.XSystemClipboard' warn:sfx.control:1011:1:sfx2/source/control/dispatch.cxx:1505: Childwindow slot missing: 10365 warn:sfx.control:1011:1:sfx2/source/control/dispatch.cxx:1505: Childwindow slot missing: 10365 Segmentation fault (core dumped) No core file identified in directory /home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_export.test.core To show backtraces for crashes during test execution, enable core files with: ulimit -c unlimited warn:linguistic:1027:1:linguistic/source/lngsvcmgr.cxx:489: no extension manager - should fire on mobile only warn:chart2:1027:1:chart2/source/view/main/ShapeFactory.cxx:2132: Exception caught. Type: N3com3sun4star3uno9ExceptionE, Message: warn:unotools.misc:1027:1:unotools/source/misc/mediadescriptor.cxx:736: caught Exception an error occurred during file opening while opening file:///home/freetank/Hasznal/LibreOfficeCore/workdir/unittest/user/config/standard.sod warn:vcl.window:1027:1:vcl/source/window/window.cxx:6869: ignoring DeploymentException component context fails to supply service 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type 'com.sun.star.datatransfer.clipboard.XSystemClipboard' warn:sfx.control:1027:1:sfx2/source/control/dispatch.cxx:1505: Childwindow slot missing: 10365 warn:sfx.control:1027:1:sfx2/source/control/dispatch.cxx:1505: Childwindow slot missing: 10365 Segmentation fault (core dumped) No core file identified in directory /home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_import.test.core To show backtraces for crashes during test execution, enable core files with: ulimit -c unlimited Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_chart2_export Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_chart2_import make[1]: *** [/home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_export.test] Error 1 make[1]: *** Waiting for unfinished jobs make[1]: *** [/home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_import.test] Error 1 make: *** [build] Error 2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
master build fails in Chart2
Hi, Since several days my master build fails with the same error : [build CXX] chart2/source/controller/dialogs/dlg_NumberFormat.cxx In file included from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:21:0: .../chart2/source/controller/dialogs/res_LegendPosition.hxx:32:7: error: redefinition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ In file included from .../chart2/source/controller/inc/dlg_InsertLegend.hxx:29:0, from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:20: .../chart2/source/controller/inc/res_LegendPosition.hxx:32:7: error: previous definition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ make[1]: *** [.../workdir/CxxObject/chart2/source/controller/dialogs/dlg_InsertLegend.o] Erreur 1 make[1]: *** Attente des tâches non terminées make: *** [build] Erreur 2 Each time I build the master, I do a complete rebuild (make disclean - ./autogen.sh make). As the Linux TB seem to not have the same problem, I guess it is on my side, but I do not know how to fix that. I build the master on Ubuntu 14.04 x86-64 with gcc 4.8. No problem when building LO 4.2.5.0.0+. Any advice is welcome. :-) 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
Re: do NOT immediately remove files from dev-downloads.libreoffice.org on update of externals!
Hi, On Tue, May 20, 2014 at 08:56:08AM +0200, Stephan Bergmann wrote: On 05/19/2014 09:45 PM, Bjoern Michaelsen wrote: please do NOT remove files from dev-downloads when updating externals, keep those files around for at least 12 months! Otherwise you will break bibisect building hard (apart from also breaking people on local branches). So please keep whatever tarball was ever used in a LibreOffice build on the server for at least 12 months. Where does the value 12 come from? I am curious about that too :-) Personally I would say do not ever remove tarballs from dev-www! D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/glew
external/glew/UnpackedTarball_glew.mk |4 external/glew/glew-debug.patch.1 | 12 2 files changed, 16 insertions(+) New commits: commit f3a46244a07b76d633ccc7f83da3fa502612e978 Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 10:07:43 2014 +0300 Make it actually work to build GLEW for debugging The check in the GLEW Makefile looked at the whole $(MAKECMDGOALS), which in our case was the string 'glew.lib debug', not just 'debug'. Change-Id: I639395c944e8f2b443cbb55b451a4036b2c9d3bb diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 1b100bc..64cbc5c 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -48,4 +48,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,glew,\ + external/glew/glew-debug.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/glew/glew-debug.patch.1 b/external/glew/glew-debug.patch.1 new file mode 100644 index 000..c6e30a4 --- /dev/null +++ b/external/glew/glew-debug.patch.1 @@ -0,0 +1,12 @@ +-*- Mode: Diff -*- +--- glew/Makefile glew/Makefile +@@ -65,7 +65,7 @@ + RM ?= rm -f + LN ?= ln -sf + +-ifeq ($(MAKECMDGOALS), debug) ++ifneq (,$(filter debug,$(MAKECMDGOALS))) + OPT = -g + else + OPT = $(POPT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 498c314861f0913a5b31ee29efc38aad12c3a781 Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 20 09:41:59 2014 +0200 Hack to for now work around dpy == null crashing CppunitTest_chart2_* ...since 2fc4f5cd750cc3899ffc6b2f831edcb01e7773b4 Register OpenGL windows to ScGridWindow upon file load. Should be revisited and fixed properly. Change-Id: I5a3d08cb750fd9ec7c98d5b85250eaabd1c7a8b2 diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 6bb7c10..20d9acd 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -390,7 +390,7 @@ bool OpenGLContext::ImplInit() #elif defined( ANDROID ) #elif defined( UNX ) -m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy, +m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy, m_aGLWin.vi, 0, GL_TRUE); @@ -690,7 +690,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent) Display *dpy = reinterpret_castDisplay*(sysData-pDisplay); -if( !glXQueryExtension( dpy, NULL, NULL ) ) +if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) ) return aWinData; XLIB_Window win = sysData-aWindow; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: do NOT immediately remove files from dev-downloads.libreoffice.org on update of externals!
On Tue, May 20, 2014 at 09:18:54AM +0200, David Tardon wrote: On Tue, May 20, 2014 at 08:56:08AM +0200, Stephan Bergmann wrote: On 05/19/2014 09:45 PM, Bjoern Michaelsen wrote: please do NOT remove files from dev-downloads when updating externals, keep those files around for at least 12 months! Otherwise you will break bibisect building hard (apart from also breaking people on local branches). So please keep whatever tarball was ever used in a LibreOffice build on the server for at least 12 months. Where does the value 12 come from? I am curious about that too :-) Personally I would say do not ever remove tarballs from dev-www! Well, 12 months was just a minimum. I have not issue with using never instead. ;) 12 months was just a rough estimate of two major releases which would be good enough for bibisect at least. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppuhelper/source desktop/unx hwpfilter/source rsc/source sal/osl sal/qa
cppuhelper/source/findsofficepath.c | 12 -
desktop/unx/source/splashx.c|2
hwpfilter/source/grammar.cxx| 73
rsc/source/rscpp/cpp3.c |3 -
sal/osl/unx/socket.c|8 ---
sal/qa/osl/process/osl_Thread.cxx |5 --
sal/qa/rtl/ostring/rtl_str.cxx | 14 ++
7 files changed, 53 insertions(+), 64 deletions(-)
New commits:
commit cd11bc699ac50af4f560ed5f2e5e7903de0898b8
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Fri May 9 10:38:04 2014 +0200
C string usage improvment
Change-Id: I5c59f0d2d1b911ffa1ee251e0f1355d137616493
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cppuhelper/source/findsofficepath.c
b/cppuhelper/source/findsofficepath.c
index 1bd7368..903b91b 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -135,8 +135,10 @@ static char* platformSpecific()
env = getenv( PATHVARNAME );
if (env == NULL)
return NULL;
-str = (char*) malloc( strlen( env ) + 1 );
-strcpy( str, env );
+
+str = strdup( env );
+if (str == NULL)
+return NULL;
/* get the tokens separated by ':' */
dir = strtok( str, PATHSEPARATOR );
@@ -145,6 +147,12 @@ static char* platformSpecific()
{
/* construct soffice file path */
file = (char*) malloc( strlen( dir ) + strlen( APPENDIX ) + 1 );
+if (file == NULL)
+{
+free(str);
+return NULL;
+}
+
strcpy( file, dir );
strcat( file, APPENDIX );
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 24b2152..288656c 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -582,7 +582,7 @@ static void splash_load_image( struct splash* splash,
rtl_uString* pUAppPath )
pLang = ustr_to_str (pLoc-Language);
pCountry = ustr_to_str (pLoc-Country);
-nLocSize = strlen (pLang-buffer) + strlen (pCountry-buffer) + 8;
+nLocSize = strlen (pLang-buffer) + strlen (pCountry-buffer) + 3;
pLocale = malloc (nLocSize);
pLocale[0] = '-';
strcpy (pLocale + 1, pLang-buffer);
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index be4b591..fccd75f 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -44,13 +44,6 @@ Node *top=0L;
int Node::count = 0;
-#define allocValue(x,y) \
-x = (char *)malloc( strlen(y) +1 ); \
-strcpy(x,y)
-
-#define allocChar(x,y) \
-x = (char *)malloc(2); \
-sprintf(x,%c,y)
#ifdef PARSE_DEBUG
#define debug printf
#else
@@ -836,55 +829,55 @@ yyreduce:
switch (yyn) {
case 1:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 2:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 3:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 4:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 5:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 6:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 7:
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr-value =
strdup(yyvsp[0].str); debug(Identifier :
[Libreoffice-commits] core.git: sal/osl sal/qa
sal/osl/unx/socket.c |4 ++--
sal/qa/rtl/ostring/rtl_str.cxx | 10 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit fe39041f98b1abb3a23b43f399963487fe5b66b9
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 10:03:18 2014 +0200
Remove unnecessary casts
Change-Id: Iafc7727a22d657dfb6bc97ed767907cce3679364
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 052ace9..d11297f 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -790,7 +790,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct
hostent *he)
if (_osl_isFullQualifiedDomainName(he-h_name))
{
-cn= (sal_Char *)strdup(he-h_name);
+cn= strdup(he-h_name);
OSL_ASSERT(cn);
if (cn == NULL)
return ((oslHostAddr)NULL);
@@ -887,7 +887,7 @@ oslHostAddr SAL_CALL osl_psz_createHostAddr (
if ((pszHostname == NULL) || (pAddr == NULL))
return ((oslHostAddr)NULL);
-cn = (sal_Char *) strdup(pszHostname);
+cn = strdup(pszHostname);
OSL_ASSERT(cn);
if (cn == NULL)
return ((oslHostAddr)NULL);
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 759d30e..4ba2962 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -711,7 +711,7 @@ namespace rtl_str
void trim_WithLength_001()
{
char const *pStr = trim this;
-sal_Char *pStr2 = (sal_Char*)strdup(pStr);
+sal_Char *pStr2 = strdup(pStr);
if (pStr2)
{
rtl_str_trim_WithLength( pStr2, 2 );
@@ -724,7 +724,7 @@ namespace rtl_str
void trim_WithLength_002()
{
char const *pStr = trim this;
-sal_Char *pStr2 = (sal_Char*)strdup(pStr);
+sal_Char *pStr2 = strdup(pStr);
if (pStr2)
{
rtl_str_trim_WithLength( pStr2, 5 );
@@ -737,7 +737,7 @@ namespace rtl_str
void trim_WithLength_003()
{
char const *pStr = trim this;
-sal_Char *pStr2 = (sal_Char*)strdup(pStr);
+sal_Char *pStr2 = strdup(pStr);
if (pStr2)
{
strcpy(pStr2, pStr);
@@ -751,7 +751,7 @@ namespace rtl_str
void trim_WithLength_004()
{
char const *pStr = \r\n\t \n\rtrim \n this;
-sal_Char *pStr2 = (sal_Char*)strdup(pStr);
+sal_Char *pStr2 = strdup(pStr);
if (pStr2)
{
rtl_str_trim_WithLength( pStr2, 17 );
@@ -764,7 +764,7 @@ namespace rtl_str
void trim_WithLength_005()
{
char const *pStr = \r\n\t \n\rtrim \t this \n\r\t\t ;
-sal_Char *pStr2 = (sal_Char*)strdup(pStr);
+sal_Char *pStr2 = strdup(pStr);
if (pStr2)
{
rtl_str_trim_WithLength( pStr2, strlen(pStr2) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: master build fails in Chart2
On 05/20/2014 08:24 AM, Jean-Baptiste Faure wrote: [build CXX] chart2/source/controller/dialogs/dlg_NumberFormat.cxx In file included from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:21:0: .../chart2/source/controller/dialogs/res_LegendPosition.hxx:32:7: error: redefinition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ In file included from .../chart2/source/controller/inc/dlg_InsertLegend.hxx:29:0, from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:20: .../chart2/source/controller/inc/res_LegendPosition.hxx:32:7: error: previous definition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ make[1]: *** [.../workdir/CxxObject/chart2/source/controller/dialogs/dlg_InsertLegend.o] Erreur 1 make[1]: *** Attente des tâches non terminées make: *** [build] Erreur 2 Do you have a leftover chart2/source/controller/dialogs/res_LegendPosition.hxx that should have been removed long ago by http://cgit.freedesktop.org/libreoffice/core/commit/?id=27eb33d753eedfa4215eaf8325bc0ee9baeb7417 remove unnecessary empty dtor, etc.? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit c3ed5f6d3348fa2b6551d0d942632d951555a01d Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 10:57:44 2014 +0300 Fail early in OpenGLContext::ImplInit() on platforms where not yet implemented So far this code apparently has not been invoked except in the very special use cases for which it has been developed, and which presumably aren't such that one would come across in normal LibreOffice use. But now it gets invoked unconditionally, in some unit tests even, and letting it call glewInit(), which calls glGetString(), without any OpenGL context, leads to a crash. So instead, explicitly fail early on OS X (and iOS and Android). Change-Id: Ia4547cc1ddff1aaa0190fcdb69506ad444214b7a diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 20d9acd..0ce85cb 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -385,10 +385,19 @@ bool OpenGLContext::ImplInit() m_aGLWin.hDC = GetDC(m_aGLWin.hWnd); #elif defined( MACOSX ) +SAL_INFO(vcl.opengl, OpenGLContext not implemented yet for OS X); +return false; + #elif defined( IOS ) +SAL_INFO(vcl.opengl, OpenGLContext not implemented yet for iOS); +return false; + #elif defined( ANDROID ) +SAL_INFO(vcl.opengl, OpenGLContext not implemented yet for Android); +return false; + #elif defined( UNX ) m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy, m_aGLWin.vi, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Compilation error
On 05/20/2014 08:58 AM, Mihály Palenik wrote: make[1]: *** [/home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_export.test] Error 1 make[1]: *** Waiting for unfinished jobs make[1]: *** [/home/freetank/Hasznal/LibreOfficeCore/workdir/CppunitTest/chart2_import.test] Error 1 make: *** [build] Error 2 http://cgit.freedesktop.org/libreoffice/core/commit/?id=498c314861f0913a5b31ee29efc38aad12c3a781 Hack to for now work around dpy == null crashing CppunitTest_chart2_* should hopefully work around that for now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 3 commits - avmedia/source external/collada2gltf
avmedia/source/framework/modeltools.cxx | 11
++
external/collada2gltf/write-only-.dae-file-which-we-need.patch.0 |2 -
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 7110b392942a73094cecbabb77a44c684d2cd1fb
Author: Jan Holesovsky ke...@collabora.com
Date: Tue May 20 09:37:47 2014 +0200
collada2gltf: Ignore case of the extension.
Change-Id: If7f39a1a0537c561373137e6a9dcdb22b48037f0
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index 2366dc7..1adef63 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -140,7 +140,9 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
{
OUString sSource = rSourceURL;
#ifdef ENABLE_COLLADA2GLTF
-if (rSourceURL.endsWith(.dae) || rSourceURL.endsWith(.kmz))
+const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(.dae);
+const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(.kmz);
+if (bIsDAE || bIsKMZ)
{
OUString sName;
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sName);
@@ -152,7 +154,7 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
std::shared_ptr GLTF::GLTFAsset asset(new GLTF::GLTFAsset());
asset-setInputFilePath(sSourcePath);
-if (rSourceURL.endsWith(.kmz))
+if (bIsKMZ)
{
std::string strDaeFilePath =
GLTF::Kmz2Collada()(asset-getInputFilePath());
if (strDaeFilePath == )
commit 95adbe9fbd156ed0227aca98a3fe7ac9664f09b8
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue May 20 02:48:43 2014 +0200
fix .kmz support on Windows; no idea why this int was unsigned
Change-Id: I08fa1c3956b48bcd65edb74add010fafa17bfe82
diff --git a/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
b/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
index 68980e2..56ff909 100644
--- a/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
+++ b/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
@@ -74,7 +74,7 @@ index d193784..3b5bdfc 100644
+continue;
-FILE *fp = fopen(strFilePath.c_str(),wb);
-+unsigned int pos = strlen(pFileName) - 1;
++int pos = strlen(pFileName) - 1;
+while (pos = 0) {
+if (pFileName[pos] == '\\' || pFileName[pos] == '/')
+break;
commit e1fff3d529aa3bb0a8b559d642cc2f5f55416d8d
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue May 20 02:34:38 2014 +0200
collada2gltf: output bundle path needs to be in url format
Otherwise it does not work on Windows.
It's strange though that input path has to be converted from url to
native path format. At least that was my observation.
Change-Id: Ia8d9e9719d927cab2ae4d928eb8066cab4588281
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index 9b48552..2366dc7 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -142,7 +142,8 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
#ifdef ENABLE_COLLADA2GLTF
if (rSourceURL.endsWith(.dae) || rSourceURL.endsWith(.kmz))
{
-OUString sName = ::utl::TempFile::CreateTempName();
+OUString sName;
+
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sName);
// remove .tmp extension
sName = sName.copy(0, sName.getLength() - 4);
const INetURLObject aSourceURLObj(rSourceURL);
@@ -162,7 +163,7 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
GLTF::COLLADA2GLTFWriter writer(asset);
writer.write();
// Path to the .json file created by COLLADA2GLTFWriter
-::utl::LocalFileHelper::ConvertPhysicalNameToURL(sName + / +
GetFilename(sName) + .json, sSource);
+sSource = sName + / + GetFilename(sName) + .json;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78654.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx |2 ++
3 files changed, 13 insertions(+)
New commits:
commit d2a19aad658cc0e8939c16b5137c15727c3cdff9
Author: sushil_shinde sushil.shi...@synerzip.com
Date: Thu May 15 19:22:12 2014 +0530
fdo#78654 LO was exporting corrupt docx file.
If docx file contains multiple hyperlinks in one paragraph
and one of the hyperlink contains PAGEREF field. End tag
for PAGEREF field was not exported hence it was causing
corruption in exported file.
Fixed export part of field end tags in case of PAGEREF.
Added unit test.
Change-Id: I18a3625213bf7269e3f441859a27acc38cf6ff45
Reviewed-on: https://gerrit.libreoffice.org/9364
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78654.docx
b/sw/qa/extras/ooxmlexport/data/fdo78654.docx
new file mode 100644
index 000..81d7bd0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78654.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 67ccaae..7f3a5b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3370,6 +3370,17 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78384,fdo78384.docx)
assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts,ascii,Wingdings);
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78654 , fdo78654.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+// In case of two Hyperlink tags in one paragraph and one of them
+// contains PAGEREF field then field end tag was missing from hyperlink.
+assertXPath ( pXmlDoc,
/w:document/w:body/w:p[2]/w:hyperlink[3]/w:r[5]/w:fldChar, fldCharType,
end );
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testfdo78599,fdo78599.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4c6c7d0..19807f4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -823,6 +823,8 @@ void DocxAttributeOutput::EndRun()
FSNS( XML_w, XML_fldCharType ), separate,
FSEND );
m_pSerializer-endElementNS( XML_w, XML_r );
+// At start of every PAGEREF field m_endPageRef value should be
true.
+m_endPageRef = true;
}
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 85 +++-
1 file changed, 59 insertions(+), 26 deletions(-)
New commits:
commit 43624d9370c4384f71c6b13fed900eaec222cf64
Author: Eike Rathke er...@redhat.com
Date: Tue May 20 10:28:58 2014 +0200
resolved fdo#34724 Jan1 or 1Jan without separating character is not date
Change-Id: I2cf02a26b81fa634c842df455de669f1c60241bc
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6d6b9d5..fef69c5 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2054,16 +2054,25 @@ bool ImpSvNumberInputScan::ScanStartString( const
OUString rString,
}
else
{
-nMonth = GetMonth(rString, nPos);
-if ( nMonth )// month (Jan 1)?
+const sal_Int32 nMonthStart = nPos;
+short nTempMonth = GetMonth(rString, nPos);
+if ( nTempMonth )// month (Jan 1)?
{
-eScannedType = NUMBERFORMAT_DATE; // !!! it IS a date !!!
-nMonthPos = 1; // month at the beginning
-if ( nMonth 0 )
+if (nPos rString.getLength()) // Jan1 without separator
is not a date
{
-SkipChar( '.', rString, nPos ); // abbreviated
+eScannedType = NUMBERFORMAT_DATE; // !!! it IS a date !!!
+nMonth = nTempMonth;
+nMonthPos = 1; // month at the beginning
+if ( nMonth 0 )
+{
+SkipChar( '.', rString, nPos ); // abbreviated
+}
+SkipBlanks(rString, nPos);
+}
+else
+{
+nPos = nMonthStart; // rewind month
}
-SkipBlanks(rString, nPos);
}
else
{
@@ -2089,15 +2098,23 @@ bool ImpSvNumberInputScan::ScanStartString( const
OUString rString,
SkipString(
pFormatter-GetLocaleData()-getLongDateDayOfWeekSep(), rString, nPos );
}
SkipBlanks(rString, nPos);
-nMonth = GetMonth(rString, nPos);
-if ( nMonth ) // month (Jan 1)?
+nTempMonth = GetMonth(rString, nPos);
+if ( nTempMonth ) // month (Jan 1)?
{
-nMonthPos = 1; // month a the beginning
-if ( nMonth 0 )
+if (nPos rString.getLength()) // Jan1
without separator is not a date
{
-SkipChar( '.', rString, nPos ); // abbreviated
+nMonth = nTempMonth;
+nMonthPos = 1; // month a the beginning
+if ( nMonth 0 )
+{
+SkipChar( '.', rString, nPos ); // abbreviated
+}
+SkipBlanks(rString, nPos);
+}
+else
+{
+nPos = nMonthStart; // rewind month
}
-SkipBlanks(rString, nPos);
}
}
if (!nMonth)
@@ -2282,6 +2299,7 @@ bool ImpSvNumberInputScan::ScanMidString( const OUString
rString,
}
}
+const sal_Int32 nMonthStart = nPos;
short nTempMonth = GetMonth(rString, nPos); // month in the middle (10
Jan 94)
if (nTempMonth)
{
@@ -2294,15 +2312,22 @@ bool ImpSvNumberInputScan::ScanMidString( const
OUString rString,
{
return MatchedReturn();
}
-eScannedType = NUMBERFORMAT_DATE; // !!! it IS a date
-nMonth = nTempMonth;
-nMonthPos = 2; // month in the middle
-if ( nMonth 0 )
+if (nMonthStart 0 nPos rString.getLength()) // 10Jan or Jan94
without separator are not dates
+{
+eScannedType = NUMBERFORMAT_DATE; // !!! it IS a date
+nMonth = nTempMonth;
+nMonthPos = 2; // month in the middle
+if ( nMonth 0 )
+{
+SkipChar( '.', rString, nPos ); // abbreviated
+}
+SkipString( pLoc-getLongDateMonthSep(), rString, nPos );
+SkipBlanks(rString, nPos);
+}
+else
{
-SkipChar( '.', rString, nPos ); // abbreviated
+nPos = nMonthStart; // rewind month
}
-SkipString( pLoc-getLongDateMonthSep(), rString, nPos );
-SkipBlanks(rString, nPos);
}
if ( SkipChar('E', rString, nPos) ||// 10E, 10e, 10,Ee
@@ -2630,6 +2655,7 @@ bool
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - xmloff/source
xmloff/source/text/txtfldi.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 6a66844b611dce6d3c7962b5f31b02cbc5d2cc9c
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 15 00:24:26 2014 +0100
fdo#74524: ODF import: fix unhandled exception in annotation import
cp#175
Crash with unhandled UnknownPropertyException when trying to get Name
property from a PageNumber field.
(cherry picked from commit cf26d7614364176742ae0303efb4499a37ae04c8)
Change-Id: I501cc138caba034c85630519014b94d783ab8f39
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 9d62939..349cd37 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3735,12 +3735,17 @@ void XMLAnnotationImportContext::EndElement()
while (xFields-hasMoreElements())
{
uno::Referencebeans::XPropertySet
xCurrField(xFields-nextElement(), uno::UNO_QUERY);
-OUString aFieldName;
-xCurrField-getPropertyValue(sPropertyName) = aFieldName;
-if ( aFieldName == aName )
+uno::Referencebeans::XPropertySetInfo const xInfo(
+xCurrField-getPropertySetInfo());
+if (xInfo-hasPropertyByName(sPropertyName))
{
-xPrevField.set( xCurrField, uno::UNO_QUERY );
-break;
+OUString aFieldName;
+xCurrField-getPropertyValue(sPropertyName) =
aFieldName;
+if (aFieldName == aName)
+{
+xPrevField.set( xCurrField, uno::UNO_QUERY );
+break;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svl/source sw/qa sw/source
svl/source/numbers/zforfind.cxx | 20 +---
sw/qa/extras/ooxmlexport/data/fdo78659.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 1870ed0e4f63e9c58476e7dcd160e04eb866e0f5
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date: Thu May 15 16:12:23 2014 +0530
fdo#78659:FIle geting corrupted after Roundtrip due to fieldchar.
In a hyperlink, the field with fieldchartype=end is getting addeded
eventhough there is no begin for that field.
Change-Id: I50df6efc63fc9a66b146d4a861ae4bd654b4a3c6
Reviewed-on: https://gerrit.libreoffice.org/9368
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78659.docx
b/sw/qa/extras/ooxmlexport/data/fdo78659.docx
new file mode 100644
index 000..55d6d08
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78659.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7f3a5b7..f70f58d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3362,6 +3362,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78284, fdo78284.docx)
image/png);
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78659, fdo78659.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[8]/w:tr[6]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[3]/w:fldChar[1],
0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO78384,fdo78384.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 19807f4..6608149 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1866,7 +1866,7 @@ bool DocxAttributeOutput::StartURL( const OUString rUrl,
const OUString rTarge
bool DocxAttributeOutput::EndURL()
{
m_closeHyperlinkInThisRun = true;
-if(m_hyperLinkAnchor != m_hyperLinkAnchor.startsWith(_Toc))
+if(m_startedHyperlink m_hyperLinkAnchor !=
m_hyperLinkAnchor.startsWith(_Toc))
{
m_endPageRef = true;
}
commit 76531b80ea49e9665c628a2e5f8b82280ef80704
Author: Eike Rathke er...@redhat.com
Date: Tue May 20 10:49:02 2014 +0200
take a shortcut on common separating ASCII characters
Change-Id: I991801b9a0b7be6024612c8f29262f2ebd8e6a64
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fef69c5..0385970 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -459,14 +459,28 @@ bool ImpSvNumberInputScan::StringContainsWord( const
OUString rWhat,
* form? */
// Check simple ASCII first before invoking i18n or anything else.
-if (rtl::isAsciiAlphanumeric( rString[nPos] ))
+const sal_Unicode c = rString[nPos];
+
+// Common separating ASCII characters in date context.
+switch (c)
+{
+case ' ':
+case '-':
+case '.':
+case '/':
+return true;
+default:
+; // nothing
+}
+
+if (rtl::isAsciiAlphanumeric( c ))
return false; // Alpha or numeric is not word gap.
sal_Int32 nIndex = nPos;
-const sal_uInt32 c = rString.iterateCodePoints( nIndex);
+const sal_uInt32 uc = rString.iterateCodePoints( nIndex);
if (nPos+1 nIndex)
return true;// Surrogate, assume these to be new words.
-(void)c;
+(void)uc;
const sal_Int32 nType = pFormatter-GetCharClass()-getCharacterType(
rString, nPos);
using namespace ::com::sun::star::i18n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/fdo78659.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx|2 +- 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit e4740dbecfce958c2c707d8cc92e6dbe52f4b71b Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue May 20 10:41:06 2014 +0200 fdo#78659 make testcase minimal Change-Id: I393b413528685276bffd35fb7fe5ce8c742314b7 diff --git a/sw/qa/extras/ooxmlexport/data/fdo78659.docx b/sw/qa/extras/ooxmlexport/data/fdo78659.docx index 55d6d08..cf08003 100644 Binary files a/sw/qa/extras/ooxmlexport/data/fdo78659.docx and b/sw/qa/extras/ooxmlexport/data/fdo78659.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index f70f58d..90021c5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3368,7 +3368,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78659, fdo78659.docx) if (!pXmlDoc) return; -assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:tbl[8]/w:tr[6]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[3]/w:fldChar[1], 0); +assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[3]/w:fldChar[1], 0); } DECLARE_OOXMLEXPORT_TEST(testFDO78384,fdo78384.docx) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Bug 58187
Hello, I'd like to try to work on bug https://bugs.freedesktop.org/show_bug.cgi?id=58187 (In the Writer Navigator an expanded tree is collapsed when you edit an entry). Does anybody have any hint for me, which code fragments to look at? For example, what's the type of the tree view or the tree items in the navigator? Up to now all tries to find the corresponding collapse method have been fruitless. Thanks in advance, Ulrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Newbie question
Hello, I have recently committed my first patches for te bug 43157. These were my first experience in open source programming, so I chose easy task. Then I gor review saying that the workben submodule files where I made change are not built. I also noticed that. I waned to know how can I respond to the review. Thank you! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/app/inputhdl.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit bb8acc29e4ad4fb8245b2ed47e60c6cac641ddb1
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue May 20 07:33:00 2014 +0200
Resolves: fdo#78838 past-the-end iterator
Inserting data in pColumnData invalidated miAutoPosColumn
See https://bugs.freedesktop.org/show_bug.cgi?id=78838#c6
Cherry-picked from 1df54514d7a1ebb1b4fa16cca386a34e7c41c490
Change-Id: Iece423cd8d14f5ae7bf382583c0369895a00f168
Reviewed-on: https://gerrit.libreoffice.org/9409
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d964312..ed5e352 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1536,7 +1536,10 @@ void ScInputHandler::GetColData()
pDoc-GetDataEntries(
aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true,
aEntries, true);
if (!aEntries.empty())
+{
pColumnData-insert(aEntries.begin(), aEntries.end());
+miAutoPosColumn = pColumnData-end();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 58187
On 2014-05-20 10:55, Ulrich Kitzinger wrote: I'd like to try to work on bug https://bugs.freedesktop.org/show_bug.cgi?id=58187 (In the Writer Navigator an expanded tree is collapsed when you edit an entry). Does anybody have any hint for me, which code fragments to look at? For example, what's the type of the tree view or the tree items in the navigator? Up to now all tries to find the corresponding collapse method have been fruitless. That sounds like it's an SvTreeList control. Grepping through sw/ shows half a dozen places that use an SvTreeList control, but I wouldn't know which one is the responsible party. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/shape.cxx |6 ++
sw/qa/extras/ooxmlexport/data/fdo78658.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
3 files changed, 15 insertions(+)
New commits:
commit df973e6e950591c0c36f2761e43ec23b9964
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Fri May 16 16:05:47 2014 +0530
fdo#78658 Corruption: lockedCanvas tag is missing from RT file
While export, locked Canvas is missing and drawing is
exported inside textbox. However a locked Canvas has to be exported
inside a text-box and drawing should fall under locked Canvas
for the RT file to work in MS Office 2010.
Reviewed on:
https://gerrit.libreoffice.org/9377
Change-Id: Iea2c411302b552db18527001cc4c6d0290085afe
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 33c846c..ca42d4a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -962,6 +962,12 @@ Reference XShape Shape::createAndInsert(
}
}
+else if( mbLockedCanvas )
+{
+//If we have aServiceName as com.sun.star.drawing.GroupShape and
lockedCanvas
+putPropertyToGrabBag( LockedCanvas, Any( true ) );
+}
+
// These can have a custom geometry, so position should be set here,
// after creation but before custom shape handling, using the position
// we got from the caller.
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78658.docx
b/sw/qa/extras/ooxmlexport/data/fdo78658.docx
new file mode 100644
index 000..1c0782e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78658.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 90021c5..f69396f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2984,6 +2984,15 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76016, fdo76016.docx)
assertXPath(pXmlDoc,
//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[2],
name, adj2);
}
+DECLARE_OOXMLEXPORT_TEST(testLockedCanvas, fdo78658.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+// Checking for lockedCanvas tag
+assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/lc:lockedCanvas[1],
1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink,
FileWithInvalidImageLink.docx)
{
/* In case if the original file has an image whose link is
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 23e9f36a21f7daa6175f53fd244677b9c2e2a660
Author: Eike Rathke er...@redhat.com
Date: Tue May 20 11:38:46 2014 +0200
simplify and ensure valid miAutoPosColumn in all cases, fdo#78838 related
Unconditionally set miAutoPosColumn at the end of all operations so it
is also valid in case of pColumnData-clear() and no entries inserted
after pDoc-GetDataEntries().
Change-Id: I689632f696091fd9ce8e93c06d7918e5eaf05ab4
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index af767b9..b9e1b90 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1409,19 +1409,15 @@ void ScInputHandler::GetColData()
if ( pColumnData )
pColumnData-clear();
else
-{
pColumnData = new ScTypedCaseStrSet;
-miAutoPosColumn = pColumnData-end();
-}
std::vectorScTypedStrData aEntries;
pDoc-GetDataEntries(
aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true,
aEntries, true);
if (!aEntries.empty())
-{
pColumnData-insert(aEntries.begin(), aEntries.end());
-miAutoPosColumn = pColumnData-end();
-}
+
+miAutoPosColumn = pColumnData-end();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/app/inputhdl.cxx |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 51a868729b5adfa402095f5c08fa889bddcd1b34
Author: Eike Rathke er...@redhat.com
Date: Tue May 20 11:38:46 2014 +0200
simplify and ensure valid miAutoPosColumn in all cases, fdo#78838 related
Unconditionally set miAutoPosColumn at the end of all operations so it
is also valid in case of pColumnData-clear() and no entries inserted
after pDoc-GetDataEntries().
Change-Id: I689632f696091fd9ce8e93c06d7918e5eaf05ab4
(cherry picked from commit 23e9f36a21f7daa6175f53fd244677b9c2e2a660)
Reviewed-on: https://gerrit.libreoffice.org/9412
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index ed5e352..0041f3c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1527,19 +1527,15 @@ void ScInputHandler::GetColData()
if ( pColumnData )
pColumnData-clear();
else
-{
pColumnData = new ScTypedCaseStrSet;
-miAutoPosColumn = pColumnData-end();
-}
std::vectorScTypedStrData aEntries;
pDoc-GetDataEntries(
aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true,
aEntries, true);
if (!aEntries.empty())
-{
pColumnData-insert(aEntries.begin(), aEntries.end());
-miAutoPosColumn = pColumnData-end();
-}
+
+miAutoPosColumn = pColumnData-end();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45789] automatic row height in reports
https://bugs.freedesktop.org/show_bug.cgi?id=45789 --- Comment #18 from Lionel Elie Mamane lio...@mamane.lu --- Michal? Any news on your work on this bug? Any question? Do you still intend to work on it? -- 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: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 40
++
chart2/qa/extras/data/docx/fdo78290_Combination_Chart_Marker_x.docx |binary
chart2/qa/extras/data/docx/fdo78290_Line_Chart_Marker_x.docx|binary
chart2/qa/extras/data/docx/fdo78290_Scatter_Chart_Marker_x.docx |binary
oox/source/export/chartexport.cxx |5 -
5 files changed, 43 insertions(+), 2 deletions(-)
New commits:
commit ee0bb265c90a135afa53c0fa6a586996e67640fa
Author: Bisal Singh Nayal bisal.na...@synerzip.com
Date: Wed May 7 20:03:11 2014 +0530
fdo#78290 : The File gets corrupted when saved in LO
Problem Description: Docx file containing a chart (line chart / scatter
chart)which has used a builtin
marker'x' gets corrupted when we save it in LO.The reason was that while
exporting LO was writing the
marker information 'x' as 'X' which MS Word doesn't
recognize.âc:markerc:symbol val=X /. Also
the size of the marker was coming 1 less than the actual value. Ex: if size
is 7 then it was being
written as 6.
Solution: During export I have made changes so that now LO writes 'x' in
the tag information
âc:marker c:symbol val=x /. Now the size of the marker is also
being correctly exported.
Change-Id: I26b747f9576625bf3acb941322ae418a0bbc6b64
Reviewed-on: https://gerrit.libreoffice.org/9273
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 30a252a..c75b5c2 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -57,6 +57,9 @@ public:
void testGapWidthXLSX();
void testSmoothedLines();
void testLabelStringODS();
+void testfdo78290_Line_Chart_Marker_x();
+void testfdo78290_Scatter_Chart_Marker_x();
+void testfdo78290_Combination_Chart_Marker_x();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -86,6 +89,9 @@ public:
CPPUNIT_TEST(testGapWidthXLSX);
CPPUNIT_TEST(testSmoothedLines);
CPPUNIT_TEST(testLabelStringODS);
+CPPUNIT_TEST(testfdo78290_Line_Chart_Marker_x);
+CPPUNIT_TEST(testfdo78290_Scatter_Chart_Marker_x);
+CPPUNIT_TEST(testfdo78290_Combination_Chart_Marker_x);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -629,6 +635,40 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill);
}
+//The below test case tests the built in marker 'x' for Office 2010 in Line
charts
+
+void Chart2ExportTest::testfdo78290_Line_Chart_Marker_x()
+{
+load(/chart2/qa/extras/data/docx/, fdo78290_Line_Chart_Marker_x.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1],val,x);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1],val,7);
+}
+
+// We can also use the built in marker 'x' in scatter chart, hence writing the
test case for the same.
+
+void Chart2ExportTest::testfdo78290_Scatter_Chart_Marker_x()
+{
+load(/chart2/qa/extras/data/docx/,
fdo78290_Scatter_Chart_Marker_x.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1],val,x);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1],val,7);
+}
+
+// Also in a combination of charts like a column chart and line chart, we can
use the built in marker 'x'
+// for the line chart too. hence put a test case for the combination chart
also.
+
+void Chart2ExportTest::testfdo78290_Combination_Chart_Marker_x()
+{
+load(/chart2/qa/extras/data/docx/,
fdo78290_Combination_Chart_Marker_x.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1],val,x);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1],val,7);
+}
+
void Chart2ExportTest::testBarChartRotation()
{
load (/chart2/qa/extras/data/docx/, barChartRotation.docx);
diff --git
a/chart2/qa/extras/data/docx/fdo78290_Combination_Chart_Marker_x.docx
b/chart2/qa/extras/data/docx/fdo78290_Combination_Chart_Marker_x.docx
new file mode 100644
index 000..ee2489d
Binary files /dev/null and
Re: master build fails in Chart2
Hi *, On Tue, May 20, 2014 at 10:08 AM, Stephan Bergmann sberg...@redhat.com wrote: On 05/20/2014 08:24 AM, Jean-Baptiste Faure wrote: .../chart2/source/controller/dialogs/res_LegendPosition.hxx:32:7: error: redefinition of ‘class chart::LegendPositionResources’ [...] Do you have a leftover chart2/source/controller/dialogs/res_LegendPosition.hxx that should have been removed long ago by http://cgit.freedesktop.org/libreoffice/core/commit/?id=27eb33d753eedfa4215eaf8325bc0ee9baeb7417 remove unnecessary empty dtor, etc.? git clean -dxn will show you all the stuff you have in your tree that's not managed by git (and thus probably shouldn't be there when you do the build in a separate directory). with -f instead of -n, git will remove those obsolete files for you. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master build fails in Chart2
Le 20/05/2014 10:08, Stephan Bergmann a écrit : On 05/20/2014 08:24 AM, Jean-Baptiste Faure wrote: [build CXX] chart2/source/controller/dialogs/dlg_NumberFormat.cxx In file included from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:21:0: .../chart2/source/controller/dialogs/res_LegendPosition.hxx:32:7: error: redefinition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ In file included from .../chart2/source/controller/inc/dlg_InsertLegend.hxx:29:0, from .../chart2/source/controller/dialogs/dlg_InsertLegend.cxx:20: .../chart2/source/controller/inc/res_LegendPosition.hxx:32:7: error: previous definition of ‘class chart::LegendPositionResources’ class LegendPositionResources ^ make[1]: *** [.../workdir/CxxObject/chart2/source/controller/dialogs/dlg_InsertLegend.o] Erreur 1 make[1]: *** Attente des tâches non terminées make: *** [build] Erreur 2 Do you have a leftover chart2/source/controller/dialogs/res_LegendPosition.hxx that should have been removed long ago by http://cgit.freedesktop.org/libreoffice/core/commit/?id=27eb33d753eedfa4215eaf8325bc0ee9baeb7417 remove unnecessary empty dtor, etc.? Indeed I still have this file. I wonder why that worked until now. I removed the file and updated my local copy. Build in progress. Thank you very much. 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
Re: Newbie question
Hi Mukhiddin, On Tue, May 20, 2014 at 11:12 AM, Mukhiddin ymukhid...@gmail.com wrote: Hello, I have recently committed my first patches for te bug 43157. These were my first experience in open source programming, so I chose easy task. Then I gor review saying that the workben submodule files where I made change are not built. I also noticed that. I waned to know how can I respond to the review. When you are logged-in to gerrit, you will get a Reply button at the top, above the commit-message. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/source
sd/source/ui/func/fuparagr.cxx |4 -
sd/source/ui/view/drtxtob.cxx | 134 +
2 files changed, 73 insertions(+), 65 deletions(-)
New commits:
commit 27fc60874795849b43903f27076e9dcafb958c76
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 20 12:37:42 2014 +0100
Related: fdo#78151 disable promote or demote outline levels in master view
it doesn't make sense in master view to do that
Change-Id: I838422f93131b8a92745a624738c5be3a7ed3459
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 73852d0..ec24fc9 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -253,88 +253,96 @@ void TextObjectBar::GetAttrState( SfxItemSet rSet )
bool bDisableRight= true;
bool bDisableUp = true;
bool bDisableDown = true;
-OutlinerView* pOLV = mpView-GetTextEditOutlinerView();
-if (mpView-ISA(OutlineView))
-{
-pOLV = static_castOutlineView*(mpView)-GetViewByWindow(
-mpViewShell-GetActiveWindow());
-}
+//fdo#78151 it doesn't make sense to promote or demote outline
levels in master view.
+const DrawViewShell* pDrawViewShell = dynamic_cast
DrawViewShell* (mpViewShell);
+const bool bInMasterView = pDrawViewShell
pDrawViewShell-GetEditMode() == EM_MASTERPAGE;
-bool bOutlineViewSh = mpViewShell-ISA(OutlineViewShell);
-
-if (pOLV
-( pOLV-GetOutliner()-GetMode() ==
OUTLINERMODE_OUTLINEOBJECT || bOutlineViewSh ) )
+if (!bInMasterView)
{
-// Outliner at outline-mode
-::Outliner* pOutl = pOLV-GetOutliner();
+OutlinerView* pOLV = mpView-GetTextEditOutlinerView();
-std::vectorParagraph* aSelList;
-pOLV-CreateSelectionList(aSelList);
-Paragraph* pPara = aSelList.empty() ? NULL :
*(aSelList.begin());
+if (mpView-ISA(OutlineView))
+{
+pOLV =
static_castOutlineView*(mpView)-GetViewByWindow(
+mpViewShell-GetActiveWindow());
+}
-// find out if we are a OutlineView
-bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW ==
pOLV-GetOutliner()-GetMode());
+bool bOutlineViewSh = mpViewShell-ISA(OutlineViewShell);
-// This is ONLY for OutlineViews
-if(bIsOutlineView)
+if (pOLV
+( pOLV-GetOutliner()-GetMode() ==
OUTLINERMODE_OUTLINEOBJECT || bOutlineViewSh ) )
{
-// allow move up if position is 2 or greater OR it
-// is a title object (and thus depth==1)
-if(pOutl-GetAbsPos(pPara) 1 || (
pOutl-HasParaFlag(pPara,PARAFLAG_ISPAGE) pOutl-GetAbsPos(pPara) 0 ) )
+// Outliner at outline-mode
+::Outliner* pOutl = pOLV-GetOutliner();
+
+std::vectorParagraph* aSelList;
+pOLV-CreateSelectionList(aSelList);
+Paragraph* pPara = aSelList.empty() ? NULL :
*(aSelList.begin());
+
+// find out if we are a OutlineView
+bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW ==
pOLV-GetOutliner()-GetMode());
+
+// This is ONLY for OutlineViews
+if(bIsOutlineView)
{
-// not at top
-bDisableUp = false;
+// allow move up if position is 2 or greater OR it
+// is a title object (and thus depth==1)
+if(pOutl-GetAbsPos(pPara) 1 || (
pOutl-HasParaFlag(pPara,PARAFLAG_ISPAGE) pOutl-GetAbsPos(pPara) 0 ) )
+{
+// not at top
+bDisableUp = false;
+}
}
-}
-else
-{
-// old behaviour for OUTLINERMODE_OUTLINEOBJECT
-if(pOutl-GetAbsPos(pPara) 0)
+else
{
-// not at top
-bDisableUp = false;
+// old behaviour for OUTLINERMODE_OUTLINEOBJECT
+if(pOutl-GetAbsPos(pPara) 0)
+{
+// not at top
+bDisableUp = false;
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - package/source
package/source/xstor/xstorage.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 164e10869f91b75db03b09f53e1467098b3e6b93
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 11:12:40 2014 +0200
fdo#78949 Handle (SAXParse-)Exception that can't pass getAllRelationships
...like it was already done in the similar else branch of
ReadRelInfoIfNecessary. The call site at GetAllRelationshipsIfAny will
translate an m_nRelInfoStatus that remained RELINFO_NOT_INIT into an
IOException.
Change-Id: I79c601acd23b3b0020c7b4de4c20b0282524bce1
(cherry picked from commit 423921b085de43f53e42f957889dd96378d2c3c4)
Reviewed-on: https://gerrit.libreoffice.org/9411
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/package/source/xstor/xstorage.cxx
b/package/source/xstor/xstorage.cxx
index 9e2ffb7..8775561 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -572,13 +572,19 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
{
// Init from original stream
uno::Reference io::XInputStream xRelInfoStream =
GetRelInfoStreamForName( OUString() );
-if ( xRelInfoStream.is() )
-m_aRelInfo =
::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(
+try
+{
+if ( xRelInfoStream.is() )
+m_aRelInfo =
::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(
xRelInfoStream,
_rels/.rels,
m_xContext );
-
-m_nRelInfoStatus = RELINFO_READ;
+m_nRelInfoStatus = RELINFO_READ;
+}
+catch (css::uno::Exception e)
+{
+SAL_INFO(package.xstor, caught Exception e.Message);
+}
}
else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/inc/contentsink.hxx| 18 ++---
sdext/source/pdfimport/test/tests.cxx |3 +
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 16 ++--
sdext/source/pdfimport/tree/pdfiprocessor.hxx |3 +
sdext/source/pdfimport/wrapper/wrapper.cxx| 31 +---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 33 ++
6 files changed, 57 insertions(+), 47 deletions(-)
New commits:
commit be7ec1384e85360179f5645d9775c5e6605d5a0f
Author: Vort vv...@yandex.ru
Date: Tue May 20 09:05:33 2014 +0300
fdo#78689 PDF Import: get font's ascent value from different source
Change-Id: I19018d25ef53bbea225bb5a9ef806ce5c1b4adc7
Reviewed-on: https://gerrit.libreoffice.org/9410
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx
b/sdext/source/pdfimport/inc/contentsink.hxx
index 93ae5ad..d4fb3b1 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -52,13 +52,15 @@ namespace pdfi
bool isItalic_,
bool isUnderline_,
bool isOutline_,
-double size_ ) :
+double size_,
+double ascent_) :
familyName(familyName_),
isBold(isBold_),
isItalic(isItalic_),
isUnderline(isUnderline_),
isOutline(isOutline_),
-size(size_)
+size(size_),
+ascent(ascent_)
{}
FontAttributes() :
@@ -67,7 +69,8 @@ namespace pdfi
isItalic(false),
isUnderline(false),
isOutline(false),
-size(0.0)
+size(0.0),
+ascent(1.0)
{}
OUString familyName;
@@ -76,6 +79,7 @@ namespace pdfi
boolisUnderline;
boolisOutline;
double size; // device pixel
+double ascent;
bool operator==(const FontAttributes rFont) const
{
@@ -84,7 +88,8 @@ namespace pdfi
!isItalic == !rFont.isItalic
!isUnderline == !rFont.isUnderline
!isOutline == !rFont.isOutline
-size == rFont.size;
+size == rFont.size
+ascent == rFont.ascent;
}
};
@@ -135,9 +140,10 @@ namespace pdfi
virtual void intersectEoClip(const css::uno::Reference
css::rendering::XPolyPolygon2D
rPath) = 0;
-virtual void drawGlyphs( const OUString
rGlyphs,
+virtual void drawGlyphs( const OUString rGlyphs,
const css::geometry::RealRectangle2D rRect,
- const css::geometry::Matrix2D
rFontMatrix ) = 0;
+ const css::geometry::Matrix2D
rFontMatrix,
+ double fontSize) = 0;
/// issued when a sequence of associated glyphs is drawn
virtual void endText() = 0;
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index aa11ea6..8b47c0a 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -346,7 +346,8 @@ namespace
virtual void drawGlyphs( const OUString rGlyphs,
const geometry::RealRectangle2D /*rRect*/,
- const geometry::Matrix2D
/*rFontMatrix*/ ) SAL_OVERRIDE
+ const geometry::Matrix2D
/*rFontMatrix*/,
+ double /*fontSize*/) SAL_OVERRIDE
{
m_aTextOut.append(rGlyphs);
}
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 487ba20..3a670a6 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -277,14 +277,20 @@ void PDFIProcessor::processGlyphLine()
void PDFIProcessor::drawGlyphs( const OUString rGlyphs,
const geometry::RealRectangle2D rRect,
-const geometry::Matrix2DrFontMatrix )
+const geometry::Matrix2DrFontMatrix,
+double fontSize)
{
+double ascent = getFont(getCurrentContext().FontId).ascent;
+
+double ascentdx = rFontMatrix.m01 * ascent * fontSize;
+double ascentdy = rFontMatrix.m11 * ascent * fontSize;
+
basegfx::B2DHomMatrix totalTextMatrix1(
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/dialog/templdlg.cxx | 13 ++---
sfx2/source/inc/templdgi.hxx|2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 2fd89dd60366caa64ed8b31b588e72dd639104bd
Author: Michael Stahl mst...@redhat.com
Date: Mon May 19 22:03:18 2014 +0200
fdo#78536: sfx2: template dialog: make the am-i-dead-yet check reentrant
In the fine tradition of our enterprise-grade code base, this lets the
check in SfxCommonTemplateDialog_Impl::Execute_Impl() do an early
return if the this instance has signalled its untimely demise even if
there are multiple calls of Execute_Impl() on the stack; extending
the scheme with further epicycles to make it work if the Execute_Impl()
calls happen on 2 different threads is left as an exercise for the
interested reader.
(regression from bcc52fb2ebdf77a1cc089857775fd742085b45b6)
(cherry picked from commit 838c580fdba8b1c72bc854d101d302be0e3861d5)
Conflicts:
sfx2/source/dialog/templdlg.cxx
Change-Id: I1d9f0d82bf6d9f5da8f9bd2be57d01937d71fd26
Reviewed-on: https://gerrit.libreoffice.org/9406
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index cbd856f..11b430c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -100,20 +100,22 @@ class SfxCommonTemplateDialog_Impl::DeletionWatcher :
private boost::noncopyable
public:
explicit DeletionWatcher(SfxCommonTemplateDialog_Impl rDialog)
: m_pDialog(rDialog)
+, m_pPrevious(m_pDialog-impl_setDeletionWatcher(this))
{
-m_pDialog-impl_setDeletionWatcher(this);
}
~DeletionWatcher()
{
if (m_pDialog)
-m_pDialog-impl_setDeletionWatcher(0);
+m_pDialog-impl_setDeletionWatcher(m_pPrevious);
}
// Signal that the dialog was deleted
void signal()
{
m_pDialog = 0;
+if (m_pPrevious)
+m_pPrevious-signal();
}
// Return true if the dialog was deleted
@@ -124,6 +126,7 @@ public:
private:
SfxCommonTemplateDialog_Impl* m_pDialog;
+DeletionWatcher *const m_pPrevious; /// let's add more epicycles!
};
// Re-direct functions
@@ -1015,9 +1018,13 @@ void SfxCommonTemplateDialog_Impl::impl_clear()
DELETEZ( m_pStyleFamiliesId );
}
-void SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(DeletionWatcher*
pNewWatcher)
+SfxCommonTemplateDialog_Impl::DeletionWatcher *
+SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(
+DeletionWatcher *const pNewWatcher)
{
+DeletionWatcher *const pRet(m_pDeletionWatcher);
m_pDeletionWatcher = pNewWatcher;
+return pRet;
}
//-
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0011aed..844acdb 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -111,7 +111,7 @@ private:
voidReadResource();
voidClearResource();
void impl_clear();
-void impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
+DeletionWatcher * impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
protected:
#define MAX_FAMILIES5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sw/inc sw/source xmloff/source
sw/inc/IDocumentMarkAccess.hxx |2
sw/inc/doc.hxx | 27 +++-
sw/source/core/crsr/annotationmark.cxx |1
sw/source/core/doc/docbm.cxx | 189 -
sw/source/core/doc/doccorr.cxx | 20 +--
sw/source/core/undo/undobj.cxx | 13 +-
sw/source/core/unocore/unoobj.cxx | 72 +++-
sw/source/ui/docvw/SidebarWin.cxx | 25 +++-
sw/source/ui/shells/textfld.cxx|3
sw/source/ui/wrtsh/wrtsh2.cxx | 21 ++-
xmloff/source/text/txtfldi.cxx |4
11 files changed, 246 insertions(+), 131 deletions(-)
New commits:
commit afbf61890a4d5e846c4aa09380d8b641d99ceefd
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jan 16 11:47:18 2014 +
Resolves: cp#179 i#124030 do not delete UNO mark which are not
expanded...
and only touch the start of the given range.
(cherry picked from commit ae295f7d009842cdceb50c4daffe948ede2b4b88)
Conflicts:
sw/source/core/doc/docbm.cxx
(cherry picked from commit 4b6b51182a9a600805729313278eb707c6ebfb14)
Change-Id: Id7317eeb8e9c063c9d8b30bca97ed0afee3ec8c5
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 856bbc6..3deaccc 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -50,7 +50,6 @@
#include edimp.hxx
#include stdio.h
-using namespace ::std;
using namespace ::boost;
using namespace ::sw::mark;
@@ -58,12 +57,19 @@ namespace
{
static bool lcl_GreaterThan( const SwPosition rPos, const SwNodeIndex
rNdIdx, const SwIndex* pIdx )
{
-return pIdx ? ( rPos.nNode rNdIdx || ( rPos.nNode == rNdIdx
rPos.nContent = pIdx-GetIndex() )) : rPos.nNode = rNdIdx;
+return pIdx != NULL
+ ? ( rPos.nNode rNdIdx
+ || ( rPos.nNode == rNdIdx
+ rPos.nContent = pIdx-GetIndex() ) )
+ : rPos.nNode = rNdIdx;
}
static bool lcl_Lower( const SwPosition rPos, const SwNodeIndex rNdIdx,
const SwIndex* pIdx )
{
-return rPos.nNode rNdIdx || ( pIdx rPos.nNode == rNdIdx
rPos.nContent pIdx-GetIndex() );
+return rPos.nNode rNdIdx
+ || ( pIdx != NULL
+ rPos.nNode == rNdIdx
+ rPos.nContent pIdx-GetIndex() );
}
static bool lcl_MarkOrderingByStart(const IDocumentMarkAccess::pMark_t
rpFirst,
@@ -91,9 +97,9 @@ namespace
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-static inline auto_ptrSwPosition lcl_PositionFromCntntNode(SwCntntNode *
const pCntntNode, const bool bAtEnd=false)
+static inline ::std::auto_ptrSwPosition
lcl_PositionFromCntntNode(SwCntntNode * const pCntntNode, const bool
bAtEnd=false)
{
-auto_ptrSwPosition pResult(new SwPosition(*pCntntNode));
+::std::auto_ptrSwPosition pResult(new SwPosition(*pCntntNode));
pResult-nContent.Assign(pCntntNode, bAtEnd ? pCntntNode-Len() : 0);
return pResult;
}
@@ -104,7 +110,7 @@ namespace
// else set it to the end of the node before rStt
// else set it to the CntntNode of the Pos outside the Range
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-static inline auto_ptrSwPosition lcl_FindExpelPosition(const
SwNodeIndex rStt,
+static inline ::std::auto_ptrSwPosition lcl_FindExpelPosition(const
SwNodeIndex rStt,
const SwNodeIndex rEnd,
const SwPosition rOtherPosition)
{
@@ -118,7 +124,7 @@ namespace
pNode = rStt.GetNodes().GoPrevious(aStt), bAtEnd = true;
if(pNode)
return lcl_PositionFromCntntNode(pNode, bAtEnd);
-return auto_ptrSwPosition(new SwPosition(rOtherPosition));
+return ::std::auto_ptrSwPosition(new SwPosition(rOtherPosition));
}
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -149,7 +155,7 @@ namespace
rMarks.begin(),
pCandidatesEnd,
back_inserter(vCandidates),
-boost::bind(logical_notbool(), boost::bind(IMark::EndsBefore,
_1, rPos)));
+boost::bind( ::std::logical_notbool(), boost::bind(
IMark::EndsBefore, _1, rPos ) ) );
// no candidate left = we are in front of the first mark or there are
none
if(!vCandidates.size()) return NULL;
// return the highest (last) candidate using mark end ordering
@@ -630,8 +636,8 @@ namespace sw { namespace mark
const SwIndex* pSttIdx,
const SwIndex* pEndIdx )
{
-vectorconst_iterator_t vMarksToDelete;
-bool isSortingNeeded = false;
+::std::vectorconst_iterator_t vMarksToDelete;
+bool bIsSortingNeeded = false;
// copy all bookmarks in the move area to a vector storing all
position data as offset
// reassignment is performed after the move
@@ -646,61 +652,77 @@ namespace sw { namespace mark
::sw::mark::MarkBase* pMark = dynamic_cast
[Libreoffice-commits] core.git: sdext/Library_pdfimport.mk
sdext/Library_pdfimport.mk |1 + 1 file changed, 1 insertion(+) New commits: commit a092418f300f15fd1e2203b6933cfb1f69c107ad Author: Caolán McNamara caol...@redhat.com Date: Tue May 20 13:19:56 2014 +0100 we need fontconfig now Change-Id: I0482f613d7c908488e7d9f84f891bd521e91cc15 diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index 5e1d41d..2c98ed7 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_static_libraries,pdfimport,\ $(eval $(call gb_Library_use_externals,pdfimport,\ boost_headers \ +$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \ zlib \ poppler \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/filter/ww8/writerwordglue.cxx | 104
1 file changed, 92 insertions(+), 12 deletions(-)
New commits:
commit 300d27b0ae4665001ec30b47af2142f6c253f370
Author: Eike Rathke er...@redhat.com
Date: Mon May 19 21:43:06 2014 +0200
resolved fdo#66620 keywords occur in unquoted context only
Change-Id: I4de41e5b66f1a856a786c521ca4ef2eec14c7499
(cherry picked from commit 0d361388060741fe8e2f1ba059fba95707bdc233)
Reviewed-on: https://gerrit.libreoffice.org/9405
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 7fc6061..056268e 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -745,6 +745,83 @@ namespace sw
return nDT;
}
+
+/** Find cFind in rParams if not embedded in double quotes.
+Will NOT find '\\' or ''.
+ */
+sal_Int32 findUnquoted( const OUString rParams, sal_Unicode cFind,
sal_Int32 nFromPos )
+{
+const sal_Int32 nLen = rParams.getLength();
+if (nFromPos 0 || nLen = nFromPos)
+return -1;
+for (sal_Int32 nI = nFromPos; nI nLen; ++nI)
+{
+const sal_Unicode c = rParams[nI];
+if (c == '\\')
+++nI;
+else if (c == '\')
+{
+++nI;
+// While not at the end and not at an unescaped end quote
+while (nI nLen)
+{
+if (rParams[nI] == '\' rParams[nI-1] != '\\')
+break;
+++nI;
+}
+}
+else //normal unquoted section
+{
+if (c == cFind)
+return nI;
+}
+}
+return -1;
+}
+
+/** Find all rFind in rParams if not embedded in double quotes and
+replace with rReplace. Will NOT find '\\' or ''.
+ */
+bool replaceUnquoted( OUString rParams, const OUString rFind, const
OUString rReplace )
+{
+bool bReplaced = false;
+if (rFind.isEmpty())
+return bReplaced;
+const sal_Unicode cFirst = rFind[0];
+
+sal_Int32 nLen = rParams.getLength();
+for (sal_Int32 nI = 0; nI nLen; ++nI)
+{
+const sal_Unicode c = rParams[nI];
+if (rParams[nI] == '\\')
+++nI;
+else if (rParams[nI] == '\')
+{
+++nI;
+// While not at the end and not at an unescaped end quote
+while (nI nLen)
+{
+if (rParams[nI] == '\' rParams[nI-1] != '\\')
+break;
+++nI;
+}
+}
+else //normal unquoted section
+{
+if (c == cFirst rParams.match( rFind, nI))
+{
+const sal_Int32 nFindLen = rFind.getLength();
+const sal_Int32 nDiff = rReplace.getLength() -
nFindLen;
+rParams.replaceAt( nI, nFindLen, rReplace);
+nI += nFindLen + nDiff - 1;
+nLen += nDiff;
+bReplaced = true;
+}
+}
+}
+return bReplaced;
+}
+
sal_uLong MSDateTimeFormatToSwFormat(OUString rParams,
SvNumberFormatter *pFormatter, sal_uInt16 rLang, bool bHijri,
sal_uInt16 nDocLang)
@@ -756,36 +833,39 @@ namespace sw
SwapQuotesInField(rParams);
-// Force to Japanese when finding one of 'geaE'
-bool bForceJapanese = (-1 != rParams.indexOf('g')
-|| -1 != rParams.indexOf('e') || -1 != rParams.indexOf('E') );
-if ( bForceJapanese )
-{
-rParams = rParams.replaceAll( ee, ).replaceAll( EE,
);
-}
+// Force to Japanese when finding one of 'geE'.
+// XXX This actually may not be correct, all era keywords could be
+// used in other locales as well. I just don't know about Word. But
+// this is how it was for 10 years..
+bool bForceJapanese = (-1 != findUnquoted( rParams, 'g', 0));
+// XXX Why replace? The number formatter does handle them and this
+// effectively changes from Gengou to Gregorian calendar. Legacy
+// because it wasn't supported a decade ago and now moot? Or is
+// that a Word specialty?
+
Re: do NOT immediately remove files from dev-downloads.libreoffice.org on update of externals!
On 20/05/14 09:54, Bjoern Michaelsen wrote: On Tue, May 20, 2014 at 09:18:54AM +0200, David Tardon wrote: On Tue, May 20, 2014 at 08:56:08AM +0200, Stephan Bergmann wrote: On 05/19/2014 09:45 PM, Bjoern Michaelsen wrote: please do NOT remove files from dev-downloads when updating externals, keep those files around for at least 12 months! Otherwise you will break bibisect building hard (apart from also breaking people on local branches). So please keep whatever tarball was ever used in a LibreOffice build on the server for at least 12 months. Where does the value 12 come from? I am curious about that too :-) Personally I would say do not ever remove tarballs from dev-www! Well, 12 months was just a minimum. I have not issue with using never instead. ;) 12 months was just a rough estimate of two major releases which would be good enough for bibisect at least. those of us who fix regression bugs occasionally have reason to re-built essentially arbitrarily old revisions, and i've personally been frustrated this year by the repository zoo of pre-3.5 days making that essentially impossible; please let's not add another way to make it more difficult. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/xlat.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit eff1d991de77700505ce18dfaaa3e01d76551ffd
Author: Chris Laplante mostthings...@gmail.com
Date: Fri May 16 15:05:42 2014 -0400
Move #include from middle of file to top
Change-Id: I715f606ee0f94e9ffd3ef9ec889948a56a9cdc19
Reviewed-on: https://gerrit.libreoffice.org/9381
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 56b4e24..3509ada 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -18,6 +18,7 @@
*/
#include rtl/textcvt.h
+#include xlat.hxx
#include tools/debug.hxx
namespace {
@@ -138,8 +139,6 @@ void ConverterCache::convertStr( int nSelect, const
sal_Unicode* pSrc, sal_uInt1
} // anonymous namespace
-#include xlat.hxx
-
namespace vcl
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - bin/lo-all-static-libs configure.ac external/coinmp
bin/lo-all-static-libs|7 + configure.ac | 42 +++--- external/coinmp/ExternalPackage_coinmp.mk |2 + external/coinmp/ExternalProject_coinmp.mk |2 + 4 files changed, 33 insertions(+), 20 deletions(-) New commits: commit c1fd24e18fe82e761cfa2a07dc8acf13365dfd81 Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 14:32:17 2014 +0300 Add the CoinMP libs Change-Id: I37b4c1081055f98c9254d64480efeb2c205e711d diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 5a71eae..77c0507 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -52,6 +52,13 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $oslibs \ + $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \ + $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \ $WORKDIR/UnpackedTarball/glew/lib/*.a \ $WORKDIR/UnpackedTarball/icu/source/lib/*.a \ $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \ commit dd633de592fde183c06101cb082744c9ce270796 Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 14:31:57 2014 +0300 Make CoinMP build for iOS Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36 diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk index bbea3dd..b0d29c2 100644 --- a/external/coinmp/ExternalPackage_coinmp.mk +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -13,6 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp)) ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll)) +else ifneq ($(DISABLE_DYNLOADING),) +# Just use the static archives from workdir. See bin/lo-all-static-libs else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib)) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib)) diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index 22769e3..71e1982 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -27,6 +27,8 @@ else $(call gb_ExternalProject_get_state_target,coinmp,build) : +$(call gb_ExternalProject_run,build,\ ./configure COIN_SKIP_PROJECTS=Data/Sample \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(DISABLE_DYNLOADING),--disable-shared) \ --enable-dependency-linking F77=unavailable \ $(MAKE) \ ) commit 4474d705ae2366c056630646677c85f95e2a7c97 Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 13:18:15 2014 +0300 No reason to avoid CoinMP for Android and iOS Change-Id: I78eb3a706251ba64ad87e7985fc43c90bea2f767 diff --git a/configure.ac b/configure.ac index 91f464d..96259be 100644 --- a/configure.ac +++ b/configure.ac @@ -677,7 +677,7 @@ linux-android*) enable_lotuswordpro=no enable_mpl_subset=yes enable_opengl=no -enable_coinmp=no +enable_coinmp=yes enable_lpsolve=no enable_report_builder=no with_theme=tango @@ -7433,7 +7433,7 @@ if test $_os = iOS; then enable_mpl_subset=yes enable_opengl=no enable_lotuswordpro=no -enable_coinmp=no +enable_coinmp=yes enable_lpsolve=no enable_postgresql_sdbc=no enable_extension_integration=no commit 8517dc95a6ad6eec34aa5295b5133c6c18fcd1e9 Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 13:03:06 2014 +0300 If we don't want lpsolve we don't want lpsolve Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3 diff --git a/configure.ac b/configure.ac index b4052c6..91f464d 100644 --- a/configure.ac +++ b/configure.ac @@ -9560,24 +9560,26 @@ else fi AC_SUBST(ENABLE_LPSOLVE) -AC_MSG_CHECKING([which lpsolve to use]) -if test $with_system_lpsolve = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LPSOLVE=TRUE -AC_CHECK_HEADER(lpsolve/lp_lib.h, [], - [ AC_MSG_ERROR(lpsolve headers not found.)], []) -save_LIBS=$LIBS -# some systems need this. Like Ubuntu -AC_CHECK_LIB(m, floor) -AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB([lpsolve55], [make_lp], [:], -[ AC_MSG_ERROR(lpsolve library not found or too old.)], []) -LIBS=$save_LIBS -libo_MINGW_CHECK_DLL([lpsolve55]) -else -
Re: Newbie question
Thank you! -- View this message in context: http://nabble.documentfoundation.org/Newbie-question-tp4109464p4109483.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
Re: getting started from scratch w/ C++
On Mon, May 19, 2014 at 09:29:45AM -0700, Tom Meinen tom_o...@yahoo.com wrote: If you have used either or both of these books and have insight on them, I'm all ears. See https://wiki.openoffice.org/wiki/Recommended_Reading#C.2B.2B_Programming That applies to LibreOffice as well. 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-2' - sw/source
sw/source/filter/ww8/writerwordglue.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4a86cd75a8e83b6910c5285812e86bf6575fa92b
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon May 19 23:26:22 2014 +0200
-Werror,-Wunused-result
Change-Id: Iaa06237d3e554d3a3d9c87f6c5dba715343afa25
(cherry picked from commit 9cf5e4c2500fc5d579896ea08802aba5ca671c96)
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 056268e..bafa0f0 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -812,7 +812,7 @@ namespace sw
{
const sal_Int32 nFindLen = rFind.getLength();
const sal_Int32 nDiff = rReplace.getLength() -
nFindLen;
-rParams.replaceAt( nI, nFindLen, rReplace);
+rParams = rParams.replaceAt( nI, nFindLen, rReplace);
nI += nFindLen + nDiff - 1;
nLen += nDiff;
bReplaced = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c9/e4fd337abdb6460441450a0ea48eef4afa05d9
c9/e4fd337abdb6460441450a0ea48eef4afa05d9 |1 + 1 file changed, 1 insertion(+) New commits: commit b0c0c835b42fd6e02bf7c723e7cdfc170d1696a7 Author: Caolán McNamara caol...@redhat.com Date: Tue May 20 13:32:02 2014 +0100 Notes added by 'git notes add' diff --git a/c9/e4fd337abdb6460441450a0ea48eef4afa05d9 b/c9/e4fd337abdb6460441450a0ea48eef4afa05d9 new file mode 100644 index 000..6ff9947 --- /dev/null +++ b/c9/e4fd337abdb6460441450a0ea48eef4afa05d9 @@ -0,0 +1 @@ +reject: erack - theres probably always be some who want it or not, *dither*, ok, leave it out ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 58187
On 20/05/14 10:55, Ulrich Kitzinger wrote: Hello, I'd like to try to work on bug https://bugs.freedesktop.org/show_bug.cgi?id=58187 (In the Writer Navigator an expanded tree is collapsed when you edit an entry). Does anybody have any hint for me, which code fragments to look at? For example, what's the type of the tree view or the tree items in the navigator? Up to now all tries to find the corresponding collapse method have been fruitless. i would expect the navigator code to be somewhere around here: sw/source/core/uibase/utlui/navipi.cxx ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Am I contributor
Hello, This is also a question of newbie developer who have just started to be familiar with the project and submitted simple bug fix (that needs to be reviewed). I wanted to know, currently what is my status? Am I contributor? I can review commits/patches in Gerrit, submit my own ones. I created account in www.ohloh.net where one can list all his contributions to some projects. When I specified my name (same as in gerrit) and project (LibreOffice) it said that there is not such contributor in the project. I followed all steps written in wiki page of libreoffice-development and sent my statement for adding me to the contributors list to the email libreoffice@lists.freedesktop.org. Am I supposed to do something else or I just need to wait when people will add me to the contributors list ? Thanks for the replies :) -- View this message in context: http://nabble.documentfoundation.org/Am-I-contributor-tp4109488.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/cppunittester
sal/cppunittester/cppunittester.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit ef02ced3ec5e66d5c25de52fc37355ae0f44235e
Author: Michael Meeks michael.me...@collabora.com
Date: Tue May 20 13:38:49 2014 +0100
Win32 - warn of extraordinary behaviour with LoadLibrary and long PATHs
Change-Id: I0a8ee157aa548a5b04df67a2355e3f4fd15e84cd
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index 6e5258b..7ac8ab5 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -206,6 +206,14 @@ public:
manager.load(testlib, args);
} catch (const CppUnit::DynamicLibraryManagerException e) {
std::cerr DynamicLibraryManagerException: \ e.what()
\\n;
+#ifdef WIN32
+const char *pPath = getenv (PATH);
+if (pPath strlen (pPath) 256)
+{
+std::cerr Windows has significant build problems with long
PATH variables ;
+std::cerr please check your PATH variable and
re-autogen.\n;
+}
+#endif
return false;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77891, which changed state. Bug 77891 Summary: LibO crashes as soon as one enters text in a module https://bugs.freedesktop.org/show_bug.cgi?id=77891 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/thread.c | 16
sal/osl/w32/time.c |2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 0562a17c64f4016f2d3ba01e1c19c27feadb2543
Author: Mukhiddin Yusupov ymukhid...@gmail.com
Date: Mon May 19 00:17:33 2014 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Changed OSL_ASSERT with SAL_WARN_IF
Change-Id: Ie81eeb51f6978162abd372f7e9910344a2baaccd
Reviewed-on: https://gerrit.libreoffice.org/9401
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index 2eeea06..ac3ddc6 100644
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -73,7 +73,7 @@ static oslThread oslCreateThread(oslWorkerFunction pWorker,
/* alloc mem. for our internal data structure */
pThreadImpl= malloc(sizeof(osl_TThreadImpl));
-OSL_ASSERT(pThreadImpl);
+SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - malloc error);
if ( pThreadImpl == 0 )
{
@@ -160,7 +160,7 @@ void SAL_CALL osl_resumeThread(oslThread Thread)
{
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-OSL_ASSERT(pThreadImpl);/* valid ptr? */
+SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
ResumeThread(pThreadImpl-m_hThread);
}
@@ -172,7 +172,7 @@ void SAL_CALL osl_suspendThread(oslThread Thread)
{
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-OSL_ASSERT(pThreadImpl);/* valid ptr? */
+SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
SuspendThread(pThreadImpl-m_hThread);
}
@@ -186,7 +186,7 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
int winPriority;
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-OSL_ASSERT(pThreadImpl);/* valid ptr? */
+SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
/* map enum to WIN32 levels
it would be faster and more elegant to preset
@@ -216,13 +216,13 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
break;
case osl_Thread_PriorityUnknown:
-OSL_ASSERT(FALSE); /* only fools try this...*/
+SAL_WARN_IF(TRUE, sal.osl, Unknown thread priority); /* only
fools try this...*/
/* let release-version behave friendly */
return;
default:
-OSL_ASSERT(FALSE); /* enum expanded, but forgotten here...*/
+SAL_WARN_IF(TRUE, sal.osl, Expanded, but forgotten priority);
/* enum expanded, but forgotten here...*/
/* let release-version behave friendly */
return;
@@ -281,7 +281,7 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const
oslThread Thread)
break;
default:
-OSL_ASSERT(FALSE); /* WIN32 API changed, incorporate new
prio-level! */
+SAL_WARN_IF(TRUE, sal.osl, New priority-level needed); /*
WIN32 API changed, incorporate new prio-level! */
/* release-version behaves friendly */
Priority= osl_Thread_PriorityUnknown;
@@ -442,7 +442,7 @@ static void RemoveKeyFromList( PTLS pTls )
pTls-pPrev-pNext = pTls-pNext;
else
{
-OSL_ASSERT( pTls == g_pThreadKeyList );
+SAL_WARN_IF( pTls != g_pThreadKeyList, sal.osl, pTls !=
g_pThreadKeyList );
g_pThreadKeyList = pTls-pNext;
}
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index dd30c44..95f2ec4 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -35,7 +35,7 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
FILETIME CurTime, OffTime;
__int64Value;
-OSL_ASSERT(pTimeVal != 0);
+SAL_WARN_IF(pTimeVal == 0, sal.osl, pTimeVal == 0);
GetSystemTime(SystemTime);
SystemTimeToFileTime(SystemTime, CurTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #26 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Mukhiddin Yusupov committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0562a17c64f4016f2d3ba01e1c19c27feadb2543 fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT 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 on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Am I contributor
On Tue, May 20, 2014 at 05:54:51AM -0700, yusupmuk wrote: I created account in www.ohloh.net where one can list all his contributions to some projects. [...] Am I supposed to do something else or I just need to wait when people will add me to the contributors list ? Ohloh watches commits on the master branch, so once the change you uploaded to gerrit has been accepted/merged, you will show up there (possible with some ~48 hour delay, as ohloh doesnt run every hour). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/chartarr.hxx | 24
sc/source/core/tool/chartarr.cxx | 36 ++--
sc/source/ui/unoobj/cellsuno.cxx |6 +++---
3 files changed, 29 insertions(+), 37 deletions(-)
New commits:
commit ee212bf4db7e38279d8c236c944ef3e09e3c0b72
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon May 19 13:42:54 2014 +0200
kill some old 16 bit column indices
Change-Id: Ie1c3f3b11ed216b53f3fd385614f6fcb2c38220c
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 4e48d27..0dfcede 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -33,26 +33,26 @@ class ScDocument;
class ScMemChart
{
-short nRowCnt;
-short nColCnt;
-double* pData;
+SCROW nRowCnt;
+SCCOL nColCnt;
+double* pData;
OUString* pColText;
OUString* pRowText;
ScMemChart(const ScMemChart rMemChart); // not implemented
public:
-ScMemChart(short nCols, short nRows);
+ScMemChart(SCCOL nCols, SCROW nRows);
~ScMemChart();
-short GetColCount() const { return nColCnt; }
-short GetRowCount() const { return nRowCnt; }
-const OUString GetColText(short nCol) const { return pColText[nCol]; }
-const OUString GetRowText(short nRow) const { return pRowText[nRow]; }
-double GetData(short nCol, short nRow) const { return pData[nCol * nRowCnt
+ nRow]; }
-void SetData(short nCol, short nRow, const double rVal) { pData[nCol *
nRowCnt + nRow] = rVal; }
-void SetColText(short nCol, const OUString rText) { pColText[nCol] =
rText; }
-void SetRowText(short nRow, const OUString rText) { pRowText[nRow] =
rText; }
+SCCOL GetColCount() const { return nColCnt; }
+SCROW GetRowCount() const { return nRowCnt; }
+const OUString GetColText(SCCOL nCol) const { return pColText[nCol]; }
+const OUString GetRowText(SCROW nRow) const { return pRowText[nRow]; }
+double GetData(SCCOL nCol, SCROW nRow) const { return pData[nCol * nRowCnt
+ nRow]; }
+void SetData(SCCOL nCol, SCROW nRow, const double rVal) { pData[nCol *
nRowCnt + nRow] = rVal; }
+void SetColText(SCCOL nCol, const OUString rText) { pColText[nCol] =
rText; }
+void SetRowText(SCROW nRow, const OUString rText) { pRowText[nRow] =
rText; }
};
class SC_DLLPUBLIC ScChartArray // only parameter-struct
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index cc6311c..e3d3a19 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -33,7 +33,7 @@
using ::std::vector;
-ScMemChart::ScMemChart(short nCols, short nRows)
+ScMemChart::ScMemChart(SCCOL nCols, SCROW nRows)
{
nRowCnt = nRows;
nColCnt = nCols;
@@ -43,8 +43,8 @@ ScMemChart::ScMemChart(short nCols, short nRows)
{
double *pFill = pData;
-for (short i = 0; i nColCnt; i++)
-for (short j = 0; j nRowCnt; j++)
+for (SCCOL i = 0; i nColCnt; i++)
+for (SCROW j = 0; j nRowCnt; j++)
*(pFill ++) = 0.0;
}
@@ -238,12 +238,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
aRows.push_back(nStrRow);
}
-
-// Data
-
-
-ScMemChart* pMemChart = new ScMemChart(
-static_castshort(nColCount), static_castshort(nRowCount) );
+// Data
+ScMemChart* pMemChart = new ScMemChart( nColCount, nRowCount );
if (pMemChart)
{
if ( bValidData )
@@ -256,7 +252,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
// DBL_MIN is a Hack for Chart to recognize empty cells.
ScAddress aPos(aCols[nCol], aRows[nRow], nTab1);
double nVal = getCellValue(*pDocument, aPos, DBL_MIN,
bCalcAsShown);
-pMemChart-SetData(static_castshort(nCol),
static_castshort(nRow), nVal);
+pMemChart-SetData(nCol, nRow, nVal);
}
}
}
@@ -265,7 +261,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
// Flag marking data as invalid?
for (nCol=0; nColnColCount; nCol++)
for (nRow=0; nRownRowCount; nRow++)
-pMemChart-SetData( static_castshort(nCol),
static_castshort(nRow), DBL_MIN );
+pMemChart-SetData( nCol, nRow, DBL_MIN );
}
@@ -287,7 +283,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
aString = aBuf.makeStringAndClear();
}
-pMemChart-SetColText( static_castshort(nCol), aString);
+pMemChart-SetColText( nCol, aString);
}
@@ -309,7 +305,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
aBuf.append(static_castsal_Int32(aRows[nRow]+1));
aString = aBuf.makeStringAndClear();
}
-pMemChart-SetRowText( static_castshort(nRow), aString);
+pMemChart-SetRowText(
Re: Am I contributor
Ok, I did not know that. Hopefully I will see myself there. Thank you -- View this message in context: http://nabble.documentfoundation.org/Am-I-contributor-tp4109488p4109494.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/thread.c | 16
sal/osl/w32/time.c |2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 92621df9e72b9d4e44e448f92df14c4ba731d5e4
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 15:46:31 2014 +0200
Revert fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
This reverts commit 0562a17c64f4016f2d3ba01e1c19c27feadb2543,
sal/log.hxx functionality is only available in C++.
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index ac3ddc6..2eeea06 100644
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -73,7 +73,7 @@ static oslThread oslCreateThread(oslWorkerFunction pWorker,
/* alloc mem. for our internal data structure */
pThreadImpl= malloc(sizeof(osl_TThreadImpl));
-SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - malloc error);
+OSL_ASSERT(pThreadImpl);
if ( pThreadImpl == 0 )
{
@@ -160,7 +160,7 @@ void SAL_CALL osl_resumeThread(oslThread Thread)
{
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
+OSL_ASSERT(pThreadImpl);/* valid ptr? */
ResumeThread(pThreadImpl-m_hThread);
}
@@ -172,7 +172,7 @@ void SAL_CALL osl_suspendThread(oslThread Thread)
{
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
+OSL_ASSERT(pThreadImpl);/* valid ptr? */
SuspendThread(pThreadImpl-m_hThread);
}
@@ -186,7 +186,7 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
int winPriority;
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-SAL_WARN_IF(!pThreadImpl, sal.osl, !pThreadImpl - invalid ptr);
/* valid ptr? */
+OSL_ASSERT(pThreadImpl);/* valid ptr? */
/* map enum to WIN32 levels
it would be faster and more elegant to preset
@@ -216,13 +216,13 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
break;
case osl_Thread_PriorityUnknown:
-SAL_WARN_IF(TRUE, sal.osl, Unknown thread priority); /* only
fools try this...*/
+OSL_ASSERT(FALSE); /* only fools try this...*/
/* let release-version behave friendly */
return;
default:
-SAL_WARN_IF(TRUE, sal.osl, Expanded, but forgotten priority);
/* enum expanded, but forgotten here...*/
+OSL_ASSERT(FALSE); /* enum expanded, but forgotten here...*/
/* let release-version behave friendly */
return;
@@ -281,7 +281,7 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const
oslThread Thread)
break;
default:
-SAL_WARN_IF(TRUE, sal.osl, New priority-level needed); /*
WIN32 API changed, incorporate new prio-level! */
+OSL_ASSERT(FALSE); /* WIN32 API changed, incorporate new
prio-level! */
/* release-version behaves friendly */
Priority= osl_Thread_PriorityUnknown;
@@ -442,7 +442,7 @@ static void RemoveKeyFromList( PTLS pTls )
pTls-pPrev-pNext = pTls-pNext;
else
{
-SAL_WARN_IF( pTls != g_pThreadKeyList, sal.osl, pTls !=
g_pThreadKeyList );
+OSL_ASSERT( pTls == g_pThreadKeyList );
g_pThreadKeyList = pTls-pNext;
}
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index 95f2ec4..dd30c44 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -35,7 +35,7 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
FILETIME CurTime, OffTime;
__int64Value;
-SAL_WARN_IF(pTimeVal == 0, sal.osl, pTimeVal == 0);
+OSL_ASSERT(pTimeVal != 0);
GetSystemTime(SystemTime);
SystemTimeToFileTime(SystemTime, CurTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #27 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Stephan Bergmann committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=92621df9e72b9d4e44e448f92df14c4ba731d5e4 Revert fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT 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 on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 --- Comment #26 from eneko.in...@gmail.com --- (In reply to comment #23) I am not 100% clear on which formats should be retained. I am currently retaining super and sub-script, because this is the most important thing for anyone working in sciences and a major problem for anyone in this field trying to write a text with libre office. If more complex logic is required, I would suggest to track this in a separate bug. Yes, as Daniel suggests, italics are important too if your headings contain words in foreign languages and latin phrases (e.g. Indonesia's policy of /Konfrontasi/), document titles (e.g. Sports in /Pravda/ (1960-1965)), or you just need some kind of emphasis (e.g. On why we /need/ italics). And in lists of tables, illustrations, etc., this is surely much more common. I'm sure that must be the case also in the sciences. -- 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: 2 commits - include/vcl slideshow/Library_OGLTrans.mk slideshow/source vcl/source
include/vcl/opengl/OpenGLContext.hxx |3
slideshow/Library_OGLTrans.mk |2
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 12
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 747
++
vcl/source/opengl/OpenGLContext.cxx| 31
5 files changed, 203 insertions(+), 592 deletions(-)
New commits:
commit 9a076c316ddb105430325121713ede6270cc1aee
Author: David Tardon dtar...@redhat.com
Date: Tue May 20 11:47:29 2014 +0200
normalize member var. names
Change-Id: Ib6215520d51ada6f956f8400de36f61a5ff025ba
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 4df199f..a5e9dcc 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -231,10 +231,10 @@ private:
/** OpenGL handle to the leaving slide's texture
*/
-unsigned int GLleavingSlide;
+unsigned int maLeavingSlideGL;
/** OpenGL handle to the entering slide's texture
*/
-unsigned int GLenteringSlide;
+unsigned int maEnteringSlideGL;
Reference presentation::XSlideShowView mxView;
Reference rendering::XIntegerBitmap mxLeavingBitmap;
@@ -242,15 +242,15 @@ private:
/** raw bytes of the entering bitmap
*/
-uno::Sequencesal_Int8 EnteringBytes;
+uno::Sequencesal_Int8 maEnteringBytes;
/** raw bytes of the leaving bitmap
*/
-uno::Sequencesal_Int8 LeavingBytes;
+uno::Sequencesal_Int8 maLeavingBytes;
#if defined( GLX_EXT_texture_from_pixmap )
-GLXPixmap LeavingPixmap;
-GLXPixmap EnteringPixmap;
+GLXPixmap maLeavingPixmapGL;
+GLXPixmap maEnteringPixmapGL;
#endif
bool mbRestoreSync;
bool mbUseLeavingPixmap;
@@ -264,11 +264,11 @@ private:
/** the form the raw bytes are in for the bitmaps
*/
-rendering::IntegerBitmapLayout SlideBitmapLayout;
+rendering::IntegerBitmapLayout maSlideBitmapLayout;
/** the size of the slides
*/
-geometry::IntegerSize2D SlideSize;
+geometry::IntegerSize2D maSlideSize;
/** Our Transition to be used.
*/
@@ -277,11 +277,11 @@ private:
public:
/** whether we are running on ATI fglrx with bug related to textures
*/
-bool cbBrokenTexturesATI;
+bool mbBrokenTexturesATI;
/** GL version
*/
-float cnGLVersion;
+float mnGLVersion;
#ifdef UNX
float mnGLXVersion;
@@ -290,11 +290,11 @@ public:
/**
Whether the display has GLX extension on X11, always true otherwise (?)
*/
-bool cbGLXPresent;
+bool mbGLXPresent;
/** Whether Mesa is the OpenGL vendor
*/
-bool cbMesa;
+bool mbMesa;
/**
whether texture from pixmap extension is available
@@ -330,28 +330,28 @@ bool OGLTransitionerImpl::initialize( const Reference
presentation::XSlideShowV
setSlides( xLeavingSlide, xEnteringSlide );
-return cbGLXPresent;
+return mbGLXPresent;
}
void OGLTransitionerImpl::impl_initializeFlags( bool const bGLXPresent )
{
-cbGLXPresent = bGLXPresent;
+mbGLXPresent = bGLXPresent;
if ( bGLXPresent ) {
const GLubyte* version = glGetString( GL_VERSION );
if( version version[0] ) {
-cnGLVersion = version[0] - '0';
+mnGLVersion = version[0] - '0';
if( version[1] == '.' version[2] )
-cnGLVersion += (version[2] - '0')/10.0;
+mnGLVersion += (version[2] - '0')/10.0;
} else
-cnGLVersion = 1.0;
-SAL_INFO(slideshow.opengl, GL version: version parsed:
cnGLVersion );
+mnGLVersion = 1.0;
+SAL_INFO(slideshow.opengl, GL version: version parsed:
mnGLVersion );
const GLubyte* vendor = glGetString( GL_VENDOR );
-cbMesa = ( vendor strstr( (const char *) vendor, Mesa ) );
-SAL_INFO(slideshow.opengl, GL vendor: vendor identified
as Mesa: cbMesa );
+mbMesa = ( vendor strstr( (const char *) vendor, Mesa ) );
+SAL_INFO(slideshow.opengl, GL vendor: vendor identified
as Mesa: mbMesa );
/* TODO: check for version once the bug in fglrx driver is fixed */
-cbBrokenTexturesATI = (vendor strcmp( (const char *) vendor, ATI
Technologies Inc. ) == 0 );
+mbBrokenTexturesATI = (vendor strcmp( (const char *) vendor, ATI
Technologies Inc. ) == 0 );
}
}
@@ -390,10 +390,10 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView(
const Reference presenta
mpContext-setWinPosAndSize(Point(aCanvasArea.X, aCanvasArea.Y),
Size(aCanvasArea.Width, aCanvasArea.Height));
SAL_INFO(slideshow.opengl, canvas area: aCanvasArea.X ,
aCanvasArea.Y -
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |2 external/coinmp/android.build.patch.1 | 143 ++ external/coinmp/no-binaries.patch.1 | 25 + 3 files changed, 170 insertions(+) New commits: commit 63bc29b2a80e746a439f248c1bb8daa3d516370c Author: Tor Lillqvist t...@collabora.com Date: Tue May 20 17:04:59 2014 +0300 Make CoinMP build for Android (No idea whether it works, of course.) Patch the config.sub files to recognize arm-linux-androideabi. Don't build any binary programs as that fails for Android becuase we don't pass in the right C++ library to use anyway. (And those programs aren't really useful to us anyway, on any platform, I guess?) Change-Id: I70c7a527db41081a51548ce6983b6a9ae8a08bc7 diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 5daf123..d27d46c 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\ )) $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ + external/coinmp/android.build.patch.1 \ + external/coinmp/no-binaries.patch.1 \ external/coinmp/windows.build.patch.1 \ )) diff --git a/external/coinmp/android.build.patch.1 b/external/coinmp/android.build.patch.1 new file mode 100644 index 000..3d8897b --- /dev/null +++ b/external/coinmp/android.build.patch.1 @@ -0,0 +1,143 @@ +# -*- Mode: Diff -*- +# Patch to make the CoinMP configury recognize Android +# +--- coinmp/config.sub coinmp/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1218,7 +1218,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +--- coinmp/CoinUtils/config.sub coinmp/CoinUtils/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1218,7 +1218,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +--- coinmp/Osi/config.sub coinmp/Osi/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1218,7 +1218,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* |
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77891, which changed state. Bug 77891 Summary: LibO crashes as soon as one enters text in a module https://bugs.freedesktop.org/show_bug.cgi?id=77891 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/source
sc/source/core/data/documen8.cxx |2 +-
sc/source/ui/docshell/externalrefmgr.cxx | 13 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit e274a615f99c96359fed477a8532c7693917a8f4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 10:19:25 2014 -0400
cp#172: Purge one document shell at a time, to avoid freeze.
Import especially when we have a whole bunch of large-ish documents open
in the background.
Change-Id: I614e6daab3481c09dae47c8407497d77aec40480
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 4563b02..6b2f028 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -806,7 +806,7 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
ScProgress aProgress(GetDocumentShell(), Updating external links,
aRefLinks.size());
for (size_t i = 0, n = aRefLinks.size(); i n; ++i)
{
-aProgress.SetState(i);
+aProgress.SetState(i+1);
ScExternalRefLink* pRefLink = aRefLinks[i];
if (pRefLink-Update())
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index ded749f..525bbce 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2796,19 +2796,20 @@ void
ScExternalRefManager::notifyAllLinkListeners(sal_uInt16 nFileId, LinkUpdate
void ScExternalRefManager::purgeStaleSrcDocument(sal_Int32 nTimeOut)
{
-DocShellMap aNewDocShells;
+// To avoid potentially freezing Calc, we close one stale document at a
time.
DocShellMap::iterator itr = maDocShells.begin(), itrEnd =
maDocShells.end();
for (; itr != itrEnd; ++itr)
{
// in 100th of a second.
sal_Int32 nSinceLastAccess = (Time( Time::SYSTEM ) -
itr-second.maLastAccess).GetTime();
-if (nSinceLastAccess nTimeOut)
-aNewDocShells.insert(*itr);
-else
-// Timed out. Let's close this.
+if (nSinceLastAccess = nTimeOut)
+{
+// Timed out. Let's close this, and exit the loop.
itr-second.maShell-DoClose();
+maDocShells.erase(itr);
+break;
+}
}
-maDocShells.swap(aNewDocShells);
if (maDocShells.empty())
maSrcDocTimer.Stop();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/source sw/uiconfig
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 26
sw/source/core/uibase/inc/optload.hxx | 37
sw/source/core/uibase/inc/wordcountdialog.hxx |4
sw/source/ui/config/optload.cxx| 40
sw/source/ui/dialog/wordcountdialog.cxx| 27
sw/uiconfig/swriter/ui/optgeneralpage.ui | 600 +++--
sw/uiconfig/swriter/ui/wordcount.ui| 52 +
7 files changed, 500 insertions(+), 286 deletions(-)
New commits:
commit 43cd2f79da7a639d09fe43e6194f7568cbc78970
Author: Michal Siedlaczek michal.siedlac...@gmail.com
Date: Sat Jan 25 11:19:16 2014 +0100
Displaying the number of standardized pages in the Word count window
The number of standardized pages (unit defined in the options)
for the entire document and the selected area is displayed
(if enabled in options) in the Word count window.
The number of pages of size P for an area containing N characters equals
P/N.
This value is a float with one decimal place precision.
The default size of the standardized page is 1800 characters
(including whitespace characters).
The configuration can be altered in Options-Writer-General.
Conflicts:
sw/source/ui/config/optload.cxx
Change-Id: If13e87c73cb7706ff6618fa0352ba29c7c670aec
Reviewed-on: https://gerrit.libreoffice.org/7642
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index b59764c..409e7d1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5463,6 +5463,32 @@
/info
valueââ/value
/prop
+ prop oor:name=ShowStandardizedPageCount oor:type=xs:boolean
oor:nillable=false
+info
+ descconfigures if standardized page count should be displayed on
the Word Count window/desc
+ labelShow Standardized Page Count/label
+/info
+valuefalse/value
+ /prop
+ prop oor:name=StandardizedPageSize oor:type=xs:int
oor:nillable=false
+info
+ descconfigures how many characters is considered one standardized
page/desc
+ labelCharacters Per Standardized Page/label
+/info
+constraints
+ minInclusive oor:value=1
+info
+ descSpecifies the minimum value allowed./desc
+/info
+ /minInclusive
+ maxInclusive oor:value=10
+info
+ descSpecifies the maximum value allowed./desc
+/info
+ /maxInclusive
+/constraints
+value1800/value
+ /prop
/group
group oor:name=Navigator
info
diff --git a/sw/source/core/uibase/inc/optload.hxx
b/sw/source/core/uibase/inc/optload.hxx
index 015..2c1f739 100644
--- a/sw/source/core/uibase/inc/optload.hxx
+++ b/sw/source/core/uibase/inc/optload.hxx
@@ -39,25 +39,28 @@ class SwWrtShell;
class SwLoadOptPage : public SfxTabPage
{
private:
-RadioButton* m_pAlwaysRB;
-RadioButton* m_pRequestRB;
-RadioButton* m_pNeverRB;
-
-CheckBox*m_pAutoUpdateFields;
-CheckBox*m_pAutoUpdateCharts;
-
-ListBox* m_pMetricLB;
-FixedText* m_pTabFT;
-MetricField* m_pTabMF;
-CheckBox*m_pUseSquaredPageMode;
-CheckBox*m_pUseCharUnit;
-Edit*m_pWordCountED;
-
-SwWrtShell* m_pWrtShell;
-sal_uInt16 m_nLastTab;
-sal_Int32m_nOldLinkMode;
+RadioButton* m_pAlwaysRB;
+RadioButton* m_pRequestRB;
+RadioButton* m_pNeverRB;
+
+CheckBox*m_pAutoUpdateFields;
+CheckBox*m_pAutoUpdateCharts;
+
+ListBox* m_pMetricLB;
+FixedText* m_pTabFT;
+MetricField* m_pTabMF;
+CheckBox*m_pUseSquaredPageMode;
+CheckBox*m_pUseCharUnit;
+Edit*m_pWordCountED;
+CheckBox*m_pShowStandardizedPageCount;
+NumericField*m_pStandardizedPageSizeNF;
+
+SwWrtShell* m_pWrtShell;
+sal_uInt16 m_nLastTab;
+sal_Int32m_nOldLinkMode;
DECL_LINK(MetricHdl, void *);
+DECL_LINK(StandardizedPageCountCheckHdl, void *);
public:
SwLoadOptPage(Window* pParent, const SfxItemSet rSet);
diff --git a/sw/source/core/uibase/inc/wordcountdialog.hxx
b/sw/source/core/uibase/inc/wordcountdialog.hxx
index 9656015..fef9d92 100644
--- a/sw/source/core/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/core/uibase/inc/wordcountdialog.hxx
@@ -31,18 +31,22 @@ class SwWordCountFloatDlg : public SfxModelessDialog
virtual voidActivate() SAL_OVERRIDE;
void SetValues(const SwDocStat rCurrent, const SwDocStat rDoc);
void showCJK(bool bShowCJK);
+void
[Bug 40469] Modifed Frame Style Options Not Preserved, Keep Ratio Option Unavailable
https://bugs.freedesktop.org/show_bug.cgi?id=40469 --- Comment #11 from Andrei Furtuna furtunas...@gmail.com --- Cannot identify described bug in version 4.3 dev, keep ration option is available and working properly. Gilvan Vilarim, can you describe more detailed the bug situation you got? -- 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: 2 commits - cui/source include/svx include/vcl svx/source vcl/source
cui/source/tabpages/paragrph.cxx |6 --
include/svx/relfld.hxx |3 ++-
include/vcl/builder.hxx |2 ++
svx/source/dialog/relfld.cxx | 14 ++
vcl/source/window/builder.cxx|6 ++
5 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit 68bc8af6b6c4d0399bd10ed450d81aa2f17931a1
Author: Michael Stahl mst...@redhat.com
Date: Tue May 20 16:20:42 2014 +0200
SvxRelativeField: set the unit from the passed stringmap
In the Paragraph Indents Spacing tab there are fields with unit:
object class=svxlo-SvxRelativeField id=spinED_LEFTINDENT:0cm
But the unit is effectively ignored, and the resulting SvxRelativeField
with FUNIT_NONE and max somehow results in 0.18cm max when the
dialog sets cm as unit.
Change-Id: I6001c93079fd7d899f1e119913b29ea4898b1c34
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 9b9d726..91fb36d 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SVX_RELFLD_HXX
#define INCLUDED_SVX_RELFLD_HXX
+#include tools/fldunit.hxx
#include vcl/field.hxx
#include svx/svxdllapi.h
@@ -39,7 +40,7 @@ protected:
voidModify() SAL_OVERRIDE;
public:
-SvxRelativeField( Window* pParent, WinBits nBits);
+SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit eUnit);
voidEnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax
= 150,
sal_uInt16 nStep = 5 );
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index f8208f5..3f4841e 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -13,6 +13,7 @@
#include typeinfo
#include osl/module.hxx
#include tools/resmgr.hxx
+#include tools/fldunit.hxx
#include vcl/dllapi.h
#include vcl/window.hxx
#include xmlreader/xmlreader.hxx
@@ -303,6 +304,7 @@ public:
static OString convertMnemonicMarkup(const OString rIn);
static OString extractCustomProperty(stringmap rMap);
+static FieldUnit detectUnit(OString const);
static bool extractDropdown(stringmap rMap);
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 1031c89..b4db001 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -22,7 +22,8 @@
-SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits)
+SvxRelativeField::SvxRelativeField(
+Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
: MetricField( pParent, nBits)
, nRelMin(0)
, nRelMax(0)
@@ -32,15 +33,20 @@ SvxRelativeField::SvxRelativeField( Window* pParent,
WinBits nBits)
, bNegativeEnabled(false)
{
-
+SetUnit(eUnit);
SetDecimalDigits( 2 );
SetMin( 0 );
SetMax( );
}
-extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window
*pParent, VclBuilder::stringmap )
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
+makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap rMap)
{
-return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT |
WB_LEFT | WB_GROUP);
+OString const custom(VclBuilder::extractCustomProperty(rMap));
+FieldUnit const eUnit(VclBuilder::detectUnit(custom));
+SvxRelativeField *const pRet = new SvxRelativeField(pParent,
+WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP, eUnit);
+return pRet;
}
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index f3858d1..fb0356a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -904,6 +904,12 @@ namespace
}
}
+FieldUnit VclBuilder::detectUnit(OString const rString)
+{
+OString const unit(extractUnit(rString));
+return detectMetricUnit(unit);
+}
+
void VclBuilder::ensureDefaultWidthChars(VclBuilder::stringmap rMap)
{
OString sWidthChars(width-chars);
commit 35199df7b7af9d9dd3e98eb5f1b24ac1d407345c
Author: Michael Stahl mst...@redhat.com
Date: Tue May 20 11:18:55 2014 +0200
(related: fdo#62176) Revert reset min/max values in paragraph ...
... dialog before setting the actual value
This prevents handling negative first-line indent in Impress, for which
it is necessary that the values are set before the limits.
This reverts commit 3d7ff1e907713d8ed53a1e193641a2f16de3c38b.
Change-Id: I47807d7d49716acab3657de1da64c6e9a99fc44d
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6dba191..0e71f68 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -431,8 +431,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet )
SetFieldUnit( *m_pLineDistAtMetricBox, eFUnit );
}
-ELRLoseFocusHdl( NULL ); // reset min/max values
-
sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE );
SfxItemState eItemState = rSet.GetItemState( _nWhich );
@@ -590,6
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/FilteredContainer.cxx | 18 --
1 file changed, 18 deletions(-)
New commits:
commit dc24203e5f20dcbf2818651a8802e67338293b3c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 17:01:38 2014 +0200
fdo#78971 There's even a git hook to prevent commits containing SAL_DEBUG
Change-Id: I5a46e1eed129edf3648c68c36951d6fdf9bd370d
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx
b/dbaccess/source/core/api/FilteredContainer.cxx
index 21c0b2a..e65092f 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -302,15 +302,9 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
try
{
-SAL_DEBUG(OFilteredContainer::construct().
- Getting metadata ...);
-
Reference XConnection xCon( m_xConnection, UNO_SET_THROW );
m_xMetaData.set( xCon-getMetaData(), UNO_SET_THROW );
-SAL_DEBUG(OFilteredContainer::construct().
- Metadata got.);
-
// create a table table filter suitable for the
XDatabaseMetaData::getTables call,
// taking into account both the externally-provided table type
filter, and any
// table type restriction which is inherent to the container
@@ -318,9 +312,6 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
OUString sInherentTableTypeRestriction( getTableTypeRestriction()
);
if ( !sInherentTableTypeRestriction.isEmpty() )
{
-SAL_DEBUG(OFilteredContainer::construct().
- NOT InherentTableTypeRestriction.);
-
if ( _rTableTypeFilter.getLength() != 0 )
{
const OUString* tableType=
_rTableTypeFilter.getConstArray();
@@ -342,9 +333,6 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
}
else
{
-SAL_DEBUG(OFilteredContainer::construct().
- InherentTableTypeRestriction.);
-
// no container-inherent restriction for the table types
if ( _rTableTypeFilter.getLength() == 0 )
{ // no externally-provided table type filter = use the
default filter
@@ -356,16 +344,10 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
}
}
-SAL_DEBUG(OFilteredContainer::construct().
- Getting tables ...);
-
static const OUString sAll(%);
Reference XResultSet xTables = m_xMetaData-getTables( Any(),
sAll, sAll, aTableTypeFilter );
Reference XRow xCurrentRow( xTables, UNO_QUERY_THROW );
-SAL_DEBUG(OFilteredContainer::construct().
- Tables got.);
-
TableInfos aUnfilteredTables;
OUString sCatalog, sSchema, sName, sType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source
dbaccess/source/core/api/FilteredContainer.cxx | 18 --
1 file changed, 18 deletions(-)
New commits:
commit 862abf22751c02a495ded3971b9a6e5c3553b514
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 17:01:38 2014 +0200
fdo#78971 There's even a git hook to prevent commits containing SAL_DEBUG
Change-Id: I5a46e1eed129edf3648c68c36951d6fdf9bd370d
(cherry picked from commit dc24203e5f20dcbf2818651a8802e67338293b3c)
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx
b/dbaccess/source/core/api/FilteredContainer.cxx
index 7e5de81..edcf256 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -303,15 +303,9 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
try
{
-SAL_DEBUG(OFilteredContainer::construct().
- Getting metadata ...);
-
Reference XConnection xCon( m_xConnection, UNO_SET_THROW );
m_xMetaData.set( xCon-getMetaData(), UNO_SET_THROW );
-SAL_DEBUG(OFilteredContainer::construct().
- Metadata got.);
-
// create a table table filter suitable for the
XDatabaseMetaData::getTables call,
// taking into account both the externally-provided table type
filter, and any
// table type restriction which is inherent to the container
@@ -319,9 +313,6 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
OUString sInherentTableTypeRestriction( getTableTypeRestriction()
);
if ( !sInherentTableTypeRestriction.isEmpty() )
{
-SAL_DEBUG(OFilteredContainer::construct().
- NOT InherentTableTypeRestriction.);
-
if ( _rTableTypeFilter.getLength() != 0 )
{
const OUString* tableType=
_rTableTypeFilter.getConstArray();
@@ -343,9 +334,6 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
}
else
{
-SAL_DEBUG(OFilteredContainer::construct().
- InherentTableTypeRestriction.);
-
// no container-inherent restriction for the table types
if ( _rTableTypeFilter.getLength() == 0 )
{ // no externally-provided table type filter = use the
default filter
@@ -357,16 +345,10 @@ sal_Int32 createWildCardVector(Sequence OUString
_rTableFilter, ::std::vecto
}
}
-SAL_DEBUG(OFilteredContainer::construct().
- Getting tables ...);
-
static const OUString sAll(%);
Reference XResultSet xTables = m_xMetaData-getTables( Any(),
sAll, sAll, aTableTypeFilter );
Reference XRow xCurrentRow( xTables, UNO_QUERY_THROW );
-SAL_DEBUG(OFilteredContainer::construct().
- Tables got.);
-
TableInfos aUnfilteredTables;
OUString sCatalog, sSchema, sName, sType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source
avmedia/source/framework/modeltools.cxx | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit f6a3c83bd499bc8df21f937bfa5d4db14b4a5352
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue May 20 16:46:43 2014 +0200
glTF embedding: handle missing image on a better way
Using empty tree leads to empty image url which
cause problem.
Change-Id: If815ce588fb303905035185404ede93fa424fcba
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index 1adef63..c3fa11e 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -25,6 +25,7 @@
#include boost/property_tree/ptree.hpp
#include boost/property_tree/json_parser.hpp
#include boost/foreach.hpp
+#include boost/optional.hpp
#ifdef ENABLE_COLLADA2GLTF
#include COLLADA2GLTFWriter.h
@@ -71,7 +72,7 @@ static void lcl_EmbedExternals(const OUString rSourceURL,
uno::Referenceembed:
// Parse json, read externals' URI and modify this relative URI's so they
remain valid in the new context.
std::vectorstd::string vExternals;
-ptree aTree, aEmptyTree;
+ptree aTree;
try
{
json_parser::read_json( sUrl, aTree );
@@ -85,12 +86,19 @@ static void lcl_EmbedExternals(const OUString rSourceURL,
uno::Referenceembed:
aTree.put(buffers. + rVal.first +
.path.,sBufferUri.substr(sBufferUri.find_last_of('/')+1));
}
// Images for textures
-BOOST_FOREACH(ptree::value_type rVal,aTree.get_child(images,
aEmptyTree))
+boost::optional ptree aImages = aTree.get_child_optional(images);
+if( aImages )
{
-const std::string sImageUri(rVal.second.getstd::string(path));
-vExternals.push_back(sImageUri);
-// Change path: make it contain only a file name
-aTree.put(images. + rVal.first +
.path.,sImageUri.substr(sImageUri.find_last_of('/')+1));
+BOOST_FOREACH(ptree::value_type rVal,aImages.get())
+{
+const std::string
sImageUri(rVal.second.getstd::string(path));
+if( !sImageUri.empty() )
+{
+vExternals.push_back(sImageUri);
+// Change path: make it contain only a file name
+aTree.put(images. + rVal.first +
.path.,sImageUri.substr(sImageUri.find_last_of('/')+1));
+}
+}
}
// Shaders (contains names only)
BOOST_FOREACH(ptree::value_type rVal,aTree.get_child(programs))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fuinsfil.cxx | 21 +++--
sd/source/ui/func/fuline.cxx |8 +++-
sd/source/ui/func/fulinend.cxx |4 ++--
sd/source/ui/func/fulink.cxx |4 ++--
sd/source/ui/func/fumorph.cxx |4 ++--
sd/source/ui/func/fuoaprms.cxx |5 ++---
sd/source/ui/func/fuolbull.cxx |7 +--
7 files changed, 19 insertions(+), 34 deletions(-)
New commits:
commit 1c9ba8a81ca3b92e8fd684b4c16a06b5180ceb64
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed May 21 00:21:12 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Idb8f0df3848416d96299ebc47ac5bd53d766e52c
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 5110cdb..3959348 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -63,6 +63,7 @@
#include unmovss.hxx
#include Outliner.hxx
#include sdabstdlg.hxx
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -321,7 +322,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDocSh-SetWaitCursor( false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-AbstractSdInsertPagesObjsDlg* pDlg = pFact ?
pFact-CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0;
+boost::scoped_ptrAbstractSdInsertPagesObjsDlg pDlg(pFact ?
pFact-CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0);
if( !pDlg )
return false;
@@ -404,8 +405,6 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDoc-RemoveUnnecessaryMasterPages();
}
-delete pDlg;
-
return (bOK);
}
@@ -414,7 +413,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-AbstractSdInsertPagesObjsDlg* pDlg = pFact ?
pFact-CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0;
+boost::scoped_ptrAbstractSdInsertPagesObjsDlg pDlg(pFact ?
pFact-CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0);
if( !pDlg )
return;
@@ -439,7 +438,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
-SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc,
OUTLINERMODE_TEXTOBJECT );
+boost::scoped_ptrSdrOutliner pOutliner(new ::sd::Outliner( mpDoc,
OUTLINERMODE_TEXTOBJECT ));
// set reference device
pOutliner-SetRefDevice( SD_MOD()-GetRefDevice( *mpDocSh ) );
@@ -542,10 +541,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
}
}
}
-delete pOutliner;
}
-
-delete pDlg;
}
@@ -595,7 +591,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
-::Outliner* pOutliner = new ::Outliner( mpDoc-GetItemPool(),
OUTLINERMODE_OUTLINEOBJECT );
+boost::scoped_ptr ::Outliner pOutliner(new ::Outliner(
mpDoc-GetItemPool(), OUTLINERMODE_OUTLINEOBJECT ));
pOutliner-SetStyleSheetPool((SfxStyleSheetPool*)mpDoc-GetStyleSheetPool());
// set reference device
@@ -631,7 +627,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
mpDocSh-SetWaitCursor( false );
-SfxProgress* pProgress = new SfxProgress( mpDocSh,
SD_RESSTR(STR_CREATE_PAGES), nNewPages);
+boost::scoped_ptrSfxProgress pProgress(new SfxProgress( mpDocSh,
SD_RESSTR(STR_CREATE_PAGES), nNewPages));
if( pProgress )
pProgress-SetState( 0, 100 );
@@ -675,13 +671,10 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium*
pMedium)
pDocliner-GetUndoManager().LeaveListAction();
-if( pProgress )
-delete pProgress;
+pProgress.reset();
mpDocSh-SetWaitCursor( true );
}
-
-delete pOutliner;
}
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index ee03d31..46eafb8 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -36,6 +36,7 @@
#include app.hrc
#include svx/svxdlg.hxx
#include svx/dialogs.hrc
+#include boost/scoped_ptr.hpp
namespace sd {
@@ -72,11 +73,11 @@ void FuLine::DoExecute( SfxRequest rReq )
if( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-SfxItemSet* pNewAttr = new SfxItemSet( mpDoc-GetPool() );
+boost::scoped_ptrSfxItemSet pNewAttr(new SfxItemSet(
mpDoc-GetPool() ));
mpView-GetAttributes( *pNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-SfxAbstractTabDialog *
[Libreoffice-commits] core.git: sw/source
sw/source/ui/config/optload.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1122d513efbb3066b4e8aefbc8dc29ce7a7e9bcf
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 17:59:56 2014 +0200
loplugin:implicitboolconversion,literaltoboolconversion
Change-Id: Ib783fd0557361286ce7b913a429c9ab8fc101c75
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d4db9ff..af52de9 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -217,7 +217,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet rSet )
m_pShowStandardizedPageCount-IsChecked(),
batch);
batch-commit();
-bRet = sal_True;
+bRet = true;
}
if (m_pStandardizedPageSizeNF-GetText() !=
m_pStandardizedPageSizeNF-GetSavedValue())
@@ -228,11 +228,11 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet rSet )
m_pStandardizedPageSizeNF-GetValue(),
batch);
batch-commit();
-bRet = sal_True;
+bRet = true;
}
bool bIsSquaredPageModeFlag = m_pUseSquaredPageMode-IsChecked();
-if ( bIsSquaredPageModeFlag != m_pUseSquaredPageMode-GetSavedValue() )
+if ( bIsSquaredPageModeFlag !=
static_castbool(m_pUseSquaredPageMode-GetSavedValue()) )
{
pMod-ApplyDefaultPageMode( bIsSquaredPageModeFlag );
if ( m_pWrtShell )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 Thomas Arnhold thomas-l...@arnhold.org changed: What|Removed |Added CC||thomas-l...@arnhold.org See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=32415 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #9 from Thomas Arnhold thomas-l...@arnhold.org --- As Christian stated in the gerrit patchset, this is a localization problem. At the moment starmath behaves like the following: 1. Inside the odf file the symbol names are in English. 2. If you have a localized version of LibreOffice (e.g. German), all symbol names are mapped to German for the UI. You see them in German, and have to write them in German. 3. If you store your formulas inside a odf file the localized symbol names are mapped back to the English names. Ergo: Changing the tranlated %OMÉGA to a better representation in french should be no problem. For the feature of supporting English symbol names in general, see Bug 32415. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #10 from Thomas Arnhold thomas-l...@arnhold.org --- Copy from gerrit: %OMEGA is the capital omega %omega is the lower case character Allowing a mixed version %Omega will make the formulas harder to read, especially with short ones like %Mu, %MU, %mu... So I'm against mixed capitalization. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #11 from Thomas Arnhold thomas-l...@arnhold.org --- A cleaner solution for capital symbols would be %CaptialMu for example. -- 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: include/osl sal/osl sal/util unotools/source
include/osl/file.h | 16
include/osl/file.hxx | 11 +--
sal/osl/unx/file_misc.cxx | 26 ++
sal/osl/w32/file_dirvol.cxx|6 ++
sal/util/sal.map |1 +
unotools/source/ucbhelper/tempfile.cxx |5 -
6 files changed, 58 insertions(+), 7 deletions(-)
New commits:
commit f65de4feee506b80be0986ce28f7a2311e4fbe2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 18:07:54 2014 +0200
fdo#60338: Introduce osl_createDirectoryWithFlags
...so that utl::TempFile can pass osl_File_OpenFlag_Private and doesn't
have to
resort to umask (the calls to umask around Directory::create had somewhat
erroneously been removed recently with
1d72a0262c4570631d0aa8f98e34e21fb9d6ae42
Related fdo#60338: Create missing temp file dir with user's original
umask,
mistaking this for creation of intermediate directories in the hierarchy).
On Windows, the flags argument to osl_createDirectoryWithFlags is ignored
completely for now.
Change-Id: Iac56a5049d579be729a3f338aa62105123edb6cb
diff --git a/include/osl/file.h b/include/osl/file.h
index c00a302..1f1ae1b 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1130,6 +1130,22 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeFile(
oslFileHandle Handle );
SAL_DLLPUBLIC oslFileError SAL_CALL osl_createDirectory( rtl_uString*
pustrDirectoryURL );
+/** Create a directory, passing flags.
+
+@param url
+File URL of the directory to create.
+
+@param flags
+A combination of the same osl_File_OpenFlag_*s used by osl_openFile,
+except that osl_File_OpenFlag_Create is implied and ignored. Support for
+the various flags can differ across operating systems.
+
+@see osl_createDirectory()
+
+@since LibreOffice 4.3
+*/
+SAL_DLLPUBLIC oslFileError SAL_CALL osl_createDirectoryWithFlags(
+rtl_uString * url, sal_uInt32 flags);
/** Remove an empty directory.
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 1e600e7..8f7f3b4 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1849,6 +1849,10 @@ public:
@param ustrDirectoryURL [in]
Full qualified URL of the directory to create.
+@param flags [in]
+Optional flags, see osl_createDirectoryWithFlags for details. This
+defaulted parameter is new since LibreOffice 4.3.
+
@return
E_None on success
E_INVAL the format of the parameters was not valid
@@ -1871,9 +1875,12 @@ public:
@see remove()
*/
-inline static RC create( const ::rtl::OUString ustrDirectoryURL )
+inline static RC create(
+const ::rtl::OUString ustrDirectoryURL,
+sal_Int32 flags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write )
{
-return static_cast RC ( osl_createDirectory( ustrDirectoryURL.pData
) );
+return static_cast RC (
+osl_createDirectoryWithFlags( ustrDirectoryURL.pData, flags ) );
}
/** Remove an empty directory.
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 787866e..eb1e151 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -131,7 +131,8 @@ oslFileType DirectoryItem_Impl::getFileType() const
return osl_File_Type_Unknown;
}
-static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
+static oslFileError osl_psz_createDirectory(
+char const * pszPath, sal_uInt32 flags);
static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL,
oslDirectory* pDirectory)
@@ -395,6 +396,13 @@ oslFileError SAL_CALL osl_releaseDirectoryItem(
oslDirectoryItem Item )
oslFileError SAL_CALL osl_createDirectory( rtl_uString* ustrDirectoryURL )
{
+return osl_createDirectoryWithFlags(
+ustrDirectoryURL, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+}
+
+oslFileError osl_createDirectoryWithFlags(
+rtl_uString * ustrDirectoryURL, sal_uInt32 flags)
+{
char path[PATH_MAX];
oslFileError eRet;
@@ -410,7 +418,7 @@ oslFileError SAL_CALL osl_createDirectory( rtl_uString*
ustrDirectoryURL )
return oslTranslateFileError( OSL_FET_ERROR, errno );
#endif/* MACOSX */
-return osl_psz_createDirectory( path );
+return osl_psz_createDirectory( path, flags );
}
oslFileError SAL_CALL osl_removeDirectory( rtl_uString* ustrDirectoryURL )
@@ -433,10 +441,20 @@ oslFileError SAL_CALL osl_removeDirectory( rtl_uString*
ustrDirectoryURL )
return osl_psz_removeDirectory( path );
}
-static oslFileError osl_psz_createDirectory( const sal_Char* pszPath )
+oslFileError osl_psz_createDirectory(char const * pszPath, sal_uInt32 flags)
{
int nRet=0;
-int mode = S_IRWXU | S_IRWXG | S_IRWXO;
+int mode
+= (((flags osl_File_OpenFlag_Read) == 0
+
[Libreoffice-commits] core.git: Branch 'feature/textbox' - sw/inc sw/source
sw/inc/textboxhelper.hxx |9 +
sw/source/core/doc/textboxhelper.cxx | 30 ++
sw/source/core/unocore/unodraw.cxx |9 -
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit f1889b1a4cdd9d175103bbf9074c75690547e70f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue May 20 18:33:05 2014 +0200
SwXDrawPage::getCount(): ignore textboxes
Change-Id: Ie011f808b35d6f5176965889eeda5cc120974f88
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index f7750b3..bac2dcc 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -10,10 +10,14 @@
#ifndef INCLUDED_SW_INC_TEXTBOXHELPER_HXX
#define INCLUDED_SW_INC_TEXTBOXHELPER_HXX
+#include list
+
#include com/sun/star/uno/Any.h
#include com/sun/star/uno/Type.h
+class SdrPage;
class SwFrmFmt;
+class SwDoc;
/**
* A TextBox is a TextFrame, that is tied to a drawinglayer shape.
@@ -34,6 +38,11 @@ public:
static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
nMemberID, const OUString rPropertyName, const css::uno::Any rValue);
/// If we have an associated TextFrame, then return that.
static SwFrmFmt* findTextBox(SwFrmFmt* pShape);
+
+/// Look up TextFrames in a document, which are in fact TextBoxes.
+static std::listSwFrmFmt* findTextBoxes(SwDoc* pDoc);
+/// Count number of shapes in the document, excluding TextBoxes.
+static sal_Int32 getCount(SdrPage* pPage, std::listSwFrmFmt*
rTextBoxes);
};
#endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index 85b18b9..4671580 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -18,9 +18,11 @@
#include unotextbodyhf.hxx
#include unotextrange.hxx
#include unomid.h
+#include dflyobj.hxx
#include svx/svdoashp.hxx
#include svx/unopage.hxx
+#include svx/svdpage.hxx
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/text/SizeType.hpp
@@ -81,6 +83,34 @@ void SwTextBoxHelper::destroy(SwFrmFmt* pShape)
}
}
+std::listSwFrmFmt* SwTextBoxHelper::findTextBoxes(SwDoc* pDoc)
+{
+std::listSwFrmFmt* aRet;
+
+SwFrmFmts rSpzFrmFmts = *pDoc-GetSpzFrmFmts();
+for (SwFrmFmts::iterator it = rSpzFrmFmts.begin(); it !=
rSpzFrmFmts.end(); ++it)
+{
+SwFrmFmt* pTextBox = findTextBox(*it);
+if (pTextBox)
+aRet.push_back(pTextBox);
+}
+
+return aRet;
+}
+
+sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::listSwFrmFmt*
rTextBoxes)
+{
+sal_Int32 nRet = 0;
+for (size_t i = 0; i pPage-GetObjCount(); ++i)
+{
+SwVirtFlyDrawObj* pObject = PTR_CAST(SwVirtFlyDrawObj,
pPage-GetObj(i));
+if (pObject std::find(rTextBoxes.begin(), rTextBoxes.end(),
pObject-GetFmt()) != rTextBoxes.end())
+continue;
+++nRet;
+}
+return nRet;
+}
+
SwFrmFmt* SwTextBoxHelper::findTextBox(SwFrmFmt* pShape)
{
SwFrmFmt* pRet = 0;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 6cef384..0c639fa 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -30,6 +30,7 @@
#include swunohelper.hxx
#include textboxhelper.hxx
#include doc.hxx
+#include docary.hxx
#include IDocumentUndoRedo.hxx
#include fmtcntnt.hxx
#include fmtflcnt.hxx
@@ -516,7 +517,13 @@ sal_Int32 SwXDrawPage::getCount(void) throw(
uno::RuntimeException, std::excepti
else
{
((SwXDrawPage*)this)-GetSvxPage();
-return pDrawPage-getCount();
+
+std::listSwFrmFmt* aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+
+if (aTextBoxes.empty())
+return pDrawPage-getCount();
+else
+return SwTextBoxHelper::getCount(pDrawPage-GetSdrPage(),
aTextBoxes);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #12 from Thomas Arnhold thomas-l...@arnhold.org --- Here's the symbol code definition: starmath/source/symbol.src StringArray RID_EXPORT_SYMBOL_NAMES holds the export names for the odf file (do not change!) StringArray RID_UI_SYMBOL_NAMES holds the localized symbol names, which are language dependent. -- 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/textbox' - sw/inc sw/source
sw/inc/textboxhelper.hxx |3 +++
sw/source/core/doc/textboxhelper.cxx | 32 ++--
sw/source/core/unocore/unodraw.cxx |6 +-
3 files changed, 38 insertions(+), 3 deletions(-)
New commits:
commit 83857d750b9205db02d4b8bfc3c304364fae0619
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue May 20 19:15:29 2014 +0200
SwXDrawPage::getByIndex(): ignore textboxes
Change-Id: Ie91619e1f44694a547bfbbc5ff8110099c8002e6
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index bac2dcc..d3532c0 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -14,6 +14,7 @@
#include com/sun/star/uno/Any.h
#include com/sun/star/uno/Type.h
+#include com/sun/star/lang/IndexOutOfBoundsException.hpp
class SdrPage;
class SwFrmFmt;
@@ -43,6 +44,8 @@ public:
static std::listSwFrmFmt* findTextBoxes(SwDoc* pDoc);
/// Count number of shapes in the document, excluding TextBoxes.
static sal_Int32 getCount(SdrPage* pPage, std::listSwFrmFmt*
rTextBoxes);
+/// Get a shape by index, excluding TextBoxes.
+static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex,
std::listSwFrmFmt* rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
};
#endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index 4671580..d2cd4d7 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -98,19 +98,47 @@ std::listSwFrmFmt* SwTextBoxHelper::findTextBoxes(SwDoc*
pDoc)
return aRet;
}
+/// If the passed SdrObject is in fact a TextFrame, that is used as a TextBox.
+bool lcl_isTextBox(SdrObject* pSdrObject, std::listSwFrmFmt* rTextBoxes)
+{
+SwVirtFlyDrawObj* pObject = PTR_CAST(SwVirtFlyDrawObj, pSdrObject);
+return pObject std::find(rTextBoxes.begin(), rTextBoxes.end(),
pObject-GetFmt()) != rTextBoxes.end();
+}
+
sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::listSwFrmFmt*
rTextBoxes)
{
sal_Int32 nRet = 0;
for (size_t i = 0; i pPage-GetObjCount(); ++i)
{
-SwVirtFlyDrawObj* pObject = PTR_CAST(SwVirtFlyDrawObj,
pPage-GetObj(i));
-if (pObject std::find(rTextBoxes.begin(), rTextBoxes.end(),
pObject-GetFmt()) != rTextBoxes.end())
+if (lcl_isTextBox(pPage-GetObj(i), rTextBoxes))
continue;
++nRet;
}
return nRet;
}
+uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex,
std::listSwFrmFmt* rTextBoxes) throw(lang::IndexOutOfBoundsException)
+{
+if (nIndex 0 || nIndex = getCount(pPage, rTextBoxes))
+throw lang::IndexOutOfBoundsException();
+
+SdrObject* pRet = 0;
+sal_Int32 nCount = 0; // Current logical index.
+for (size_t i = 0; i pPage-GetObjCount(); ++i)
+{
+if (lcl_isTextBox(pPage-GetObj(i), rTextBoxes))
+continue;
+if (nCount == nIndex)
+{
+pRet = pPage-GetObj(i);
+break;
+}
+++nCount;
+}
+assert(pRet);
+return uno::makeAny(uno::Referencedrawing::XShape(pRet-getUnoShape(),
uno::UNO_QUERY));
+}
+
SwFrmFmt* SwTextBoxHelper::findTextBox(SwFrmFmt* pShape)
{
SwFrmFmt* pRet = 0;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 0c639fa..f3851d9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -538,7 +538,11 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
throw lang::IndexOutOfBoundsException();
((SwXDrawPage*)this)-GetSvxPage();
-return pDrawPage-getByIndex( nIndex );
+std::listSwFrmFmt* aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+if (aTextBoxes.empty())
+return pDrawPage-getByIndex( nIndex );
+else
+return SwTextBoxHelper::getByIndex(pDrawPage-GetSdrPage(), nIndex,
aTextBoxes);
}
uno::Type SwXDrawPage::getElementType(void) throw( uno::RuntimeException,
std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx | 87 +-
1 file changed, 46 insertions(+), 41 deletions(-)
New commits:
commit 4ffc7955361f38140fbacc41a0f473de5173c2dc
Author: David Tardon dtar...@redhat.com
Date: Tue May 20 17:19:13 2014 +0200
avoid duplication
Change-Id: I2de8da0ce3648657977825309d4dd9902c0f8900
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
index 9e04452..191bca8 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
@@ -47,15 +47,42 @@
#else // UNX == X11
-namespace unx
-{
#define GLX_GLXEXT_PROTOTYPES 1
#include GL/glx.h
#include GL/glxext.h
+
+#endif
+
+namespace
+{
+
+typedef void (*GLFunction_t)();
+
+#ifdef _WIN32
+
+GLFunction_t lcl_glGetProcAddress(const char *const name)
+{
+return wglGetProcAddress(name);
+}
+
+#elif defined(MACOSX)
+
+GLFunction_t lcl_glGetProcAddress(const char *const name)
+{
+return 0;
+}
+
+#else // UNX == X11
+
+GLFunction_t lcl_glGetProcAddress(const char *const name)
+{
+return glXGetProcAddress(reinterpret_castconst GLubyte*(name));
}
#endif
+}
+
bool OGLShaders::cbInitialized = false;
#ifdef GL_VERSION_2_0
@@ -83,46 +110,24 @@ bool OGLShaders::Initialize()
{
#ifdef GL_VERSION_2_0
if( !cbInitialized ) {
-#ifdef _WIN32
-glActiveTexture = (PFNGLACTIVETEXTUREPROC) wglGetProcAddress(
glActiveTexture );
-glCreateShader = (PFNGLCREATESHADERPROC) wglGetProcAddress(
glCreateShader );
-glShaderSource = (PFNGLSHADERSOURCEPROC) wglGetProcAddress(
glShaderSource );
-glCompileShader = (PFNGLCOMPILESHADERPROC) wglGetProcAddress(
glCompileShader );
-glGetShaderiv = (PFNGLGETSHADERIVPROC) wglGetProcAddress(
glGetShaderiv );
-glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) wglGetProcAddress(
glGetShaderInfoLog );
-glDeleteShader = (PFNGLDELETESHADERPROC) wglGetProcAddress(
glDeleteShader );
-glCreateProgram = (PFNGLCREATEPROGRAMPROC) wglGetProcAddress(
glCreateProgram );
-glAttachShader = (PFNGLATTACHSHADERPROC) wglGetProcAddress(
glAttachShader );
-glLinkProgram = (PFNGLLINKPROGRAMPROC) wglGetProcAddress(
glLinkProgram );
-glGetProgramiv = (PFNGLGETPROGRAMIVPROC) wglGetProcAddress(
glGetProgramiv );
-glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) wglGetProcAddress(
glGetProgramInfoLog );
-glUseProgram = (PFNGLUSEPROGRAMPROC) wglGetProcAddress( glUseProgram
);
-glDeleteProgram = (PFNGLDELETEPROGRAMPROC) wglGetProcAddress(
glDeleteProgram );
-glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)
wglGetProcAddress( glGetUniformLocation );
-glUniform1i = (PFNGLUNIFORM1IPROC) wglGetProcAddress( glUniform1i );
-glUniform1f = (PFNGLUNIFORM1FPROC) wglGetProcAddress( glUniform1f );
+glActiveTexture = (PFNGLACTIVETEXTUREPROC) lcl_glGetProcAddress(
glActiveTexture );
+glCreateShader = (PFNGLCREATESHADERPROC) lcl_glGetProcAddress(
glCreateShader );
+glShaderSource = (PFNGLSHADERSOURCEPROC) lcl_glGetProcAddress(
glShaderSource );
+glCompileShader = (PFNGLCOMPILESHADERPROC) lcl_glGetProcAddress(
glCompileShader );
+glGetShaderiv = (PFNGLGETSHADERIVPROC) lcl_glGetProcAddress(
glGetShaderiv );
+glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) lcl_glGetProcAddress(
glGetShaderInfoLog );
+glDeleteShader = (PFNGLDELETESHADERPROC) lcl_glGetProcAddress(
glDeleteShader );
+glCreateProgram = (PFNGLCREATEPROGRAMPROC) lcl_glGetProcAddress(
glCreateProgram );
+glAttachShader = (PFNGLATTACHSHADERPROC) lcl_glGetProcAddress(
glAttachShader );
+glLinkProgram = (PFNGLLINKPROGRAMPROC) lcl_glGetProcAddress(
glLinkProgram );
+glGetProgramiv = (PFNGLGETPROGRAMIVPROC) lcl_glGetProcAddress(
glGetProgramiv );
+glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)
lcl_glGetProcAddress( glGetProgramInfoLog );
+glUseProgram = (PFNGLUSEPROGRAMPROC) lcl_glGetProcAddress(
glUseProgram );
+glDeleteProgram = (PFNGLDELETEPROGRAMPROC) lcl_glGetProcAddress(
glDeleteProgram );
+glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)
lcl_glGetProcAddress( glGetUniformLocation );
+glUniform1i = (PFNGLUNIFORM1IPROC) lcl_glGetProcAddress( glUniform1i
);
+glUniform1f = (PFNGLUNIFORM1FPROC) lcl_glGetProcAddress( glUniform1f
);
cbInitialized = true;
-#elif defined(MACOSX)
-#else
-glActiveTexture = (PFNGLACTIVETEXTUREPROC) unx::glXGetProcAddress(
(unsigned char *) glActiveTexture );
-glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress(
(unsigned char *) glCreateShader );
-glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress(
(unsigned char *) glShaderSource );
-glCompileShader = (PFNGLCOMPILESHADERPROC)
[Libreoffice-commits] core.git: sdext/Library_pdfimport.mk
sdext/Library_pdfimport.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a130817f7deb61666262075e3918630f8d340c06 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue May 20 19:57:58 2014 +0200 Correct linker library sequence for pdfimport Otherwise I get a lot of missing fontconfig symbols. Change-Id: I9bc3e395d54380a36cd6dd73cf95b7f4e4cab54e diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index 2c98ed7..3e3d170 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -32,9 +32,9 @@ $(eval $(call gb_Library_use_static_libraries,pdfimport,\ $(eval $(call gb_Library_use_externals,pdfimport,\ boost_headers \ -$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \ zlib \ poppler \ +$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \ )) $(eval $(call gb_Library_add_exception_objects,pdfimport,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/core/ucbcmds.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f332958999cc38ad778ac381cc67d249e9bd918a Author: Julien Nabet serval2...@yahoo.fr Date: Tue May 20 20:09:41 2014 +0200 Fix wrong copy paste, should be ucb::CheckinArgument See http://nabble.documentfoundation.org/Wrong-copy-paste-in-ucbcmds-cxx-ucb-module-td4109103.html for more details Change-Id: I4f6754cf0350e969cece52008b310e1d8f182622 diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 22f5dc9..c4ed448 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -251,7 +251,7 @@ CommandProcessorInfo::CommandProcessorInfo() = ucb::CommandInfo( OUString( CHECKIN_NAME ), // Name CHECKIN_HANDLE, // Handle -cppu::UnoTypeucb::GlobalTransferCommandArgument::get() ); // ArgType +cppu::UnoTypeucb::CheckinArgument::get() ); // ArgType } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - 2 commits - sc/inc sc/source
sc/inc/externalrefmgr.hxx| 24
sc/inc/sc.hrc|3
sc/source/core/data/documen8.cxx |2
sc/source/ui/docshell/externalrefmgr.cxx | 170 ++-
sc/source/ui/src/scstring.src|5
5 files changed, 197 insertions(+), 7 deletions(-)
New commits:
commit 36162e779da890e99c962563d060355c72a2b8e5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 13:57:13 2014 -0400
cp#172: Populate cache tables when updating all external links.
This way, even after the loaded doc shells get purged due to timeout,
we won't reload those external documents from disk again. One caveat
is that we currently don't pre-populate empty cells even if they are
referenced by the host document.
Change-Id: I1de2987836bf2fc5d9d7044b406fb99faa534164
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index bbb3094..9bcc64d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -55,6 +55,12 @@ class SharedStringPool;
}
+namespace sc {
+
+class ColumnSpanSet;
+
+}
+
class ScExternalRefLink : public ::sfx2::SvBaseLink
{
public:
@@ -145,6 +151,8 @@ public:
Table();
~Table();
+void clear();
+
/**
* Add cell value to the cache.
*
@@ -268,6 +276,13 @@ public:
void setAllCacheTableReferencedStati( bool bReferenced );
bool areAllCacheTablesReferenced() const;
+/**
+ * Collect all cached non-empty cell positions, inferred directly from the
+ * cached data, not the cached range metadata stored separately in the
+ * Table.
+ */
+void getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet rSet )
const;
+
private:
struct ReferencedStatus
{
@@ -295,8 +310,17 @@ public:
ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, size_t
nTabIndex) const;
ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const
OUString rTabName, bool bCreateNew, size_t* pnIndex);
+/**
+ * Clear all caches including the cache tables.
+ */
void clearCache(sal_uInt16 nFileId);
+/**
+ * Clear all caches but keep the tables. All cache tables will be empty
+ * after the call, but the tables will not be removed.
+ */
+void clearCacheTables(sal_uInt16 nFileId);
+
private:
struct RangeHash
{
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 525bbce..9f6b657 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -53,6 +53,8 @@
#include vcl/msgbox.hxx
#include stringutil.hxx
#include scmatrix.hxx
+#include columnspanset.hxx
+#include column.hxx
#include memory
#include algorithm
@@ -254,6 +256,13 @@ ScExternalRefCache::Table::~Table()
{
}
+void ScExternalRefCache::Table::clear()
+{
+maRows.clear();
+maCachedRanges.RemoveAll();
+meReferenced = REFERENCED_MARKED;
+}
+
void ScExternalRefCache::Table::setReferencedFlag(
ScExternalRefCache::Table::ReferencedFlag eFlag )
{
meReferenced = eFlag;
@@ -445,9 +454,6 @@ void ScExternalRefCache::Table::setCachedCellRange(SCCOL
nCol1, SCROW nRow1, SCC
maCachedRanges.Append(aRange);
else
maCachedRanges.Join(aRange);
-
-OUString aStr;
-maCachedRanges.Format(aStr, SCA_VALID);
}
void ScExternalRefCache::Table::setWholeTableCached()
@@ -1106,6 +1112,35 @@ bool ScExternalRefCache::areAllCacheTablesReferenced()
const
return maReferenced.mbAllReferenced;
}
+void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId,
sc::ColumnSpanSet rSet ) const
+{
+const DocItem* pDocItem = getDocItem(nFileId);
+if (!pDocItem)
+// This document is not cached.
+return;
+
+const std::vectorTableTypeRef rTables = pDocItem-maTables;
+for (size_t nTab = 0, nTabCount = rTables.size(); nTab nTabCount; ++nTab)
+{
+const Table rTable = *rTables[nTab];
+std::vectorSCROW aRows;
+rTable.getAllRows(aRows);
+std::vectorSCROW::const_iterator itRow = aRows.begin(), itRowEnd =
aRows.end();
+for (; itRow != itRowEnd; ++itRow)
+{
+SCROW nRow = *itRow;
+std::vectorSCCOL aCols;
+rTable.getAllCols(nRow, aCols);
+std::vectorSCCOL::const_iterator itCol = aCols.begin(), itColEnd
= aCols.end();
+for (; itCol != itColEnd; ++itCol)
+{
+SCCOL nCol = *itCol;
+rSet.set(nTab, nCol, nRow, true);
+}
+}
+}
+}
+
ScExternalRefCache::ReferencedStatus::ReferencedStatus() :
mbAllReferenced(false)
{
@@ -1199,6 +1234,28 @@ void ScExternalRefCache::clearCache(sal_uInt16 nFileId)
maDocs.erase(nFileId);
}
+void ScExternalRefCache::clearCacheTables(sal_uInt16 nFileId)
+{
+osl::MutexGuard aGuard(maMtxDocs);
[SOLVED] Re: Wrong copy paste in ucbcmds.cxx? (ucb module)
sberg wrote ... I wonder if line 254 could be a wrong copy paste and should be: cppu::UnoType ucb::CheckinArgument ::get() ); Yes, that's wrong. (See UniversalContentBroker::execute in ucb/source/core/ucb.cxx, where CHECKIN_HANDLE/CHECKIN_NAME expects to get a CheckinArgument, not a GlobalTransferCommandArgument. Thank you Stephan for your feedback. I pushed the fix on master (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=f332958999cc38ad778ac381cc67d249e9bd918a) I didn't gerrit review on 4.2 since it's not related to a known bug but if you want to, I can. Julien -- View this message in context: http://nabble.documentfoundation.org/Wrong-copy-paste-in-ucbcmds-cxx-ucb-module-tp4109103p4109522.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
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #13 from Thomas Arnhold thomas-l...@arnhold.org --- Maybe we should approve some (less) user confusion and remove the translation of those Greek symbol names. None of the other function, operators,... are translated! Absolutely none! To reduce the user confusion we could add the Greek symbols to the Elements Dock, so that they are easy accessible (see f5e2d31331839fd8c6039bec057a9c28ed3c7396). What's the opinion about that? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source
sc/inc/scopetools.hxx |9 +
sc/source/core/data/documen8.cxx |3 +++
sc/source/core/tool/scopetools.cxx | 14 ++
3 files changed, 26 insertions(+)
New commits:
commit a1c7e073fe545e6a0bd8c5eecb152106b9ec35fa
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 14:24:44 2014 -0400
Turn the mouse cursor to the wait hand during the external link update.
Change-Id: I983127828b28c72dd12d4778b88051964e9bceaa
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 443ceaf..785fd70 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -13,6 +13,7 @@
#include scdllapi.h
class ScDocument;
+class Window;
namespace sc {
@@ -55,6 +56,14 @@ public:
~IdleSwitch();
};
+class WaitPointerSwitch
+{
+Window* mpFrameWin;
+public:
+WaitPointerSwitch(Window* pWin);
+~WaitPointerSwitch();
+};
+
}
#endif
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index e8ce20c..1247563 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -87,6 +87,7 @@
#include globalnames.hxx
#include stringutil.hxx
#include documentlinkmgr.hxx
+#include scopetools.hxx
#include boost/scoped_ptr.hpp
@@ -802,6 +803,8 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
aRefLinks.push_back(pRefLink);
}
+sc::WaitPointerSwitch aWaitSwitch(pWin);
+
pExternalRefMgr-enableDocTimer(false);
ScProgress aProgress(GetDocumentShell(),
ScResId(SCSTR_UPDATE_EXTDOCS).toString(), aRefLinks.size());
for (size_t i = 0, n = aRefLinks.size(); i n; ++i)
diff --git a/sc/source/core/tool/scopetools.cxx
b/sc/source/core/tool/scopetools.cxx
index 96f4458..0664219 100644
--- a/sc/source/core/tool/scopetools.cxx
+++ b/sc/source/core/tool/scopetools.cxx
@@ -9,6 +9,7 @@
#include scopetools.hxx
#include document.hxx
+#include vcl/window.hxx
namespace sc {
@@ -56,6 +57,19 @@ IdleSwitch::~IdleSwitch()
mrDoc.EnableIdle(mbOldValue);
}
+WaitPointerSwitch::WaitPointerSwitch(Window* pWin) :
+mpFrameWin(pWin)
+{
+if (mpFrameWin)
+mpFrameWin-EnterWait();
+}
+
+WaitPointerSwitch::~WaitPointerSwitch()
+{
+if (mpFrameWin)
+mpFrameWin-LeaveWait();
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04831249713827fb175faa118205bb132387dad9
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue May 20 20:50:44 2014 +0200
Following fdo#78838, let's make this part safe too
(Thank you Eike)
Change-Id: Icc7061c7f7296302d6ed21f0e74a48cbaa82011a
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b9e1b90..be0220d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -718,7 +718,6 @@ void ScInputHandler::GetFormulaData()
else
{
pFormulaData = new ScTypedCaseStrSet;
-miAutoPosFormula = pFormulaData-end();
}
if( pFormulaDataPara )
@@ -749,6 +748,7 @@ void ScInputHandler::GetFormulaData()
pFormulaDataPara-insert(ScTypedStrData(aEntry, 0.0,
ScTypedStrData::Standard));
}
}
+miAutoPosFormula = pFormulaData-end();
pDoc-GetFormulaEntries( *pFormulaData );
pDoc-GetFormulaEntries( *pFormulaDataPara );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added CC||jumbo4...@yahoo.fr --- Comment #14 from Laurent BP jumbo4...@yahoo.fr --- Hi, I agree to remove translation of Greek letters: in French it is often confusing about how to write letters, for instance %rhô instead of %rho. But as mentioned in bug 32415, it would be better to use UNICODE letters (easy access through panel Element Dock) than letters of special font. I do not agree with mixed capitalization: it would be too confusing. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #15 from Tomaz Vajngerl qui...@gmail.com --- I think the best (forward and backwards compatible) solution to this is to embrace unicode characters for Greek symbols and always write those instead of symbol names. We already use unicode characters when we import from MathML and doc / docx instead of symbol names (obviously because we don't know how to map between them). To make this complete we need auto-replace so we can directly convert the symbol name into the unicode character (along with other user-defined symbols in the catalog). I already did some experiments with unicode Greek symbols in Elements Dock (write the unicode symbol which is locale independent instead of symbol name) but they are useless if we don't embrace them everywhere. This is something I wanted to work on in the future.. -- 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: 2 commits - vcl/inc vcl/osx
vcl/inc/osx/salinst.h |1 -
vcl/osx/salinst.cxx |4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 0f836296ea3cdc10326ad54983b634168285b8e2
Author: Tor Lillqvist t...@collabora.com
Date: Tue May 20 23:34:02 2014 +0300
Don't use two separate names for the same thing
Change-Id: Iad76d452d5dbaa03099c1a649d7f278b0151f340
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 6d9a8d6..8a88a26 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -147,7 +147,6 @@ public:
static const short AppExecuteSVMain = 0x7fff;
static const short AppEndLoopEvent= 1;
static const short AppStartTimerEvent = 10;
-static const short AppleRemoteEvent = 15;
static const short YieldWakeupEvent = 20;
static NSMenu* GetDynamicDockMenu();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 2fce74c..b779109 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -475,7 +475,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
break;
#if !HAVE_FEATURE_MACOSX_SANDBOX
-case AppleRemoteEvent:
+case AppleRemoteControlEvent: // Defined in
apple_remote/RemoteMainController.h
{
sal_Int16 nCommand = 0;
SalData* pSalData = GetSalData();
commit c41ad388af65863b89788f874031cb129ce0f8b2
Author: Tor Lillqvist t...@collabora.com
Date: Tue May 20 23:32:00 2014 +0300
We don't support the Apple Remote in sandboxed mode
Change-Id: Ie0a456647376b9d249850227d3481be5b4ee991d
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 7b10141..2fce74c 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -474,6 +474,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
}
break;
+#if !HAVE_FEATURE_MACOSX_SANDBOX
case AppleRemoteEvent:
{
sal_Int16 nCommand = 0;
@@ -536,6 +537,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
break;
+#endif
case YieldWakeupEvent:
// do nothing, fall out of Yield
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/refactor-god-objects'
New branch 'feature/refactor-god-objects' available with the following commits: commit 3056fa190eeb24bd6f264790497b763d20f42cf9 Author: Valentin Kettner vakevk+libreoff...@gmail.com Date: Tue May 20 22:45:09 2014 +0200 Finished cleaning up of IDocumentDeviceAccess methods in SwDoc. Moved all SwDoc::getPrintData and SwDoc::setPrintData calls to their appropriate interface methods (SwDoc::getIDocumentDeviceAccess::). Change-Id: I5671b365238abae6d94f125fb7a99481d81392f9 commit 0a7bfbd5d5882f7835c959dddbccc1c9070491f2 Author: Valentin Kettner vakevk+libreoff...@gmail.com Date: Tue May 20 22:01:36 2014 +0200 Cleaning up of IDocumentDeviceAccess methods in SwDoc. Moved all SwDoc::getJobSetup and SwDoc::setJobSetup calls to their appropriate interface methods (SwDoc::getIDocumentDeviceAccess::). Change-Id: I155a0341363ec42eaad3290d2e6feb8c7d73bbb1 commit 45f3f91834216d2e132128c90e56d46134865d38 Author: Valentin Kettner vakevk+libreoff...@gmail.com Date: Tue May 20 21:35:48 2014 +0200 Cleaning up of IDocumentDeviceAccess methods in SwDoc. Moved all SwDoc::getReferenceDevice and SwDoc::setReferenceDevice calls to their appropriate interface methods (SwDoc::getIDocumentDeviceAccess::). Change-Id: I2a1b488500fa4f0bfbb7ebadccde2c94b70efd85 commit cf66bc9b5d438cdd5fd72ddc7f15b03eddf9291b Author: Valentin Kettner vakevk+libreoff...@gmail.com Date: Tue May 20 19:31:06 2014 +0200 Removed getVirtualDevice and setVirtualDevice from SwDoc. Nothing else had to be chaned because they werent call from anywhere else. Change-Id: I708b54b909c5a1814bcec858dd356e17e5c6c473 commit 5964e208481f4b05bf6d6da7bf23e83979b17c17 Author: Valentin Kettner vakevk+libreoff...@gmail.com Date: Tue May 20 17:29:37 2014 +0200 Started cleaning up of IDocumentDeviceAccess methods in SwDoc. Moved all SwDoc::getPrinter and SwDoc::setPrinter calls to their appropriate interface methods (SwDoc::getIDocumenterDeviceAccess::). Change-Id: Icbe5369ba03a05d9e2afb1300a9c67b0a0a20c60 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Mihkel Tõnnov mihh...@gmail.com changed: What|Removed |Added Depends on||78883 --- Comment #145 from Mihkel Tõnnov mihh...@gmail.com --- (In reply to comment #144) added bug 78883 - regression, bibisected ...except that you actually removed it, too :) Adding it back. -- 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: 6 commits - chart2/source include/vcl vcl/source
chart2/source/view/charttypes/GL3DBarChart.cxx |6 ++-
chart2/source/view/inc/GL3DRenderer.hxx| 17 ++---
chart2/source/view/main/3DChartObjects.cxx | 10 ++---
chart2/source/view/main/GL3DRenderer.cxx | 47 ++---
include/vcl/opengl/OpenGLHelper.hxx|7 +++
vcl/source/opengl/OpenGLHelper.cxx | 36 +++
6 files changed, 106 insertions(+), 17 deletions(-)
New commits:
commit 61b2ae31c6642e09b3052599ae22077e8d41eabd
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed May 21 01:49:59 2014 +0200
use FBO for the picking
Change-Id: Ibab6daa1f76300d159ccd4cfbca061c8d8c1951f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 1653668..d36a008 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -217,14 +217,16 @@ public:
}
-void GL3DBarChart::clickedAt(const Point )
+void GL3DBarChart::clickedAt(const Point rPos)
{
+sal_uInt32 nId = 1;
{
PickingModeSetter(mpRenderer.get());
render();
+nId = mpRenderer-GetPixelColorFromPoint(rPos.X(), rPos.Y());
}
if (mpCamera)
-mpCamera-zoom(1);
+mpCamera-zoom(nId);
}
}
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 52d341a..b08e90e 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -179,6 +179,8 @@ public:
void ProcessUnrenderedShape();
void SetPickingMode(bool bPickingMode);
+
+sal_uInt32 GetPixelColorFromPoint(long nX, long nY);
private:
void MoveModelf(PosVecf3 trans,PosVecf3 angle,PosVecf3 scale);
@@ -362,6 +364,10 @@ private:
bool mbPickingMode;
SceneBox m_SenceBox;
+
+GLuint mnPickingFbo;
+GLuint mnPickingRbo;
+GLuint mnPickingTexture;
};
}
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 92cf61d..cea7e0f 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -249,6 +249,8 @@ void OpenGL3DRenderer::init()
glBufferData(GL_ARRAY_BUFFER, sizeof(squareVertices), squareVertices,
GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
+OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo,
mnPickingRbo, mnPickingTexture);
+
CHECK_GL_ERROR();
Init3DUniformBlock();
@@ -1580,6 +1582,22 @@ void OpenGL3DRenderer::MoveModelf(PosVecf3
trans,PosVecf3 angle,PosVecf3 scal
void OpenGL3DRenderer::SetPickingMode(bool bPickingMode)
{
mbPickingMode = bPickingMode;
+if(mbPickingMode)
+{
+glBindFramebuffer(GL_FRAMEBUFFER, mnPickingFbo);
+}
+else
+{
+glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+}
+
+sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long nX, long nY)
+{
+boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]);
+glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
+Color aColor(buf[3], buf[2], buf[1], buf[0]);
+return aColor.GetColor();
}
}
commit 8c39739a38237df6e8f39f312cf08fadae896ae4
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed May 21 00:41:37 2014 +0200
add method for creating framebuffer objects to OpenGLHelper
Change-Id: I08bd2e58ee98a68accae256fcbcc288a8c56ae0b
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 3cb482b..70b1d2a 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -29,6 +29,13 @@ public:
static void renderToFile(long nWidth, long nHeight, const OUString
rFileName);
static const char* GLErrorString(GLenum errorCode);
+
+/**
+ * The caller is responsible for deleting the buffer objects identified by
+ * nFramebufferId, nRenderbufferId and nTexturebufferId
+ */
+static void createFramebuffer(long nWidth, long nHeight,
+GLuint nFramebufferId, GLuint nRenderbufferId, GLuint
nTexturebufferId);
};
VCLOPENGL_DLLPUBLIC std::ostream operator(std::ostream rStrm, const
glm::mat4 rMatrix);
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 0e9d710..ad2506d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -268,5 +268,41 @@ std::ostream operator(std::ostream rStrm, const
glm::mat4 rMatrix)
return rStrm;
}
+void OpenGLHelper::createFramebuffer(long nWidth, long nHeight,
+GLuint nFramebufferId, GLuint nRenderbufferId, GLuint
nTexturebufferId)
+{
+// create a renderbuffer
+glGenRenderbuffers(1, nRenderbufferId);
+glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferId);
+glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, nWidth,
nHeight);
+glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+// create
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/GL3DRenderer.cxx |4 1 file changed, 4 insertions(+) New commits: commit 19979ae27055cb910bfc368bfc2899d211f56be1 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Wed May 21 02:09:11 2014 +0200 forgot to release the OpenGL resources Change-Id: I2baefbe611f9ed28defc46ca3af332d13b32c561 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index cea7e0f..cf75ea6 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -110,6 +110,10 @@ OpenGL3DRenderer::~OpenGL3DRenderer() glDeleteBuffers(1, m_RenderVertexBuf); glDeleteBuffers(1, m_3DUBOBuffer); glDeleteBuffers(1, m_VertexBuffer); + +glDeleteFramebuffers(1, mnPickingFbo); +glDeleteRenderbuffers(1, mnPickingRbo); +glDeleteTextures(1, mnPickingTexture); } void OpenGL3DRenderer::ShaderResources::LoadShaders() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 8 commits - chart2/source include/vcl sc/inc sc/source vcl/source
chart2/source/view/charttypes/GL3DBarChart.cxx |6 +-
chart2/source/view/inc/GL3DRenderer.hxx| 17 +---
chart2/source/view/main/3DChartObjects.cxx | 10 ++--
chart2/source/view/main/GL3DRenderer.cxx | 51 ++---
include/vcl/opengl/OpenGLHelper.hxx|7 +++
sc/inc/chartarr.hxx| 24 +--
sc/source/core/tool/chartarr.cxx | 36 ++---
sc/source/ui/unoobj/cellsuno.cxx |6 +-
vcl/source/opengl/OpenGLHelper.cxx | 36 +
9 files changed, 139 insertions(+), 54 deletions(-)
New commits:
commit ae1426a2667ba2a426753283eb6f501341d7a517
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed May 21 02:09:11 2014 +0200
forgot to release the OpenGL resources
Change-Id: I2baefbe611f9ed28defc46ca3af332d13b32c561
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index cea7e0f..cf75ea6 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -110,6 +110,10 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
glDeleteBuffers(1, m_RenderVertexBuf);
glDeleteBuffers(1, m_3DUBOBuffer);
glDeleteBuffers(1, m_VertexBuffer);
+
+glDeleteFramebuffers(1, mnPickingFbo);
+glDeleteRenderbuffers(1, mnPickingRbo);
+glDeleteTextures(1, mnPickingTexture);
}
void OpenGL3DRenderer::ShaderResources::LoadShaders()
commit 9d9b631c60dc4b88d5cff0a4a8c9e5c94b019a47
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed May 21 01:49:59 2014 +0200
use FBO for the picking
Change-Id: Ibab6daa1f76300d159ccd4cfbca061c8d8c1951f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 1653668..d36a008 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -217,14 +217,16 @@ public:
}
-void GL3DBarChart::clickedAt(const Point )
+void GL3DBarChart::clickedAt(const Point rPos)
{
+sal_uInt32 nId = 1;
{
PickingModeSetter(mpRenderer.get());
render();
+nId = mpRenderer-GetPixelColorFromPoint(rPos.X(), rPos.Y());
}
if (mpCamera)
-mpCamera-zoom(1);
+mpCamera-zoom(nId);
}
}
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 52d341a..b08e90e 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -179,6 +179,8 @@ public:
void ProcessUnrenderedShape();
void SetPickingMode(bool bPickingMode);
+
+sal_uInt32 GetPixelColorFromPoint(long nX, long nY);
private:
void MoveModelf(PosVecf3 trans,PosVecf3 angle,PosVecf3 scale);
@@ -362,6 +364,10 @@ private:
bool mbPickingMode;
SceneBox m_SenceBox;
+
+GLuint mnPickingFbo;
+GLuint mnPickingRbo;
+GLuint mnPickingTexture;
};
}
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 92cf61d..cea7e0f 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -249,6 +249,8 @@ void OpenGL3DRenderer::init()
glBufferData(GL_ARRAY_BUFFER, sizeof(squareVertices), squareVertices,
GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
+OpenGLHelper::createFramebuffer(m_iWidth, m_iHeight, mnPickingFbo,
mnPickingRbo, mnPickingTexture);
+
CHECK_GL_ERROR();
Init3DUniformBlock();
@@ -1580,6 +1582,22 @@ void OpenGL3DRenderer::MoveModelf(PosVecf3
trans,PosVecf3 angle,PosVecf3 scal
void OpenGL3DRenderer::SetPickingMode(bool bPickingMode)
{
mbPickingMode = bPickingMode;
+if(mbPickingMode)
+{
+glBindFramebuffer(GL_FRAMEBUFFER, mnPickingFbo);
+}
+else
+{
+glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+}
+
+sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long nX, long nY)
+{
+boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]);
+glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
+Color aColor(buf[3], buf[2], buf[1], buf[0]);
+return aColor.GetColor();
}
}
commit 8f6411c08f8382ff486af1f10fff5cf9c6525265
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed May 21 00:41:37 2014 +0200
add method for creating framebuffer objects to OpenGLHelper
Change-Id: I08bd2e58ee98a68accae256fcbcc288a8c56ae0b
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 3cb482b..70b1d2a 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -29,6 +29,13 @@ public:
static void renderToFile(long nWidth, long nHeight, const OUString
rFileName);
static const char* GLErrorString(GLenum errorCode);
+
+/**
+ * The caller is responsible for deleting the buffer objects identified by
+ *
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source
sc/inc/document.hxx |3
sc/inc/xmlwrap.hxx | 14
sc/source/core/data/documen2.cxx |1
sc/source/core/data/documen9.cxx |5
sc/source/filter/xml/xmlimprt.cxx| 23 +
sc/source/filter/xml/xmlimprt.hxx|6
sc/source/filter/xml/xmlwrap.cxx | 473 +++
sc/source/ui/docshell/docsh.cxx | 10
sc/source/ui/docshell/externalrefmgr.cxx |4
9 files changed, 268 insertions(+), 271 deletions(-)
New commits:
commit ce3152ab14937cc37102b0be4264c793d288235a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 21:01:46 2014 -0400
Let's not use ScDocument as a convenient anything goes storage place.
Change-Id: I0ae2f44b89b0db915e78a9b07835000e843d016f
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 08f1ca4..e1aabf4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -400,7 +400,6 @@ private:
boolbInsertingFromOtherDoc;
boolbLoadingMedium;
boolbImportingXML; // special handling of formula text
-boolbXMLFromWrapper;// distinguish ScXMLImportWrapper
from external component
boolbCalcingAfterLoad; // in CalcAfterLoad
TRUE
// don't construct/destruct listeners temporarily
boolbNoListening;
@@ -1754,8 +1753,6 @@ public:
voidSetLoadingMedium( bool bVal );
voidSetImportingXML( bool bVal );
boolIsImportingXML() const { return bImportingXML; }
-voidSetXMLFromWrapper( bool bVal );
-boolIsXMLFromWrapper() const { return bXMLFromWrapper; }
voidSetCalcingAfterLoad( bool bVal ) { bCalcingAfterLoad =
bVal; }
boolIsCalcingAfterLoad() const { return bCalcingAfterLoad; }
voidSetNoListening( bool bVal ) { bNoListening = bVal; }
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 8bb78af..e74c01a 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -26,10 +26,6 @@
#include importfilterdata.hxx
#include sal/types.h
-class ScDocument;
-class SfxMedium;
-class ScMySharedData;
-
#include tools/errcode.hxx
namespace com { namespace sun { namespace star {
@@ -43,10 +39,16 @@ namespace com { namespace sun { namespace star {
namespace sax { struct InputSource; class XParser; class XWriter; } }
} } }
+class ScDocument;
+class SfxMedium;
+class ScMySharedData;
+class ScDocShell;
+
class ScXMLImportWrapper
{
sc::ImportPostProcessData maPostProcessData;
+ScDocShell mrDocShell;
ScDocument rDoc;
SfxMedium* pMedium;
::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
xStorage;
@@ -70,7 +72,9 @@ class ScXMLImportWrapper
ScMySharedData* pSharedData);
public:
-ScXMLImportWrapper(ScDocument rD, SfxMedium* pM, const
::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage );
+ScXMLImportWrapper(
+ScDocShell rDocSh, SfxMedium* pM, const
css::uno::Referencecss::embed::XStorage xStor );
+
bool Import(bool bStylesOnly, ErrCode );
bool Export(bool bStylesOnly);
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index e0ed474..d65c42c 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -194,7 +194,6 @@ ScDocument::ScDocument( ScDocumentMode eMode,
SfxObjectShell* pDocShell ) :
bInsertingFromOtherDoc( false ),
bLoadingMedium( false ),
bImportingXML( false ),
-bXMLFromWrapper( false ),
bCalcingAfterLoad( false ),
bNoListening( false ),
mbIdleEnabled(true),
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 4d7920e..c9fe85b 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -620,11 +620,6 @@ void ScDocument::SetImportingXML( bool bVal )
SetLoadingMedium(bVal);
}
-void ScDocument::SetXMLFromWrapper( bool bVal )
-{
-bXMLFromWrapper = bVal;
-}
-
rtl::ReferenceSvxForbiddenCharactersTable
ScDocument::GetForbiddenCharacters()
{
return xForbiddenCharacters;
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index f95b2aa..2aa6c14 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2102,7 +2102,7 @@ ScXMLImport::ScXMLImport(
bRemoveLastChar(false),
bNullDateSetted(false),
bSelfImportingXMLSet(false),
-bFromWrapper(false),
+mbLockSolarMutex(true),
mbHasNewCondFormatData(false)
{
pStylesImportHelper = new ScMyStylesImportHelper(*this);
@@ -2240,6 +2240,23 @@ ScXMLImport::~ScXMLImport() throw()
delete pDetectiveOpArray;
}
+void ScXMLImport::initialize( const css::uno::Sequencecss::uno::Any
aArguments )
+throw
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source
sc/inc/unonames.hxx |2 ++ sc/source/filter/xml/xmlimprt.cxx |5 +++-- sc/source/filter/xml/xmlwrap.cxx |3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 1d17a0fe5312f7107beb50b6bb779f4eff8c67c8 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue May 20 21:09:41 2014 -0400 Let's use constant uno name for these. Change-Id: I5e34f4d7561ef7f4f7b8b3b4d7d06cca072831c7 diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 1cc71a9..689dcea 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -668,6 +668,8 @@ #define SC_UNO_EMBED_FONTS EmbedFonts +#define SC_UNO_ODS_LOCK_SOLAR_MUTEX LockSolarMutex + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 2aa6c14..813190d 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -69,6 +69,7 @@ #include editattributemap.hxx #include documentimport.hxx #include pivotsource.hxx +#include unonames.hxx #include comphelper/extract.hxx @@ -2253,8 +2254,8 @@ void ScXMLImport::initialize( const css::uno::Sequencecss::uno::Any aArgument if (!xInfoSetInfo.is()) return; -if (xInfoSetInfo-hasPropertyByName(LockSolarMutex)) -xInfoSet-getPropertyValue(LockSolarMutex) = mbLockSolarMutex; +if (xInfoSetInfo-hasPropertyByName(SC_UNO_ODS_LOCK_SOLAR_MUTEX)) +xInfoSet-getPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX) = mbLockSolarMutex; } SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString rLocalName, diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 6282b9f..4402b2b 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -71,6 +71,7 @@ #include sheetdata.hxx #include XMLCodeNameProvider.hxx #include docsh.hxx +#include unonames.hxx using namespace com::sun::star; @@ -348,7 +349,7 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode nError) }; uno::Reference beans::XPropertySet xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aImportInfoMap ) ) ); -xInfoSet-setPropertyValue(LockSolarMutex, uno::makeAny(false)); +xInfoSet-setPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX, uno::makeAny(false)); // get BuildId from parent container if available ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source
Rebased ref, commits from common ancestor:
commit 4ea57c9f946a0078429a8a87b9d34372eb5c5072
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 21:09:41 2014 -0400
Let's use constant uno name for these.
Change-Id: I5e34f4d7561ef7f4f7b8b3b4d7d06cca072831c7
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 1cc71a9..689dcea 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -668,6 +668,8 @@
#define SC_UNO_EMBED_FONTS EmbedFonts
+#define SC_UNO_ODS_LOCK_SOLAR_MUTEX LockSolarMutex
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 2aa6c14..813190d 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -69,6 +69,7 @@
#include editattributemap.hxx
#include documentimport.hxx
#include pivotsource.hxx
+#include unonames.hxx
#include comphelper/extract.hxx
@@ -2253,8 +2254,8 @@ void ScXMLImport::initialize( const
css::uno::Sequencecss::uno::Any aArgument
if (!xInfoSetInfo.is())
return;
-if (xInfoSetInfo-hasPropertyByName(LockSolarMutex))
-xInfoSet-getPropertyValue(LockSolarMutex) = mbLockSolarMutex;
+if (xInfoSetInfo-hasPropertyByName(SC_UNO_ODS_LOCK_SOLAR_MUTEX))
+xInfoSet-getPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX) =
mbLockSolarMutex;
}
SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16
nPrefix, const OUString rLocalName,
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 6282b9f..cc1cbff 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -71,6 +71,7 @@
#include sheetdata.hxx
#include XMLCodeNameProvider.hxx
#include docsh.hxx
+#include unonames.hxx
using namespace com::sun::star;
@@ -343,12 +344,12 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly,
ErrCode nError)
{ OUString(OrganizerMode), 0, ::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(SourceStorage), 0, cppu::UnoTypeembed::XStorage::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(LockSolarMutex), 0, getBooleanCppuType(),
css::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString(SC_UNO_ODS_LOCK_SOLAR_MUTEX), 0, getBooleanCppuType(),
css::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference beans::XPropertySet xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aImportInfoMap ) ) );
-xInfoSet-setPropertyValue(LockSolarMutex, uno::makeAny(false));
+xInfoSet-setPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX,
uno::makeAny(false));
// get BuildId from parent container if available
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - sc/inc sc/source
sc/inc/xmlwrap.hxx |9 +++-
sc/source/filter/xml/xmlwrap.cxx | 81 ++-
sc/source/ui/docshell/docsh.cxx |8 +--
3 files changed, 50 insertions(+), 48 deletions(-)
New commits:
commit ec639ad118ecb02ab0efea3a60c793d9b6ea3ef6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue May 20 22:32:43 2014 -0400
Finer grained ODS import mode selection.
Change-Id: I18520837f8d25103bf8482a0204b8a7b7740feb1
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index e74c01a..b7ec5cd 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -72,10 +72,17 @@ class ScXMLImportWrapper
ScMySharedData* pSharedData);
public:
+
+static const sal_uInt8 STYLES = 0x01;
+static const sal_uInt8 CONTENT = 0x02;
+static const sal_uInt8 METADATA = 0x04;
+static const sal_uInt8 SETTINGS = 0x08;
+static const sal_uInt8 ALL = STYLES | CONTENT | METADATA | SETTINGS;
+
ScXMLImportWrapper(
ScDocShell rDocSh, SfxMedium* pM, const
css::uno::Referencecss::embed::XStorage xStor );
-bool Import(bool bStylesOnly, ErrCode );
+bool Import( sal_uInt8 nMode, ErrCode rError );
bool Export(bool bStylesOnly);
const sc::ImportPostProcessData GetImportPostProcessData() const;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index cc1cbff..159c3d8 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -309,7 +309,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const
uno::Referenceuno::XCo
return nReturn;
}
-bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode nError)
+bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode rError )
{
uno::Referenceuno::XComponentContext xContext =
comphelper::getProcessComponentContext();
@@ -349,6 +349,7 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode
nError)
};
uno::Reference beans::XPropertySet xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aImportInfoMap ) ) );
+// No need to lock solar mutex when calling from the wrapper.
xInfoSet-setPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX,
uno::makeAny(false));
// get BuildId from parent container if available
@@ -403,14 +404,14 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly,
ErrCode nError)
}
}
-if (bStylesOnly)
-xInfoSet-setPropertyValue(OrganizerMode, uno::makeAny(sal_True));
+if (mrDocShell.GetCreateMode() == SFX_CREATE_MODE_ORGANIZER)
+xInfoSet-setPropertyValue(OrganizerMode, uno::makeAny(true));
xInfoSet-setPropertyValue( SourceStorage, uno::Any( xStorage ) );
bool bOasis = ( SotStorage::GetVersion( xStorage ) SOFFICE_FILEFORMAT_60
);
-if (!bStylesOnly bOasis)
+if ((nMode METADATA) == METADATA bOasis)
{
// RDF metadata: ODF = 1.2
try
@@ -428,34 +429,37 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly,
ErrCode nError)
ucb::InteractiveAugmentedIOException iaioe;
if ( e.TargetException = iaioe )
{
-nError = SCERR_IMPORT_UNKNOWN;
+rError = SCERR_IMPORT_UNKNOWN;
}
else
{
-nError = SCWARN_IMPORT_FEATURES_LOST;
+rError = SCWARN_IMPORT_FEATURES_LOST;
}
}
catch ( const uno::Exception )
{
-nError = SCWARN_IMPORT_FEATURES_LOST;
+rError = SCWARN_IMPORT_FEATURES_LOST;
}
}
// #i103539#: always read meta.xml for generator
sal_uInt32 nMetaRetval(0);
-uno::Sequenceuno::Any aMetaArgs(1);
-uno::Any* pMetaArgs = aMetaArgs.getArray();
-pMetaArgs[0] = xInfoSet;
+if ((nMode METADATA) == METADATA)
+{
+uno::Sequenceuno::Any aMetaArgs(1);
+uno::Any* pMetaArgs = aMetaArgs.getArray();
+pMetaArgs[0] = xInfoSet;
-SAL_INFO( sc.filter, meta import start );
+SAL_INFO( sc.filter, meta import start );
-nMetaRetval = ImportFromComponent(
-xContext, xModel, xXMLParser, aParserInput,
-bOasis ?
OUString(com.sun.star.comp.Calc.XMLOasisMetaImporter)
-:
OUString(com.sun.star.comp.Calc.XMLMetaImporter),
-meta.xml, Meta.xml, aMetaArgs, false);
+nMetaRetval = ImportFromComponent(
+xContext, xModel, xXMLParser, aParserInput,
+bOasis ?
OUString(com.sun.star.comp.Calc.XMLOasisMetaImporter)
+:
OUString(com.sun.star.comp.Calc.XMLMetaImporter),
+meta.xml, Meta.xml, aMetaArgs, false);
-SAL_INFO( sc.filter, meta import end );
+SAL_INFO( sc.filter, meta import end );
+}
SvXMLGraphicHelper* pGraphicHelper = NULL;
[Libreoffice-commits] core.git: Branch 'private/kohei/external-ref-refresh' - include/sfx2 sc/inc sc/source sfx2/source
include/sfx2/sfxmodelfactory.hxx | 12 +---
sc/inc/unonames.hxx |3 ++-
sc/source/filter/xml/xmlimprt.cxx| 16
sc/source/filter/xml/xmlimprt.hxx|1 +
sc/source/filter/xml/xmlwrap.cxx |5 +
sc/source/ui/docshell/externalrefmgr.cxx |2 +-
sfx2/source/doc/objxtor.cxx |6 +-
7 files changed, 35 insertions(+), 10 deletions(-)
New commits:
commit 1bd673611ecd795a1caaac676c6c5cef0eba023b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed May 21 00:00:57 2014 -0400
cp#172: Skip styles import for external link cache documents.
This reduces external link update time by 10%.
Change-Id: Ic14d9ea7530818f839330a2004f6aa67ef1e831e
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 7f7b05f..2067fbf 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -25,16 +25,14 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/lang/XSingleServiceFactory.hpp
+#define SFXMODEL_STANDARD (sal_uInt64)(0x)
+#define SFXMODEL_EMBEDDED_OBJECT(sal_uInt64)(0x0001)
+#define SFXMODEL_EXTERNAL_LINK (sal_uInt64)(0x0002)
+#define SFXMODEL_DISABLE_EMBEDDED_SCRIPTS (sal_uInt64)(0x0004)
+#define SFXMODEL_DISABLE_DOCUMENT_RECOVERY (sal_uInt64)(0x0008)
namespace sfx2
{
-
-
-#define SFXMODEL_STANDARD (sal_uInt64)(0x)
-#define SFXMODEL_EMBEDDED_OBJECT(sal_uInt64)(0x0001)
-#define SFXMODEL_DISABLE_EMBEDDED_SCRIPTS (sal_uInt64)(0x0002)
-#define SFXMODEL_DISABLE_DOCUMENT_RECOVERY (sal_uInt64)(0x0004)
-
typedef ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface ( SAL_CALL * SfxModelFactoryFunc ) (
const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory _rxFactory,
const sal_uInt64 _nCreationFlags
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 689dcea..ca7a28c 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -668,7 +668,8 @@
#define SC_UNO_EMBED_FONTS EmbedFonts
-#define SC_UNO_ODS_LOCK_SOLAR_MUTEX LockSolarMutex
+#define SC_UNO_ODS_LOCK_SOLAR_MUTEX ODSLockSolarMutex
+#define SC_UNO_ODS_IMPORT_STYLESODSImportStyles
#endif
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 813190d..9128026 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2104,6 +2104,7 @@ ScXMLImport::ScXMLImport(
bNullDateSetted(false),
bSelfImportingXMLSet(false),
mbLockSolarMutex(true),
+mbImportStyles(true),
mbHasNewCondFormatData(false)
{
pStylesImportHelper = new ScMyStylesImportHelper(*this);
@@ -2256,6 +2257,9 @@ void ScXMLImport::initialize( const
css::uno::Sequencecss::uno::Any aArgument
if (xInfoSetInfo-hasPropertyByName(SC_UNO_ODS_LOCK_SOLAR_MUTEX))
xInfoSet-getPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX) =
mbLockSolarMutex;
+
+if (xInfoSetInfo-hasPropertyByName(SC_UNO_ODS_IMPORT_STYLES))
+xInfoSet-getPropertyValue(SC_UNO_ODS_IMPORT_STYLES) =
mbImportStyles;
}
SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16
nPrefix, const OUString rLocalName,
@@ -2765,6 +2769,9 @@ void ScXMLImport::SetType(uno::Reference
beans::XPropertySet rProperties,
const sal_Int16 nCellType,
const OUString rCurrency)
{
+if (!mbImportStyles)
+return;
+
if ((nCellType != util::NumberFormat::TEXT) (nCellType !=
util::NumberFormat::UNDEFINED))
{
if (rNumberFormat == -1)
@@ -2832,6 +2839,9 @@ void ScXMLImport::SetType(uno::Reference
beans::XPropertySet rProperties,
void ScXMLImport::AddStyleRange(const table::CellRangeAddress rCellRange)
{
+if (!mbImportStyles)
+return;
+
if (!xSheetCellRanges.is() GetModel().is())
{
uno::Reference lang::XMultiServiceFactory
xMultiServiceFactory(GetModel(), uno::UNO_QUERY);
@@ -2845,6 +2855,9 @@ void ScXMLImport::AddStyleRange(const
table::CellRangeAddress rCellRange)
void ScXMLImport::SetStyleToRanges()
{
+if (!mbImportStyles)
+return;
+
if (!sPrevStyleName.isEmpty())
{
uno::Reference beans::XPropertySet xProperties (xSheetCellRanges,
uno::UNO_QUERY);
@@ -2901,6 +2914,9 @@ void ScXMLImport::SetStyleToRanges()
void ScXMLImport::SetStyleToRange(const ScRange rRange, const OUString*
pStyleName,
const sal_Int16 nCellType, const OUString*
pCurrency)
{
+if (!mbImportStyles)
+return;
+
if (sPrevStyleName.isEmpty())
{
nPrevCellType = nCellType;
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 660f3bd..1f44982 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++
[Libreoffice-commits] core.git: download.lst external/python3
download.lst |3
external/python3/UnpackedTarball_python3.mk|3
external/python3/python-3.3.0-implicit-int.patch.1 | 30 --
external/python3/python-3.3.0-msvc-x64.patch.1 | 22 -
external/python3/python-3.3.3-quoted-printable.patch.1 | 201 -
external/python3/python-3.3.5-pyexpat-symbols.patch.1 | 28 ++
6 files changed, 42 insertions(+), 245 deletions(-)
New commits:
commit 005fae2bddf4e43cb361bbdb9fc2cfb961693ffd
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon May 12 16:13:30 2014 +0200
upgrade to python-3.3.5
- remove now obselete patches, which were applied upstream.
- Hack to get MacOS to build
Change-Id: Id68e78e411efc92a46ea9e180f09c390fe5acb4a
Reviewed-on: https://gerrit.libreoffice.org/9311
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/download.lst b/download.lst
index 69aa304..8a3b889 100644
--- a/download.lst
+++ b/download.lst
@@ -110,7 +110,8 @@ export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9
export PNG_TARBALL := libpng-1.5.18.tar.gz
export POPPLER_TARBALL :=
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
+export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
+export PYTHON_TARBALL := Python-3.3.5.tgz
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL :=
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index d08ba1f..d6a1d04 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -24,13 +24,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
- external/python3/python-3.3.0-implicit-int.patch.1 \
external/python3/python-3.3.0-gcc-4.8.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
- external/python3/python-3.3.3-quoted-printable.patch.1 \
external/python3/python-3.3.3-py17797.patch.1 \
external/python3/python-3.3.3-msvc2012-winxp.patch.1 \
+ external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.3.0-implicit-int.patch.1
b/external/python3/python-3.3.0-implicit-int.patch.1
deleted file mode 100644
index 6e4d2b0..000
--- a/external/python3/python-3.3.0-implicit-int.patch.1
+++ /dev/null
@@ -1,30 +0,0 @@
-fix function names in import.h
-
-MSVC complains about some declarations in Include/import.h.
-Apparently the problem is a missing space between PyAPI_FUNC(int) and the
-function name, leading to concatenated int_PyImport... names and no
-return type.
-
-diff -ru python3.old/Include/import.h python3/Include/import.h
python3.old/Include/import.h 2012-09-29 10:00:26.0 +0200
-+++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100
-@@ -86,15 +86,15 @@
-
- PyAPI_FUNC(void) _PyImport_ReInitLock(void);
-
--PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(
-+PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
- const char *name/* UTF-8 encoded string */
- );
--PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *);
--PyAPI_FUNC(int)_PyImport_FixupBuiltin(
-+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
-+PyAPI_FUNC(int) _PyImport_FixupBuiltin(
- PyObject *mod,
- char *name /* UTF-8 encoded string */
- );
--PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject
*);
-+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *,
PyObject *);
-
- struct _inittab {
- char *name; /* ASCII encoded string */
diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1
b/external/python3/python-3.3.0-msvc-x64.patch.1
index 03fcfa7..8882a1c 100644
--- a/external/python3/python-3.3.0-msvc-x64.patch.1
+++ b/external/python3/python-3.3.0-msvc-x64.patch.1
@@ -210,7 +210,7 @@ diff -ru python3/PCbuild/pcbuild.sln
python3.new/PCbuild/pcbuild.sln
ItemDefinitionGroup
Condition='$(Configuration)|$(Platform)'=='Debug|Win32'
--- python3/PCbuild/pythoncore.vcxproj
+++ python3/PCbuild/pythoncore.vcxproj
-@@ -185,35 +185,35 @@
+@@ -195,35 +195,35 @@
ItemDefinitionGroup
[Libreoffice-bugs] [Bug 63834] PDFIMPORT bullets disappear, underlined text becomes crossed out
https://bugs.freedesktop.org/show_bug.cgi?id=63834 --- Comment #4 from vv...@yandex.ru --- Underlined text problem will be fixed within Bug 78689 -- 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
