[Libreoffice-commits] .: sc/source
sc/source/ui/collab/contacts.cxx |2 +- sc/source/ui/collab/sendfunc.cxx |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit b37bcdded66ae82c5677fe60d8347b87281f3fa2 Author: Julien Nabet serval2...@yahoo.fr Date: Fri Jul 20 08:34:42 2012 +0200 Prefer prefix ++/-- operators for non-primitive types Change-Id: Iba122812b0485f6e8097e1767b64d7ed67f9684e diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx index 4536e2e..d81ff9a 100644 --- a/sc/source/ui/collab/contacts.cxx +++ b/sc/source/ui/collab/contacts.cxx @@ -227,7 +227,7 @@ public: { AccountContactPairV aPairs = pContacts-getContacts(); AccountContactPairV::iterator it; -for( it = aPairs.begin(); it != aPairs.end(); it++ ) +for( it = aPairs.begin(); it != aPairs.end(); ++it ) { Image aImage; GFile *pAvatarFile = tp_contact_get_avatar_file( it-second ); diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index c16364b..d22e4ba 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -198,7 +198,7 @@ class ScDocFuncDemo : public ScDocFuncRecv // FIXME: Lifecycle nightmare std::vector boost::shared_ptrScDocFuncRecv aCopy( maClients ); for (std::vector boost::shared_ptrScDocFuncRecv ::iterator i - = aCopy.begin(); i != aCopy.end(); i++) + = aCopy.begin(); i != aCopy.end(); ++i) (*i)-RecvMessage(rString); } @@ -207,7 +207,7 @@ class ScDocFuncDemo : public ScDocFuncRecv // FIXME: Lifecycle nightmare std::vector boost::shared_ptrScDocFuncRecv aCopy( maClients ); for (std::vector boost::shared_ptrScDocFuncRecv ::iterator i - = aCopy.begin(); i != aCopy.end(); i++) + = aCopy.begin(); i != aCopy.end(); ++i) (*i)-fileReceived( rStr ); } }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [HELP] fdo#51239 how to debug it is slow
On 2012-07-19 14:38, Lionel Elie Mamane wrote: For example, to minimise the number of Java calls from C++ , maybe we could, when we retrieve a whole row through JDBC, doing this from Java code instead of from C++ code: for (i=0; i row-getNumberOfColumns; ++i) cacheEntry[i]=row-getColumnValue(i); This would bring us down from one call per column to one call per row, hopefully without duplicating *too* *much* logic between a C++ version and a Java version. For bonus points, retrieve a whole chunk of rows at a time, say around 1000. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] cleaning before = assignment lotuswordpro/source/filter/xfilter/xfparastyle.cxx
On 07/19/2012 11:03 PM, julien2412 wrote: Thank you David for the hint! I re read the An in-depth explanation part of http://stackoverflow.com/questions/3279543/what-is-the-copy-and-swap-idiom/3279550#3279550, it's great ! I understood when and above all how the memory is cleaned. About your multidimalgorithm, what would be the problem if it'd be changed like this ? (to sum up: passing parameter by value to optimize) It's a well-known but (in my impression) not-too-widely used idiom. And IIRC it even has no drawbacks (which is sometimes hard to tell, C++ being so baroque and fragile that something that looks rather innocuous can actually be an epic catastrophe). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: jvmaccess/util jvmfwk/plugins jvmfwk/source registry/util store/util
jvmaccess/util/gcc3.map |9 + jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map | 31 jvmfwk/source/framework.map |9 + registry/util/reg.map |9 + store/util/store.map|8 + 5 files changed, 35 insertions(+), 31 deletions(-) New commits: commit ce60a046d9db7b604bb66e47d683e62ac65a2f65 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 09:46:57 2012 +0200 Globally unique symbols missing from some map files ...after gbuild'ification (they used to be added via solenv/bin/addsym.awk). And sunjavaplugin.map is actually unused. Change-Id: If6804cff8d01e268b84512d6c4b1edebde018cc0 diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map index 5d199a6..70d26fb 100644 --- a/jvmaccess/util/gcc3.map +++ b/jvmaccess/util/gcc3.map @@ -18,6 +18,8 @@ UDK_3.1 { global: +_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions + # jvmaccess/virtualmachine.hxx: _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException() _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const ) @@ -89,3 +91,10 @@ UDK_3.5 { # LibO 3.6 _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException _ZTVN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # vtable for jvmaccess::VirtualMachine::AttachGuard::CreationException } UDK_3.4; + +# Unique libstdc++ symbols: +GLIBCXX_3.4 { +global: +_ZGVNSt7num_put*; _ZNSt7num_put*; +_ZNSs4_Rep20_S_empty_rep_storageE; +}; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map deleted file mode 100644 index 502a58c..000 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map +++ /dev/null @@ -1,31 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -UDK_3_0_0 { -global: -jfw_plugin_getAllJavaInfos; -jfw_plugin_getJavaInfoByPath; -jfw_plugin_startJavaVirtualMachine; -local: -*; -}; - -UDK_3.1 { # OOo 3.3 -global: -jfw_plugin_existJRE; -} UDK_3_0_0; diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map index 8def35b..ff26edf 100644 --- a/jvmfwk/source/framework.map +++ b/jvmfwk/source/framework.map @@ -18,6 +18,8 @@ UDK_3_0_0 { global: +_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions + # jvmfwk/framework.h: jfw_freeJavaInfo; jfw_areEqualJavaInfo; @@ -47,3 +49,10 @@ UDK_3.1 { # OOo 3.1.0 global: jfw_existJRE; } UDK_3_0_0; + +# Unique libstdc++ symbols: +GLIBCXX_3.4 { +global: +_ZGVNSt7num_put*; _ZNSt7num_put*; +_ZNSs4_Rep20_S_empty_rep_storageE; +}; diff --git a/registry/util/reg.map b/registry/util/reg.map index 7b9a3f5..ad4c39c 100644 --- a/registry/util/reg.map +++ b/registry/util/reg.map @@ -17,6 +17,8 @@ # UDK_3_0_0 { global: +_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions + initRegistry_Api; initRegistryTypeWriter_Api; initRegistryTypeReader_Api; @@ -100,3 +102,10 @@ UDK_3.1 { typereg_writer_setReferenceData; typereg_writer_getBlob; } UDK_3_0_0; + +# Unique libstdc++ symbols: +GLIBCXX_3.4 { +global: +_ZGVNSt7num_put*; _ZNSt7num_put*; +_ZNSs4_Rep20_S_empty_rep_storageE; +}; diff --git a/store/util/store.map b/store/util/store.map index a4c00dc..d2c4e03 100644 --- a/store/util/store.map +++ b/store/util/store.map @@ -18,6 +18,8 @@ UDK_3_0_0 { global: +_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions + store_acquireHandle; store_attrib; store_closeDirectory; @@ -47,3 +49,9 @@ UDK_3_0_0 { *; }; +# Unique libstdc++ symbols: +GLIBCXX_3.4 { +global: +_ZGVNSt7num_put*; _ZNSt7num_put*; +
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/pyuno_runtime.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 618376bcb55906913bc76365d7db9b71eb422daa Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 10:32:47 2012 +0200 warning C4702: unreachable code Change-Id: Ie2cc83dde7e0522e0bf669a1dd3d7a8ca680f7e2 diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index f3284c4..b021fdd 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -589,8 +589,6 @@ PyRef Runtime::any2PyObject (const Any a ) const throw RuntimeException(buf.makeStringAndClear( ), Reference XInterface () ); } } -//We shouldn't be here... -assert(false); } static Sequence Type invokeGetTypes( const Runtime r , PyObject * o ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC-UPDATE](19.07) Impress Remote
On Thu, 2012-07-19 at 19:00 +0200, Andrzej J. R. Hunt wrote: I made some good progress today: Great work, hopefully the frustration turned into a deeper understanding appreciation for valgrind / lifecycle etc. ? :-) This means that tomorrow I should be able to start work on the various views for the app! Exciting :-) Speaking of which - did you get a screenshot blogged ? it'd be great to have that so users can see progress in increments. Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch mdds/makefile.mk
mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch | 52 ++ mdds/makefile.mk |5 2 files changed, 56 insertions(+), 1 deletion(-) New commits: commit 42c58d9ce4f33b047feb1e94e60f165360d96209 Author: David Tardon dtar...@redhat.com Date: Fri Jul 20 10:37:55 2012 +0200 fix mdds breakage in mingw build Change-Id: Iad7e4c12144799a6b33b3cd39476da5653b1bdd1 diff --git a/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch b/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch new file mode 100644 index 000..fd43c1a --- /dev/null +++ b/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch @@ -0,0 +1,52 @@ +From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001 +From: David Tardon dtar...@redhat.com +Date: Fri, 20 Jul 2012 10:30:38 +0200 +Subject: [PATCH] help compiler select the right overload of vector::insert + +--- + include/mdds/multi_type_vector_def.inl |8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl +index 252a260..fb72070 100644 +--- a/include/mdds/multi_type_vector_def.inl misc/build/mdds_0.6.0/include/mdds/multi_type_vector_def.inl +@@ -1148,7 +1148,7 @@ void multi_type_vector_CellBlockFunc::insert_empty_impl(size_type row, size_ty + + // Insert two new block below the current; one for the empty block being + // inserted, and one for the lower part of the current non-empty block. +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + + m_blocks[block_index+1] = new block(length); + m_blocks[block_index+2] = new block(size_blk_next); +@@ -1302,7 +1302,7 @@ void multi_type_vector_CellBlockFunc::insert_cells_to_middle( + // Insert two new blocks. + size_type n1 = row - start_row; + size_type n2 = blk-m_size - n1; +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + blk-m_size = n1; + + m_blocks[block_index+1] = new block(length); +@@ -1467,7 +1467,7 @@ void multi_type_vector_CellBlockFunc::set_cells_to_single_block( + assert(start_row_in_block start_row end_row end_row_in_block); + + // Insert two new blocks below the current one. +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + + // first new block is for the data array being inserted. + size_type new_size = end_row - start_row + 1; +@@ -1985,7 +1985,7 @@ void multi_type_vector_CellBlockFunc::set_empty_in_single_block( + + // First, insert two new blocks at position past the current block. + size_type lower_block_size = end_row_in_block - end_row; +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + m_blocks[block_index+1] = new block(empty_block_size); // empty block. + m_blocks[block_index+2] = new block(lower_block_size); + +-- +1.7.10.2 + diff --git a/mdds/makefile.mk b/mdds/makefile.mk index f7b83f4..53a0419 100644 --- a/mdds/makefile.mk +++ b/mdds/makefile.mk @@ -29,7 +29,10 @@ TARGET=mdds TARFILE_NAME=mdds_0.6.0 TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38 -PATCH_FILES=mdds_0.6.0.patch +PATCH_FILES=\ + mdds_0.6.0.patch \ + 0001-help-compiler-select-the-right-overload-of-vector-in.patch \ + CONFIGURE_DIR= CONFIGURE_ACTION= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 in LibreOffice
Hi there, On Thu, 2012-07-19 at 11:21 -0500, Yi Ding wrote: +1 ... +1 ... +1 ... Thanks for your encouragement, but this is a developers list :-) which of these do you want to work on ? There is low-hanging fruit everywhere for developers to focus on - which would you like to look into ? Startup performance for example: reducing the configmgr thrash by tweaking that code to allow us to split out settings that are not commonly needed eg. the labels data would give a measureable boost to startup. It requires only a hacker - is it you ? :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check with DEBUGCCPUNIT=TRUE is waiting for console output
Ping? Anybody have any ideas? This is driving me nuts during my testing. On 2012-07-11 13:25, Noel Grandin wrote: OK, I'm closer to figuring this one out. When I do this: $ DEBUGCPPUNIT=TRUE make -s check gdb executes the unit tests, but then, if everything went OK, GDB __doesn't quit__ I have to enter a q on the console. However, if there actually was an exception, then GDB correctly prints it out, quits and returns to the command line. This is particularly annoying because, in this mode, there is no indication on the console that GDB is waiting for input. So I don't know if the test is just taking long, or if I need to do something. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#52293: Spelling error (UI, Localization)
Hi all, This patch [aims to] fix the aforementioned bug. Kevin -- Kevin Peng kpeng...@fastmail.fm -- http://www.fastmail.fm - Send your email first class 0001-Changed-discreet-to-discrete.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/dp_backend.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 06f20d73da21342046a480a6b22af69901351328 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 11:10:05 2012 +0200 Fix SAL_LOG area usage Change-Id: If8acc5e9fee2730796637dfb505e0c514f96f1a3 diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 16bc5d1..13231ec 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -73,7 +73,7 @@ void PackageRegistryBackend::disposing( lang::EventObject const event ) ::osl::MutexGuard guard( getMutex() ); if ( m_bound.erase( url ) != 1 ) { -SAL_WARN(basic, erase( url ) != 1); +SAL_WARN(desktop.deployment, erase( url ) != 1); } } @@ -209,7 +209,7 @@ Referencedeployment::XPackage PackageRegistryBackend::bindPackage( { // first insertion SAL_WARN_IF( ReferenceXInterface(insertion.first-second) != xNewPackage, -desktop, mismatch); +desktop.deployment, mismatch); } else { // found existing entry @@ -339,7 +339,8 @@ Package::Package( ::rtl::ReferencePackageRegistryBackend const myBackend, if (m_bRemoved) { //We use the last segment of the URL -SAL_WARN_IF(!m_name.isEmpty(), basic, non-empty m_name); +SAL_WARN_IF( +!m_name.isEmpty(), desktop.deployment, non-empty m_name); OUString name = m_url; rtl::Bootstrap::expandMacros(name); sal_Int32 index = name.lastIndexOf('/'); @@ -679,7 +680,8 @@ void Package::processPackage_impl( } catch (const RuntimeException e) { SAL_WARN( -basic, unexpected RuntimeException \ e.Message ''); +desktop.deployment, +unexpected RuntimeException \ e.Message ''); throw; } catch (const CommandFailedException ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/mork'
New branch 'feature/mork' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3.5.6] Cherry pick straightforward patch
Hi, fdo#5 FILEOPEN: CRASH by opening .docx file can be workarounded by the commit dfe0baa281d9d4701e9b3846880334213ccb05f5 As David Tardon said on https://bugs.freedesktop.org/show_bug.cgi?id=5#c7, it doesn't solve the problem. Is it ok for the cherry-pick (perhaps with FIXME comment ?) to 3.5.6 branch ? Julien -- View this message in context: http://nabble.documentfoundation.org/REVIEW-3-5-6-Cherry-pick-straightforward-patch-tp3996585.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
[PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:
From Michael Stahl mst...@redhat.com: Hello Miklos Vajna, I'd like you to do a code review. Please visit https://gerrit.libreoffice.org/335 to review the following change. Change subject: fdo#38056: ODF import: fix page style attributes: .. fdo#38056: ODF import: fix page style attributes: PageMasterImportPropMapper: in the case of a single fo:border and style:border-line-width attribute, it is possible that the border is imported wrongly, like this: 1. pAllBorderProperty is set from the imported value, with name TopBorder 2. individual pNewBorder[i] are created as copies from pAllBorderProperty, one of which also with name TopBorder 3. pNewBorder[i] is updated with widths from pBorderWidths[i] 4. the individual pNewBorder[i] are added to the property vector 5. the property vector is sorted by property name 6. the properites are applied in order; if the pNewBorder[TOP] happens to precede the pAllBorderProperty (which is indeterminate as they both have name TopBorder), then the pAllBorderProperty will overwrite the border widths computed in step 3. Thus, nerf the various pAllFoo properties so they do not override the individual Foo properties later on. (cherry picked from commit 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231) Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958 Signed-off-by: Miklos Vajna vmik...@suse.cz (cherry picked from commit 6a05f22cd3253ae5c45495d0c081e1f44a3ff756) --- M xmloff/source/style/PageMasterImportPropMapper.cxx 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/335/1 -- To view, visit https://gerrit.libreoffice.org/335 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-5]: fdo#46966 dmapper: fix headery/footery default value
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#46966 dmapper: fix headery/footery default value .. Patch Set 1: Abandoned already in -3-5 -- To view, visit https://gerrit.libreoffice.org/331 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-5]: fdo#52066 fix RTF import of rectangle shape without text in ...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#52066 fix RTF import of rectangle shape without text in it .. Patch Set 1: Abandoned already in -3-5 -- To view, visit https://gerrit.libreoffice.org/330 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-5]: fdo#48335 two RTF export fixes
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#48335 two RTF export fixes .. Patch Set 1: Abandoned already in -3-5 -- To view, visit https://gerrit.libreoffice.org/332 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I05940e7ff649051ecae4a72ae73617a47ffca885 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:
On Fri, Jul 20, 2012 at 10:12:58AM +, Gerrit ger...@gerrit.libreoffice.org wrote: Hello Miklos Vajna, I'd like you to do a code review. Please visit Now this is really confusing; I already signed off this patch, so I should not do a code review this time. ;-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - idlc/README Repository.mk sc/source tubes/inc tubes/source
Repository.mk|1 idlc/README |2 - sc/source/ui/collab/contacts.cxx |9 +++ sc/source/ui/collab/sendfunc.cxx | 28 --- sc/source/ui/collab/sendfunc.hxx |3 +- sc/source/ui/docshell/docsh.cxx |2 + tubes/inc/tubes/conference.hxx |4 ++- tubes/inc/tubes/constants.h |4 +++ tubes/inc/tubes/manager.hxx | 12 +++--- tubes/source/conference.cxx | 13 +-- tubes/source/manager.cxx | 46 ++- 11 files changed, 96 insertions(+), 28 deletions(-) New commits: commit 37c67a137882cc1a9e113552dcab42a7d6337358 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jul 20 00:12:19 2012 +0200 tubes: send a file for collaboration when buddy session starts Channels for file and for tube are independent in telepathy, so let sender create UUID and pass it to receiver, who then can bind the document to the channel. UUID for tube channel goes through telepathy. UUID for file channel is encoded in the filename for now. Tubes specific CreateDocFunc is re-introduced, so we could set current UUID after file is received and when the document is being constructed, get channel from TeleManager with this UUID. This is not immune to constructing other documents in the middle of binding proccess. Change-Id: I57c7e57a5d7d3ccd7d94677a8cf2719c78baa2fd diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx index d81ff9a..c2cc8b6 100644 --- a/sc/source/ui/collab/contacts.cxx +++ b/sc/source/ui/collab/contacts.cxx @@ -98,11 +98,6 @@ class TubeContacts : public ModelessDialog // Receiving file is not related to any document. mpManager-sigFileReceived.connect( boost::bind( ScDocFuncRecv::fileReceived, mpSender-GetReceiver(), _1 ) ); - -// TODO: It's still not clear to me who should take care of this signal -// and what exactly it is supposed to happen. -mpManager-sigConferenceCreated.connect( boost::bind( -ScDocFuncSend::SetCollaboration, mpSender, _1 ) ); } } @@ -124,7 +119,11 @@ class TubeContacts : public ModelessDialog fprintf( stderr, could not start session with %s\n, tp_contact_get_identifier( pContact ) ); else +{ mpSender-SetCollaboration( pConference ); +mpSender-SendFile( OStringToOUString( +pConference-getUuid(), RTL_TEXTENCODING_UTF8 ) ); +} } } diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index d22e4ba..4b3d1c9 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -39,6 +39,7 @@ #include tubes/manager.hxx #include tubes/conference.hxx #include tubes/contact-list.hxx +#include tubes/constants.h // new file send/recv fun ... #include com/sun/star/uno/Sequence.hxx @@ -232,12 +233,13 @@ void ScDocFuncSend::SendMessage( ScChangeOpWriter rOp ) mpDirect-RecvMessage( rOp.toString() ); } -void ScDocFuncSend::SendFile( const rtl::OUString rURL ) +void ScDocFuncSend::SendFile( const rtl::OUString sUuid ) { -(void)rURL; - String aTmpPath = utl::TempFile::CreateTempName(); -aTmpPath.Append( rtl::OUString( .ods ) ); +aTmpPath.Append( OUString(_) ); +aTmpPath.Append( sUuid ); +aTmpPath.Append( OUString(_) ); +aTmpPath.Append( OUString(.ods) ); rtl::OUString aFileURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL ); @@ -416,22 +418,30 @@ sal_Bool ScDocFuncSend::MergeCells( const ScCellMergeOption rOption, sal_Bool b return ScDocFunc::MergeCells( rOption, bContents, bRecord, bApi ); } -#ifdef INTERCEPT -SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc() +ScDocFunc *ScDocShell::CreateDocFunc() { if (getenv (INTERCEPT)) { -boost::shared_ptrScDocFuncDirect pDirect( new ScDocFuncDirect( *this ) ); +ScDocFuncDirect* pDirect = new ScDocFuncDirect( *this ); boost::shared_ptrScDocFuncRecv pReceiver( new ScDocFuncRecv( pDirect ) ); static boost::shared_ptrScDocFuncDemo aDemoBus( new ScDocFuncDemo() ); aDemoBus-add_client( pReceiver ); // a lifecycle horror no doubt. -return new ScDocFuncSend( *this, boost::shared_ptrScDocFuncRecv( aDemoBus.get() ) ); +return new ScDocFuncSend( *this, aDemoBus.get() ); +} +else if (TeleManager::hasWaitingConference()) +{ +ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this ); +ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect ); +ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver ); +TeleManager *pManager = TeleManager::get(); +pSender-SetCollaboration( pManager-getConference()
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 50679, which changed state. Bug 50679 Summary: EDITING: Copying cell(s) with conditional formatting CRASH when paste https://bugs.freedesktop.org/show_bug.cgi?id=50679 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
fdo#32773 LibO thinks comments separate words
From Muhammad Haggag mhag...@gmail.com: Muhammad Haggag has abandoned this change. Change subject: fdo#32773 LibO thinks comments separate words .. Patch Set 1: Abandoned Change is obsolete following http://cgit.freedesktop.org/libreoffice/core/commit/?id=b0f170d7df9cff12535d2ecfd146b32b745a8ef8 I'll investigate again after updating to latest. -- To view, visit https://gerrit.libreoffice.org/311 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia516e6b612becb2dfc2a5922306b89e2d8dd65d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Muhammad Haggag mhag...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Muhammad Haggag mhag...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch mdds/makefile.mk
mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch | 52 ++ mdds/makefile.mk |5 2 files changed, 56 insertions(+), 1 deletion(-) New commits: commit ee1e3004506083a86b6bf9c3dabd21427cf8e935 Author: David Tardon dtar...@redhat.com Date: Fri Jul 20 10:37:55 2012 +0200 fix mdds breakage in mingw build Change-Id: Iad7e4c12144799a6b33b3cd39476da5653b1bdd1 diff --git a/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch b/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch new file mode 100644 index 000..fd43c1a --- /dev/null +++ b/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch @@ -0,0 +1,52 @@ +From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001 +From: David Tardon dtar...@redhat.com +Date: Fri, 20 Jul 2012 10:30:38 +0200 +Subject: [PATCH] help compiler select the right overload of vector::insert + +--- + include/mdds/multi_type_vector_def.inl |8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl +index 252a260..fb72070 100644 +--- a/include/mdds/multi_type_vector_def.inl misc/build/mdds_0.6.0/include/mdds/multi_type_vector_def.inl +@@ -1148,7 +1148,7 @@ void multi_type_vector_CellBlockFunc::insert_empty_impl(size_type row, size_ty + + // Insert two new block below the current; one for the empty block being + // inserted, and one for the lower part of the current non-empty block. +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + + m_blocks[block_index+1] = new block(length); + m_blocks[block_index+2] = new block(size_blk_next); +@@ -1302,7 +1302,7 @@ void multi_type_vector_CellBlockFunc::insert_cells_to_middle( + // Insert two new blocks. + size_type n1 = row - start_row; + size_type n2 = blk-m_size - n1; +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + blk-m_size = n1; + + m_blocks[block_index+1] = new block(length); +@@ -1467,7 +1467,7 @@ void multi_type_vector_CellBlockFunc::set_cells_to_single_block( + assert(start_row_in_block start_row end_row end_row_in_block); + + // Insert two new blocks below the current one. +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + + // first new block is for the data array being inserted. + size_type new_size = end_row - start_row + 1; +@@ -1985,7 +1985,7 @@ void multi_type_vector_CellBlockFunc::set_empty_in_single_block( + + // First, insert two new blocks at position past the current block. + size_type lower_block_size = end_row_in_block - end_row; +-m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); ++m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); + m_blocks[block_index+1] = new block(empty_block_size); // empty block. + m_blocks[block_index+2] = new block(lower_block_size); + +-- +1.7.10.2 + diff --git a/mdds/makefile.mk b/mdds/makefile.mk index f7b83f4..53a0419 100644 --- a/mdds/makefile.mk +++ b/mdds/makefile.mk @@ -29,7 +29,10 @@ TARGET=mdds TARFILE_NAME=mdds_0.6.0 TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38 -PATCH_FILES=mdds_0.6.0.patch +PATCH_FILES=\ + mdds_0.6.0.patch \ + 0001-help-compiler-select-the-right-overload-of-vector-in.patch \ + CONFIGURE_DIR= CONFIGURE_ACTION= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 74 +++--- 1 file changed, 40 insertions(+), 34 deletions(-) New commits: commit 5586159e46d5f38e322c88459e1e7beed8133161 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 19 23:34:18 2012 +0100 Resolves: fdo#51772 failure to import a specific .rtf file In this example the xCharacterStyles-getByName(aCharStyle) throws, and the whole import is abandoned i.e. xRet.set(xCharacterStyles-getByName(aCharStyle), uno::UNO_QUERY); so to keep things simple wrap the entire block in a try catch and return an empty xRet. Could use the hasByName around the specific failing query. Change-Id: I4f4970534cc2ff15c7d96ff2ee0a9affcfce1737 Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 897402c..270bb12 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3620,42 +3620,48 @@ void DomainMapper_Impl::ApplySettingsTable() uno::Referencebeans::XPropertySet DomainMapper_Impl::GetCurrentNumberingCharStyle() { uno::Referencebeans::XPropertySet xRet; -OUString aStyle = GetCurrentParaStyleId(); -if (aStyle.isEmpty() || GetTopContextType() != CONTEXT_PARAGRAPH) -return xRet; -const StyleSheetEntryPtr pEntry = GetStyleSheetTable()-FindStyleSheetByISTD(aStyle); -if (!pEntry) -return xRet; -const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() : 0); -sal_Int32 nListId = pStyleSheetProperties-GetListId(); -sal_Int32 nListLevel = pStyleSheetProperties-GetListLevel(); -if (nListId 0 || nListLevel 0) -return xRet; - -// So we are in a paragraph style and it has numbering. Look up the relevant character style. -OUString aListName = ListDef::GetStyleName(nListId); -uno::Reference style::XStyleFamiliesSupplier xStylesSupplier(GetTextDocument(), uno::UNO_QUERY); -uno::Reference container::XNameAccess xStyleFamilies = xStylesSupplier-getStyleFamilies(); -uno::Referencecontainer::XNameAccess xNumberingStyles; -xStyleFamilies-getByName(NumberingStyles) = xNumberingStyles; -uno::Referencebeans::XPropertySet xStyle(xNumberingStyles-getByName(aListName), uno::UNO_QUERY); -uno::Referencecontainer::XIndexAccess xLevels(xStyle-getPropertyValue(NumberingRules), uno::UNO_QUERY); -uno::Sequencebeans::PropertyValue aProps; -xLevels-getByIndex(nListLevel) = aProps; -for (int i = 0; i aProps.getLength(); ++i) -{ -const beans::PropertyValue rProp = aProps[i]; - -if (rProp.Name == CharStyleName) -{ -OUString aCharStyle; -rProp.Value = aCharStyle; -uno::Referencecontainer::XNameAccess xCharacterStyles; -xStyleFamilies-getByName(CharacterStyles) = xCharacterStyles; -xRet.set(xCharacterStyles-getByName(aCharStyle), uno::UNO_QUERY); -break; +try +{ +OUString aStyle = GetCurrentParaStyleId(); +if (aStyle.isEmpty() || GetTopContextType() != CONTEXT_PARAGRAPH) +return xRet; +const StyleSheetEntryPtr pEntry = GetStyleSheetTable()-FindStyleSheetByISTD(aStyle); +if (!pEntry) +return xRet; +const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() : 0); +sal_Int32 nListId = pStyleSheetProperties-GetListId(); +sal_Int32 nListLevel = pStyleSheetProperties-GetListLevel(); +if (nListId 0 || nListLevel 0) +return xRet; + +// So we are in a paragraph style and it has numbering. Look up the relevant character style. +OUString aListName = ListDef::GetStyleName(nListId); +uno::Reference style::XStyleFamiliesSupplier xStylesSupplier(GetTextDocument(), uno::UNO_QUERY); +uno::Reference container::XNameAccess xStyleFamilies = xStylesSupplier-getStyleFamilies(); +uno::Referencecontainer::XNameAccess xNumberingStyles; +xStyleFamilies-getByName(NumberingStyles) = xNumberingStyles; +uno::Referencebeans::XPropertySet xStyle(xNumberingStyles-getByName(aListName), uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xLevels(xStyle-getPropertyValue(NumberingRules), uno::UNO_QUERY); +uno::Sequencebeans::PropertyValue aProps; +xLevels-getByIndex(nListLevel) = aProps; +for (int i = 0; i aProps.getLength(); ++i) +{ +const beans::PropertyValue rProp = aProps[i]; + +if (rProp.Name == CharStyleName) +{ +OUString aCharStyle; +rProp.Value = aCharStyle; +uno::Referencecontainer::XNameAccess xCharacterStyles; +
[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild solenv/inc
config_host.mk.in |1 - configure.in |7 ++- solenv/gbuild/JavaClassSet.mk |3 ++- solenv/inc/settings.mk|2 -- 4 files changed, 4 insertions(+), 9 deletions(-) New commits: commit 1e0971c3dd8bb303176f058bcd53682de9241616 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 14:11:53 2012 +0200 Support for --with-java-target-version in gbuild ...had been missing. Old dmake-based build system did not add -source/-target when using gcj (unless gcj really was Eclipse Java Compiler, in which case those -source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is no longer necessary. (Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.) Change-Id: Ic3596691b622be45e151333981f8f236d11825b4 diff --git a/config_host.mk.in b/config_host.mk.in index 1f78bf6..5e24730 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -238,7 +238,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export INTRO_BIPMAP=@INTRO_BITMAP@ -export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVACISGCJ=@JAVACISGCJ@ diff --git a/configure.in b/configure.in index 081c6f0..b41fa09 100644 --- a/configure.in +++ b/configure.in @@ -1623,8 +1623,8 @@ AC_ARG_WITH(java, AC_ARG_WITH(java_target_version, AS_HELP_STRING([--with-java-target-version], [Generate class files that will work on JVMs with the specified version. - For example, use --with-java-target-version=1.4 to make sure that the - application will work with JVM 1.4 even when compiled with JDK 1.5.]) + For example, use --with-java-target-version=1.5 to make sure that the + application will work with JVM 1.5 even when compiled with JDK 1.6.]) [ This option is ignored when you compile with gcj/gij. @@ -5336,8 +5336,6 @@ if test $SOLAR_JAVA != ; then AC_MSG_CHECKING([re-checking JDK]) JDK=gcj AC_MSG_RESULT([checked (ecj)]) -#TODO: what's to do here? some switch to do 1.5 compiling? -JAVAFLAGS=-source 1.5 -target 1.5 _gij_longver=40200 fi fi @@ -5823,7 +5821,6 @@ AC_SUBST(CLASSPATH) AC_SUBST(JAVALIB) AC_SUBST(JAVACOMPILER) AC_SUBST(JAVADOC) -AC_SUBST(JAVAFLAGS) AC_SUBST(JAVAINTERPRETER) AC_SUBST(JAVAIFLAGS) AC_SUBST(JAVA_HOME) diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 2338f32..7198331 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,8 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \ +-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) gb_JavaClassSet_JAVACDEBUG := # Enforces correct dependency order for possibly generated stuff: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9d01c5e..36234fc 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -133,8 +133,6 @@ JAVARESPONSE= .ENDIF .ENDIF -JAVAFLAGS+=$(JAVA_TARGET_FLAG) - #END JAVA CDEFS= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: mysqlcppconn/mysql_config.pmk
mysqlcppconn/mysql_config.pmk |6 -- 1 file changed, 6 deletions(-) New commits: commit 9931d736edfedb9b82a270d754f1ee8a2b134ec7 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 20 14:17:54 2012 +0200 fdo#52275: Revert mysqlcppconn: work around weird gcc issue This reverts commit d3d533c9e45b6badf202a12f0ed266d0168aa636. Hard-coding -std=c++xy in one module is a bad idea. None of these gccs give any spurious error in gnu++11 mode now: gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5) diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk index 9c9c76a..eb316e0 100644 --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -47,9 +47,3 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD -# workaround for gcc bug (4.6.1 20110908): -# it complains about std::basic string operator= overloading ambiguity -.IF $(COM)==GCC -CFLAGSCXX+=-std=c++98 -.ENDIF # $(COM)==GCC - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Revert of hrc cleanup
Hi Eike, On 07/19/2012 09:29 PM, Eike Rathke wrote: Some values are used as results of calculations, for example for the specific case of the Navigator (SCSTR_CONTENT_GRAPHIC, ...) the resources are obtained in a loop based on SCSTR_CONTENT_ROOT, see sc/source/ui/navipi/content.cxx ScContentTree::InitRoot() So the mere non-occurrence of a value's or constant's name in the source doesn't mean that the value itself isn't used. Hrm ok. But furthermore this means, that it's very risky to remove ressources at all. Especially if some code gets removed where a resource id was used and someone could think that this id is now unused. I mean nobody can be sure about this. So I revert all of those string changes now. Because I can't ensure that there are more of those errors. Moreover I did remove a massive removal of resource ids. So may it be possible that there are false positives too. That sucks :( Is there any way to get a real checkup what string and definitions are in use at all?! If not it would be safer to revert all of this cleanup. Even if that's very sad... Yes, unless we have means to prove that a resource indeed is not used. Latest example I stumbled over are the path type resources under Tools-Options-LibO-Paths, but it seems you fixed that already with your revert in 3e7832724e6647f6e786b0feb846b97ce8c03070. And here again comes the --with-dbgutil build handy that when opening that tabpage immediately spits out to stderr: warn:legacy.osl:31119:1:/build/libo/core/tools/source/rc/resmgr.cxx:787: file:///build/libo/core/solver/unxlngx6/installation/opt/program/../program/resource/cuien-US.res Class: 273, Id: 11022. Cannot load resource! Ok. To be absolutely sure I bring all my removed resource ids back. Because I don't want to introduce further regressions. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - mysqlcppconn/mysql_config.pmk
mysqlcppconn/mysql_config.pmk |6 -- 1 file changed, 6 deletions(-) New commits: commit aeb97e51b05e1dfd6d535704a115213809c707fc Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 20 14:17:54 2012 +0200 fdo#52275: Revert mysqlcppconn: work around weird gcc issue This reverts commit d3d533c9e45b6badf202a12f0ed266d0168aa636. Hard-coding -std=c++xy in one module is a bad idea. None of these gccs give any spurious error in gnu++11 mode now: gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5) (cherry picked from commit 9931d736edfedb9b82a270d754f1ee8a2b134ec7) Change-Id: I9aaa541bfc888a000ab3a1836bbd3fcfb9ef5bac Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk index 9c9c76a..eb316e0 100644 --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -47,9 +47,3 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD -# workaround for gcc bug (4.6.1 20110908): -# it complains about std::basic string operator= overloading ambiguity -.IF $(COM)==GCC -CFLAGSCXX+=-std=c++98 -.ENDIF # $(COM)==GCC - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Revert of hrc cleanup
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Special attention to translatable resources if there is any in the batch. My recent master build lost some localized string in the navigator. Not lethal, though. Em 20-07-2012 09:24, Thomas Arnhold escreveu: Ok. To be absolutely sure I bring all my removed resource ids back. Because I don't want to introduce further regressions. Thomas Regards - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJQCU+NAAoJEJp3R7nH3vLxuZEIALwvyPxJllXtEWuFkOVegsM0 dLO54nyB1VhzWkIPMSKEJODkLsu2Zl1JG+5n4NQP03QFOosCxAs5VhKttjBy2dRO jHlC1u/uMhinB3orKgKCBDFGKG8rK1QplaGS6bACDhylyRIhqlTHqiTqi31Cm+WB Xj+j9sEwcbEdpse47+cV21DaJd3zUk+paZvNbm2aweslV93EIGDZYtTUceadnBUL XNr/kJEqbGNm5s4vY9EFWnABA9CwiLW7/1p32GXf8oVVWIm28PSEuLkN6iI6DgrA uut3dsa0OIIYQ7q2OTRdgMI+UNQRz7LfLd3GVYwQH8Ty2f2oEQgcFaau6ZTGMZY= =xGQE -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 74 +++--- 1 file changed, 40 insertions(+), 34 deletions(-) New commits: commit 7002d8eadad748486765c2f00d3aed0f9652b987 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 19 23:34:18 2012 +0100 Resolves: fdo#51772 failure to import a specific .rtf file In this example the xCharacterStyles-getByName(aCharStyle) throws, and the whole import is abandoned i.e. xRet.set(xCharacterStyles-getByName(aCharStyle), uno::UNO_QUERY); so to keep things simple wrap the entire block in a try catch and return an empty xRet. Could use the hasByName around the specific failing query. Change-Id: I4f4970534cc2ff15c7d96ff2ee0a9affcfce1737 Signed-off-by: Miklos Vajna vmik...@suse.cz Signed-off-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 897402c..270bb12 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3620,42 +3620,48 @@ void DomainMapper_Impl::ApplySettingsTable() uno::Referencebeans::XPropertySet DomainMapper_Impl::GetCurrentNumberingCharStyle() { uno::Referencebeans::XPropertySet xRet; -OUString aStyle = GetCurrentParaStyleId(); -if (aStyle.isEmpty() || GetTopContextType() != CONTEXT_PARAGRAPH) -return xRet; -const StyleSheetEntryPtr pEntry = GetStyleSheetTable()-FindStyleSheetByISTD(aStyle); -if (!pEntry) -return xRet; -const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() : 0); -sal_Int32 nListId = pStyleSheetProperties-GetListId(); -sal_Int32 nListLevel = pStyleSheetProperties-GetListLevel(); -if (nListId 0 || nListLevel 0) -return xRet; - -// So we are in a paragraph style and it has numbering. Look up the relevant character style. -OUString aListName = ListDef::GetStyleName(nListId); -uno::Reference style::XStyleFamiliesSupplier xStylesSupplier(GetTextDocument(), uno::UNO_QUERY); -uno::Reference container::XNameAccess xStyleFamilies = xStylesSupplier-getStyleFamilies(); -uno::Referencecontainer::XNameAccess xNumberingStyles; -xStyleFamilies-getByName(NumberingStyles) = xNumberingStyles; -uno::Referencebeans::XPropertySet xStyle(xNumberingStyles-getByName(aListName), uno::UNO_QUERY); -uno::Referencecontainer::XIndexAccess xLevels(xStyle-getPropertyValue(NumberingRules), uno::UNO_QUERY); -uno::Sequencebeans::PropertyValue aProps; -xLevels-getByIndex(nListLevel) = aProps; -for (int i = 0; i aProps.getLength(); ++i) -{ -const beans::PropertyValue rProp = aProps[i]; - -if (rProp.Name == CharStyleName) -{ -OUString aCharStyle; -rProp.Value = aCharStyle; -uno::Referencecontainer::XNameAccess xCharacterStyles; -xStyleFamilies-getByName(CharacterStyles) = xCharacterStyles; -xRet.set(xCharacterStyles-getByName(aCharStyle), uno::UNO_QUERY); -break; +try +{ +OUString aStyle = GetCurrentParaStyleId(); +if (aStyle.isEmpty() || GetTopContextType() != CONTEXT_PARAGRAPH) +return xRet; +const StyleSheetEntryPtr pEntry = GetStyleSheetTable()-FindStyleSheetByISTD(aStyle); +if (!pEntry) +return xRet; +const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() : 0); +sal_Int32 nListId = pStyleSheetProperties-GetListId(); +sal_Int32 nListLevel = pStyleSheetProperties-GetListLevel(); +if (nListId 0 || nListLevel 0) +return xRet; + +// So we are in a paragraph style and it has numbering. Look up the relevant character style. +OUString aListName = ListDef::GetStyleName(nListId); +uno::Reference style::XStyleFamiliesSupplier xStylesSupplier(GetTextDocument(), uno::UNO_QUERY); +uno::Reference container::XNameAccess xStyleFamilies = xStylesSupplier-getStyleFamilies(); +uno::Referencecontainer::XNameAccess xNumberingStyles; +xStyleFamilies-getByName(NumberingStyles) = xNumberingStyles; +uno::Referencebeans::XPropertySet xStyle(xNumberingStyles-getByName(aListName), uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xLevels(xStyle-getPropertyValue(NumberingRules), uno::UNO_QUERY); +uno::Sequencebeans::PropertyValue aProps; +xLevels-getByIndex(nListLevel) = aProps; +for (int i = 0; i aProps.getLength(); ++i) +{ +const beans::PropertyValue rProp = aProps[i]; + +if (rProp.Name == CharStyleName) +{ +OUString aCharStyle; +rProp.Value = aCharStyle; +
[Libreoffice-commits] .: Branch 'feature/mork' - 4 commits - connectivity/Library_mork.mk connectivity/Module_connectivity.mk connectivity/source Repository.mk
Repository.mk |1 connectivity/Library_mork.mk| 28 ++ connectivity/Module_connectivity.mk |1 connectivity/source/drivers/mork/driver.cxx | 243 connectivity/source/drivers/mork/driver.hxx | 58 + connectivity/source/drivers/mork/mork.component | 16 + connectivity/source/drivers/mork/services.cxx | 40 +++ 7 files changed, 387 insertions(+) New commits: commit 65a4881c2aac4810f223a685a807587633a9566f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 20 15:00:26 2012 +0200 Prototypes of functions to implement Change-Id: I32123b09835920267f72cd98b3fd98ddf8b83d5a diff --git a/connectivity/source/drivers/mork/driver.cxx b/connectivity/source/drivers/mork/driver.cxx index ec876e1..2286556 100644 --- a/connectivity/source/drivers/mork/driver.cxx +++ b/connectivity/source/drivers/mork/driver.cxx @@ -30,12 +30,13 @@ #include driver.hxx -namespace connectivity { namespace mork { - -namespace { - namespace css = com::sun::star; +namespace connectivity +{ +namespace mork +{ + class Service: public cppu::WeakImplHelper2 css::lang::XServiceInfo, css::sdbc::XDriver , private boost::noncopyable @@ -43,43 +44,51 @@ class Service: public: Service(css::uno::Reference css::uno::XComponentContext const context): context_(context) -{ assert(context.is()); } +{ +assert(context.is()); +} private: virtual ~Service() {} -virtual rtl::OUString SAL_CALL getImplementationName() -throw (css::uno::RuntimeException) -{ return connectivity::mork::getImplementationName(); } +rtl::OUString SAL_CALL getImplementationName() +throw (css::uno::RuntimeException) +{ +return connectivity::mork::getImplementationName(); +} -virtual sal_Bool SAL_CALL supportsService(rtl::OUString const ServiceName) -throw (css::uno::RuntimeException) -{ return ServiceName == getSupportedServiceNames()[0]; } //TODO +sal_Bool SAL_CALL supportsService(rtl::OUString const ServiceName) +throw (css::uno::RuntimeException) +{ +return ServiceName == getSupportedServiceNames()[0];//TODO +} -virtual css::uno::Sequence rtl::OUString SAL_CALL +css::uno::Sequence rtl::OUString SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) -{ return connectivity::mork::getSupportedServiceNames(); } +{ +return connectivity::mork::getSupportedServiceNames(); +} -virtual css::uno::Reference css::sdbc::XConnection SAL_CALL connect( -rtl::OUString const url, -css::uno::Sequence css::beans::PropertyValue const info) -throw (css::sdbc::SQLException, css::uno::RuntimeException); +css::uno::Reference css::sdbc::XConnection SAL_CALL connect( +rtl::OUString const url, +css::uno::Sequence css::beans::PropertyValue const info) +throw (css::sdbc::SQLException, css::uno::RuntimeException); -virtual sal_Bool SAL_CALL acceptsURL( -rtl::OUString const url) -throw (css::sdbc::SQLException, css::uno::RuntimeException); +sal_Bool SAL_CALL acceptsURL( +rtl::OUString const url) +throw (css::sdbc::SQLException, css::uno::RuntimeException); -virtual css::uno::Sequence css::sdbc::DriverPropertyInfo SAL_CALL +css::uno::Sequence css::sdbc::DriverPropertyInfo SAL_CALL getPropertyInfo( -rtl::OUString const url, -css::uno::Sequence css::beans::PropertyValue const info) -throw (css::sdbc::SQLException, css::uno::RuntimeException); +rtl::OUString const url, +css::uno::Sequence css::beans::PropertyValue const info) +throw (css::sdbc::SQLException, css::uno::RuntimeException); -virtual sal_Int32 SAL_CALL getMajorVersion() -throw (css::uno::RuntimeException); +sal_Int32 SAL_CALL getMajorVersion() +throw (css::uno::RuntimeException); -virtual sal_Int32 SAL_CALL getMinorVersion() -throw (css::uno::RuntimeException); +sal_Int32 SAL_CALL getMinorVersion() +throw (css::uno::RuntimeException); css::uno::Reference css::uno::XComponentContext context_; }; @@ -90,73 +99,145 @@ class Connection: { public: Connection( -css::uno::Reference css::uno::XComponentContext const context): -context_(context) -{ assert(context.is()); } +css::uno::Reference css::uno::XComponentContext const context); private: -virtual ~Connection() {} +~Connection(); + +// XConnection +::com::sun::star::uno::Reference ::com::sun::star::sdbc::XStatement SAL_CALL createStatement( ) +throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + +::com::sun::star::uno::Reference ::com::sun::star::sdbc::XPreparedStatement SAL_CALL prepareStatement( const ::rtl::OUString sql ) +
[Libreoffice-commits] .: Branch 'feature/mork' - 2 commits - config_host.mk.in configure.in mysqlcppconn/mysql_config.pmk solenv/gbuild solenv/inc
config_host.mk.in |1 - configure.in |7 ++- mysqlcppconn/mysql_config.pmk |6 -- solenv/gbuild/JavaClassSet.mk |3 ++- solenv/inc/settings.mk|2 -- 5 files changed, 4 insertions(+), 15 deletions(-) New commits: commit 992fa41939d6c68395f8702c6ceaa8dc0925d729 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 20 14:17:54 2012 +0200 fdo#52275: Revert mysqlcppconn: work around weird gcc issue This reverts commit d3d533c9e45b6badf202a12f0ed266d0168aa636. Hard-coding -std=c++xy in one module is a bad idea. None of these gccs give any spurious error in gnu++11 mode now: gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5) diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk index 9c9c76a..eb316e0 100644 --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -47,9 +47,3 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD -# workaround for gcc bug (4.6.1 20110908): -# it complains about std::basic string operator= overloading ambiguity -.IF $(COM)==GCC -CFLAGSCXX+=-std=c++98 -.ENDIF # $(COM)==GCC - commit 1e04b79f706d49694ab9851f83a0ecc36c3dd8e7 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 14:11:53 2012 +0200 Support for --with-java-target-version in gbuild ...had been missing. Old dmake-based build system did not add -source/-target when using gcj (unless gcj really was Eclipse Java Compiler, in which case those -source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is no longer necessary. (Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.) Change-Id: Ic3596691b622be45e151333981f8f236d11825b4 diff --git a/config_host.mk.in b/config_host.mk.in index 1f78bf6..5e24730 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -238,7 +238,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export INTRO_BIPMAP=@INTRO_BITMAP@ -export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVACISGCJ=@JAVACISGCJ@ diff --git a/configure.in b/configure.in index 081c6f0..b41fa09 100644 --- a/configure.in +++ b/configure.in @@ -1623,8 +1623,8 @@ AC_ARG_WITH(java, AC_ARG_WITH(java_target_version, AS_HELP_STRING([--with-java-target-version], [Generate class files that will work on JVMs with the specified version. - For example, use --with-java-target-version=1.4 to make sure that the - application will work with JVM 1.4 even when compiled with JDK 1.5.]) + For example, use --with-java-target-version=1.5 to make sure that the + application will work with JVM 1.5 even when compiled with JDK 1.6.]) [ This option is ignored when you compile with gcj/gij. @@ -5336,8 +5336,6 @@ if test $SOLAR_JAVA != ; then AC_MSG_CHECKING([re-checking JDK]) JDK=gcj AC_MSG_RESULT([checked (ecj)]) -#TODO: what's to do here? some switch to do 1.5 compiling? -JAVAFLAGS=-source 1.5 -target 1.5 _gij_longver=40200 fi fi @@ -5823,7 +5821,6 @@ AC_SUBST(CLASSPATH) AC_SUBST(JAVALIB) AC_SUBST(JAVACOMPILER) AC_SUBST(JAVADOC) -AC_SUBST(JAVAFLAGS) AC_SUBST(JAVAINTERPRETER) AC_SUBST(JAVAIFLAGS) AC_SUBST(JAVA_HOME) diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 2338f32..7198331 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,8 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \ +-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) gb_JavaClassSet_JAVACDEBUG := # Enforces correct dependency order for possibly generated stuff: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9d01c5e..36234fc 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -133,8 +133,6 @@ JAVARESPONSE= .ENDIF .ENDIF -JAVAFLAGS+=$(JAVA_TARGET_FLAG) - #END JAVA CDEFS= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/docshell/impex.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6945d1eb7666f90b6b356f97d368c87664c77d88 Author: Eike Rathke er...@redhat.com Date: Thu Jul 19 18:10:49 2012 +0200 resolved fdo#52205 do not force all text cells in CSV import Do not set ScSetStringParam::mbSetTextCellFormat=true for SetString() that slightly changed behavior, the nColFormat==SC_COL_TEXT case is handled separately anyway. Change-Id: I0a0f9472801dcb02af77d6eaf90170309a41e9a8 Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index e98c67b..50333f8 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1227,7 +1227,7 @@ static bool lcl_PutString( ScSetStringParam aParam; aParam.mpNumFormatter = pFormatter; aParam.mbDetectNumberFormat = bDetectNumFormat; -aParam.mbSetTextCellFormat = true; +aParam.mbSetTextCellFormat = false; aParam.mbHandleApostrophe = false; pDoc-SetString( nCol, nRow, nTab, rStr, aParam ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - offapi/com sw/inc sw/qa sw/source xmloff/inc xmloff/source
offapi/com/sun/star/text/textfield/Annotation.idl |5 + sw/inc/docufld.hxx|7 +- sw/qa/core/swdoc-test.cxx |2 sw/source/core/crsr/bookmrk.cxx | 37 sw/source/core/doc/docbm.cxx |5 + sw/source/core/fields/docufld.cxx | 24 ++-- sw/source/core/inc/bookmrk.hxx|1 sw/source/core/unocore/unofield.cxx | 16 - sw/source/core/unocore/unomap.cxx |1 sw/source/core/unocore/unoportenum.cxx| 31 ++ sw/source/filter/html/htmlfld.cxx |2 sw/source/filter/html/swhtml.cxx |2 sw/source/filter/ww8/ww8par.cxx |2 sw/source/ui/fldui/fldmgr.cxx |2 sw/source/ui/wrtsh/wrtsh2.cxx |3 - xmloff/inc/txtfldi.hxx|6 ++ xmloff/inc/xmloff/txtimp.hxx |2 xmloff/inc/xmloff/xmltoken.hxx|1 xmloff/source/core/xmltoken.cxx |1 xmloff/source/text/txtflde.cxx|4 + xmloff/source/text/txtfldi.cxx| 66 -- xmloff/source/text/txtimp.cxx |2 xmloff/source/text/txtparae.cxx | 34 ++- 23 files changed, 232 insertions(+), 24 deletions(-) New commits: commit 2fe8ce57e90327cfeed6b7da07a2c57bdbbb Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 14:41:23 2012 +0200 SwXTextField::attachToRange: don't generate new fieldmark id on each import Change-Id: If7256136cde91279ad8b684da1b7bf1666bd1dba diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index d06ec8c..1b14610 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -92,6 +92,7 @@ #include docsh.hxx #include fmtmeta.hxx // MetaFieldManager #include switerator.hxx +#include bookmrk.hxx #include rtl/strbuf.hxx #include vector #include xmloff/odffields.hxx @@ -1760,7 +1761,17 @@ void SwXTextField::attachToRange( aPam, OUString(), ODF_COMMENTRANGE); - ((SwPostItField*)aFmt.GetFld())-SetName(pFieldmark-GetName()); +SwPostItField* pPostItField = (SwPostItField*)aFmt.GetFld(); +if (pPostItField-GetName().isEmpty()) +// The fieldmark always has a (generated) name. +pPostItField-SetName(pFieldmark-GetName()); +else +{ +// The field has a name already, use it. +sw::mark::MarkBase* pMarkBase = dynamic_castsw::mark::MarkBase*(pFieldmark); +if (pMarkBase) +pMarkBase-SetName(pPostItField-GetName()); +} // Make sure we always insert the field at the end SwPaM aEnd(*aPam.End(), *aPam.End()); commit d4b473dd9ba77427b28d97847067b8877c2033d9 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 14:27:07 2012 +0200 office:annotation-end import Change-Id: I8d1475b5bc9a36dade5ce28e74139834c69f8e14 diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 7c0e6e6..b2483de 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -1345,15 +1345,20 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext const ::rtl::OUString sPropertyContent; const ::rtl::OUString sPropertyDate; const ::rtl::OUString sPropertyTextRange; +const ::rtl::OUString sPropertyName; ::rtl::OUStringBuffer aAuthorBuffer; ::rtl::OUStringBuffer aInitialsBuffer; +OUString aName; ::rtl::OUStringBuffer aTextBuffer; ::rtl::OUStringBuffer aDateBuffer; com::sun::star::uno::Reference com::sun::star::beans::XPropertySet mxField; com::sun::star::uno::Reference com::sun::star::text::XTextCursor mxCursor; com::sun::star::uno::Reference com::sun::star::text::XTextCursor mxOldCursor; +/// If this is an annotation end, then position of the start. +com::sun::star::uno::Reference com::sun::star::text::XTextContent m_xStart; +sal_uInt16 m_nToken; public: @@ -1361,6 +1366,7 @@ public: XMLAnnotationImportContext(SvXMLImport rImport, XMLTextImportHelper rHlp, + sal_uInt16 nToken, sal_uInt16 nPrfx, const ::rtl::OUString sLocalName); diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index f01c0ec..d4a1156 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -221,6 +221,8 @@ enum XMLTextPElemTokens XML_TOK_TEXT_SHEET_NAME,
Re: [REVIEW 3-6, 3-6-0] [PUSHED 3-6] resolved fdo#52205 do not force all text cells in CSV import
On 07/19/2012 12:31 PM, Eike Rathke wrote: Hi, Please review and cherry-pick to 3-6 and 3-6-0 http://cgit.freedesktop.org/libreoffice/core/commit/?id=b7dbc768a71ccfb567e3b2979e57d0d1318977cf that fixes https://bugs.freedesktop.org/show_bug.cgi?id=52205 I reviewed and tested several csv files and one related pivot table use case, and it did fix the bug. The old behavior for ScSetStringParam::mbSetTextCellFormat was somewhat confusing and there was a reason for that. I now slightly changed the behavior of that flag and you commit kept that new behavior. But I couldn't reproduce the original issue that the old behavior was intended to fix, so I think it's safe to keep the new behavior. Pushed to the -3-6 branch with my sign-off. We need 2 more sign-offs to push this to the -3-6-0 branch (I assume?). Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/Library_mork.mk connectivity/source
connectivity/Library_mork.mk|3 connectivity/source/drivers/mork/MorkDriver.cxx | 243 ++ connectivity/source/drivers/mork/MorkDriver.hxx | 58 ++ connectivity/source/drivers/mork/MorkParser.cxx | 578 connectivity/source/drivers/mork/MorkParser.hxx | 166 ++ connectivity/source/drivers/mork/driver.cxx | 243 -- connectivity/source/drivers/mork/driver.hxx | 58 -- connectivity/source/drivers/mork/services.cxx |2 8 files changed, 1048 insertions(+), 303 deletions(-) New commits: commit 1599831df2adb3966572c1dcbf5d8ef972ed3fbf Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 20 15:28:46 2012 +0200 Integrating the two BSD-licensed MorkParser files Change-Id: I8e793dfe53556becdcc733a9f76e64df23fb5524 diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index e0ea9c8..ec118ed 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -10,7 +10,8 @@ $(eval $(call gb_Library_Library,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ -connectivity/source/drivers/mork/driver \ +connectivity/source/drivers/mork/MorkDriver \ +connectivity/source/drivers/mork/MorkParser \ connectivity/source/drivers/mork/services \ )) diff --git a/connectivity/source/drivers/mork/MorkDriver.cxx b/connectivity/source/drivers/mork/MorkDriver.cxx new file mode 100644 index 000..83f9d7c --- /dev/null +++ b/connectivity/source/drivers/mork/MorkDriver.cxx @@ -0,0 +1,243 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include sal/config.h + +#include cassert + +#include boost/noncopyable.hpp +#include com/sun/star/beans/PropertyValue.hpp +#include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/sdbc/DriverPropertyInfo.hpp +#include com/sun/star/sdbc/SQLException.hpp +#include com/sun/star/sdbc/XConnection.hpp +#include com/sun/star/sdbc/XDriver.hpp +#include com/sun/star/uno/Reference.hxx +#include com/sun/star/uno/RuntimeException.hpp +#include com/sun/star/uno/Sequence.hxx +#include com/sun/star/uno/XComponentContext.hpp +#include cppuhelper/implbase1.hxx +#include cppuhelper/implbase2.hxx +#include cppuhelper/weak.hxx +#include rtl/ustring.hxx +#include sal/types.h + +#include MorkDriver.hxx + +namespace css = com::sun::star; + +namespace connectivity +{ +namespace mork +{ + +class Service: +public cppu::WeakImplHelper2 css::lang::XServiceInfo, css::sdbc::XDriver , +private boost::noncopyable +{ +public: +Service(css::uno::Reference css::uno::XComponentContext const context): +context_(context) +{ +assert(context.is()); +} + +private: +virtual ~Service() {} + +rtl::OUString SAL_CALL getImplementationName() +throw (css::uno::RuntimeException) +{ +return connectivity::mork::getImplementationName(); +} + +sal_Bool SAL_CALL supportsService(rtl::OUString const ServiceName) +throw (css::uno::RuntimeException) +{ +return ServiceName == getSupportedServiceNames()[0];//TODO +} + +css::uno::Sequence rtl::OUString SAL_CALL +getSupportedServiceNames() throw (css::uno::RuntimeException) +{ +return connectivity::mork::getSupportedServiceNames(); +} + +css::uno::Reference css::sdbc::XConnection SAL_CALL connect( +rtl::OUString const url, +css::uno::Sequence css::beans::PropertyValue const info) +throw (css::sdbc::SQLException, css::uno::RuntimeException); + +sal_Bool SAL_CALL acceptsURL( +rtl::OUString const url) +throw (css::sdbc::SQLException, css::uno::RuntimeException); + +css::uno::Sequence css::sdbc::DriverPropertyInfo SAL_CALL +getPropertyInfo( +rtl::OUString const url, +css::uno::Sequence css::beans::PropertyValue const info) +throw (css::sdbc::SQLException, css::uno::RuntimeException); + +sal_Int32 SAL_CALL getMajorVersion() +throw (css::uno::RuntimeException); + +sal_Int32 SAL_CALL getMinorVersion() +throw (css::uno::RuntimeException); + +css::uno::Reference css::uno::XComponentContext context_; +}; + +class Connection: +public cppu::WeakImplHelper1 css::sdbc::XConnection , +private boost::noncopyable +{ +public: +Connection( +css::uno::Reference css::uno::XComponentContext const context); + +private: +~Connection(); + +// XConnection +::com::sun::star::uno::Reference ::com::sun::star::sdbc::XStatement SAL_CALL createStatement( ) +throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + +::com::sun::star::uno::Reference
[Libreoffice-commits] .: Branch 'feature/mork' - 5 commits - offapi/com sw/inc sw/qa sw/source xmloff/inc xmloff/source
offapi/com/sun/star/text/textfield/Annotation.idl |5 + sw/inc/docufld.hxx|7 +- sw/qa/core/swdoc-test.cxx |2 sw/source/core/crsr/bookmrk.cxx | 37 sw/source/core/doc/docbm.cxx |5 + sw/source/core/fields/docufld.cxx | 24 ++-- sw/source/core/inc/bookmrk.hxx|1 sw/source/core/unocore/unofield.cxx | 16 - sw/source/core/unocore/unomap.cxx |1 sw/source/core/unocore/unoportenum.cxx| 31 ++ sw/source/filter/html/htmlfld.cxx |2 sw/source/filter/html/swhtml.cxx |2 sw/source/filter/ww8/ww8par.cxx |2 sw/source/ui/fldui/fldmgr.cxx |2 sw/source/ui/wrtsh/wrtsh2.cxx |3 - xmloff/inc/txtfldi.hxx|6 ++ xmloff/inc/xmloff/txtimp.hxx |2 xmloff/inc/xmloff/xmltoken.hxx|1 xmloff/source/core/xmltoken.cxx |1 xmloff/source/text/txtflde.cxx|4 + xmloff/source/text/txtfldi.cxx| 66 -- xmloff/source/text/txtimp.cxx |2 xmloff/source/text/txtparae.cxx | 34 ++- 23 files changed, 232 insertions(+), 24 deletions(-) New commits: commit 7588a62134a5107cdfc6dee1e232330574f8f4cd Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 14:41:23 2012 +0200 SwXTextField::attachToRange: don't generate new fieldmark id on each import Change-Id: If7256136cde91279ad8b684da1b7bf1666bd1dba diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index d06ec8c..1b14610 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -92,6 +92,7 @@ #include docsh.hxx #include fmtmeta.hxx // MetaFieldManager #include switerator.hxx +#include bookmrk.hxx #include rtl/strbuf.hxx #include vector #include xmloff/odffields.hxx @@ -1760,7 +1761,17 @@ void SwXTextField::attachToRange( aPam, OUString(), ODF_COMMENTRANGE); - ((SwPostItField*)aFmt.GetFld())-SetName(pFieldmark-GetName()); +SwPostItField* pPostItField = (SwPostItField*)aFmt.GetFld(); +if (pPostItField-GetName().isEmpty()) +// The fieldmark always has a (generated) name. +pPostItField-SetName(pFieldmark-GetName()); +else +{ +// The field has a name already, use it. +sw::mark::MarkBase* pMarkBase = dynamic_castsw::mark::MarkBase*(pFieldmark); +if (pMarkBase) +pMarkBase-SetName(pPostItField-GetName()); +} // Make sure we always insert the field at the end SwPaM aEnd(*aPam.End(), *aPam.End()); commit 2552e87eaeddf0086d07a2122a2031d257144bdd Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 14:27:07 2012 +0200 office:annotation-end import Change-Id: I8d1475b5bc9a36dade5ce28e74139834c69f8e14 diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 7c0e6e6..b2483de 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -1345,15 +1345,20 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext const ::rtl::OUString sPropertyContent; const ::rtl::OUString sPropertyDate; const ::rtl::OUString sPropertyTextRange; +const ::rtl::OUString sPropertyName; ::rtl::OUStringBuffer aAuthorBuffer; ::rtl::OUStringBuffer aInitialsBuffer; +OUString aName; ::rtl::OUStringBuffer aTextBuffer; ::rtl::OUStringBuffer aDateBuffer; com::sun::star::uno::Reference com::sun::star::beans::XPropertySet mxField; com::sun::star::uno::Reference com::sun::star::text::XTextCursor mxCursor; com::sun::star::uno::Reference com::sun::star::text::XTextCursor mxOldCursor; +/// If this is an annotation end, then position of the start. +com::sun::star::uno::Reference com::sun::star::text::XTextContent m_xStart; +sal_uInt16 m_nToken; public: @@ -1361,6 +1366,7 @@ public: XMLAnnotationImportContext(SvXMLImport rImport, XMLTextImportHelper rHlp, + sal_uInt16 nToken, sal_uInt16 nPrfx, const ::rtl::OUString sLocalName); diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index f01c0ec..d4a1156 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -221,6 +221,8 @@ enum XMLTextPElemTokens XML_TOK_TEXT_SHEET_NAME,
[Libreoffice-commits] .: sc/source
sc/source/ui/src/scfuncs.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eccc5f97ba245faadf61cf4577b21d4f8da6460d Author: Kevin Peng kpeng...@fastmail.fm Date: Fri Jul 20 01:53:03 2012 -0700 fdo#52293 Changed discreet to discrete Change-Id: I305883239dbcd6f46d6ed5614c4968e0b59055ca diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 039aad6..d05a075 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -5518,7 +5518,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 { String 1 // Description { -Text [ en-US ] = Returns the discreet probability of an interval. ; +Text [ en-US ] = Returns the discrete probability of an interval. ; }; ExtraData = { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fdo#52293: Spelling error (UI, Localization)
Hi Kevin, On Friday, 2012-07-20 02:00:12 -0700, Kevin Peng wrote: This patch [aims to] fix the aforementioned bug. It does, thanks. Liked your comment in the bug about the secret calculation ;) Pushed to master with http://cgit.freedesktop.org/libreoffice/core/commit/?id=eccc5f97ba245faadf61cf4577b21d4f8da6460d For future reference, if a patch fixes a bug please mention the bug number in the form fdo#... in the commit summary, here for example fdo#52293, that enables our git hook to add a comment to the bug (see example in there) and readers of the commit message know what the change was about. Apparently we don't have your license statement on file, https://wiki.documentfoundation.org/Development/Developers Could you please send a mail to the mailing list with a blanket statement that you contribute this and further patches under LGPLv3+ and MPL 1.1 licenses? Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp2eRcZxVyXf.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Revert of hrc cleanup
Hi Thomas, On Wed, 2012-07-18 at 21:33 +0200, Thomas Arnhold wrote: as Markus stated in dc05a825e71316e6f602e5c8dfcd3d10ecb6252f those string cleanups aren't save. I've had the illusion, that by compiling and quick checking all of it got tested (mostly by compiling). Ah ... ;-) right; so it's necessary to check the code to ensure that arithmetic is not used to pick items in a range; it's necessary to read the hrc file to check that out really. Of course, if no pattern is visible in the hrc file, and/or there is no comment there - IMHO the bug is that that is not clear, and we should revert just that bit, and annotate / clarify the .hrc or .src file itself. Because there were complains, if I removed too much. I didn't touch things like STR_FOO_BEGIN 100 and STR_FOO_END 200 if there were definitions inside it and STR_FOO_BEGIN or STR_FOO_END were seen in the source. Oh - so, of course, people also use that pattern in ways that are not string lists. IMHO there is no really good way to detect this short of seeing a few missing strings, and having an idea of where to poke to restore them. So I revert all of those string changes now. Because I can't ensure that there are more of those errors. Moreover I did remove a massive removal of resource ids. Well - if a .hrc is removed; and is not referenced in any .src file, nor any .cxx file (on each platform) then that is just great. Is there any way to get a real checkup what string and definitions are in use at all?! If not it would be safer to revert all of this cleanup. Even if that's very sad... Basically no - it's very sad and broken :-) hence the need for a robust cleanup tool; and (in future) some better l10n infrastructure. I don't wanted to mess all of this up. Hey - you did good ! it's a great area to work on cleanup for; the fact that there are a few problems is expected with any development. And the navigator code is a particularly unpleasant example of cut/paste coding from the stone-age :-) so it's expected to break a lot. It'd be great if you could go back through the patch do some more checking in the code for arithmetic relating to SIDs - if possible ? Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/CppunitTest_sw_subsequent_odfexport.mk sw/Module_sw.mk sw/qa
sw/CppunitTest_sw_subsequent_odfexport.mk | 98 ++ sw/Module_sw.mk |1 sw/qa/extras/odfexport/data/fdo38244.odt |binary sw/qa/extras/odfexport/odfexport.cxx | 95 + 4 files changed, 194 insertions(+) New commits: commit c251673851b72c3b516dee6db44f1e7a8854aeb9 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 15:34:43 2012 +0200 fdo#38244 comment range odf import/export testcase Change-Id: I8cbaa30aa222404f55f5ff49474cf93e8b1bdac2 diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk new file mode 100644 index 000..0b90494 --- /dev/null +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -0,0 +1,98 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Miklos Vajna vmik...@suse.cz (SUSE, Inc.) +# Portions created by the Initial Developer are Copyright (C) 2012 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odfexport)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfexport, \ +sw/qa/extras/odfexport/odfexport \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ +cppu \ +cppuhelper \ +sal \ + sw \ +test \ +tl \ +unotest \ +utl \ +vcl \ +$(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ +libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfexport,\ +-I$(SRCDIR)/sw/inc \ +-I$(SRCDIR)/sw/source/core/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfexport,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfexport)) + +$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\ +comphelper/util/comphelp \ +configmgr/source/configmgr \ +fileaccess/source/fileacc \ +filter/source/config/cache/filterconfig1 \ +framework/util/fwk \ +i18npool/util/i18npool \ +package/util/package2 \ +package/source/xstor/xstor \ +sw/util/sw \ +sw/util/swd \ +sax/source/expatwrap/expwrap \ +sfx2/util/sfx \ +svl/source/fsstor/fsstorage \ +svtools/util/svt \ +toolkit/util/tk \ +ucb/source/core/ucb1 \ +ucb/source/ucp/file/ucpfile1 \ +unotools/util/utl \ +unoxml/source/service/unoxml \ +xmlhelp/util/ucpchelp1 \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport)) + +$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport)) + +$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfexport,\ + $(OUTDIR)/unittest/registry \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 0f9d9c5..3a898f7 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_subsequent_ww8import \ CppunitTest_sw_subsequent_rtfexport \ CppunitTest_sw_subsequent_rtfimport \ +CppunitTest_sw_subsequent_odfexport \ CppunitTest_sw_subsequent_odfimport \ )) diff --git a/sw/qa/extras/odfexport/data/fdo38244.odt b/sw/qa/extras/odfexport/data/fdo38244.odt new file mode 100644 index 000..0fcc168 Binary files /dev/null and b/sw/qa/extras/odfexport/data/fdo38244.odt differ diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx new file mode 100644 index 000..4792508 --- /dev/null +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -0,0 +1,95 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the License); you may not use
Re: [PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:
On Fri, Jul 20, 2012 at 01:12:37PM +0200, Michael Stahl wrote: On 20/07/12 12:34, Miklos Vajna wrote: On Fri, Jul 20, 2012 at 10:12:58AM +, Gerrit ger...@gerrit.libreoffice.org wrote: Hello Miklos Vajna, I'd like you to do a code review. Please visit Now this is really confusing; I already signed off this patch, so I should not do a code review this time. ;-) i agree :) i didn't do anything explicit to add you as reviewer to this patch, so presumably gerrit did it automatically. Well, gerrit sees the patch and it sees a 'new version' as it is cherry-picked and does not have the same identity. IIRC that mail will be gone when gerrit puts the patches on master itself (in which case it understands better what happened). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - dtrans/source embedserv/source o3tl/inc sal/Library_sal_textenc.mk sal/util shell/source tools/source xmerge/source
dtrans/source/win32/dtobj/XTDataObject.cxx | 10 +--- embedserv/source/inprocserv/dllentry.cxx|6 -- o3tl/inc/o3tl/sorted_vector.hxx | 22 +--- sal/Library_sal_textenc.mk |2 sal/util/sal_textenc/saltextenc.map | 40 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 36 +- shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |3 - shell/source/win32/shlxthandler/shlxthdl.cxx|3 - tools/source/fsys/wntmsc.cxx|5 -- xmerge/source/activesync/XMergeFactory.cpp |6 -- xmerge/source/activesync/XMergeSync.cpp |6 -- 11 files changed, 21 insertions(+), 118 deletions(-) New commits: commit e5a0755bc2f8129cb854367740a02c859555c033 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 15:55:05 2012 +0200 new does not return null Change-Id: Iea00f7c6435c6ae3ccbb2f97ab4407df8b86c54b diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index ec3d201..a28f866 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -496,10 +496,9 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( if ( DATADIR_GET == dwDirection ) { *ppenumFormatetc = new CEnumFormatEtc( this, m_FormatEtcContainer ); -if ( NULL != *ppenumFormatetc ) -static_cast LPUNKNOWN ( *ppenumFormatetc )-AddRef( ); +static_cast LPUNKNOWN ( *ppenumFormatetc )-AddRef( ); -hr = ( NULL != *ppenumFormatetc ) ? S_OK : E_OUTOFMEMORY; +hr = S_OK; } else hr = E_INVALIDARG; @@ -832,10 +831,9 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum ) return E_INVALIDARG; *ppenum = new CEnumFormatEtc( m_lpUnkOuter, m_FormatEtcContainer ); -if ( NULL != *ppenum ) -static_cast LPUNKNOWN ( *ppenum )-AddRef( ); +static_cast LPUNKNOWN ( *ppenum )-AddRef( ); -return ( NULL != *ppenum ) ? S_OK : E_OUTOFMEMORY; +return S_OK; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 6a43fce..6daf9bf 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -186,9 +186,6 @@ extern C STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID ri return E_NOINTERFACE; *ppv = new inprocserv::InprocEmbedProvider_Impl( rclsid ); -if ( *ppv == NULL ) -return E_OUTOFMEMORY; - ((LPUNKNOWN)*ppv)-AddRef(); return S_OK; } @@ -316,9 +313,6 @@ STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter, return CLASS_E_NOAGGREGATION; InprocEmbedDocument_Impl* pEmbedDocument = new InprocEmbedDocument_Impl( m_guid ); -if ( !pEmbedDocument ) -return E_OUTOFMEMORY; - pEmbedDocument-AddRef(); HRESULT hr = pEmbedDocument-Init(); if ( SUCCEEDED( hr ) ) diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 9f37b3b..83df85f 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -817,21 +817,16 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( if ( 0 != pUnkOuter ) return CLASS_E_NOAGGREGATION; pIUnk = new COooFilter(); -if ( 0 != pIUnk ) +if ( SUCCEEDED( pIUnk-QueryInterface( riid , ppvObject ) ) ) { -if ( SUCCEEDED( pIUnk-QueryInterface( riid , ppvObject ) ) ) -{ -// Release extra refcount from QueryInterface -pIUnk-Release(); -} -else -{ -delete pIUnk; -return E_UNEXPECTED; -} +// Release extra refcount from QueryInterface +pIUnk-Release(); } else -return E_OUTOFMEMORY; +{ +delete pIUnk; +return E_UNEXPECTED; +} return S_OK; } @@ -919,19 +914,14 @@ extern C SCODE STDMETHODCALLTYPE DllGetClassObject( } else return CLASS_E_CLASSNOTAVAILABLE; -if ( 0 != pResult ) +if( SUCCEEDED( pResult-QueryInterface( iid, ppvObj ) ) ) +// Release extra refcount from QueryInterface +pResult-Release(); +else { -if( SUCCEEDED( pResult-QueryInterface( iid, ppvObj ) ) ) -// Release extra refcount from QueryInterface -pResult-Release(); -else -{ -delete pImpl; -return E_UNEXPECTED; -} +delete pImpl; +return E_UNEXPECTED; } -else -return E_OUTOFMEMORY; return S_OK; }
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
On Thu, 2012-07-19 at 17:58 +0200, Markus Mohrhard wrote: Hey Eike, Kohei, 2012/7/19 Kohei Yoshida kohei.yosh...@gmail.com: I'm also not fully convinced of this patch. This behavior has been in Libreoffice since the start so IMHO it is more important to keep the behavior for all the LibO users than to change it again to please potential users switching from OOo. I think the only sane solution that will please both sides is to have it as configuration option but I'm not thrilled to see the default behavior changed again. FWIW, what would the ideal situation be if had a time machine ? e.g. Would a compatibility option of TreatEmptyCellsAsZero that defaulted to true if unset, and LibreOffice = X.Y exported it as false have made sense ? I mean, if it mattered enough, I suppose one could be added that is always explicitly exported true or false and hook off the meta:generator for known legacy implementations that default true/false when its not set. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
On 07/20/2012 10:04 AM, Caolán McNamara wrote: On Thu, 2012-07-19 at 17:58 +0200, Markus Mohrhard wrote: Hey Eike, Kohei, 2012/7/19 Kohei Yoshida kohei.yosh...@gmail.com: I'm also not fully convinced of this patch. This behavior has been in Libreoffice since the start so IMHO it is more important to keep the behavior for all the LibO users than to change it again to please potential users switching from OOo. I think the only sane solution that will please both sides is to have it as configuration option but I'm not thrilled to see the default behavior changed again. FWIW, what would the ideal situation be if had a time machine ? e.g. Would a compatibility option of TreatEmptyCellsAsZero that defaulted to true if unset, and LibreOffice = X.Y exported it as false have made sense ? IMO the most sane solution is to make it configurable, and let the user choose which way she prefers. We could try to be smart and detect the version of the document and change the behavior, but that will open up another can of worms. I'll add this configuration option during 3.7 cycle if this can wait until 3.7. If you guys need it earlier than that I could work on it and push it as a late feature if it's desperately needed for 3.6. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Support for the checkerboard transition animation in SVG export.
Ported the class CheckerBoardWipe. This and any future contributions to the LibreOffice project are under LGPLv3+/MPL, unless stated otherwise. -- Horácio Fernandes 0001-Support-for-the-checkerboard-transition-animation-in.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#51239 how to debug it is slow
On Thu, 2012-07-19 at 18:09 +0200, Stephan Bergmann wrote: This is about direct use of JNI, not via UNO. Ah - I wonder ... ;-) if it is the transition that is the problem; could we have a Java thread polling a loopback socket and sucking simple commands parsing executing them, then passing the data back in some other form ;- It'd be hideous if that actually was quicker than a direct JNI call but ... ;-) it's possible. Particularly in the world of under-utilized multi-threaded CPUs it might not be -so- bad. Bit of a pain cross-platform, but might work for suitably chunky methods; I wonder - could we use the wonder binary-urp magic to prototype it [ though I guess we'd need a native Java implementation of that - hmm ]. Urgh ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
Fair point. :-) Let me see if I can get a build working on Windows this weekend. I see on the wiki that building with VS 2010 is not yet supported: http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies Is this information still current? On Fri, Jul 20, 2012 at 3:43 AM, Michael Meeks michael.me...@suse.com wrote: Hi there, On Thu, 2012-07-19 at 11:21 -0500, Yi Ding wrote: +1 ... +1 ... +1 ... Thanks for your encouragement, but this is a developers list :-) which of these do you want to work on ? There is low-hanging fruit everywhere for developers to focus on - which would you like to look into ? Startup performance for example: reducing the configmgr thrash by tweaking that code to allow us to split out settings that are not commonly needed eg. the labels data would give a measureable boost to startup. It requires only a hacker - is it you ? :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On 20/07/12 16:31, Yi Ding wrote: Fair point. :-) Let me see if I can get a build working on Windows this weekend. I see on the wiki that building with VS 2010 is not yet supported: http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies Is this information still current? yes it is; there is actually a patch for MSVC2010 attached here: https://bugs.freedesktop.org/show_bug.cgi?id=30655 but it is quite outdated and apparently even when it was written there was some CLR thing that didn't work. if you know the MSVC toolchain well then you could try to get that to work, and it would be very useful, but you will probably have to spend some time on it; currently only MSVC 2008 is known to work. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Adding new label's format
Hello. I'm working for a labels manufaturer and I would like to add our format in libreoffice. We have customers who have asked for it in the past. How is the best way to perform this ? I found in the past that all informations are in a xml file (don't remember where now). There is a description of this file to give the good informations ? Thanks in advance. Sylvain Fauveau ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build light weight conversion binary
Hi, The company that I work for use LibreOffice as the main word processor. We convert a lot of client letters from doc/docx to open document format. We are on Mac OS X Lion (10.7) btw. We use: soffice --headless --convert-to odt …. to do the batch conversion. The problems with this are: - It takes quite a long time to start up. It becomes a problem when we have to convert many documents. - It won't work if there is already a LibreOffice instance running So my boss asked me to fix these 2 issues. I managed to build the source code on Mac OS X Lion and then try to see what's going on (unfortunately specifying --headless fail to build). I found out that to just do the conversion, there are many dynamic libraries are loaded (so I guess this is why it takes a long time). Trying to understand what's going on in the code is not a simple task to be honest. Can some one help or give me info on how to: - build a bare minimum/small binary (without too many dependencies) just for conversion to odt? also how do I link statically? The conversion utility doesn't need all the gui libraries I believe. Minimum dependency will make start up a lot quicker. - what to do to allow conversion working while there is an instance of LibreOffice already running? Should I modify something in the source code? I'm sure a lot of people would love to have this light weight conversion utility. Many thanks before. Jerry___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC][LightProof]Сonclusion
Hello folks, I'm happy to say that this summer I had some success with conversion LanguageTool rules into LightProof ones. So most likely you can easily convert most rules. More detail here: http://googleyourlanguage.blogspot.com/2012/07/most-of-rules-can-be-succefully.html Unfortunately, my project was failed. Due personal problem I won't finish it, at least soon. I hope it will be useful to someone. Feel free to use and edit my code. I wish someone will finish what I've started. May thanks to community, especially to László, Cedric, Fridrich, who helped me all time I hacked. Happy hacking! Best regards Daniel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE
THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE |6 ++ 1 file changed, 6 insertions(+) New commits: commit 3640338f3db6b926b78040a63e97353b04d4cd62 Author: Michael Meeks michael.me...@suse.com Date: Fri Jul 20 15:35:36 2012 +0100 fdo#43057 apparently. diff --git a/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE b/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE new file mode 100644 index 000..d18029b --- /dev/null +++ b/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE @@ -0,0 +1,6 @@ +There are claims that this repository has been migrated to: + + http://github.com/tdf/ + +Which sadly excludes all the existing developers from being +able to easily commit to, and help out with website tasks. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 in LibreOffice
On Fri, Jul 20, 2012 at 9:37 AM, Michael Stahl mst...@redhat.com wrote: On 20/07/12 16:31, Yi Ding wrote: Fair point. :-) Let me see if I can get a build working on Windows this weekend. I see on the wiki that building with VS 2010 is not yet supported: http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies Is this information still current? yes it is; there is actually a patch for MSVC2010 attached here: https://bugs.freedesktop.org/show_bug.cgi?id=30655 but it is quite outdated and apparently even when it was written there was some CLR thing that didn't work. if you know the MSVC toolchain well then you could try to get that to work, and it would be very useful, but you will probably have to spend some time on it; currently only MSVC 2008 is known to work. Great, thanks. I'll give it a try, although after reading the Building on Windows thread I might end up giving up and just running the build on a VM. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH (partial)] fdo#48549 System::Beep() removal
Hi, I've written a patch that remove all call to Sound:Beep. Thomas Arnhold suggest me to replace the Sound:Beep by some error reporting mechanism. My question is: What is, in your opinion, the best way to do this? Best regards Mek Otar 0001-fdo-48549-System-Beep-removal.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source
filter/source/svg/presentation_engine.js | 134 +-- 1 file changed, 110 insertions(+), 24 deletions(-) New commits: commit 6ee666c53da83982784ea59894479a8b93c8ecd7 Author: Horacio Fernandes horacio.fernan...@gmail.com Date: Fri Jul 20 10:07:15 2012 -0400 Support for the checkerboard transition animation in SVG export. Ported the class CheckerBoardWipe. Change-Id: I990c8f417c64d22ef87c1007887e630ac19a7083 diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 88d8de0..186ef95 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -4217,6 +4217,7 @@ PINWHEELWIPE_TRANSITION = 6; // 23 PUSHWIPE_TRANSITION = 7; // 35 SLIDEWIPE_TRANSITION= 8; // 36 FADE_TRANSITION = 9; // 37 +CHECKERBOARDWIPE_TRANSITION = 10; // 39 aTransitionTypeInMap = { 'barWipe' : BARWIPE_TRANSITION, @@ -4227,12 +4228,13 @@ aTransitionTypeInMap = { 'pinWheelWipe' : PINWHEELWIPE_TRANSITION, 'pushWipe' : PUSHWIPE_TRANSITION, 'slideWipe' : SLIDEWIPE_TRANSITION, -'fade' : FADE_TRANSITION +'fade' : FADE_TRANSITION, +'checkerBoardWipe' : CHECKERBOARDWIPE_TRANSITION }; aTransitionTypeOutMap = [ '', 'barWipe', 'boxWipe', 'fourBoxWipe', 'ellipseWipe', 'clockWipe', 'pinWheelWipe', 'pushWipe', 'slideWipe', - 'fade' ]; + 'fade', 'checkerBoardWipe' ]; // Transition Subtypes @@ -4243,25 +4245,27 @@ CORNERSIN_TRANS_SUBTYPE = 3; // 11 CORNERSOUT_TRANS_SUBTYPE= 4; VERTICAL_TRANS_SUBTYPE = 5; HORIZONTAL_TRANS_SUBTYPE= 6; // 14 -CIRCLE_TRANS_SUBTYPE= 7; // 27 -CLOCKWISETWELVE_TRANS_SUBTYPE = 8; // 33 -CLOCKWISETHREE_TRANS_SUBTYPE= 9; -CLOCKWISESIX_TRANS_SUBTYPE = 10; -CLOCKWISENINE_TRANS_SUBTYPE = 11; -TWOBLADEVERTICAL_TRANS_SUBTYPE = 12; -TWOBLADEHORIZONTAL_TRANS_SUBTYPE= 13; -FOURBLADE_TRANS_SUBTYPE = 14; // 39 -FROMLEFT_TRANS_SUBTYPE = 15; // 97 -FROMTOP_TRANS_SUBTYPE = 16; -FROMRIGHT_TRANS_SUBTYPE = 17; -FROMBOTTOM_TRANS_SUBTYPE= 18; -CROSSFADE_TRANS_SUBTYPE = 19; -FADETOCOLOR_TRANS_SUBTYPE = 20; -FADEFROMCOLOR_TRANS_SUBTYPE = 21; -FADEOVERCOLOR_TRANS_SUBTYPE = 22; -THREEBLADE_TRANS_SUBTYPE= 23; -EIGHTBLADE_TRANS_SUBTYPE= 24; -ONEBLADE_TRANS_SUBTYPE = 25; // 107 +DOWN_TRANS_SUBTYPE = 7 // 19 +CIRCLE_TRANS_SUBTYPE= 8; // 27 +CLOCKWISETWELVE_TRANS_SUBTYPE = 9; // 33 +CLOCKWISETHREE_TRANS_SUBTYPE= 10; +CLOCKWISESIX_TRANS_SUBTYPE = 11; +CLOCKWISENINE_TRANS_SUBTYPE = 12; +TWOBLADEVERTICAL_TRANS_SUBTYPE = 13; +TWOBLADEHORIZONTAL_TRANS_SUBTYPE= 14; +FOURBLADE_TRANS_SUBTYPE = 15; // 39 +FROMLEFT_TRANS_SUBTYPE = 16; // 97 +FROMTOP_TRANS_SUBTYPE = 17; +FROMRIGHT_TRANS_SUBTYPE = 18; +FROMBOTTOM_TRANS_SUBTYPE= 19; +CROSSFADE_TRANS_SUBTYPE = 20; +FADETOCOLOR_TRANS_SUBTYPE = 21; +FADEFROMCOLOR_TRANS_SUBTYPE = 22; +FADEOVERCOLOR_TRANS_SUBTYPE = 23; +THREEBLADE_TRANS_SUBTYPE= 24; +EIGHTBLADE_TRANS_SUBTYPE= 25; +ONEBLADE_TRANS_SUBTYPE = 26; // 107 +ACROSS_TRANS_SUBTYPE= 27; aTransitionSubtypeInMap = { 'leftToRight' : LEFTTORIGHT_TRANS_SUBTYPE, @@ -4270,6 +4274,7 @@ aTransitionSubtypeInMap = { 'cornersOut': CORNERSOUT_TRANS_SUBTYPE, 'vertical' : VERTICAL_TRANS_SUBTYPE, 'horizontal': HORIZONTAL_TRANS_SUBTYPE, +'down' : DOWN_TRANS_SUBTYPE, 'circle': CIRCLE_TRANS_SUBTYPE, 'clockwiseTwelve' : CLOCKWISETWELVE_TRANS_SUBTYPE, 'clockwiseThree': CLOCKWISETHREE_TRANS_SUBTYPE, @@ -4288,16 +4293,18 @@ aTransitionSubtypeInMap = { 'fadeOverColor' : FADEOVERCOLOR_TRANS_SUBTYPE, 'threeBlade': THREEBLADE_TRANS_SUBTYPE, 'eightBlade': EIGHTBLADE_TRANS_SUBTYPE, -'oneBlade' : ONEBLADE_TRANS_SUBTYPE +'oneBlade' : ONEBLADE_TRANS_SUBTYPE, +'across': ACROSS_TRANS_SUBTYPE }; aTransitionSubtypeOutMap = [ 'default', 'leftToRight', 'topToBottom', 'cornersIn', - 'cornersOut', 'vertical', 'horizontal', 'circle', + 'cornersOut', 'vertical', 'horizontal', 'down', 'circle', 'clockwiseTwelve', 'clockwiseThree', 'clockwiseSix', 'clockwiseNine', 'twoBladeVertical', 'twoBladeHorizontal', 'fourBlade', 'fromLeft', 'fromTop', 'fromRight',
Changes needed for LibreOffice 4
On Thursday 19 of July 2012, Michael Meeks wrote: * 4.0 - when to call it that ? (Kendy) + extension downloads + some quite popular PDF import 3m downloads + mysql - 330k + spellcheck dicts - 300k + renaming com::sun::star a problem here, + instead perhaps announce rolling flag-day (Caolan's plan) + http://wiki.documentfoundation.org/Development/LibreOffice4 + too much to do in one six-month section + top of agenda for next week. I think one of the first things that need to be done is actually saying what LibreOffice 4 means. Looking at the wiki page linked above, apparently that's not clear at all. I see 3 reasons for why we should have LibreOffice 4 (not necessarily exclusive): a) for marketing reasons - we want to be like Firefox, we want to match AOOi (who AFAIK might go to 4.0 somewhen soon), or similar completely non-technical reasons b) we do significant user-visible changes, such as UI rework, or something that make the new LO version quite different from the previous ones c) we break backwards compatibility As a) is not technical at all, there's not much point in discussing it on a development list. If that needs to be done, we stamp 4 on it and it's done. Option b) is actually rather similar to a) in that if it's decided to be done, we just do it and that's it, it just will be more work. I'm not aware of anything significant in this area that'd warrant this, so I think we can ignore this one (correct me if I'm wrong). Option c) can mean either stopping supporting some file formats, or breaking API/ABI compatibility. For file formats we want to do this with binfilter AFAIK, nothing else, and this is a lot like b) as well in that it's just done and that's it. Breaking API/ABI compatibility for LibreOffice means breaking (only) extensions, which depending on the changes may need recompiling, adjusting or complete overhaul. Now, if you look at http://wiki.documentfoundation.org/Development/LibreOffice4 , a lot of the stuff there does not belong to the page at all, as it has absolutely nothing to do with any of the above: - get rid of ASCII graphics noise (//=== etc) is actually an EasyHack that just should be created as such, and can be done at any time without affecting anything else. There are a number of items in the list like this. - de-UNO-ize the ODF import and export filters. is a purely internal matter that does not affect anything outside of LO core (or am I wrong here?) and as such it can be done at any time. Again, nothing to do with LibreOffice 4 (unless we want to use 4.0 as an excuse if things go wrong). There are several more like that. So, as long as we decide to do c) when switching to LO4 (which AFAIK we plan to do, even if c) alone is not the reason), the page first needs to be cleaned up to contain only items that actually do have something to do with LibreOffice4. And after all this is done, it should be easier to actually talk about LO4, because we'll know what the talk is actually about. As for the technical details (i.e. c) ), we'll need to decide how to handle the breakages it'll cause for extensions. Note that as extensions use only URE (right?), affected code is actually relatively small (AFAIK sal/, salhelper/, cppu/, cppuhelper/, udkapi/ and offapi/, not sure about the last one). I see roughly several ways: 1) We say we don't care about backwards compatibility, and keep possibly breaking it every release. Extensions will need to check they run with exactly the same version they were built for. + easy for us - more work for extension developers (#ifdef's , they'll either support just newest LO, or need to provide several versions) 2) We break compatibility once for 4.0 and keep it again afterwards. IOW like we've done so far. + extensions will need to be updated once and then it'll stay the same for them - we need to manage to do this between 3.last and 4.0 , which may be quite some work and risks the KDE4.0 fate and the bad options (release too late, release too buggy, get stuck with stable 3.x and never stable 4.x); I have some experience with this from the KDE times and, unless we find out we don't actually have much work in front of us, we probably don't want to go there 3) = 1)+2) - we break it at 4.0, keep going with 1) until we're confident enough we can manage 2) again + easy for us (we just should end up with decently designed APIs for extensions, or we may need to do this again) - more work for extension developer, until we enter 2) 4) We do 2), but we smooth it out with a transition period (backwards compatibility wrappers). I believe that a number of the LO4 changes can be done in a compatible way with just a little more work (I have quite some experience there from the KDE times too). For example, the com::sun::star::* - uno:: change is probably doable in 3.x by
Re: [PATCH] Support for the checkerboard transition animation in SVG export.
On Fri, 20 Jul 2012 16:24:10 +0200, Horácio Fernandes horacio.fernan...@gmail.com wrote: Ported the class CheckerBoardWipe. This and any future contributions to the LibreOffice project are under LGPLv3+/MPL, unless stated otherwise. Hi Horácio, thanks for submitting your patch, I committed it to master. Really a nice addition. Go on this way and have fun! :) Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - solenv/gdb
solenv/gdb/libreoffice/sw.py | 24 1 file changed, 24 insertions(+) New commits: commit 81d2dd00391dbc8a040e5c1f3059121863269d2c Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 16:48:11 2012 +0200 gdb: add SwIndex pretty-printer Change-Id: I452038a80f9a091f2b7af36d236cebd5f176b5e9 diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 7ea6a66..941f56d 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -50,6 +50,17 @@ class SwNodeIndexPrinter(object): node = self.value['pNd'].dereference(); return %s (node %d) % (self.typename, node['nOffset']) +class SwIndexPrinter(object): +'''Prints SwIndex.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +offset = self.value['m_nIndex'] +return %s (offset %d) % (self.typename, offset) + class SwPaMPrinter(object): '''Prints SwPaM.''' @@ -200,6 +211,7 @@ def build_pretty_printers(): printer.add('BigPtrArray', BigPtrArrayPrinter) printer.add('SwPosition', SwPositionPrinter) printer.add('SwNodeIndex', SwNodeIndexPrinter) +printer.add('SwIndex', SwIndexPrinter) printer.add('SwPaM', SwPaMPrinter) printer.add('SwRect', SwRectPrinter) commit 0a31b57050b7f73e51d344a413f0171a8f6a2afd Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 16:41:25 2012 +0200 gdb: add SwNodeIndex pretty-printer Change-Id: I6d233c2cf715021262a5de1bdc76f68b7eb17db3 diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 581169d..7ea6a66 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -39,6 +39,17 @@ class SwPositionPrinter(object): offset = self.value['nContent']['m_nIndex'] return %s (node %d, offset %d) % (self.typename, node['nOffset'], offset) +class SwNodeIndexPrinter(object): +'''Prints SwNodeIndex.''' + +def __init__(self, typename, value): +self.typename = typename +self.value = value + +def to_string(self): +node = self.value['pNd'].dereference(); +return %s (node %d) % (self.typename, node['nOffset']) + class SwPaMPrinter(object): '''Prints SwPaM.''' @@ -188,6 +199,7 @@ def build_pretty_printers(): printer = printing.Printer(libreoffice/sw) printer.add('BigPtrArray', BigPtrArrayPrinter) printer.add('SwPosition', SwPositionPrinter) +printer.add('SwNodeIndex', SwNodeIndexPrinter) printer.add('SwPaM', SwPaMPrinter) printer.add('SwRect', SwRectPrinter) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docbm.cxx |2 +- sw/source/core/doc/docedt.cxx | 20 2 files changed, 9 insertions(+), 13 deletions(-) New commits: commit 9c497e9ed128f341846072b1c85271d9208290a4 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 17:08:20 2012 +0200 SwDoc::DeleteRangeImplImpl: avoid crash on undoing comment range insert Change-Id: I1e085448fb8fb1227794a5196e954d97af770218 diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index cfc8629..f3befe4 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -593,7 +593,7 @@ namespace sw { namespace mark isPosInRange = true, isOtherPosInRange = true; } -if(isPosInRange (isOtherPosInRange || !pMark-IsExpanded() || IDocumentMarkAccess::GetType(*pMark) == TEXT_FIELDMARK)) +if(isPosInRange (isOtherPosInRange || !pMark-IsExpanded())) { // completely in range diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 3655294..5ae2ab6 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -76,6 +76,7 @@ #include editsh.hxx #include fldbas.hxx #include fmtfld.hxx +#include docufld.hxx #include unoflatpara.hxx #include SwGrammarMarkUp.hxx @@ -1646,21 +1647,16 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM rPam) { SwTxtNode* pTxtNd = rPam.Start()-nNode.GetNode().GetTxtNode(); xub_StrLen nIndex = rPam.Start()-nContent.GetIndex(); -// If there are at least two chars before the postit, we may have a fieldmark there. -if (pTxtNd-GetTxt().GetChar(nIndex) == CH_TXTATR_INWORD nIndex 1) +// We may have a postit here. +if (pTxtNd-GetTxt().GetChar(nIndex) == CH_TXTATR_INWORD) { SwTxtAttr* pTxtAttr = pTxtNd-GetTxtAttrForCharAt(nIndex, RES_TXTATR_FIELD); -if (pTxtAttr pTxtAttr-GetFld().GetFld()-Which() == RES_POSTITFLD pTxtNd-GetTxt().GetChar(nIndex - 1) == CH_TXT_ATR_FIELDEND) +if (pTxtAttr pTxtAttr-GetFld().GetFld()-Which() == RES_POSTITFLD) { -xub_StrLen nStart = pTxtNd-GetTxt().SearchBackward(CH_TXT_ATR_FIELDSTART, nIndex - 2); -if (nStart != STRING_NOTFOUND) -{ -SwIndex aStart(pStt-nContent); -aStart = nStart; -SwIndex aEnd(pEnd-nContent); -aEnd = nIndex - 1; -_DelBookmarks(pStt-nNode, pEnd-nNode, NULL, aStart, aEnd); -} +const SwPostItField* pField = dynamic_castconst SwPostItField*(pTxtAttr-GetFld().GetFld()); +IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()-findMark(pField-GetName()); +if (ppMark != getIDocumentMarkAccess()-getMarksEnd()) +getIDocumentMarkAccess()-deleteMark(ppMark); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build light weight conversion binary
Hi Jerry, On Thu, 2012-07-19 at 22:26 -0700, Jerry Tan wrote: The company that I work for use LibreOffice as the main word processor. We convert a lot of client letters from doc/docx to open document format. Sounds like a good use-case :-) We are on Mac OS X Lion (10.7) btw. We use: soffice --headless --convert-to odt …. to do the batch conversion. Seems sensible. The problems with this are: - It takes quite a long time to start up. It becomes a problem when we have to convert many documents. This is a matter of profiling; when you say quite a long time - how long are you talking ? :-) Also, is your concern cold or warm startup time ? - It won't work if there is already a LibreOffice instance running That should be easy enough to fix; it's a matter of not checking the OSL_PIPE that we setup to send arguments to the main process. It is possible that --nolockcheck does that, or perhaps there is a hidden argument for that. So my boss asked me to fix these 2 issues. I managed to build the source code on Mac OS X Lion and then try to see what's going on (unfortunately specifying --headless fail to build). So - --headless doesn't work well for Mac, there is a need for some work there to fix it. There are really two different approaches - one is to re-factor the font code so it is re-usable without setting up the display / head logic, the other is to build use freetype on mac, and re-use the Linux code for font rendering etc. There are also some nice sillies going on; last I looked there was some considerable proportion of the time rendering a nice gradient background to a bitmap view of the window you can't see when using --headless ;-) I suspect just profiling and turning off a lot of that fluff would accelerate things for you. But -always- profile before optimisting. Callgrind-for-mac + KCachegrind on Linux would be a great pair of free tools if you have nothing better. I found out that to just do the conversion, there are many dynamic libraries are loaded (so I guess this is why it takes a long time). That's not obvious to me, and I've done lots of work on profiling. If you want faster cold-start, you can try using the --enable-mergelib build mode - that builds a ton of the code into a single, huge library - it may help you: I'd be interested in some hard profiling results from that. Trying to understand what's going on in the code is not a simple task to be honest. Can some one help or give me info on how to: :-) - build a bare minimum/small binary (without too many dependencies) just for conversion to odt? also how do I link statically? The conversion utility doesn't need all the gui libraries I believe. Minimum dependency will make start up a lot quicker. So - those fragmented libraries help you there - the UI pieces shouldn't be linked on startup. - what to do to allow conversion working while there is an instance of LibreOffice already running? Should I modify something in the source code? That should be easyish cf. above. See desktop/source/app/officeipcthread.cxx and thereabouts :-) I'm sure a lot of people would love to have this light weight conversion utility. Thanks so much for jumping in ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
2012/7/20 Lubos Lunak l.lu...@suse.cz: On Thursday 19 of July 2012, Michael Meeks wrote: * 4.0 - when to call it that ? (Kendy) So for that, we should first decide on what LibreOffice4 will mean. Summary: - it needs to be said what we expect from LibreOffice4 - the wiki page with technical tasks needs to be cleaned up - we need to decide how to deal with the fact that LO4 will break backwards compatibility For me the 4 Version would be different from other versions, if the office suite includes a browser and a messenger http://interface.sf.net and http://dooble.sf.net Like MS Office 360 has Skype and Cloud. Regards Randolph ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/experimental bridges/inc bridges/source configure.in distro-configs/LibreOfficeAndroidX86.conf extensions/Module_extensions.mk icu/icu4c-android.patch icu/icu4c-build.
android/experimental/LibreOffice4Android/Makefile| 21 ++- bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx |2 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |3 configure.in | 29 +++-- distro-configs/LibreOfficeAndroidX86.conf| 26 extensions/Module_extensions.mk |7 + icu/icu4c-android.patch |4 icu/icu4c-build.patch|2 openldap/makefile.mk |4 sal/android/lo-bootstrap.c | 30 +++-- solenv/gbuild/platform/ANDROID_INTEL_GCC.mk | 104 +++ solenv/inc/unx.mk|4 solenv/inc/unxandr.mk|4 sw/CppunitTest_sw_filters_test.mk|3 sw/CppunitTest_sw_subsequent_odfimport.mk|2 15 files changed, 205 insertions(+), 40 deletions(-) New commits: commit d3c4d9a0f828d42ee6cd0768607ca08b21669d70 Author: Michael Meeks michael.me...@suse.com Date: Mon Jul 16 17:40:25 2012 +0100 android: x86 porting work. diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index d2c5f8e..da87ca7 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -16,8 +16,13 @@ APP_PACKAGE=org.libreoffice # code are very much self-contained pre-packaged thingies. APP_DATA_PATH=/data/data/$(APP_PACKAGE) -SODEST=libs/armeabi-v7a -OBJLOCAL=obj/local/armeabi-v7a +ifeq ($(CPU),I) +ABI_PATH=x86 +else +ABI_PATH=armeabi-v7a +endif +SODEST=libs/$(ABI_PATH) +OBJLOCAL=obj/local/$(ABI_PATH) define COPYSO cp $(1) $(SODEST)$(if $(2),/$(2)) $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) \ @@ -34,10 +39,10 @@ all: build-ant properties: echo sdk.dir=$(ANDROID_SDK_HOME) local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) ../../Bootstrap/local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) ../../Bootstrap/local.properties -copy-stuff: -# First always clean +copy-stuff: +# First always clean rm -rf libs $(OBJLOCAL) mkdir -p $(SODEST) $(OBJLOCAL) # @@ -134,7 +139,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) + $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/$(ABI_PATH)/libgnustl_shared.so) # # Then other assets. Let the directory structure under assets mimic # that under solver for now. @@ -234,7 +239,7 @@ copy-stuff: # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST) - echo set solib-search-path ./obj/local/armeabi-v7a $(SODEST)/gdb.setup + echo set solib-search-path ./obj/local/$(ABI_PATH) $(SODEST)/gdb.setup build-ant: copy-stuff properties # @@ -269,4 +274,4 @@ run: clean: properties $(ANT) clean - rm -rf assets libs $(SODEST) $(OBJLOCAL) + rm -rf assets libs obj diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index c21fb76..bc43fb4 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -39,7 +39,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ -|| defined(NETBSD) || defined(DRAGONFLY) +|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk index c814132..e48bfce 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk @@ -42,7 +42,8 @@ ENABLE_EXCEPTIONS=TRUE $(COM)$(OS)$(CPU)$(COMNAME) == GCCOPENBSDIgcc3 || \ $(COM)$(OS)$(CPU)$(COMNAME) == GCCFREEBSDIgcc3 || \ $(COM)$(OS)$(CPU)$(COMNAME) == GCCNETBSDIgcc3 || \ -$(COM)$(OS)$(CPU)$(COMNAME) == GCCDRAGONFLYIgcc3 +$(COM)$(OS)$(CPU)$(COMNAME) == GCCDRAGONFLYIgcc3 || \ +$(COM)$(OS)$(CPU)$(COMNAME) == GCCANDROIDIgcc3 || \ # In case someone enabled the non-standard -fomit-frame-pointer which does not # work with the .cxx sources in this directory: diff --git a/configure.in b/configure.in index b41fa09..980a2fb 100644 --- a/configure.in +++ b/configure.in @@ -129,18 +129,25 @@ ANDROID_ARCH= ANDROID_NDK_HOME= if test -n $with_android_ndk; then ANDROID_NDK_HOME=$with_android_ndk + # Set up a lot of pre-canned defaults # What if the NDK at some point starts including several toolchains for different # gcc versions
[Libreoffice-commits] .: Branch 'feature/android-x86' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/de_AT.xml |1 + i18npool/source/localedata/data/de_CH.xml |1 + i18npool/source/localedata/data/de_LI.xml |1 + i18npool/source/localedata/data/de_LU.xml |1 + 4 files changed, 4 insertions(+) New commits: commit d0d840c27943f976fd59a673f2de84a10ea475c9 Author: Eike Rathke er...@redhat.com Date: Fri Jul 20 17:51:39 2012 +0200 fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}] Change-Id: I589cedcd2db0208b03d1e28babbb493912f20c78 diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml index de57ea9..d657cc5 100644 --- a/i18npool/source/localedata/data/de_AT.xml +++ b/i18npool/source/localedata/data/de_AT.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml index 494eb69..245e57b 100644 --- a/i18npool/source/localedata/data/de_CH.xml +++ b/i18npool/source/localedata/data/de_CH.xml @@ -55,6 +55,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml index 5be436a..f927431 100644 --- a/i18npool/source/localedata/data/de_LI.xml +++ b/i18npool/source/localedata/data/de_LI.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml index edbb008..78c85bb 100644 --- a/i18npool/source/localedata/data/de_LU.xml +++ b/i18npool/source/localedata/data/de_LU.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/Module_extensions.mk
extensions/Module_extensions.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c05d8b827a2c376fb419d8ae7801b6bd6e0ca14 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 20 16:55:02 2012 +0100 fix probable cut-and-paste build error Change-Id: I71a3ea0fd548bb6dcaf2df823fa3d63026b1b3dc diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 205f860..dba2d30 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) ifneq ($(filter-out IOS ANDROID,$(OS)),) -$(eval $(call gb_Module_add_targets,shell,\ +$(eval $(call gb_Module_add_targets,extensions,\ Library_ldapbe2 \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
Hi Mek, On Fri, 2012-07-20 at 16:54 +0200, Mek Otar wrote: I've written a patch that remove all call to Sound:Beep. Thomas Arnhold suggest me to replace the Sound:Beep by some error reporting mechanism. My question is: What is, in your opinion, the best way to do this? Looks great to me, the beeping is random, turns into XBell on Linux so for multi-user seats it can come out of a totally different machine, somewhere else ;-) etc. It'd be great to have a blanket MPL/LGPLv3+ license statement from you on the list that we can link into here: http://wiki.documentfoundation.org/Development/Developers Than I'd merge it ! :-) Thanks for your contribution; what's next ? :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build light weight conversion binary
On 20/07/12 17:25, Michael Meeks wrote: On Thu, 2012-07-19 at 22:26 -0700, Jerry Tan wrote: The company that I work for use LibreOffice as the main word processor. We convert a lot of client letters from doc/docx to open document format. - It won't work if there is already a LibreOffice instance running That should be easy enough to fix; it's a matter of not checking the OSL_PIPE that we setup to send arguments to the main process. It is possible that --nolockcheck does that, or perhaps there is a hidden argument for that. there is no need to fix anything, just set up a separate user profile directory for your batch conversions and start soffice like this: soffice -env:UserInstallation=file:///tmp/lo_userdir_conversions So my boss asked me to fix these 2 issues. I managed to build the source code on Mac OS X Lion and then try to see what's going on (unfortunately specifying --headless fail to build). do you mean the configure --enable-headless option? that is very experimental and know to build only on the system of the guy who added it :) So - --headless doesn't work well for Mac, there is a need for some work there to fix it. There are really two different approaches - one is to re-factor the font code so it is re-usable without setting up the display / head logic, the other is to build use freetype on mac, and re-use the Linux code for font rendering etc. yes the --headless option in soffice, which currently works only on X11, could in theory be made to work on Mac as well (and is _completely_ independent of the configure --enable-headless option). - build a bare minimum/small binary (without too many dependencies) just for conversion to odt? also how do I link statically? The conversion utility doesn't need all the gui libraries I believe. Minimum dependency will make start up a lot quicker. So - those fragmented libraries help you there - the UI pieces shouldn't be linked on startup. indeed that's why there are various *ui libraries, they contain dialogs that aren't loaded when you just convert documents. - what to do to allow conversion working while there is an instance of LibreOffice already running? Should I modify something in the source code? that's completely unnecessary, as i wrote above. you can't start 2 soffice with the same user profile, and trying to make that work is probably quite a large effort and would probably slow down things with file locking and such if it can be made to work at all. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
On Thu, 2012-07-19 at 11:36 +0100, Caolán McNamara wrote: On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: origin/feature/cmclayouttrans A work in progress, to munge translating .ui files into our localization mechanism. Extraction of translatables done, re-insertion still a to-do :-) Gosh - does that mean that cmclayout got merged to master ? or is it just renamed somehow ? I didn't see that, and the branch appears not to be there anymore. What's up there ? Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Support for the checkerboard transition animation in SVG export.
Seen pushed. -- Thorsten pgpxmWnf2Nhiy.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/mspub' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
git branch audit - results ...
Thanks for all the input, I tried to condense it; what I have is this. After another git remote prune origin I see we're a lot cleaner now :-) but I still have these to delete (will do that Monday absent screams): * to-kill origin/feature/external_gbuild # ~obsolete attempt to gbuild external modules origin/feature/cell-format-data-bar # obsolete now origin/feature/cell-notes # obsolete now origin/feature/line-numbers-in-basicIDE # merged to master origin/feature/masterpages # merged to master 3.6 origin/feature/layout # obsoleted by Caolan's new work * unknown status - input appreciated origin/feature/chart_errorbars origin/feature/gbuild_mkdir origin/feature/gbuildfixes origin/feature/mork origin/feature/template-dialog Thanks ! :-) Michael. * keep: origin/feature/accfixes2 origin/feature/gsoc_test_improvements origin/feature/gsoc_test_improvements2 origin/feature/gsoc_test_improvements3 origin/feature/stub_writer origin/feature/cmclayouttrans origin/feature/unitymenus origin/feature/coretext # Norbert's coretext work origin/feature/submodules origin/features/base-preview # Lionel's ongoing work origin/feature/gsoc-calc-perf origin/feature/gsoc-calc-perf2 origin/feature/matrix-new-backend # Kohei's ongoing work origin/feature/opengl-canvas # openGL rendering origin/feature/remote # Andrezj's Android remote origin/feature/gbuild_help * already removed: origin/feature/android-x86 origin/feature/pdf-signing origin/feature/crossmsi origin/feature/kill-set_soenv origin/feature/mspub origin/feature/multiline-input origin/feature/gbuild_a11y origin/feature/gbuild_components origin/feature/gbuild_conversions origin/feature/gbuild_extensions origin/feature/gbuild_java origin/feature/gbuild_merge origin/feature/gbuild_mkdir origin/feature/gbuild_scp2 origin/feature/gbuild_sdext origin/feature/gbuild_shell origin/feature/gbuild_testtools -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docedt.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f573b16e7b4909d5cae129cc00f50be4b06b468d Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 18:17:42 2012 +0200 SwDoc::DeleteRangeImplImpl: don't touch fieldmarks when undo is not available Change-Id: Ia7fa4510a874a518c8bff3614a38425ee7802ad8 diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 5ae2ab6..f1dedb3 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -1642,8 +1642,8 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM rPam) } } -// Delete fieldmarks before postits. -if (pStt-nNode == pEnd-nNode (pEnd-nContent.GetIndex() - pStt-nContent.GetIndex()) == 1) +// Delete fieldmarks before postits, but let's leave them alone during import. +if (GetIDocumentUndoRedo().DoesUndo() pStt-nNode == pEnd-nNode (pEnd-nContent.GetIndex() - pStt-nContent.GetIndex()) == 1) { SwTxtNode* pTxtNd = rPam.Start()-nNode.GetNode().GetTxtNode(); xub_StrLen nIndex = rPam.Start()-nContent.GetIndex(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changes needed for LibreOffice 4
Hi Randolph, On Fri, 2012-07-20 at 17:29 +0200, Randolph D. wrote: For me the 4 Version would be different from other versions, if the office suite includes a browser and a messenger This is a developer list. Please move this suggestion to the discuss list. It is fine to have vision suggestions of this kind - as long as they are backed by real code, patches etc. :-) This is the 2nd time I've had to write essentially the same mail on exactly this topic to you in the same week. I love your idea - as long as it is backed by the hard-work required to produce the code, to make it happen :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unofield.cxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit c69bd0ead5852967492046caa311732ebe549a7c Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 20 18:25:06 2012 +0200 SwXTextField::attachToRange: avoid unnecessary dynamic_cast Change-Id: I76aab7b0405db206fa03e03021ac872fc435eec2 diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 1b14610..957cb6b 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1766,12 +1766,8 @@ void SwXTextField::attachToRange( // The fieldmark always has a (generated) name. pPostItField-SetName(pFieldmark-GetName()); else -{ // The field has a name already, use it. -sw::mark::MarkBase* pMarkBase = dynamic_castsw::mark::MarkBase*(pFieldmark); -if (pMarkBase) -pMarkBase-SetName(pPostItField-GetName()); -} +pMarksAccess-renameMark(pFieldmark, pPostItField-GetName()); // Make sure we always insert the field at the end SwPaM aEnd(*aPam.End(), *aPam.End()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/localedata/data/de_AT.xml |1 + i18npool/source/localedata/data/de_CH.xml |1 + i18npool/source/localedata/data/de_LI.xml |1 + i18npool/source/localedata/data/de_LU.xml |1 + 4 files changed, 4 insertions(+) New commits: commit 41306f222d7f3aa3fedcd2a9a91fd7558449a24e Author: Eike Rathke er...@redhat.com Date: Fri Jul 20 17:51:39 2012 +0200 fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}] Change-Id: I589cedcd2db0208b03d1e28babbb493912f20c78 diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml index dde647e..69e93fc 100644 --- a/i18npool/source/localedata/data/de_AT.xml +++ b/i18npool/source/localedata/data/de_AT.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml index 7349e04..772e004 100644 --- a/i18npool/source/localedata/data/de_CH.xml +++ b/i18npool/source/localedata/data/de_CH.xml @@ -38,6 +38,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml index 6e320b1..4abcc9e 100644 --- a/i18npool/source/localedata/data/de_LI.xml +++ b/i18npool/source/localedata/data/de_LI.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml index dc733c2..69a50bd 100644 --- a/i18npool/source/localedata/data/de_LU.xml +++ b/i18npool/source/localedata/data/de_LU.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changes needed for LibreOffice 4
ok michael, you wrote friendly, so all ideas given. but I wounder why Lubos is allowed to write about a marketing brainstorming :-) 2012/7/20 Michael Meeks michael.me...@suse.com: ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}]
Hey, 2012/7/20 Eike Rathke er...@redhat.com: Hi, Please review and cherry-pick to 3-6 and 3-6-0 the no-brainer http://cgit.freedesktop.org/libreoffice/core/commit/?id=d0d840c27943f976fd59a673f2de84a10ea475c9 Looks good. Pushed into 3-6. Two more reviews needed for 3-6-0. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On Fri, 2012-07-20 at 17:20 +0200, Lubos Lunak wrote: Now, if you look at http://wiki.documentfoundation.org/Development/LibreOffice4 , a lot of the stuff there does not belong to the page at all, as it has absolutely nothing to do with any of the above: Can you edit the page to separate the pieces that you don't believe require ABI change from those that do ? - de-UNO-ize the ODF import and export filters. is a purely internal matter that does not affect anything outside of LO core (or am I wrong here?) that depends on whether crazy people have tried to hook into / use those interfaces from their scripts etc. Anything exposed is scripting / plugin-authors is liable to their random walk attacks of this nature :-) Summary: - it needs to be said what we expect from LibreOffice4 Very true; I've used it to refer to the ABI breakage we've been needing for a long time to cleanup our accumulating cruft issues. - the wiki page with technical tasks needs to be cleaned up It'd be great if you could do that separation :-) please don't delete anything though - some tasks are rather succinct but useful to retain. - we need to decide how to deal with the fact that LO4 will break backwards compatibility Of course, we need some good technical ideas. In particular, I'd love some stub / skel libraries and clever bridging with old names to rid us of the com::sun::star evils ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build light weight conversion binary
Jerry, Michael, Il 20/07/2012 18:04, Michael Stahl ha scritto: On Thu, 2012-07-19 at 22:26 -0700, Jerry Tan wrote: So my boss asked me to fix these 2 issues. I managed to build the source code on Mac OS X Lion and then try to see what's going on (unfortunately specifying --headless fail to build). do you mean the configure --enable-headless option? that is very experimental and know to build only on the system of the guy who added it :) Last time i checked the 3.6 branch it was building fine for linux, can you share any details on the configuration that is failing? thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Adding bibisect repository support to tinbuild2
(updating subject line) On Wed, Jul 18, 2012 at 6:45 PM, Norbert Thiebaud nthieb...@gmail.com wrote: + I'd like not to create a new step for that but to fold it in the 'push' step For clarity I'll keep the bulk of the code factored-out into a separate function, but I'll have that function called from within do_push(). Yep, that is fine. Now that I've done some testing here, I realize that we need some way to turn off the push-nightlies step while still enabling the creation of the bibisect repositories. For example, I don't want to bother with pushing nightlies, especially when I'm testing my commits locally. To fix I've reordered the day-checking guts of do_push() so that we do our nightly check first, then call do_bibisect_push(), then (if pushing nightlies is enabled), call push_nightlies.sh. Both parts are included in the same tinbuild phase, but can be enabled independently. I think that all of the git and file operations should run on most *nix systems, including OSX. There might be a couple of tweaks to make ... But I'm not so much concerned about the git-foo part of the script but rather with what is put in bi-bisect. make dev-install does not work on all platform and you do not have a */opt/* to 'add' . Based on the discussion in this thread it sounds like we're pretty close with an opt/ directory and make dev-install, but we might need an unpack step for at least OS/Darwin (and maybe for Windows?). To address these issues (and per suggestion), I've moved the code that handles finding the opt/ directory, make-install, copying, etc.. into tinbuild_internals.sh where we can further override it in platform-specific files such as tinbuild_internals_Darwin.sh. On Thu, Jul 19, 2012 at 5:11 AM, Norbert Thiebaud nthieb...@gmail.com wrote: BTW on mac I though that 'mounting' the dmg and then copying the content it over the 'artefact' git should do the trick... due to a poor upload bandwidth, I did not bother with it so far since I cannot afford to operate such bibisect construction on my box (well that is If I want to make it available to others) The redo-repos.sh script is set up to create two local repos: 'bibisect-repository' and 'fake-remote'. All of the git operations, even the so-called remote operations, happen locally on your box, so it's perfect for fast testing (or when you don't have much/any upload bandwidth! :-) Here's how I create the repos and test the system: (in the LO checkout) ../buildbot/bin/redo-repos.sh ../buildbot/bin/tinbuild2 -0vx -m debug -p bob Norbert -- if you have a OSX buildbot available and can help figure out the darwin-specific pieces, that would be very helpful. I hope that all we'll have to do is make a darwin version of copy_build_into_bibisect_repository(). I've just stubbed-in a basic version, but I really need a mac to test it on -- see the patches for details, and let me know what works and what needs fixing :-) Cheers, --R 0001-Bibisect-Add-support-for-bibisect-repository-integra.patch.gz Description: GNU Zip compressed data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding new label's format
Hi Sylvain, On Fri, 2012-07-20 at 16:06 +0200, Info Agipa wrote: I'm working for a labels manufaturer and I would like to add our format in libreoffice. We have customers who have asked for it in the past. Great. How is the best way to perform this ? I found in the past that all informations are in a xml file (don't remember where now). There is a description of this file to give the good informations ? See: officecfg/registry/data/org/openoffice/Office/Labels.xcu Winfried did some lovely work recently to improve label layout which made this more powerful, he'd be the best guy for a documentation pointer here I suspect. Ultimately, we'd love a patch with an explicit MPL/LGPLv3+ license for all your submissions that we can link into: http://wiki.documentfoundation.org/Development/Developers Many thanks in advance for your contribution :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On Fri, Jul 20, 2012 at 06:33:20PM +0200, john malc dimitrije...@gmail.com wrote: 1. *rewrite whole LO* I know, it's Friday, but still... ;-) Some reading: http://www.joelonsoftware.com/articles/fog69.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On Friday 20 of July 2012, Michael Meeks wrote: On Fri, 2012-07-20 at 17:20 +0200, Lubos Lunak wrote: Now, if you look at http://wiki.documentfoundation.org/Development/LibreOffice4 , a lot of the stuff there does not belong to the page at all, as it has absolutely nothing to do with any of the above: Can you edit the page to separate the pieces that you don't believe require ABI change from those that do ? I can, but I don't think I know enough to know about all of them. I can mark some as questionable though. - de-UNO-ize the ODF import and export filters. is a purely internal matter that does not affect anything outside of LO core (or am I wrong here?) that depends on whether crazy people have tried to hook into / use those interfaces from their scripts etc. Anything exposed is scripting / plugin-authors is liable to their random walk attacks of this nature :-) Hmm. That makes it something we should take into consideration then, but that consideration may be quickly over with saying that it's internal API and as such we don't care about people who abuse it. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
john malc wrote: I have some ideas : Again the reminder that ideas or discussions _without_ any intention to work on them *in the code*, are off-topic here. Please move them to disc...@documentfoundation.org (subscribe via email to discuss+subscr...@documentfoundation.org). Thanks for keeping this list focused, -- Thorsten pgpFoPz97vHOx.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On Fri, Jul 20, 2012 at 06:33:20PM +0200, john malc wrote: Hi, I have some ideas : 3. kick Draw and Math-parts out of LO. Either make it as plugin or just kill it. 1) nobody uses it (Math Latex; Draw photoshop, corel, gimp etc.); Can we see the numbers, please? 2) installer can be smaller. You _are_ aware of the fact that Math is tiny compared to the other apps in LibreOffice (not mentioning the core libs that _must_ be installed) and that Draw shares practically all of its code with Impress, are you? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding bibisect repository support to tinbuild2
On Fri, Jul 20, 2012 at 11:30 AM, Robinson Tryon bishop.robin...@gmail.com wrote: Now that I've done some testing here, I realize that we need some way to turn off the push-nightlies step while still enabling the creation of the bibisect repositories. For example, I don't want to bother with pushing nightlies, especially when I'm testing my commits locally. To fix I've reordered the day-checking guts of do_push() so that we do our nightly check first, then call do_bibisect_push(), then (if pushing nightlies is enabled), call push_nightlies.sh. Both parts are included in the same tinbuild phase, but can be enabled independently. Yep, Sound good. I think that all of the git and file operations should run on most *nix systems, including OSX. There might be a couple of tweaks to make ... But I'm not so much concerned about the git-foo part of the script but rather with what is put in bi-bisect. make dev-install does not work on all platform and you do not have a */opt/* to 'add' . Based on the discussion in this thread it sounds like we're pretty close with an opt/ directory and make dev-install, but we might need an unpack step for at least OS/Darwin (and maybe for Windows?). To address these issues (and per suggestion), I've moved the code that handles finding the opt/ directory, make-install, copying, etc.. into tinbuild_internals.sh where we can further override it in platform-specific files such as tinbuild_internals_Darwin.sh. On Thu, Jul 19, 2012 at 5:11 AM, Norbert Thiebaud nthieb...@gmail.com wrote: BTW on mac I though that 'mounting' the dmg and then copying the content it over the 'artefact' git should do the trick... due to a poor upload bandwidth, I did not bother with it so far since I cannot afford to operate such bibisect construction on my box (well that is If I want to make it available to others) The redo-repos.sh script is set up to create two local repos: 'bibisect-repository' and 'fake-remote'. All of the git operations, even the so-called remote operations, happen locally on your box, so it's perfect for fast testing (or when you don't have much/any upload bandwidth! :-) oh! yeah for testing purpose that is fine.. but for production work I cold not afford it. Norbert -- if you have a OSX buildbot available and can help figure out the darwin-specific pieces, that would be very helpful. I hope that all we'll have to do is make a darwin version of copy_build_into_bibisect_repository(). I've just stubbed-in a basic version, but I really need a mac to test it on -- see the patches for details, and let me know what works and what needs fixing :-) Yeah, I think I probably can get away with a small function that mount the dmg, copy the content in the 'artefact' repo and unmount... I'll give it a shoot this WE. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
Lubos Lunak wrote: Hmm. That makes it something we should take into consideration then, but that consideration may be quickly over with saying that it's internal API and as such we don't care about people who abuse it. There's more nuance required here I think. Substantial use of unstable API still leaves us with noticeable repercussions on the extension ecosystem, that we might want to have *once*, and not spread over multiple releases. Cheers, -- Thorsten pgp8HIUwZflNv.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build light weight conversion binary
Hello, Il 20/07/2012 07:26, Jerry Tan ha scritto: Hi, The company that I work for use LibreOffice as the main word processor. We convert a lot of client letters from doc/docx to open document format. We are on Mac OS X Lion (10.7) btw. We use: soffice --headless --convert-to odt …. to do the batch conversion. The problems with this are: - It takes quite a long time to start up. It becomes a problem when we have to convert many documents. You can try to look at using UNO wrappers like unoconv so you can keep your libo instance running all the time to avoid startup time costs: https://github.com/dagwieers/unoconv There's a long thread in this issue regarding unoconv on MacOS X https://github.com/dagwieers/unoconv/issues/27 hth, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On 07/20/2012 12:50 PM, Lubos Lunak wrote: - de-UNO-ize the ODF import and export filters. is a purely internal matter that does not affect anything outside of LO core (or am I wrong here?) that depends on whether crazy people have tried to hook into / use those interfaces from their scripts etc. Anything exposed is scripting / plugin-authors is liable to their random walk attacks of this nature :-) Hmm. That makes it something we should take into consideration then, but that consideration may be quickly over with saying that it's internal API and as such we don't care about people who abuse it. You can remove it from the list. I'm the one who added it because back then we were tasked with listing all major architectural changes of which this was certainly one. But in the end this work doesn't really affect the existing UNO API, and we are already working on that for 3.7 (one of Daniel's GSOC tasks). So, it's safe to remove it IMO. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changes needed for LibreOffice 4
On Friday 20 of July 2012, Lubos Lunak wrote: On Friday 20 of July 2012, Michael Meeks wrote: On Fri, 2012-07-20 at 17:20 +0200, Lubos Lunak wrote: Now, if you look at http://wiki.documentfoundation.org/Development/LibreOffice4 , a lot of the stuff there does not belong to the page at all, as it has absolutely nothing to do with any of the above: Can you edit the page to separate the pieces that you don't believe require ABI change from those that do ? I can, but I don't think I know enough to know about all of them. I can mark some as questionable though. Done. I'm rather unsure about a number of them, and I may have misplaced others, so please check. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 50679, which changed state. Bug 50679 Summary: EDITING: Copying cell(s) with conditional formatting CRASH when paste https://bugs.freedesktop.org/show_bug.cgi?id=50679 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: Changes needed for LibreOffice 4
On Friday 20 of July 2012, Thorsten Behrens wrote: Lubos Lunak wrote: Hmm. That makes it something we should take into consideration then, but that consideration may be quickly over with saying that it's internal API and as such we don't care about people who abuse it. There's more nuance required here I think. Substantial use of unstable API still leaves us with noticeable repercussions on the extension ecosystem, that we might want to have *once*, and not spread over multiple releases. Even if people actually do use our internal APIs, that doesn't mean we have to leave it that way. And that does not necessarily mean hiding it intentionally. If we are going to make the effort to keep those APIs stable, we may as well just make them public. And, in general, if it's likely that some internal APIs might be used from the outside, then we should consider a way of avoiding that. If it's internal, somebody is going to change it somewhen. So we should hide it, or maybe somehow visible mark it as such and add if you find this useful, contact us about about it public, or so. Being afraid to change internal interfaces just because somebody from the outside might be using that is just lame (incidentally, that's another thing I have experience with). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: idlc/source
idlc/source/idlccompile.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7c10706845e3b2924152c831b35a458078dc274f Author: Michael Stahl mst...@redhat.com Date: Fri Jul 20 19:27:44 2012 +0200 idlc: do not use -I., deps need absolute paths (regression from 63c508e3e86a140e35161c45d2be97779746f6cb) Change-Id: I03ae2cf6fdb229e26d33ef4611a1495590f90df7 diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 5e3d689..68cf263 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -244,7 +244,6 @@ sal_Int32 compileFile(const OString * pathname) lCppArgs.push_back(-DIDL); lCppArgs.push_back(-C); lCppArgs.push_back(-zI); -lCppArgs.push_back(-I.); OStringBuffer cppArgs(256); Options* pOptions = idlc()-getOptions(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changes needed for LibreOffice 4
On Friday 20 of July 2012, Lubos Lunak wrote: And after all this is done, it should be easier to actually talk about LO4, because we'll know what the talk is actually about. As for the technical details (i.e. c) ), we'll need to decide how to handle the breakages it'll cause for extensions. Note that as extensions use only URE (right?), affected code is actually relatively small (AFAIK sal/, salhelper/, cppu/, cppuhelper/, udkapi/ and offapi/, not sure about the last one). By the way, could somebody please confirm this or list the things where we do need to care about stability to the outside world? I know ure/source/README has a list of libraries, but this is not only about libraries. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
spurious IDL rebuilds on master fixed now
this week there was a problem on master with the dependencies generated for IDL files, caused by adding of a -I. option in an AOO rebase. this has caused spurious re-builds of all IDL files, which can happen during make subsequentcheck and will cause that to fail variously. this is fixed now on master with 7c10706845e3b2924152c831b35a458078dc274f. if you have a source tree on a revision from ~Tuesday to before the fix, to get correct dependencies after pulling, do make udkapi.clean offapi.clean oovbaapi.clean or i guess simply letting IDL files rebuild themselves spuriously once more should fix it as well :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 50679, which changed state. Bug 50679 Summary: EDITING: Copying cell(s) with conditional formatting CRASH when paste https://bugs.freedesktop.org/show_bug.cgi?id=50679 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE
THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4db7926f578e41a23b4161e1fc309459e2409e4b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Jul 20 20:15:08 2012 +0200 rewording diff --git a/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE b/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE index d18029b..270618f 100644 --- a/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE +++ b/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE @@ -1,6 +1,6 @@ -There are claims that this repository has been migrated to: +The main work on the website has been migrated to: http://github.com/tdf/ -Which sadly excludes all the existing developers from being -able to easily commit to, and help out with website tasks. +interested newcomers should find it there and are invited in helping the +project! ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changes needed for LibreOffice 4
Hi Thorsten, On Friday, 2012-07-20 19:03:41 +0200, Thorsten Behrens wrote: Lubos Lunak wrote: Hmm. That makes it something we should take into consideration then, but that consideration may be quickly over with saying that it's internal API and as such we don't care about people who abuse it. There's more nuance required here I think. Substantial use of unstable API still leaves us with noticeable repercussions on the extension ecosystem, that we might want to have *once*, and not spread over multiple releases. Well, an API not being marked as published exactly tells authors that the piece may change or go away at any given time, not bound to any major release or whatsoever. But it should be possible to determine at least vaguely the clear text names of services, interfaces and properties an extension uses so maybe we could setup some scan your extension service where one can throw an extension in and get a list of API used and maybe split in sections stable, unstable and questionable ... Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpWUYMOC2pHZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice