LibreOffice Gerrit News for core on 2013-10-24
Moin! * Open changes on master for project core changed in the last 25 hours: + w:pict element was wrongly exported as child of w:rPr element. in https://gerrit.libreoffice.org/6366 from Sushil Shinde + cppunit: remove ExternalPackage in https://gerrit.libreoffice.org/6409 from Michael Stahl + openssl: use libraries from WORKDIR in https://gerrit.libreoffice.org/6410 from Michael Stahl + fdo#54938: More uses of cppu::supportsService in https://gerrit.libreoffice.org/6406 from Marcos Souza + Convert code that calls OUString::getStr()[] to use the [] operator in https://gerrit.libreoffice.org/6401 from Noel Grandin + Fix for Chart Series Names in https://gerrit.libreoffice.org/6350 from vinaya mandke + added links to the image in tiled rendering in https://gerrit.libreoffice.org/6397 from Ptyl * Merged changes on master for project core changed in the last 25 hours: + icu: apparently icutu library is only used by genbrk etc. tools in https://gerrit.libreoffice.org/6405 from Michael Stahl + icu: use executables from WORKDIR in https://gerrit.libreoffice.org/6404 from Michael Stahl + icu: use libraries from WORKDIR in https://gerrit.libreoffice.org/6403 from Michael Stahl + Makefile: make convenience targets like make icu work for external/ in https://gerrit.libreoffice.org/6402 from Michael Stahl + fdo#54938: Replace existsValue for cppu::supportsService in https://gerrit.libreoffice.org/6378 from Marcos Souza + Fix build of ldapbe in Ubuntu in https://gerrit.libreoffice.org/6400 from Marcos Souza + clean up places accessing the NULL at the of an OUString in https://gerrit.libreoffice.org/6399 from Noel Grandin + clean up some include guards in https://gerrit.libreoffice.org/6388 from Thomas Arnhold + fixincludeguards.sh: unify all include guards in https://gerrit.libreoffice.org/6386 from Thomas Arnhold + starmath: fix include guards in https://gerrit.libreoffice.org/6389 from Thomas Arnhold + Solve fdo#69926 Wrong default notation for galaxy icon theme in https://gerrit.libreoffice.org/6321 from Joren De Cuyper + tiledrendering opens files in https://gerrit.libreoffice.org/6396 from Ptyl + tiled rendering file picker works in https://gerrit.libreoffice.org/6395 from Ptyl + tiledrendering extracts values when clicking render in https://gerrit.libreoffice.org/6380 from Ptyl + added callback for render in https://gerrit.libreoffice.org/6379 from Ptyl + fdo#54938: Kill ServiceInfoHelper::supportsService and use cppu's instead in https://gerrit.libreoffice.org/6394 from Marcos Souza + remove RTL_CONSTASCII_(U)STRINGPARAM in https://gerrit.libreoffice.org/6352 from Christina Roßmanith + convert code to use OUString::endsWith in https://gerrit.libreoffice.org/6371 from Noel Grandin * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Backport for bug fdo#70345 in https://gerrit.libreoffice.org/6250 from matthieu gay + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |1 + 1 file changed, 1 insertion(+) New commits: commit 022c955f138e350d9a431489380c054d9766a4d0 Author: László Németh nem...@numbertext.org Date: Thu Oct 24 08:46:46 2013 +0200 librelogo: fix blinking LABEL Change-Id: I807dda255b741996480116fab22377b39bf963b4 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 3b8d9d0..e830ed5 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1040,6 +1040,7 @@ def label(st): # get text size shape = _.doc.createInstance( com.sun.star.drawing.TextShape) shape.TextAutoGrowWidth = True +shape.Visible = False actual = __getshape__(__ACTUAL__) _.drawpage.add(shape) text(shape, st[2]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/cppunit RepositoryExternal.mk
RepositoryExternal.mk |2 - external/cppunit/ExternalPackage_cppunit.mk | 50 external/cppunit/Module_cppunit.mk |1 3 files changed, 1 insertion(+), 52 deletions(-) New commits: commit 32a001d85baf2b72a37b4ab8475f9489b7364769 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 23 23:41:58 2013 +0200 cppunit: remove ExternalPackage The DllPlugInTester executable is apparently unused. Change-Id: I1d26aebe8aa67b037438bd21bb00496804c41125 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ebdc619..969f575 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -197,7 +197,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ )) define gb_LinkTarget__use_cppunit -$(call gb_LinkTarget_use_package,$(1),cppunit) +$(call gb_LinkTarget_use_external_project,$(1),cppunit) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cppunit/include)\ diff --git a/external/cppunit/ExternalPackage_cppunit.mk b/external/cppunit/ExternalPackage_cppunit.mk deleted file mode 100644 index d900e22..000 --- a/external/cppunit/ExternalPackage_cppunit.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,cppunit,cppunit)) -$(eval $(call gb_ExternalPackage_use_external_project,cppunit,cppunit)) - -ifeq ($(OS),WNT) -ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/$(if $(MSVC_USE_DEBUG_RUNTIME),cppunitd_dll.dll,cppunit_dll.dll),src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.dll,ReleaseDll/cppunit_dll.dll))) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib))) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/DllPlugInTesterd_dll.exe,ReleaseDll/DllPlugInTester_dll.exe))) -else -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dll.a,src/cppunit/.libs/libcppunit.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe)) -endif -else -ifneq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester)) -else -ifneq ($(filter DESKTOP,$(BUILD_TYPE)),) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/DllPlugInTester)) -endif -endif -ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dylib,src/cppunit/.libs/libcppunit.dylib)) -else ifeq ($(OS),AIX) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a)) -else ifeq ($(OS),OPENBSD) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0.0,src/cppunit/.libs/libcppunit-1.13.so.0.0)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.a,src/cppunit/.libs/libcppunit.a)) -else ifeq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so,src/cppunit/.libs/libcppunit-1.13.so)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so)) -else -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0,src/cppunit/.libs/libcppunit-1.13.so.0.0.1)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0.1)) -endif -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk index f0af9e8..296feeb 100644 --- a/external/cppunit/Module_cppunit.mk +++ b/external/cppunit/Module_cppunit.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,cppunit)) $(eval $(call gb_Module_add_targets,cppunit,\ UnpackedTarball_cppunit \ - ExternalPackage_cppunit \ ExternalProject_cppunit \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |1 + 1 file changed, 1 insertion(+) New commits: commit 5a51dde06cd7840132b26626312beb8c2cbc31b8 Author: László Németh nem...@numbertext.org Date: Thu Oct 24 08:46:46 2013 +0200 librelogo: fix blinking LABEL Change-Id: I807dda255b741996480116fab22377b39bf963b4 (cherry picked from commit 022c955f138e350d9a431489380c054d9766a4d0) Reviewed-on: https://gerrit.libreoffice.org/6413 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 84be810..216bb0f 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1027,6 +1027,7 @@ def label(st): # get text size shape = _.doc.createInstance( com.sun.star.drawing.TextShape) shape.TextAutoGrowWidth = True +shape.Visible = False actual = __getshape__(__ACTUAL__) _.drawpage.add(shape) text(shape, st[2]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - curl/ExternalPackage_curl.mk scp2/source
curl/ExternalPackage_curl.mk |6 ++ scp2/source/ooo/file_library_ooo.scp |2 +- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit a41deebce26dfa6b2d6d77b63bdb9d2965003678 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 23 22:20:25 2013 +0200 curl: libcurl.so.4 goes into instset, not libcurl.so! Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file is not actually in the instset, just a libcurl.so with SONAME libcurl.so.4. (regression in LO 4.0.0) Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f (cherry picked from commit 30e1d4c0a9202d5c8057efdb0bfda11f46a25251) Reviewed-on: https://gerrit.libreoffice.org/6411 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk index 5f55260..e9cb7a1 100644 --- a/curl/ExternalPackage_curl.mk +++ b/curl/ExternalPackage_curl.mk @@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl. else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4)) else -# TODO: Do we really want the unversioned library in the installation? -# And if that's true, why do we need to deliver the versioned one at all? -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) endif else ifeq ($(OS)$(COM),WNTGCC) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 36ec8d4..f353d45 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -150,7 +150,7 @@ File gid_File_Lib_Curl #ifdef MACOSX Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX)); #else - Name = STRING(CONCAT2(libcurl,UNXSUFFIX)); + Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4)); #endif #else #ifdef _gcc3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sot/source
sot/source/sdstor/stgstrms.cxx | 16 1 file changed, 12 insertions(+), 4 deletions(-) New commits: commit f35096b7f7f3ad168cd221a20823e25a56315948 Author: Armin Le Grand a...@apache.org Date: Wed Oct 16 16:47:38 2013 +0100 i123485 secured file import scanning existing pages (cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 and adapted to the rewritten scanBuildPageChainCache) Reviewed-on: https://gerrit.libreoffice.org/6272 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com (cherry picked from commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0) Conflicts: sot/source/sdstor/stgstrms.cxx Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162 Reviewed-on: https://gerrit.libreoffice.org/6314 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 1561204..1c9af60 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -23,6 +23,7 @@ #include sal/log.hxx #include osl/file.hxx #include tools/tempfile.hxx +#include set #include sot/stg.hxx #include stgelem.hxx @@ -339,16 +340,23 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize) bool bError = false; sal_Int32 nBgn = nStart; -sal_Int32 nOldBgn = -1; sal_Int32 nOptSize = 0; -while( nBgn = 0 nBgn != nOldBgn ) + +// Track already scanned PageNumbers here and use them to +// see if an already counted page is re-visited +std::set sal_Int32 nUsedPageNumbers; + +while( nBgn = 0 !bError ) { if( nBgn = 0 ) m_aPagesCache.push_back(nBgn); -nOldBgn = nBgn; nBgn = pFat-GetNextPage( nBgn ); -if( nBgn == nOldBgn ) + +if( nUsedPageNumbers.find(nBgn) != nUsedPageNumbers.end() ) bError = true; +else +nUsedPageNumbers.insert(nBgn); + nOptSize += nPageSize; } if (bError) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Support of csv files with .xls extension
Hi All, Starting with 4.1 csv files with xls extension also tsv files are opened using writer instead of calc, when opening from the start center or from cli without '--calc'. While it's clear that the tsv part should be fixed (BTW it's a trivial fix [1]), I'm not sure about csv files with xls extension. Users shouldn't expect that after changing the file extension to some random extension, it still would be recognized as a csv by default. But on the other hand the fact that some user opened a bug for it, might indicate that some app\web app generates such files. So what do you think? Should it be fixed, or should we close the bug as WONTFIX? The relevant bug reports are: https://bugs.freedesktop.org/show_bug.cgi?id=68903 (csv with .xls extension) https://bugs.freedesktop.org/show_bug.cgi?id=69290 (tsv) Best Regards, Maxim Monastirsky (When responding, please be aware that I'm not subscribed to the list) [1] https://bugs.freedesktop.org/show_bug.cgi?id=68903#c8 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSoC 2014
Hi Ankit, On Wed, Oct 23, 2013 at 03:42:04PM +0530, Ankit Vadehra ankit...@gmail.com wrote: I'm Ankit Vadehra, a CSE student and I wanted to take part in GSoC 2014, with Libre Office as the mentoring organisation. I'm not much of an open-source developer, but I am an enthusiast. I've been using LibreOffice for quite some time, and am quite familiar with how the updates rolled out. As mentioned previously, I'm no pro. so I'm reaching out to the community(much before application period) so as to get better acquainted with the timeline, process and how/what to do so as to get comfortable with everything and ensure my application is successful. I'm fluent with C++ , I know quite a lot of Python. As the Libre Office idea page stays same, I was wondering whether I should start now, so by the time the application period opens I have code sample and stuff. I would appreciate if you could give me brief pointers. Let's get back to this, once the list of accepted organizations for GSoC 2014 is announced. :-) Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/unoidl.cxx | 112 --- 1 file changed, 78 insertions(+), 34 deletions(-) New commits: commit bdd55e28fc7788c2968daaf87b782f8e6189ee2d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 24 09:48:13 2013 +0200 fdo#67725 unoidl::AggregatingCursor must wrap modules for aggregation, too Otherwise cppuhelper::TypeManager::createTypeDescriptionEnumeration, sitting on top such an AggregatingCursor, will miss any entities from provider P' in module M if any previous provider P contains the same module M. That happened when climaker generates cli_oootypes.dll, where the enumeration missed everything from offapi in top-level module com because it had already seen udkapi's com, and only reported the handful of entities under offapi's other top-level module org (which does not appear in udkapi). Change-Id: If538391bde22bcc346417b5988cf12023f0d4172 diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx index 7c3e2e5..6d716d4 100644 --- a/unoidl/source/unoidl.cxx +++ b/unoidl/source/unoidl.cxx @@ -28,41 +28,101 @@ namespace unoidl { namespace { +class AggregatingModule: public ModuleEntity { +public: +AggregatingModule( +std::vector rtl::Reference Provider const providers, +OUString const name): +providers_(providers), name_(name) +{} + +private: +virtual ~AggregatingModule() throw () {} + +virtual std::vector OUString getMemberNames() const; + +virtual rtl::Reference MapCursor createCursor() const; + +std::vector rtl::Reference Provider providers_; +OUString name_; +}; + +std::vector OUString AggregatingModule::getMemberNames() const { +std::set OUString names; +for (std::vector rtl::Reference Provider ::const_iterator i( + providers_.begin()); + i != providers_.end(); ++i) +{ +rtl::Reference Entity ent((*i)-findEntity(name_)); +if (ent.is() ent-getSort() == Entity::SORT_MODULE) { +std::vector OUString ns( +static_cast ModuleEntity * (ent.get())-getMemberNames()); +names.insert(ns.begin(), ns.end()); +} +} +return std::vector OUString (names.begin(), names.end()); +} + class AggregatingCursor: public MapCursor { public: AggregatingCursor( -std::vector rtl::Reference MapCursor const cursors): -cursors_(cursors), iterator_(cursors_.begin()) -{} +std::vector rtl::Reference Provider const providers, +OUString const name): +providers_(providers), name_(name), iterator_(providers_.begin()) +{ findCursor(); } private: virtual ~AggregatingCursor() throw () {} -virtual rtl::Reference Entity getNext(rtl::OUString * name); +virtual rtl::Reference Entity getNext(OUString * name); -std::vector rtl::Reference MapCursor cursors_; -std::vector rtl::Reference MapCursor ::iterator iterator_; -std::set rtl::OUString seenMembers; +void findCursor(); + +std::vector rtl::Reference Provider providers_; +OUString name_; +std::vector rtl::Reference Provider ::iterator iterator_; +rtl::Reference MapCursor cursor_; +std::set OUString seen_; }; -rtl::Reference Entity AggregatingCursor::getNext(rtl::OUString * name) { -for (;;) { -if (iterator_ == cursors_.end()) { -return rtl::Reference Entity (); -} -rtl::OUString n; -rtl::Reference Entity ent((*iterator_)-getNext(n)); +rtl::Reference Entity AggregatingCursor::getNext(OUString * name) { +while (cursor_.is()) { +OUString n; +rtl::Reference Entity ent(cursor_-getNext(n)); if (ent.is()) { -if (seenMembers.insert(n).second) { +if (seen_.insert(n).second) { if (name != 0) { *name = n; } -return ent; +return ent-getSort() == Entity::SORT_MODULE +? new AggregatingModule( +providers_, (name_.isEmpty() ? name_ : name_ + .) + n) +: ent; } } else { -++iterator_; +cursor_.clear(); +findCursor(); } } +return rtl::Reference Entity (); +} + +void AggregatingCursor::findCursor() { +for (; !cursor_.is() iterator_ != providers_.end(); ++iterator_) { +if (name_.isEmpty()) { +cursor_ = (*iterator_)-createRootCursor(); +} else { +rtl::Reference Entity ent((*iterator_)-findEntity(name_)); +if (ent.is() ent-getSort() == Entity::SORT_MODULE) { +cursor_ = static_cast ModuleEntity * (ent.get())- +createCursor(); +} +} +} +} + +rtl::Reference MapCursor AggregatingModule::createCursor() const { +return new AggregatingCursor(providers_,
[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts officecfg/registry sw/inc sw/source
download.lst |2 external/more_fonts/ExternalPackage_caladea.mk | 21 + external/more_fonts/ExternalPackage_carlito.mk | 21 + external/more_fonts/Module_more_fonts.mk |4 + external/more_fonts/UnpackedTarball_caladea.mk | 14 +++ external/more_fonts/UnpackedTarball_carlito.mk | 14 +++ officecfg/registry/data/org/openoffice/VCL.xcu | 24 ++ sw/inc/IDocumentMarkAccess.hxx |3 sw/source/core/crsr/crossrefbookmark.cxx | 21 ++--- sw/source/core/doc/docbm.cxx | 23 ++ sw/source/core/unocore/unobkm.cxx |3 sw/source/filter/inc/fltshell.hxx | 36 +- sw/source/filter/ww1/fltshell.cxx | 89 - sw/source/filter/ww1/w1filter.cxx |2 sw/source/filter/ww8/ww8par.cxx| 36 +- sw/source/filter/ww8/ww8par.hxx| 41 --- sw/source/filter/ww8/ww8par5.cxx | 84 ++- 17 files changed, 335 insertions(+), 103 deletions(-) New commits: commit 679faffc68bb854af0f55d0f218698e2f372f00b Author: Oliver-Rainer Wittmann o...@apache.org Date: Thu Nov 22 11:14:51 2012 + Resolves: #i120879# import Microsoft Word TOC bookmarks as... cross reference bookmarks and suppress the import of unreferenced ones. Review by: zhengfan (cherry picked from commit e3a34e95823105fda68fd29a4ded22a9d52523fb) Conflicts: sw/source/core/crsr/crossrefbookmark.cxx sw/source/core/inc/crossrefbookmark.hxx sw/source/filter/inc/fltshell.hxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par5.cxx Change-Id: I5898cbd33c9a17b9517040e19ca8eda4355a1eac also remove symbol-visibility problems in IDocumentMarkAccess.hxx (cherry picked from commit de9ea83df087ba3f8e614a69e8b18403d54b9589) Conflicts: sw/inc/IDocumentMarkAccess.hxx Change-Id: I2f51cc4412525c6e62d120df5c7fe1c223e35972 diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 4b27357..35f5ec0 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -242,6 +242,9 @@ class IDocumentMarkAccess /** Returns the MarkType used to create the mark */ static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark rMark); + +static SAL_DLLPUBLIC_EXPORT OUString GetCrossRefHeadingBookmarkNamePrefix(); +static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM rPaM ); protected: virtual ~IDocumentMarkAccess() {}; }; diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx index 8ef73ad..22438a8 100644 --- a/sw/source/core/crsr/crossrefbookmark.cxx +++ b/sw/source/core/crsr/crossrefbookmark.cxx @@ -17,15 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include IDocumentMarkAccess.hxx #include crossrefbookmark.hxx #include ndtxt.hxx namespace { - -const char CrossRefHeadingBookmark_NamePrefix[] = __RefHeading__; -const char CrossRefNumItemBookmark_NamePrefix[] = __RefNumPara__; - +const char CrossRefNumItemBookmark_NamePrefix[] = __RefNumPara__; } namespace sw { namespace mark @@ -37,12 +35,9 @@ namespace sw { namespace mark const OUString rPrefix) : Bookmark(rPaM, rCode, rName, rShortName) { -if(rPaM.HasMark()) -OSL_ENSURE((rPaM.GetMark()-nNode == rPaM.GetPoint()-nNode -rPaM.Start()-nContent.GetIndex() == 0 -rPaM.End()-nContent.GetIndex() == rPaM.GetPoint()-nNode.GetNode().GetTxtNode()-Len()), -CrossRefBookmark::CrossRefBookmark(..) -- creation of cross-reference bookmark with an expanded PaM that does not expand over exactly one whole paragraph.); +OSL_ENSURE( IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( rPaM ), +CrossRefBookmark::CrossRefBookmark(..) +- creation of cross-reference bookmark with an illegal PaM that does not expand over exactly one whole paragraph.); SetMarkPos(*rPaM.Start()); if(rName.isEmpty()) m_aName = MarkBase::GenerateNewName(rPrefix); @@ -71,19 +66,19 @@ namespace sw { namespace mark const KeyCode rCode, const OUString rName, const OUString rShortName) -: CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefHeadingBookmark_NamePrefix)) +: CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()) { } bool CrossRefHeadingBookmark::IsLegalName(const OUString rName) { -return
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - de/9ea83df087ba3f8e614a69e8b18403d54b9589 e3/a34e95823105fda68fd29a4ded22a9d52523fb
de/9ea83df087ba3f8e614a69e8b18403d54b9589 |1 + e3/a34e95823105fda68fd29a4ded22a9d52523fb |1 + 2 files changed, 2 insertions(+) New commits: commit 99d91cf3e7550a083e6ca2205255a72c43acbe40 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 09:19:06 2013 +0100 Notes added by 'git notes add' diff --git a/de/9ea83df087ba3f8e614a69e8b18403d54b9589 b/de/9ea83df087ba3f8e614a69e8b18403d54b9589 new file mode 100644 index 000..833b69c --- /dev/null +++ b/de/9ea83df087ba3f8e614a69e8b18403d54b9589 @@ -0,0 +1 @@ +merged as: 679faffc68bb854af0f55d0f218698e2f372f00b commit 31e88a7bf8b85a7fb00cde8c11750a1c1bba6336 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 09:18:58 2013 +0100 Notes added by 'git notes add' diff --git a/e3/a34e95823105fda68fd29a4ded22a9d52523fb b/e3/a34e95823105fda68fd29a4ded22a9d52523fb new file mode 100644 index 000..833b69c --- /dev/null +++ b/e3/a34e95823105fda68fd29a4ded22a9d52523fb @@ -0,0 +1 @@ +merged as: 679faffc68bb854af0f55d0f218698e2f372f00b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/3c0e0ad7857ca3f290d4e5d52e2cbf3b39db44
16/3c0e0ad7857ca3f290d4e5d52e2cbf3b39db44 |1 + 1 file changed, 1 insertion(+) New commits: commit a4f20049f0589e5787356ef0f81eca5d73630760 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 09:20:05 2013 +0100 Notes added by 'git notes add' diff --git a/16/3c0e0ad7857ca3f290d4e5d52e2cbf3b39db44 b/16/3c0e0ad7857ca3f290d4e5d52e2cbf3b39db44 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/16/3c0e0ad7857ca3f290d4e5d52e2cbf3b39db44 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/qa
sw/qa/tiledrendering/tiledrendering.cxx |7 +-- sw/qa/tiledrendering/tiledrendering.ui |2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 9fd0abe9abfe37cb1591e1db794e0c921d95b172 Author: Ptyl Dragon p...@cloudon.com Date: Wed Oct 23 11:55:16 2013 +0200 added links to the image in tiled rendering Change-Id: Ic9d972fd67123e3ab04f023806f7f96c89a883a7 diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index bfd20c3..6af94ec 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -21,37 +21,68 @@ #include vcl/vclmain.hxx #include vcl/field.hxx #include vcl/button.hxx +#include vcl/fixed.hxx +#include sfx2/filedlghelper.hxx +#include com/sun/star/ui/dialogs/TemplateDescription.hpp +#include com/sun/star/ui/dialogs/XFilePicker.hpp +#include com/sun/star/uno/XInterface.hpp +#include com/sun/star/frame/XComponentLoader.hpp +#include com/sun/star/frame/Desktop.hpp +#include com/sun/star/lang/XComponent.hpp +#include com/sun/star/beans/XPropertySet.hpp + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::ui::dialogs; +using namespace ::sfx2; -class UIPreviewApp : public Application +class TiledRenderingApp : public Application { +private: +uno::Referenceuno::XComponentContext xContext; +uno::Referencelang::XMultiComponentFactory xFactory; +uno::Referencelang::XMultiServiceFactory xSFactory; +uno::Referenceuno::XInterface xDesktop; +uno::Referenceframe::XComponentLoader xLoader; +uno::Referencelang::XComponent xComponent; public: virtual void Init(); virtual int Main(); +void Open(OUString aFileUrl); }; -using namespace com::sun::star; class TiledRenderingDialog: public ModalDialog{ +private: +TiledRenderingApp * app; public: -TiledRenderingDialog() : ModalDialog(DIALOG_NO_PARENT, TiledRendering, qa/sw/ui/tiledrendering.ui) +TiledRenderingDialog(TiledRenderingApp * app) : +ModalDialog(DIALOG_NO_PARENT, TiledRendering, qa/sw/ui/tiledrendering.ui), +app(app) { PushButton * renderButton; get(renderButton,buttonRenderTile); renderButton-SetClickHdl( LINK( this, TiledRenderingDialog, RenderHdl)); + +PushButton * chooseDocumentButton; +get(chooseDocumentButton,buttonChooseDocument); +chooseDocumentButton-SetClickHdl( LINK( this, TiledRenderingDialog, ChooseDocumentHdl)); + SetStyle(GetStyle()|WB_CLOSEABLE); } + virtual ~TiledRenderingDialog() { } DECL_LINK ( RenderHdl, Button * ); +DECL_LINK ( ChooseDocumentHdl, Button * ); -sal_Int32 extractInt(const char * name) +sal_Int32 ExtractInt(const char * name) { NumericField * pField; get(pField,name); OUString aString(pField-GetText()); -std::cerr param name returned aString /n; return aString.toInt32(); } @@ -59,67 +90,79 @@ public: IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) { -extractInt(spinContextWidth); -extractInt(spinContextHeight); -extractInt(spinTilePosX); -extractInt(spinTilePosY); -extractInt(spinTileWidth); -extractInt(spinTileHeight); +ExtractInt(spinContextWidth); +ExtractInt(spinContextHeight); +ExtractInt(spinTilePosX); +ExtractInt(spinTilePosY); +ExtractInt(spinTileWidth); +ExtractInt(spinTileHeight); +FixedImage * pImage; +get(pImage,imageTile); +return 1; +} + +IMPL_LINK ( TiledRenderingDialog, ChooseDocumentHdl, Button *, EMPTYARG ) +{ +FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 ); +uno::Reference XFilePicker xFP = aDlgHelper.GetFilePicker(); +if( aDlgHelper.Execute() == ERRCODE_NONE ) +{ +OUString aFileUrl =xFP-getFiles().getConstArray()[0]; +app-Open(aFileUrl); +} return 1; } -void UIPreviewApp::Init() +void TiledRenderingApp::Open(OUString aFileUrl){ +static const OUString TARGET(_default); +static const Sequencebeans::PropertyValue PROPS (0); +if(xComponent.get()) +{ +xComponent-dispose(); +xComponent.clear(); +} +xComponent.set(xLoader-loadComponentFromURL(aFileUrl,TARGET,0,PROPS)); +} + +void TiledRenderingApp::Init() { -uno::Referenceuno::XComponentContext xContext = -cppu::defaultBootstrap_InitialComponentContext(); -uno::Referencelang::XMultiComponentFactory xFactory = -xContext-getServiceManager(); -uno::Referencelang::XMultiServiceFactory xSFactory = -uno::Referencelang::XMultiServiceFactory (xFactory, uno::UNO_QUERY_THROW); +xContext.set(cppu::defaultBootstrap_InitialComponentContext()); +xFactory.set(xContext-getServiceManager()); +xSFactory.set(uno::Referencelang::XMultiServiceFactory (xFactory, uno::UNO_QUERY_THROW));
Re: GSoC 2014
Hi Ankit, You can still start now by getting a build done and then completing one or more Easy Hacks. That will help you to become familiar with the development workflow and is also required before applying for GSoC. You find the relevant information here: https://wiki.documentfoundation.org/Development Good luck! Samuel Am 24.10.2013 09:56, schrieb Miklos Vajna: Hi Ankit, On Wed, Oct 23, 2013 at 03:42:04PM +0530, Ankit Vadehra ankit...@gmail.com wrote: I'm Ankit Vadehra, a CSE student and I wanted to take part in GSoC 2014, with Libre Office as the mentoring organisation. I'm not much of an open-source developer, but I am an enthusiast. I've been using LibreOffice for quite some time, and am quite familiar with how the updates rolled out. As mentioned previously, I'm no pro. so I'm reaching out to the community(much before application period) so as to get better acquainted with the timeline, process and how/what to do so as to get comfortable with everything and ensure my application is successful. I'm fluent with C++ , I know quite a lot of Python. As the Libre Office idea page stays same, I was wondering whether I should start now, so by the time the application period opens I have code sample and stuff. I would appreciate if you could give me brief pointers. Let's get back to this, once the list of accepted organizations for GSoC 2014 is announced. :-) Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - include/touch ios/shared sw/source vcl/ios
include/touch/touch.h |2 ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m |1 sw/source/core/view/viewsh.cxx | 26 ++- vcl/ios/iosinst.cxx | 36 +- 4 files changed, 60 insertions(+), 5 deletions(-) New commits: commit ef0d8a50f5d65ebcdc77af0749cfeaf74235f01c Author: Ptyl Dragon p...@cloudon.com Date: Thu Oct 24 11:28:42 2013 +0200 now showing blank tile Change-Id: I76cbf205e1983bea1ebae28f5172b2fbc250 diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m index bcc2191..5dc9db1 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m @@ -30,6 +30,7 @@ -(void)initScrollView{ self.scrollView = [UIScrollView new]; +self.scrollView.backgroundColor = [UIColor grayColor]; self.view = self.scrollView; } -(void)resize{ diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index bb50ea5..4cdb37d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -55,7 +55,9 @@ #include ndole.hxx #include ndindex.hxx #include accmap.hxx +#include vcl/bitmapex.hxx #include svtools/colorcfg.hxx +#include vcl/bmpacc.hxx #include svtools/accessibilityoptions.hxx #include accessibilityoptions.hxx #include statstr.hrc @@ -64,6 +66,7 @@ #include sortedobjs.hxx #include anchoredobject.hxx #include wrtsh.hxx +#include vcl/alpha.hxx #include ../../ui/inc/view.hxx #include PostItMgr.hxx @@ -1790,7 +1793,16 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); -//TODO now get it to the 'context' +BitmapEx aBitmapEx(aDevice.GetBitmapEx(Point(0,0), aDevice.GetOutputSizePixel())); +Bitmap aBitmap = aBitmapEx.GetBitmap(); +BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); +touch_lo_copy_buffer((void *) readAccess-GetBuffer(), + tileWidth, + tileHeight, + readAccess- GetScanlineSize(), + context, + contextWidth, + contextHeight); } } commit 7569a946c8b9fb9bd814e4aff9f170cd92a8c30b Author: Ptyl Dragon p...@cloudon.com Date: Wed Oct 23 18:35:40 2013 +0200 refactored to allow copying FixedImage to ios Change-Id: Icecdae8ea2bb68c228f038758af8fb688ce9dd4a diff --git a/include/touch/touch.h b/include/touch/touch.h index 7dddaf3..979a8de 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -110,7 +110,7 @@ tilePosX, tilePosY, tileWidth, tileHeight address the part of the document to be context, contextHeight, contextWidth specify where to draw. */ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight); - +void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth, size_t targetHeight); void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state); // Move the start of the selection to (x,y) diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index a1a441e..bb50ea5 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -17,6 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifdef IOS + +#include touch/touch.h + +#endif + #include com/sun/star/accessibility/XAccessible.hpp #include sfx2/viewfrm.hxx #include sfx2/progress.hxx @@ -66,6 +72,8 @@ #include vcl/svapp.hxx #include svx/sdrpaintwindow.hxx + + sal_Bool ViewShell::mbLstAct = sal_False; ShellResource *ViewShell::mpShellRes = 0; Window *ViewShell::mpCareWindow = 0; @@ -1761,7 +1769,7 @@ void ViewShell::PaintTile(OutputDevice *pOut, const Rectangle rRect) #if !HAVE_FEATURE_DESKTOP extern C -void touch_lo_draw_tile(void * /*context*/, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight) +void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight) { // Currently we
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column3.cxx | 14 -- 1 file changed, 14 deletions(-) New commits: commit ba88ea36d6062dcb19a499c2804dc7b973c737eb Author: Laurent Godard lgodard.li...@laposte.net Date: Thu Oct 24 10:41:45 2013 +0200 remove useless commented code Change-Id: I8f26c75ac6d95f584e649fb7acf637394129ba44 Reviewed-on: https://gerrit.libreoffice.org/6414 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 73bcf2d..da5cdbb 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1717,8 +1717,6 @@ void ScColumn::SetFormula( SCROW nRow, const ScTokenArray rArray, formula::Form pCell-SetNeedNumberFormat(true); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -1736,8 +1734,6 @@ void ScColumn::SetFormula( SCROW nRow, const OUString rFormula, formula::Formul pCell-SetNeedNumberFormat(true); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -1752,8 +1748,6 @@ ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell ) pCell-SetNeedNumberFormat(true); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -1785,8 +1779,6 @@ bool ScColumn::SetGroupFormulaCell( SCROW nRow, ScFormulaCell* pCell ) pCell-SetNeedNumberFormat(true); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -2206,8 +2198,6 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError) sc::CellStoreType::iterator it = GetPositionToInsert(nRow); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -2234,8 +2224,6 @@ void ScColumn::SetRawString( SCROW nRow, const svl::SharedString rStr, bool bBr sc::CellStoreType::iterator it = GetPositionToInsert(nRow); maCells.set(it, nRow, rStr); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); @@ -2278,8 +2266,6 @@ void ScColumn::SetValue( SCROW nRow, double fVal ) sc::CellStoreType::iterator it = GetPositionToInsert(nRow); maCells.set(it, nRow, fVal); maCellTextAttrs.set(nRow, sc::CellTextAttr()); -//ScPostIt* pPostIt; -//maCellNotes.set(nRow, pPostIt); CellStorageModified(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4da1e31b833a2bff190dc3c6bc807e35ee724ecc Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 09:56:49 2013 +0100 is this the foo we need now to download automatically Change-Id: I156c2a2d645c140bfd716f41d8c81c0656ceee56 diff --git a/Makefile.fetch b/Makefile.fetch index 61dfe6c..60ce0ae 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -99,6 +99,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,EPM,$(EPM_TARBALL)) \ $(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \ $(call fetch_Optional,MARIADB,$(MARIADB_TARBALL)) \ + $(call fetch_Optional,MORE_FONTS,$(FONT_CALADEA_TARBALL)) \ + $(call fetch_Optional,MORE_FONTS,$(FONT_CARLITO_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_GENTIUM_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_NARROW_TARBALL)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - solenv/gbuild sw/source
solenv/gbuild/platform/IOS_ARM_GCC.mk |3 +++ sw/source/core/inc/pagefrm.hxx| 11 --- sw/source/core/layout/trvlfrm.cxx |6 +- 3 files changed, 4 insertions(+), 16 deletions(-) New commits: commit c7f83feb90b7bde9e3609795a749ca3bf2c0d02c Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 12:06:26 2013 +0300 Use static_cast instead of C-style cast Makes it more obvious to the code reader that nothing wrong is going on (or the compiler would have complained). Change-Id: I2ab420ffeb71f5c0b68e1b7db039cb9cde6af801 diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 80da515..1be599e 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1800,7 +1800,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const return 0; sal_uInt16 nPhyPage = pPage-GetPhyPageNum(); -if ( !((SwRootFrm*)pPage-GetUpper())-IsVirtPageNum() ) +if ( !(static_castconst SwRootFrm*(pPage-GetUpper()))-IsVirtPageNum() ) return nPhyPage; //Search the nearest section using the virtual page number. commit 5d0051efb99c6cbd0dc4dd655a71e7435159f6bc Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 11:33:52 2013 +0300 Bin a few pointless comments Change-Id: Ia8a47bcd07cf10302b5cf6f550627e5c7cd1d9f6 diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index f3ea616..773dac4 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -33,10 +33,7 @@ struct SwPosition; struct SwCrsrMoveState; class SwAttrSetChg; class Font; - -// #i28701# - replaced by class SwSortedObjs class SwSortedObjs; -// #i28701# class SwAnchoredObject; enum SwPageChg @@ -51,7 +48,6 @@ class SwPageFrm: public SwFtnBossFrm { friend class SwFrm; -// #i28701# - use SwSortedObjs SwSortedObjs *pSortedObjs; SwPageDesc *pDesc; //PageDesc der die Seite beschreibt. @@ -123,7 +119,6 @@ public: const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; } SwSortedObjs *GetSortedObjs() { return pSortedObjs; } -// #i28701# - new methods to append/remove drawing objects void AppendDrawObjToPage( SwAnchoredObject _rNewObj ); void RemoveDrawObjFromPage( SwAnchoredObject _rToRemoveObj ); @@ -157,7 +152,6 @@ public: //Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage void PrepareRegisterChg(); -// #i50432# - adjust method description and synopsis. // Appends a fly frame - the given one or a new one - at the page frame. // Needed for Modify and MakeFrms // - return value not needed any more @@ -260,9 +254,6 @@ public: /** paint page border and shadow -#i9719# -implement paint of page border and shadow - @param _rPageRect input parameter - constant instance reference of the page rectangle. Generally, it's the frame area of the page, but for empty pages in print @@ -291,8 +282,6 @@ public: /** get bound rectangle of border and shadow for repaints -#i9719# - @param _rPageRect input parameter - constant instance reference of the page rectangle. Generally, it's the frame area of the page, but for empty pages in print diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 14eb645..80da515 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -49,13 +49,11 @@ #include frmtool.hxx #include ndtxt.hxx #include dcontact.hxx -// OD 2004-05-24 #i28701# #include sortedobjs.hxx #include txatbase.hxx #include fmtfld.hxx #include fldbas.hxx -// FLT_MAX #include cfloat #include swselectionlist.hxx @@ -1609,8 +1607,6 @@ Point SwRootFrm::GetPagePos( sal_uInt16 nPageNum ) const /** get page frame by phyiscal page number * - * OD 14.01.2003 #103492# - * * @return pointer to the page frame with the given physical page number */ SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const commit beda848f388685b0fcb60c590fb691029c23a26b Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 01:54:32 2013 +0300 The icu, xml2 and libxslt libs moved Change-Id: I202ab418d2cf0d4f0f9d7786fec837dd76abd7b5 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index fea5802..aac083b 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -123,6 +123,7 @@ define gb_LinkTarget__command_dynamiclink $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard
[Libreoffice-commits] core.git: sw/qa
sw/qa/tiledrendering/tiledrendering.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7cd77d5cb0b6fd3343f2703c73e2dc4b65fc0e9e Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 12:26:03 2013 +0300 WaE: declaration shadows a field Change-Id: I37a5edbc578a71cb7eba29c3191cfa36e90ca022 diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 6af94ec..53921f0 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -56,9 +56,9 @@ class TiledRenderingDialog: public ModalDialog{ private: TiledRenderingApp * app; public: -TiledRenderingDialog(TiledRenderingApp * app) : +TiledRenderingDialog(TiledRenderingApp * app_) : ModalDialog(DIALOG_NO_PARENT, TiledRendering, qa/sw/ui/tiledrendering.ui), -app(app) +app(app_) { PushButton * renderButton; get(renderButton,buttonRenderTile); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source sysui/desktop
sw/inc/shellres.hxx |3 ++- sw/source/core/draw/dpage.cxx|6 +++--- sw/source/ui/docvw/SidebarTxtControl.cxx |6 +++--- sw/source/ui/docvw/edtwin.cxx|2 +- sw/source/ui/docvw/edtwin2.cxx |8 sw/source/ui/utlui/initui.cxx|5 +++-- sw/source/ui/utlui/initui.hrc|7 --- sw/source/ui/utlui/initui.src|9 ++--- sysui/desktop/menus/base.desktop |2 +- sysui/desktop/menus/calc.desktop |2 +- sysui/desktop/menus/draw.desktop |2 +- sysui/desktop/menus/impress.desktop |2 +- sysui/desktop/menus/math.desktop |2 +- sysui/desktop/menus/writer.desktop |2 +- 14 files changed, 32 insertions(+), 26 deletions(-) New commits: commit f3167bd7d33fbc1e93f0728ab06b6d67fc1956bd Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 10:34:13 2013 +0100 Related: fdo#70571 say [ctrl+]click to follow link as opposed to hyperlink. Be more generic and consistent across both ctrl+click and click modes. Change-Id: I673ed59fc9f3408a0c4534c6490d9bbc3598bc08 diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 85d5d95..0538045 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -64,7 +64,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource OUStringaTOXTablesName; OUStringaTOXAuthoritiesName; -OUStringaHyperlinkClick; +OUStringaLinkCtrlClick; +OUStringaLinkClick; std::vectorOUString aDocInfoLst; diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 9f18b52..5e73e87 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -182,9 +182,9 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ); if ( !bExecHyperlinks ) -{ -sTxt = ViewShell::GetShellRes()-aHyperlinkClick + : + sTxt; -} +sTxt = ViewShell::GetShellRes()-aLinkCtrlClick + : + sTxt; +else +sTxt = ViewShell::GetShellRes()-aLinkClick + : + sTxt; } diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index ffed69a..27bc246 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -241,9 +241,9 @@ void SidebarTxtControl::MouseMove( const MouseEvent rMEvt ) OUString sURL( pURL-GetURL() ); SvtSecurityOptions aSecOpts; if ( aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK) ) -{ -sURL = ViewShell::GetShellRes()-aHyperlinkClick + : + sURL; -} +sURL = ViewShell::GetShellRes()-aLinkCtrlClick + : + sURL; +else +sURL = ViewShell::GetShellRes()-aLinkClick + : + sURL; Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL); } } diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index b6e7d23..879d1af 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -217,11 +217,11 @@ void SwEditWin::RequestHelp(const HelpEvent rEvt) SvtSecurityOptions aSecOpts; bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ); +sTxt = : + sTxt; if ( !bExecHyperlinks ) -{ -sTxt = : + sTxt; -sTxt = ViewShell::GetShellRes()-aHyperlinkClick + sTxt; -} +sTxt = ViewShell::GetShellRes()-aLinkCtrlClick + sTxt; +else +sTxt = ViewShell::GetShellRes()-aLinkClick + sTxt; } break; } diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d3f3f96..78312ff 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -204,7 +204,8 @@ ShellResource::ShellResource() aTOXObjectsName(SW_RES(STR_TOX_OBJ)), aTOXTablesName( SW_RES(STR_TOX_TBL)), aTOXAuthoritiesName(SW_RES(STR_TOX_AUTH)), -aHyperlinkClick(SW_RESSTR(STR_HYPERLINK_CLICK)), +aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)), +aLinkClick(SW_RESSTR(STR_LINK_CLICK)), pAutoFmtNameLst(0), sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), sPageDescFollowName(SW_RES(STR_PAGEDESC_FOLLOWNAME)), @@ -217,7 +218,7 @@ ShellResource::ShellResource() OUString aModStr( aModifiedCode.GetName() );
[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source
i18nlangtag/source/isolang/MS-LCID-to-list.sh | 88 i18nlangtag/source/isolang/MS-LCID.lst| 460 ++ 2 files changed, 548 insertions(+) New commits: commit 5dcee8893a41ace34aad77530cb8781ecde8e2cd Author: Eike Rathke er...@redhat.com Date: Thu Oct 24 11:44:49 2013 +0200 raw LangID list for reference ... to hopefully be able to generate a diff when the next release of MS-LCID.pdf will be available at http://msdn.microsoft.com/library/cc233965.aspx Change-Id: I10877cdc8d4b90c6b971dfa5e05ad796fd2a2d00 diff --git a/i18nlangtag/source/isolang/MS-LCID.lst b/i18nlangtag/source/isolang/MS-LCID.lst new file mode 100644 index 000..219157f --- /dev/null +++ b/i18nlangtag/source/isolang/MS-LCID.lst @@ -0,0 +1,460 @@ +0x0001 ar +0x0002 bg +0x0003 ca +0x0004 zh-Hans +0x0005 cs +0x0006 da +0x0007 de +0x0008 el +0x0009 en +0x000a es +0x000b fi +0x000c fr +0x000d he +0x000e hu +0x000f is +0x0010 it +0x0011 ja +0x0012 ko +0x0013 nl +0x0014 no +0x0015 pl +0x0016 pt +0x0017 rm +0x0018 ro +0x0019 ru +0x001a bs, hr, or sr +0x001b sk +0x001c sq +0x001d sv +0x001e th +0x001f tr +0x0020 ur +0x0021 id +0x0022 uk +0x0023 be +0x0024 sl +0x0025 et +0x0026 lv +0x0027 lt +0x0028 tg +0x0029 fa +0x002a vi +0x002b hy +0x002c az +0x002d eu +0x002e dsb or hsb +0x002f mk +0x0030 st +0x0031 ts +0x0032 tn +0x0033 ve, reserved +0x0034 xh +0x0035 zu +0x0036 af +0x0037 ka +0x0038 fo +0x0039 hi +0x003a mt +0x003b se +0x003c ga +0x003d yi, reserved +0x003e ms +0x003f kk +0x0040 ky +0x0041 sw +0x0042 tk +0x0043 uz +0x0044 tt +0x0045 bn +0x0046 pa +0x0047 gu +0x0048 or +0x0049 ta +0x004a te +0x004b kn +0x004c ml +0x004d as +0x004e mr +0x004f sa +0x0050 mn +0x0051 bo +0x0052 cy +0x0053 km +0x0054 lo +0x0055 my +0x0056 gl +0x0057 kok +0x0058 mni, reserved +0x0059 sd +0x005a syr +0x005b si +0x005c chr +0x005d iu +0x005e am +0x005f tzm +0x0060 ks, reserved +0x0061 ne +0x0062 fy +0x0063 ps +0x0064 fil +0x0065 dv +0x0066 bin, reserved +0x0067 ff +0x0068 ha +0x0069 ibb, reserved +0x006a yo +0x006b quz +0x006c nso +0x006d ba +0x006e lb +0x006f kl +0x0070 ig +0x0071 kr, reserved +0x0072 om +0x0073 ti +0x0074 gn +0x0075 haw +0x0076 la, reserved +0x0077 so, reserved +0x0078 ii +0x0079 pap, reserved +0x007a arn +0x007b Neither defined nor reserved +0x007c moh +0x007d Neither defined nor reserved +
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/qa sw/source
sw/qa/tiledrendering/tiledrendering.cxx | 22 +++--- sw/source/core/view/viewsh.cxx |9 + 2 files changed, 24 insertions(+), 7 deletions(-) New commits: commit 3642832fdc21ce71bf8fb103b58a0fa7b9f4eba8 Author: Jan Holesovsky ke...@collabora.com Date: Thu Oct 24 12:04:18 2013 +0200 Tiled rendering: Very crude way to show something. We are reusing the ViewShell's output device; instead we should provide an own, and draw to that one - to be continued... Change-Id: I4ed1bffbbcedeefa955db1d59eb4b252f4a25a64 diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 6f6e6e1..389e997 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -125,13 +125,29 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) // SystemGraphicsData aData; // [setup the aData] // VirtualDevice aDevice(aData, [color depth]); -VirtualDevice aDevice; +/* +// FIXME don't use pViewShell()-GetOut() directly, we need an own +// device here, something like +#ifdef IOS +VirtualDevice aDevice(8); +#else +VirtualDevice aDevice(1); +#endif + +aDevice.SetReferenceDevice(VirtualDevice::REFDEV_MODE_MSO1); +MapMode aMapMode(aDevice.GetMapMode()); +aMapMode.SetMapUnit(MAP_TWIP); +aDevice.SetMapMode(aMapMode); + aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); +*/ -pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); +pViewShell-PaintTile(pViewShell-GetOut(), Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); +// FIXME pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); // copy the aDevice content to mpImage -BitmapEx aBitmap(aDevice.GetBitmapEx(Point(0,0), aDevice.GetOutputSizePixel())); +// FIXME BitmapEx aBitmap(pViewShell-GetOut()-GetBitmapEx(Point(0,0), aDevice.PixelToLogic(Size(contextWidth, contextHeight; +BitmapEx aBitmap(pViewShell-GetOut()-GetBitmapEx(Point(0,0), pViewShell-GetOut()-PixelToLogic(Size(contextWidth, contextHeight; mpImage-SetImage(Image(aBitmap)); // update the dialog size diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 4cdb37d..af6b8af 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1756,17 +1756,18 @@ void ViewShell::PaintTile(OutputDevice *pOut, const Rectangle rRect) { assert(pOut); -pOut-SetPixelOffset(Size(-rRect.TopLeft().X(), -rRect.TopLeft().Y())); +pOut-SetPixelOffset(Size(rRect.TopLeft().X(), rRect.TopLeft().Y())); + // TODO make the tileWidth/Height fit the width/height of the pOut device // now we need to setup the ViewShell's output device // TODO clean up ViewShell's approach to output devices -OutputDevice *pSaveOut = mpOut; -mpOut = pOut; +OutputDevice *pSaveOut = GetOut(); +SetOutDev(this, pOut); Paint(rRect); -mpOut = pSaveOut; +SetOutDev(this, pSaveOut); } #if !HAVE_FEATURE_DESKTOP ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: .desktop files
On Tue, 2013-10-15 at 16:21 +0200, bjoern wrote: On Tue, Oct 15, 2013 at 02:47:21PM +0100, Caolán McNamara wrote: Are the duplicates intentional/necessary (I'm not up to date on the .desktop format). And if they are, presumably they should follow the same replaceable naming scheme of UNIXBASISROOTNAME Tweaked the .desktop files to use UNIXBASISROOTNAME for both launcher links now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/matus/rowdefaults'
New branch 'private/matus/rowdefaults' available with the following commits: commit 2b89b6b982cb534e2caf347febe12f9481b3e82e Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Oct 24 12:14:10 2013 +0200 remove now unused ScDocument::GetRowDefault Change-Id: I35b0a1cd86d1da9f11a9b8d3990eaa1509983243 commit 98b084f5a61b249d00dc1e0673d8d1c98c76090b Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Oct 24 09:16:38 2013 +0200 remove now unused ScMyDefaultStyles.maRowDefaults Also adapt to GetColDefault() being always true. Change-Id: I4701f02c540591b3d9f5095b22de82623c22c0db commit 7c03e0248e3e42b1fe09bf89b5ffcf13be1341c2 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 23 21:34:09 2013 +0200 remove pRowDefaults; it was full of default values It's because ScDocument::GetRowDefault() is constant false. Change-Id: I66d688e09dadc392c27e32bcd5243273c7be02e8 commit ab227354511d3c5e9c7c2128579fcab7124b1021 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Oct 24 11:54:07 2013 +0200 avoid temporary variables Change-Id: I5eff10913c31d05e71105ed391a8bef4333ced4f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag
i18nlangtag/source/isolang/mslangid.cxx | 42 include/i18nlangtag/mslangid.hxx|3 ++ 2 files changed, 45 insertions(+) New commits: commit b796a2030b9814978c904979dc609422d08eb538 Author: Eike Rathke er...@redhat.com Date: Thu Oct 24 12:26:02 2013 +0200 added isNonLatinWestern() Change-Id: Ie2aadab8302f365379a569989bd9640db55b9716 diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 72d5051..a48693b 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -24,6 +24,10 @@ #include i18nlangtag/mslangid.hxx +// Only very limited few functions that are guaranteed to not be called from +// LanguageTag may use LanguageTag ... +#include i18nlangtag/languagetag.hxx + LanguageType MsLangId::nConfiguredSystemLanguage = LANGUAGE_SYSTEM; LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM; @@ -405,6 +409,44 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang ) // static +bool MsLangId::isNonLatinWestern( LanguageType nLang ) +{ +switch (nLang) +{ +case LANGUAGE_AZERI_CYRILLIC: +case LANGUAGE_AZERI_CYRILLIC_LSO: +case LANGUAGE_BELARUSIAN: +case LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA: +case LANGUAGE_BOSNIAN_CYRILLIC_LSO: +case LANGUAGE_BULGARIAN: +case LANGUAGE_GREEK: +case LANGUAGE_MONGOLIAN_CYRILLIC_LSO: +case LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA: +case LANGUAGE_RUSSIAN: +case LANGUAGE_RUSSIAN_MOLDOVA: +case LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA: +case LANGUAGE_SERBIAN_CYRILLIC_LSO: +case LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO: +case LANGUAGE_SERBIAN_CYRILLIC_SAM: +case LANGUAGE_SERBIAN_CYRILLIC_SERBIA: +case LANGUAGE_UKRAINIAN: +case LANGUAGE_UZBEK_CYRILLIC: +case LANGUAGE_UZBEK_CYRILLIC_LSO: +return true; +default: +{ +if (getScriptType( nLang) != com::sun::star::i18n::ScriptType::LATIN) +return false; +LanguageTag aLanguageTag( nLang); +if (aLanguageTag.hasScript()) +return aLanguageTag.getScript() != Latn; +} +} +return false; +} + + +// static LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, bool /*bUserInterfaceSelection*/ ) { switch (nLang) diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index e0582d8..c35996c 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -148,6 +148,9 @@ public: /** Get ::com::sun::star::i18n::ScriptType of locale. */ static sal_Int16 getScriptType( LanguageType nLang ); +/** Whether locale is Western but not Latin script, e.g. Cyrillic or Greek. */ +static bool isNonLatinWestern( LanguageType nLang ); + /** Map an obsolete user defined LANGID (see lang.h LANGUAGE_OBSOLETE_USER_...) to the new value defined by MS in the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/edtwin.cxx | 21 ++--- 1 file changed, 2 insertions(+), 19 deletions(-) New commits: commit 642f900a09f668e9c3d09e23cc23be9d99b46268 Author: Eike Rathke er...@redhat.com Date: Thu Oct 24 12:36:05 2013 +0200 use MsLangId::isNonLatinWestern() Change-Id: I3aba3f85face62e0b8d54aebb92412c350aa2923 diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 31e4b70..9433cbf 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -796,7 +796,7 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView (i18n::UnicodeScript)GetAppCharClass().getScript( rInBuffer, 0 ) : i18n::UnicodeScript_kScriptCount; -bool bSystemIsNonLatin = false, bOOoLangIsNonLatin = false; +bool bSystemIsNonLatin = false; switch ( eType ) { case i18n::UnicodeScript_kGreek: @@ -809,24 +809,7 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView break; } -switch ( eLang ) -{ -case LANGUAGE_AZERI_CYRILLIC: -case LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA: -case LANGUAGE_BULGARIAN: -case LANGUAGE_GREEK: -case LANGUAGE_RUSSIAN: -case LANGUAGE_RUSSIAN_MOLDOVA: -case LANGUAGE_SERBIAN_CYRILLIC_SAM: -case LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA: -case LANGUAGE_UZBEK_CYRILLIC: -case LANGUAGE_UKRAINIAN: -case LANGUAGE_BELARUSIAN: -bOOoLangIsNonLatin = true; -break; -default: -break; -} +bool bOOoLangIsNonLatin = MsLangId::isNonLatinWestern( eLang); bLang = (bSystemIsNonLatin != bOOoLangIsNonLatin); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - writerfilter/source
writerfilter/source/dmapper/MeasureHandler.cxx | 35 +++ writerfilter/source/dmapper/MeasureHandler.hxx |6 + writerfilter/source/dmapper/StyleSheetTable.cxx| 52 - writerfilter/source/dmapper/StyleSheetTable.hxx|5 + writerfilter/source/dmapper/TablePropertiesHandler.cxx | 10 +++ writerfilter/source/dmapper/TablePropertiesHandler.hxx |3 writerfilter/source/dmapper/TblStylePrHandler.cxx | 15 writerfilter/source/dmapper/TblStylePrHandler.hxx |2 8 files changed, 127 insertions(+), 1 deletion(-) New commits: commit 5a50bb1701b44c6c765acd80aa38dc13e7ab9eed Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 24 13:05:21 2013 +0200 writerfilter: implement MeasureHandler::getInteropGrabBag() This allows e.g. storing a table style's w:tblPr - w:tblInd - w:type. Change-Id: I653edc8912ce4e61c703bfffc6e3dcf322295b6f diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index 783ebdc..57ffec5 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -53,9 +53,25 @@ void MeasureHandler::lcl_attribute(Id rName, Value rVal) { case NS_rtf::LN_unit: case NS_ooxml::LN_CT_TblWidth_type:// = 90668; +{ //can be: NS_ooxml::LN_Value_ST_TblWidth_nil, NS_ooxml::LN_Value_ST_TblWidth_pct, //NS_ooxml::LN_Value_ST_TblWidth_dxa, NS_ooxml::LN_Value_ST_TblWidth_auto; m_nUnit = nIntValue; + +if (!m_aInteropGrabBagName.isEmpty()) +{ +beans::PropertyValue aValue; +aValue.Name = type; +switch (nIntValue) +{ +case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value = uno::makeAny(OUString(nil)); break; +case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value = uno::makeAny(OUString(pct)); break; +case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value = uno::makeAny(OUString(dxa)); break; +case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value = uno::makeAny(OUString(auto)); break; +} +m_aInteropGrabBag.push_back(aValue); +} +} break; case NS_ooxml::LN_CT_Height_hRule: // 90666; { @@ -105,6 +121,25 @@ sal_Int32 MeasureHandler::getMeasureValue() const return nRet; } +void MeasureHandler::enableInteropGrabBag(OUString aName) +{ +m_aInteropGrabBagName = aName; +} + +beans::PropertyValue MeasureHandler::getInteropGrabBag() +{ +beans::PropertyValue aRet; +aRet.Name = m_aInteropGrabBagName; + +uno::Sequencebeans::PropertyValue aSeq(m_aInteropGrabBag.size()); +beans::PropertyValue* pSeq = aSeq.getArray(); +for (std::vectorbeans::PropertyValue::iterator i = m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i) +*pSeq++ = *i; + +aRet.Value = uno::makeAny(aSeq); +return aRet; +} + } //namespace dmapper } //namespace writerfilter diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index 0155614..b1e7c57 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -22,6 +22,7 @@ #include WriterFilterDllApi.hxx #include resourcemodel/LoggedResources.hxx #include boost/shared_ptr.hpp +#include com/sun/star/beans/PropertyValue.hpp namespace writerfilter { namespace dmapper @@ -36,6 +37,9 @@ class WRITERFILTER_DLLPRIVATE MeasureHandler : public LoggedProperties sal_Int32 m_nUnit; sal_Int16 m_nRowHeightSizeType; //table row height type +OUString m_aInteropGrabBagName; +std::vectorbeans::PropertyValue m_aInteropGrabBag; + // Properties virtual void lcl_attribute(Id Name, Value val); virtual void lcl_sprm(Sprm sprm); @@ -50,6 +54,8 @@ public: sal_Int32 getUnit() const { return m_nUnit; } sal_Int16 GetRowHeightSizeType() const { return m_nRowHeightSizeType;} +void enableInteropGrabBag(OUString aName); +beans::PropertyValue getInteropGrabBag(); }; typedef boost::shared_ptr MeasureHandler MeasureHandlerPtr; diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 9168fa6e..cf3a15a 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -262,13 +262,11 @@ namespace dmapper { if (pProperties.get()) { MeasureHandlerPtr pHandler(new MeasureHandler); + if (m_pCurrentInteropGrabBag) + pHandler-enableInteropGrabBag(tblInd); pProperties-resolve( *pHandler ); if
[Libreoffice-commits] core.git: 5 commits - android/Bootstrap configure.ac external/epm external/fontconfig external/freetype external/libatomic_ops openssl/ExternalPackage_openssl.mk python3/python-3
RepositoryExternal.mk | 24 ++--- android/Bootstrap/Makefile.shared |2 configure.ac|6 +- external/epm/ExternalPackage_epm.mk | 20 --- external/epm/Module_epm.mk |1 external/fontconfig/ExternalPackage_fontconfig.mk | 18 --- external/fontconfig/ExternalProject_fontconfig.mk |2 external/fontconfig/Module_fontconfig.mk|1 external/freetype/ExternalPackage_freetype.mk | 22 external/freetype/Module_freetype.mk|1 external/libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 --- external/libatomic_ops/Module_libatomic_ops.mk |1 openssl/ExternalPackage_openssl.mk |5 - python3/python-3.3.0-ssl.patch.1| 41 +++- solenv/bin/modules/installer/epmfile.pm |7 -- 15 files changed, 43 insertions(+), 128 deletions(-) New commits: commit 19d7c0348d7caadc42d557eb6d7a93446c7cd698 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 13:01:43 2013 +0200 epm: use executables from WORKDIR and clean up configure Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce diff --git a/configure.ac b/configure.ac index ad72a5c..e1d6124 100644 --- a/configure.ac +++ b/configure.ac @@ -7362,6 +7362,7 @@ if test $enable_epm = yes; then if test $EPM = no -o $EPM = internal; then echo EPM will be built. BUILD_TYPE=$BUILD_TYPE EPM +EPM=${WORKDIR}/UnpackedTarball/epm/epm else # Gentoo has some epm which is something different... AC_MSG_CHECKING([whether the found epm is the right epm]) @@ -7377,8 +7378,7 @@ if test $enable_epm = yes; then AC_MSG_RESULT([OK, = 3.7]) else AC_MSG_RESULT([too old. epm = 3.7 is required.]) -echo EPM will be built. -BUILD_TYPE=$BUILD_TYPE EPM +AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) fi fi fi @@ -7428,7 +7428,7 @@ if test $enable_epm = yes; then fi if echo $PKGFORMAT | $EGREP rpm 21 /dev/null || \ echo $PKGFORMAT | $EGREP pkg 21 /dev/null; then -if test $EPM != no -a $EPM != internal; then +if test $with_epm = no -a $_os != Darwin; then if test `echo $EPM_VERSION | cut -d'.' -f1` -lt 4; then AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs]) if grep Patched for LibreOffice $EPM /dev/null 2/dev/null; then diff --git a/external/epm/ExternalPackage_epm.mk b/external/epm/ExternalPackage_epm.mk deleted file mode 100644 index 793f419..000 --- a/external/epm/ExternalPackage_epm.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,epm,epm)) - -$(eval $(call gb_ExternalPackage_use_external_project,epm,epm)) - -$(eval $(call gb_ExternalPackage_add_files,epm,bin,\ - epm \ - epminstall \ - mkepmlist \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/epm/Module_epm.mk b/external/epm/Module_epm.mk index f86455c..1f4ed07 100644 --- a/external/epm/Module_epm.mk +++ b/external/epm/Module_epm.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,epm)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_Module_add_targets,epm,\ - ExternalPackage_epm \ ExternalProject_epm \ UnpackedTarball_epm \ )) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 06897fb..c386465 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -722,13 +722,6 @@ sub find_epm_on_system { $epmname = $ENV{'EPM'}; } -elsif ( ($ENV{'EPM'} eq no) || ($ENV{'EPM'} eq internal) ) -{ -$epmname = epm; -my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0); -if ($$epmref eq ) { installer::exiter::exit_program(ERROR: Could not find program $epmname (EPM set to \internal\ or \no\)!, find_epm_on_system); } -$epmname = $$epmref; -} else { installer::exiter::exit_program(Environment variable EPM set (\$ENV{'EPM'}\), but file does not exist or is not executable!, find_epm_on_system); commit
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/edtwin.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 124acbb11539f66aefb7d39fc61c7d99fb9409e7 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 12:15:21 2013 +0100 Related: fdo#70571 allowing clicking on a hyperlink in a protected section Change-Id: I6104ee3bb0928275a0e4ffb9a7ca1be37ebc1f9e diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 9433cbf..3a71de7 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4429,8 +4429,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt) if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_False ) ) { -// Do it again if we're not on a field to update the cursor accordingly -if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos ) +// Do it again if we're not on a field/hyperlink to update the cursor accordingly +if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos + SwContentAtPos::SW_INETATTR != aCntntAtPos.eCntntAtPos ) rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True ); sal_Bool bViewLocked = rSh.IsViewLocked(); @@ -4487,7 +4488,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt) } } } -else +else if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos ) { if ( bExecHyperlinks aCntntAtPos.aFnd.pAttr ) rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docbm.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit d78b26eb9ee290d2324f70890f21bb6bdb7dd33e Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 24 13:43:57 2013 +0200 -Werror,-Wunused-const-variable Change-Id: I32b9d2398d2d734a0d96c937b2238d8ff9a74ef7 diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index dad027e..0d1d8c3 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -288,11 +288,6 @@ IDocumentMarkAccess::MarkType IDocumentMarkAccess::GetType(const IMark rBkmk) } } -namespace -{ -const char CrossRefHeadingBookmark_NamePrefix[] = __RefHeading__; -} - OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix() { return OUString(__RefHeading__); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Support of csv files with .xls extension
On Thu, 2013-10-24 at 10:38 +0300, Maxim Monastirsky wrote: Hi All, Starting with 4.1 csv files with xls extension also tsv files are opened using writer instead of calc, when opening from the start center or from cli without '--calc'. While it's clear that the tsv part should be fixed (BTW it's a trivial fix [1]), I'm not sure about csv files with xls extension. Users shouldn't expect that after changing the file extension to some random extension, it still would be recognized as a csv by default. But on the other hand the fact that some user opened a bug for it, might indicate that some app\web app generates such files. So what do you think? Should it be fixed, or should we close the bug as WONTFIX? The relevant bug reports are: https://bugs.freedesktop.org/show_bug.cgi?id=68903 (csv with .xls extension) https://bugs.freedesktop.org/show_bug.cgi?id=69290 (tsv) Well, when the app name is not given, the current detection code relies on the extension to decide which app to open the file with (as you already noticed). I believe we associate csv to Calc in this case, http://cgit.freedesktop.org/libreoffice/core/tree/filter/source/textfilterdetect/filterdetect.cxx#n75 so I would say it's also reasonable to associate tsv and xls to Calc as well. Feel free to propose a patch for this and push it to gerrit. It should be a very easy fix. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a843992b7a21d2c4bb1fc91e8465738af78c1151 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 14:07:41 2013 +0200 Updated core Project: help bb440434d0561b291c73cf467c16e803934b8abb diff --git a/helpcontent2 b/helpcontent2 index 8fcc691..bb44043 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8fcc6911b8df398f174ac564569c7bbc107f8dfc +Subproject commit bb440434d0561b291c73cf467c16e803934b8abb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Module_helpcontent2.mk Package_imagelist.mk
Module_helpcontent2.mk |1 - Package_imagelist.mk | 14 -- 2 files changed, 15 deletions(-) New commits: commit bb440434d0561b291c73cf467c16e803934b8abb Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 14:07:41 2013 +0200 helpcontent: no need to deliver helpimg.ilst ... since postprocess reads it from WORKDIR already. Change-Id: Ib65a45b5afec3884f890850b5d95c1ef828e0ca3 diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk index 321169c..6f3d592 100644 --- a/Module_helpcontent2.mk +++ b/Module_helpcontent2.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,helpcontent2,\ AllLangHelp_smath \ AllLangHelp_swriter \ CustomTarget_imagelist \ - Package_imagelist \ )) # vim: set noet sw=4 ts=4: diff --git a/Package_imagelist.mk b/Package_imagelist.mk deleted file mode 100644 index 9f3ced4..000 --- a/Package_imagelist.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,helpcontent2_imagelist,$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary))) - -$(eval $(call gb_Package_add_file,helpcontent2_imagelist,res/img/helpimg.ilst,helpimg.ilst)) - -# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/macosx-change-install-names.pl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 470b4a03bf6d5f6340c201066a10d72ad7b01107 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 24 14:16:24 2013 +0200 Allow NONE libs to find each other on Mac OS X ...otherwise e.g. during execution of sw/PythonTest_sw_python.mk workdir/*/LinkTarget/Library/libtest.dylib would not find workdir/*/LinkTarget/Library/libunotest.dylib without yet another addition to DYLD_LIBRARY_PATH. (Special cases where NONE libs are located somewhere else than workdir/*/LinkTarget/Library/ can be and are still found via DYLD_LIBRARY_PATH.) Change-Id: Ia301746842ef49393d0229915c01b61e378ca100 diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 6d7edb2..10f230b 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -61,7 +61,7 @@ sub action($$$) 'shl/OXT/URELIB' = ($OLD ? '@executable_path/urelibs' : '@executable_path/../Frameworks'), 'shl/NONE/URELIB' = '@__VIA_LIBRARY_PATH__', 'shl/NONE/OOO' = '@__VIA_LIBRARY_PATH__', - 'shl/NONE/NONE' = '@__VIA_LIBRARY_PATH__'); + 'shl/NONE/NONE' = '@loader_path'); my ($type, $loc1, $loc2) = @_; my $act = $action{$type/$loc1/$loc2}; die illegal combination $type/$loc1/$loc2 unless defined $act; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/gallery1.hxx |4 +++- svx/source/gallery2/gallery1.cxx | 28 +--- svx/source/gallery2/galtheme.cxx |2 +- 3 files changed, 29 insertions(+), 5 deletions(-) New commits: commit 398519cb61b3aa2df61b9b18724ced4a36eb39d6 Author: Michael Meeks michael.me...@collabora.com Date: Wed Oct 23 19:49:06 2013 +0100 fdo#69079 - fix multiple user gallery creations. Change-Id: I0539e2708b973b8bea7bd63488277f00201c6c46 diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index e0c6fef..1d7ac1f 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -53,7 +53,9 @@ private: public: -GalleryThemeEntry( const INetURLObject rBaseURL, const OUString rName, +GalleryThemeEntry( bool bCreateUniqueURL, + const INetURLObject rBaseURL, + const OUString rName, sal_Bool bReadOnly, sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 939fb1f..e7cea79 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -42,7 +42,15 @@ using namespace ::com::sun::star; // - GalleryThemeEntry - -GalleryThemeEntry::GalleryThemeEntry( const INetURLObject rBaseURL, const OUString rName, +static bool FileExists( const INetURLObject rURL, const rtl::OUString rExt ) +{ +INetURLObject aURL( rURL ); +aURL.setExtension( rExt ); +return FileExists( aURL ); +} + +GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, + const INetURLObject rBaseURL, const OUString rName, sal_Bool _bReadOnly, sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) : nId ( _nId ), @@ -52,6 +60,19 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject rBaseURL, const OUStr INetURLObject aURL( rBaseURL ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL ); +if (bCreateUniqueURL) +{ +INetURLObject aBaseNoCase( ImplGetURLIgnoreCase( rBaseURL ) ); +aURL = aBaseNoCase; +static sal_Int32 nIdx = 0; +while( FileExists( aURL, thm ) ) +{ // create new URLs +nIdx++; +aURL = aBaseNoCase; +aURL.setName( aURL.getName() + OUString::number(nIdx)); +} +} + aURL.setExtension( thm ); aThmURL = ImplGetURLIgnoreCase( aURL ); @@ -491,8 +512,9 @@ sal_Bool Gallery::CreateTheme( const OUString rThemeName ) { INetURLObject aURL( GetUserURL() ); aURL.Append( rThemeName ); -GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( aURL, rThemeName, - sal_False, sal_True, 0, sal_False ); +GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( +true, aURL, rThemeName, +sal_False, sal_True, 0, sal_False ); aThemeList.push_back( pNewEntry ); delete( new GalleryTheme( this, pNewEntry ) ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index bab0d02..dc2f48a 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -746,7 +746,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject rURL, sa } INetURLObject aPathURL( rURL ); -pRet = new GalleryThemeEntry( aPathURL, aThemeName, +pRet = new GalleryThemeEntry( false, aPathURL, aThemeName, bReadOnly, sal_False, nThemeId, bThemeNameFromResource ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Mirosław Zalewski mini...@poczta.onet.pl changed: What|Removed |Added Depends on||67370 --- Comment #96 from Mirosław Zalewski mini...@poczta.onet.pl --- Hi I am proposing #67370: automatic hyphenation is not visible in text files exported as tagged PDF. Since PDF/A-1 format forces tagging, PDF/A-1 are affected as well. And PDF/A-1 were supposed to be readable and accessible in long-term future. This will be huge issue for government, business and NGO users when they switch to 4.1. See comment #10 there for bibisect log. Windows seems to be not affected by this issue. Mac OS X builds have not been tested. Best regards Mirosław Zalewski -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 69079] Creating a new themes in the gallery the files are always created as file new theme.* instead of sdxxx.* - existing files will be overwritten and leads to data loss.
https://bugs.freedesktop.org/show_bug.cgi?id=69079 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #9 from Michael Meeks michael.me...@collabora.com --- Fixed on master, and pending back-port to 4-1 as: https://gerrit.libreoffice.org/6417 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|1 - source/text/scalc/01/solver_options.xhp |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 4327d90e23cba2f2829a4d2bf0ed449fbeb92cdb Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 13:19:40 2013 +0100 update help ids for solver integer dialog .ui conversion Change-Id: Ie4095142ee30a1e5f261e18c3210f1ce625d988d diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6e3ec11..0c31bec 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3187,7 +3187,6 @@ HID_SC_SHEET_PAGE_STD,58788, HID_SC_SOLVEROPTIONS,59016, HID_SC_SOLVEROPTIONS_LB,59017, HID_SC_SOLVER_DOUBLE,59019, -HID_SC_SOLVER_INTEGER,59018, HID_SC_SOLVER_NOSOLUTION,59021, HID_SC_SOLVER_PROGRESS,59020, HID_SC_SOLVER_SUCCESS,59022, diff --git a/source/text/scalc/01/solver_options.xhp b/source/text/scalc/01/solver_options.xhp index eaf17e0..69e6782 100644 --- a/source/text/scalc/01/solver_options.xhp +++ b/source/text/scalc/01/solver_options.xhp @@ -37,7 +37,7 @@ bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE id=bm_id7214270 localize=false/paragraph role=paragraph id=par_id393993 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions./ahelp/paragraphcommentsettings/comment bookmark xml-lang=en-US branch=hid/SC_HID_SC_SOLVEROPTIONS_LB id=bm_id1331217 localize=false/paragraph role=paragraph id=par_id5871761 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenConfigure the current solver./ahelp/paragraphcommentedit/comment bookmark xml-lang=en-US branch=hid/sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT id=bm_id2186346 localize=false/paragraph role=paragraph id=par_id6531266 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenIf the current entry in the Settings listbox allows to edit a value, you can click the Edit button. A dialog opens where you can change the value./ahelp/paragraphcommentedit settings spin box/comment -bookmark xml-lang=en-US branch=hid/sc:NumericField:RID_SCDLG_SOLVER_INTEGER:NF_VALUE id=bm_id2761314 localize=false/paragraph role=paragraph id=par_id3912778 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter or change the value./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/integerdialog/IntegerDialog id=bm_id2761314 localize=false/paragraph role=paragraph id=par_id3912778 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter or change the value./ahelp/paragraph paragraph role=paragraph id=par_id3163853 xml-lang=en-US l10n=NEWUse the Options dialog to configure the current solver engine./paragraph paragraph role=paragraph id=par_id121158 xml-lang=en-US l10n=NEWYou can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions./paragraph paragraph role=paragraph id=par_id3806878 xml-lang=en-US l10n=NEWSelect the solver engine to use and to configure from the listbox. The listbox is disabled if onle one solver engine is installed./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 266e9392acf4fc6bbe5cc609e3874bfc91e93607 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 13:19:40 2013 +0100 Updated core Project: help 4327d90e23cba2f2829a4d2bf0ed449fbeb92cdb diff --git a/helpcontent2 b/helpcontent2 index bb44043..4327d90 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bb440434d0561b291c73cf467c16e803934b8abb +Subproject commit 4327d90e23cba2f2829a4d2bf0ed449fbeb92cdb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 69079] Creating a new themes in the gallery the files are always created as file new theme.* instead of sdxxx.* - existing files will be overwritten and leads to data loss.
https://bugs.freedesktop.org/show_bug.cgi?id=69079 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.2.0 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=398519cb61b3aa2df61b9b18724ced4a36eb39d6 fdo#69079 - fix multiple user gallery creations. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1 sc/inc/helpids.h|1 sc/inc/sc.hrc |1 sc/source/ui/app/inputhdl.cxx |2 sc/source/ui/inc/solveroptions.hxx | 13 +-- sc/source/ui/miscdlgs/solveroptions.cxx | 19 ++--- sc/source/ui/src/solveroptions.src | 50 -- sc/uiconfig/scalc/ui/integerdialog.ui | 113 8 files changed, 128 insertions(+), 72 deletions(-) New commits: commit 8755bef6dd4145f2eac8c18a4a7eb58c52b83d47 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 12:46:27 2013 +0100 convert SolverInteger dialog to .ui Change-Id: Iec4b0d041ec0389630d21572d6c5658639d85b17 diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 2bbaf3a..29893fe 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -86,6 +86,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/insertcells \ sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ + sc/uiconfig/scalc/ui/integerdialog \ sc/uiconfig/scalc/ui/leftfooterdialog \ sc/uiconfig/scalc/ui/leftheaderdialog \ sc/uiconfig/scalc/ui/namerangesdialog \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index b7856b2..126eba6 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -170,7 +170,6 @@ #define HID_SC_SOLVEROPTIONS SC_HID_SC_SOLVEROPTIONS #define HID_SC_SOLVEROPTIONS_LB SC_HID_SC_SOLVEROPTIONS_LB -#define HID_SC_SOLVER_INTEGER SC_HID_SC_SOLVER_INTEGER #define HID_SC_SOLVER_DOUBLE SC_HID_SC_SOLVER_DOUBLE #define HID_SC_SOLVER_PROGRESS SC_HID_SC_SOLVER_PROGRESS #define HID_SC_SOLVER_NOSOLUTION SC_HID_SC_SOLVER_NOSOLUTION diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 7e945b6..a8ad8eb 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1090,7 +1090,6 @@ #define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137) #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139) -#define RID_SCDLG_SOLVER_INTEGER(SC_DIALOGS_START + 140) #define RID_SCDLG_SOLVER_DOUBLE (SC_DIALOGS_START + 141) #define RID_SCDLG_SOLVER_PROGRESS (SC_DIALOGS_START + 142) #define RID_SCDLG_SOLVER_NOSOLUTION (SC_DIALOGS_START + 143) diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index b632b47..9dbde59 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -20,12 +20,12 @@ #ifndef SC_SOLVEROPTIONS_HXX #define SC_SOLVEROPTIONS_HXX -#include vcl/dialog.hxx - #include vcl/button.hxx +#include vcl/dialog.hxx +#include vcl/field.hxx #include vcl/fixed.hxx +#include vcl/layout.hxx #include vcl/lstbox.hxx -#include vcl/field.hxx #include svx/checklbx.hxx #include com/sun/star/uno/Sequence.hxx @@ -77,11 +77,8 @@ public: class ScSolverIntegerDialog : public ModalDialog { -FixedText maFtName; -NumericFieldmaNfValue; -FixedLine maFlButtons; -OKButtonmaBtnOk; -CancelButtonmaBtnCancel; +VclFrame* m_pFrame; +NumericField* m_pNfValue; public: ScSolverIntegerDialog( Window * pParent ); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 6488c7b..479f3a4 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -401,15 +401,12 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) //-- -ScSolverIntegerDialog::ScSolverIntegerDialog( Window * pParent ) -: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_INTEGER ) ), -maFtName( this, ScResId( FT_OPTIONNAME ) ), -maNfValue ( this, ScResId( NF_VALUE ) ), -maFlButtons ( this, ScResId( FL_BUTTONS ) ), -maBtnOk ( this, ScResId( BTN_OK ) ), -maBtnCancel ( this, ScResId( BTN_CANCEL ) ) +ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) +: ModalDialog( pParent, IntegerDialog, +modules/scalc/ui/integerdialog.ui ) { -FreeResource(); +get(m_pFrame, frame); +get(m_pNfValue, value); } ScSolverIntegerDialog::~ScSolverIntegerDialog() @@ -418,17 +415,17 @@ ScSolverIntegerDialog::~ScSolverIntegerDialog() void ScSolverIntegerDialog::SetOptionName( const OUString rName ) { -maFtName.SetText( rName ); +m_pFrame-set_label(rName); } void ScSolverIntegerDialog::SetValue( sal_Int32 nValue ) { -maNfValue.SetValue( nValue ); +m_pNfValue-SetValue( nValue ); } sal_Int32 ScSolverIntegerDialog::GetValue() const { -sal_Int64 nValue = maNfValue.GetValue(); +sal_Int64 nValue = m_pNfValue-GetValue(); if ( nValue
[Libreoffice-commits] core.git: configure.ac extensions/Executable_pluginapp.bin.mk
configure.ac | 15 ++- extensions/Executable_pluginapp.bin.mk |4 2 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 85b120d06100e082ad45051d4f1c3c549569 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 24 14:28:58 2013 +0200 Disallow --without-system-cairo combined with (implicit) --enable-gtk As the system gtk libraries may depend on later versions of libcairo.so.2 and its bring-along libpixman-1.so.0 with the same SONAMEs. So if it would ever happen at runtime that our bundled libcairo.so.2 and/or libpixman-1.so.0 get loaded before the system ones, the system gtk would probably not work correctly. Ultimately, the bundled cairo can probably go completely. This reverts 122a137672d761418a549568ad8cad623dd2b4b5 extensions: crude hack for mysterious cairo link failure. As discussed at #libreoffice-dev: Oct 24 10:10:15 mst__ sberg, caolan, dtardon any idea what the proper fix is for pluginapp.bin? 122a137672d761418a549568ad8cad623dd2b4b5 breaks on RHEL5 tinderbox... Oct 24 10:10:17 IZBot core - extensions: crude hack for mysterious cairo link failure - http://cgit.freedesktop.org/libreoffice/core/commit/?id=122a137672d761418a549568ad8cad623dd2b4b5 Oct 24 10:12:53 dtardon mst__, i'd try gb_Executable_use_external,pluginapp.bin,cairo Oct 24 10:13:58 mst__ dtardon, i'm not sure if that is the intent - the -lcairo comes from the gtk external so we should use same cairo as gtk i.e. system one? but id on't understand why linker won't find the pixman library Oct 24 10:16:35 sberg mst__, I get no build failures in make extensions.clean make extensions when I comment out that FIXME in extensions/Executable_pluginapp.bin.mk Oct 24 10:18:59 mst__ sberg, it only started to fail for me when i removed libcairo.so from solver, probably you still have a stale one Oct 24 10:19:42 sberg mst__, in solver/*/lib/? no Oct 24 10:20:48 sberg mst__, but turns out I'm using --with-system-cairo (as required by --enable-gtk3), so ignore me Oct 24 10:22:53 mst__ sberg, so if i rm solver/unxlngx6/lib/*cairo* solver/unxlngx6/lib/*pixman* it still fails for me, how could system-cairo work then? Oct 24 10:24:13 sberg mst__, in that /usr/lib64/libcairo.so has a DT_NEEDED on libpixman-1.so.0 (which our libcairo.so is missing, I'd assume) Oct 24 10:24:44 sberg mst__, erm Oct 24 10:41:18 mst__ sberg, so if i filter out -lcairo in gb_LinkTarget__use_gtk then it magically works - are there any problems with that approach? Oct 24 10:47:19 sberg mst__, so the root of the problem is that there's two different libcairo involved? (just doing a local build --wihtout-system-cairo here, to see what's going on) Oct 24 10:47:55 mst__ sberg, i don't think so since i get same problem after removing all cairo libs from solver Oct 24 11:12:11 sberg mst__, so the link line for pluginapp.bin contains -lcairo twice, apparently dragged in indirectly (via _use_externals gthread and gtk, likely), and does not contain our -L.../cairo/src/.libs (as it doesn't _use_externals cairo), but does contain -Lsolver/*/lib. Now, /usr/lib64/libcairo.so needs libpixman-1.so.0 and there happens to be one in solver/*/lib that lacks syms compared to /usr/lib64/libpixman-1.so.0 Oct 24 11:13:43 sberg mst__, so this was nicely hidden when all the external libs were delivered to solver/*/lib, but in the end I think the bug is to combine system gtk with non-system cairo and/or pixman Oct 24 11:14:49 sberg mst__, as long as our cairo and/or pixman have the same SONAMEs or exported symbol names as system ones, all hell can happen at runtime anyway Oct 24 11:15:32 mst__ sberg, but... why then does it fail for me if i don't have the cairo/pixman libs in solver? Oct 24 11:15:57 mst__ ahhh -Wl,-rpath-link,$S/instdir/unxlngx6/program - taht must be why Oct 24 11:17:40 mst__ is it normal that -Wl,--trace does not print out what libraries were found via -Wl,-rpath-link? it only appears to print explicit -lfoo Oct 24 11:18:27 sberg mst__, because of -Linstdir/*/program Oct 24 11:20:27 mst__ sberg, so we need -Wl,-rpath-link,$S/instdir/unxlngx6/program obviously; Oct 24 11:22:08 mst__ sberg, apparently everything builds successfully when filtering out -lcairo from GTK_LIBS, do you think that is the best workaround for this? Oct 24 11:22:14 sberg mst__, no, we need to change configure.ac to disallow --enable-gtk --without-system-{ciaro,pixman} Oct 24 11:22:39 sberg mst__, similarly to how we already disallow --enable-gtk3 --without-system-cairo Oct 24 11:24:48 mst__ sberg, that would be sort of pointless,
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |4 ++-- sc/source/ui/app/inputhdl.cxx| 14 +- sc/source/ui/view/viewdata.cxx |2 +- 3 files changed, 12 insertions(+), 8 deletions(-) New commits: commit 082e1fa44cf6b3d61d571bab99407d3f38d8288d Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 13:51:09 2013 +0100 more string bounds checks for sc Change-Id: I99293a91018c130415bd3816fa23f44643512a74 diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 33ba889..5a7d8e2 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3673,14 +3673,14 @@ ScTokenArray* ScCompiler::CompileString( const OUString rFormula ) aCorrectedSymbol = ; } sal_uInt8 nForced = 0; // ==formula forces recalc even if cell is not visible -if( aFormula[nSrcPos] == '=' ) +if( nSrcPos aFormula.getLength() aFormula[nSrcPos] == '=' ) { nSrcPos++; nForced++; if ( bAutoCorrect ) aCorrectedFormula += =; } -if( aFormula[nSrcPos] == '=' ) +if( nSrcPos aFormula.getLength() aFormula[nSrcPos] == '=' ) { nSrcPos++; nForced++; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 87713ec..de88da3 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2247,11 +2247,15 @@ void ScInputHandler::UpdateFormulaMode() { SfxApplication* pSfxApp = SFX_APP(); -if ( pEngine-GetParagraphCount() == 1 - ( pEngine-GetText(0)[0] == '=' || - pEngine-GetText(0)[0] == '+' || - pEngine-GetText(0)[0] == '-' ) - !bProtected ) +bool bIsFormula = !bProtected pEngine-GetParagraphCount() == 1; +if (bIsFormula) +{ +const OUString rText = pEngine-GetText(0); +bIsFormula = !rText.isEmpty() +(rText[0] == '=' || rText[0] == '+' || rText[0] == '-'); +} + +if ( bIsFormula ) { if (!bFormulaMode) { diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 0769315c..1434cd4 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1328,7 +1328,7 @@ void ScViewData::EditGrowY( sal_Bool bInitial ) // Subsequent calls with empty text might involve changed attributes (including // font height), so they are treated like normal text. OUString aText = pEngine-GetText( 0 ); -if ( ( aText.isEmpty() bInitial ) || aText[0] == '=' ) +if ( ( aText.isEmpty() bInitial ) || (!aText.isEmpty() aText[0] == '=') ) nAllowedExtra = SC_GROWY_BIG_EXTRA; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/dmapper/CellMarginHandler.cxx | 54 + writerfilter/source/dmapper/CellMarginHandler.hxx | 13 +++- writerfilter/source/dmapper/MeasureHandler.cxx |7 ++ writerfilter/source/dmapper/StyleSheetTable.cxx| 26 +++- writerfilter/source/dmapper/TablePropertiesHandler.cxx |4 + 5 files changed, 102 insertions(+), 2 deletions(-) New commits: commit d5c420b32dd104fe4105d1ca004eb8206fdba0d8 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 24 14:49:47 2013 +0200 writerfilter: save styleId / name / isDefault for table styles Change-Id: Ib422584d2f6cbb8bfd88dd67aef96b8b062c3d38 diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 1dfac15..f53e129 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -176,7 +176,7 @@ PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask, StyleSheetE beans::PropertyValue TableStyleSheetEntry::GetInteropGrabBag() { beans::PropertyValue aRet; -aRet.Name = sStyleName; +aRet.Name = sStyleIdentifierI; uno::Sequencebeans::PropertyValue aSeq(m_aInteropGrabBag.size()); beans::PropertyValue* pSeq = aSeq.getArray(); @@ -477,12 +477,28 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val) break; case NS_ooxml::LN_CT_Style_default: m_pImpl-m_pCurrentEntry-bIsDefaultStyle = (nIntValue != 0); +if(m_pImpl-m_pCurrentEntry-nStyleTypeCode == STYLE_TYPE_TABLE) +{ +TableStyleSheetEntry* pTableEntry = static_castTableStyleSheetEntry *(m_pImpl-m_pCurrentEntry.get()); +beans::PropertyValue aValue; +aValue.Name = default; +aValue.Value = uno::makeAny(sal_Bool(pTableEntry-bIsDefaultStyle)); +pTableEntry-AppendInteropGrabBag(aValue); +} break; case NS_ooxml::LN_CT_Style_customStyle: break; case NS_ooxml::LN_CT_Style_styleId: m_pImpl-m_pCurrentEntry-sStyleIdentifierI = sValue; m_pImpl-m_pCurrentEntry-sStyleIdentifierD = sValue; +if(m_pImpl-m_pCurrentEntry-nStyleTypeCode == STYLE_TYPE_TABLE) +{ +TableStyleSheetEntry* pTableEntry = static_castTableStyleSheetEntry *(m_pImpl-m_pCurrentEntry.get()); +beans::PropertyValue aValue; +aValue.Name = styleId; +aValue.Value = uno::makeAny(sValue); +pTableEntry-AppendInteropGrabBag(aValue); +} break; case NS_ooxml::LN_CT_TblWidth_w: dynamic_cast StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TblWidth_w( nIntValue ); @@ -533,6 +549,14 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm) //this is only a UI name! m_pImpl-m_pCurrentEntry-sStyleName = sStringValue; m_pImpl-m_pCurrentEntry-sStyleName1 = sStringValue; +if(m_pImpl-m_pCurrentEntry-nStyleTypeCode == STYLE_TYPE_TABLE) +{ +TableStyleSheetEntry* pTableEntry = static_castTableStyleSheetEntry *(m_pImpl-m_pCurrentEntry.get()); +beans::PropertyValue aValue; +aValue.Name = name; +aValue.Value = uno::makeAny(sStringValue); +pTableEntry-AppendInteropGrabBag(aValue); +} break; case NS_ooxml::LN_CT_Style_basedOn: m_pImpl-m_pCurrentEntry-sBaseStyleIdentifier = sStringValue; commit 0ed8f752b4566ac427c0a48e14904907a7dac839 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 24 14:34:10 2013 +0200 writerfilter: implement CellMarginHandler::getInteropGrabBag This allows roundtrip of the whole tblCellMar XML fragment. Change-Id: I41c5afd6b1cfa7322f5f1bd8c44ed6bffe10eb41 diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index 6119831..a74e02b 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -32,6 +32,8 @@ using namespace ::writerfilter; CellMarginHandler::CellMarginHandler() : LoggedProperties(dmapper_logger, CellMarginHandler), m_nValue( 0 ), +m_nWidth( 0 ), +m_nType( 0 ), m_nLeftMargin( 0 ), m_bLeftMarginValid( false ), m_nRightMargin( 0 ), @@ -55,16 +57,42 @@ void CellMarginHandler::lcl_attribute(Id rName, Value rVal) switch( rName ) { case NS_ooxml::LN_CT_TblWidth_w: +m_nWidth = nIntValue; m_nValue = ConversionHelper::convertTwipToMM100( nIntValue ); break; case NS_ooxml::LN_CT_TblWidth_type: OSL_ENSURE( NS_ooxml::LN_Value_ST_TblWidth_dxa == sal::static_int_castId(nIntValue), cell margins work for absolute values, only); +
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|1 - source/text/scalc/01/solver_options.xhp |1 + 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 91f8b3cb54e752a174ee10be4e528c7dcd4fb55e Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 14:12:15 2013 +0100 add a help id for the double input dialog Change-Id: Ic520786fac92674130dee6f309df3094e81e2a8e diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 0c31bec..8234a1f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3186,7 +3186,6 @@ HID_SC_SHEET_PAGE_REP,58789, HID_SC_SHEET_PAGE_STD,58788, HID_SC_SOLVEROPTIONS,59016, HID_SC_SOLVEROPTIONS_LB,59017, -HID_SC_SOLVER_DOUBLE,59019, HID_SC_SOLVER_NOSOLUTION,59021, HID_SC_SOLVER_PROGRESS,59020, HID_SC_SOLVER_SUCCESS,59022, diff --git a/source/text/scalc/01/solver_options.xhp b/source/text/scalc/01/solver_options.xhp index 69e6782..8fade24 100644 --- a/source/text/scalc/01/solver_options.xhp +++ b/source/text/scalc/01/solver_options.xhp @@ -37,6 +37,7 @@ bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE id=bm_id7214270 localize=false/paragraph role=paragraph id=par_id393993 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions./ahelp/paragraphcommentsettings/comment bookmark xml-lang=en-US branch=hid/SC_HID_SC_SOLVEROPTIONS_LB id=bm_id1331217 localize=false/paragraph role=paragraph id=par_id5871761 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenConfigure the current solver./ahelp/paragraphcommentedit/comment bookmark xml-lang=en-US branch=hid/sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT id=bm_id2186346 localize=false/paragraph role=paragraph id=par_id6531266 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenIf the current entry in the Settings listbox allows to edit a value, you can click the Edit button. A dialog opens where you can change the value./ahelp/paragraphcommentedit settings spin box/comment +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/doubledialog/DoubleDialog id=bm_id2761315 localize=false/ bookmark xml-lang=en-US branch=hid/modules/scalc/ui/integerdialog/IntegerDialog id=bm_id2761314 localize=false/paragraph role=paragraph id=par_id3912778 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter or change the value./ahelp/paragraph paragraph role=paragraph id=par_id3163853 xml-lang=en-US l10n=NEWUse the Options dialog to configure the current solver engine./paragraph paragraph role=paragraph id=par_id121158 xml-lang=en-US l10n=NEWYou can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
helpcontent2|2 sc/UIConfig_scalc.mk|1 sc/inc/helpids.h|1 sc/inc/sc.hrc |1 sc/source/ui/inc/solveroptions.hxx |9 -- sc/source/ui/miscdlgs/solveroptions.cxx | 25 ++- sc/source/ui/src/solveroptions.src | 43 sc/uiconfig/scalc/ui/doubledialog.ui| 106 8 files changed, 117 insertions(+), 71 deletions(-) New commits: commit 57ebd448497ec357aa348f5df90a52e8d58b4bb6 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 14:09:30 2013 +0100 convert SolverDouble dialog to .ui Change-Id: I996038a45495a5b6a63622ac0d290ac4fbc0bedd diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 29893fe..6ec6ee4 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/deletecells \ sc/uiconfig/scalc/ui/deletecontents \ sc/uiconfig/scalc/ui/descriptivestatisticsdialog \ + sc/uiconfig/scalc/ui/doubledialog \ sc/uiconfig/scalc/ui/erroralerttabpage \ sc/uiconfig/scalc/ui/externaldata \ sc/uiconfig/scalc/ui/filldlg \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 126eba6..f772fc7 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -170,7 +170,6 @@ #define HID_SC_SOLVEROPTIONS SC_HID_SC_SOLVEROPTIONS #define HID_SC_SOLVEROPTIONS_LB SC_HID_SC_SOLVEROPTIONS_LB -#define HID_SC_SOLVER_DOUBLE SC_HID_SC_SOLVER_DOUBLE #define HID_SC_SOLVER_PROGRESS SC_HID_SC_SOLVER_PROGRESS #define HID_SC_SOLVER_NOSOLUTION SC_HID_SC_SOLVER_NOSOLUTION #define HID_SC_SOLVER_SUCCESS SC_HID_SC_SOLVER_SUCCESS diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index a8ad8eb..89f3898 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1090,7 +1090,6 @@ #define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137) #define RID_SCDLG_SOLVEROPTIONS (SC_DIALOGS_START + 139) -#define RID_SCDLG_SOLVER_DOUBLE (SC_DIALOGS_START + 141) #define RID_SCDLG_SOLVER_PROGRESS (SC_DIALOGS_START + 142) #define RID_SCDLG_SOLVER_NOSOLUTION (SC_DIALOGS_START + 143) #define RID_SCDLG_SOLVER_SUCCESS(SC_DIALOGS_START + 144) diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 9dbde59..5ce5ec7 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -82,7 +82,6 @@ class ScSolverIntegerDialog : public ModalDialog public: ScSolverIntegerDialog( Window * pParent ); -~ScSolverIntegerDialog(); voidSetOptionName( const OUString rName ); voidSetValue( sal_Int32 nValue ); @@ -91,15 +90,11 @@ public: class ScSolverValueDialog : public ModalDialog { -FixedText maFtName; -EditmaEdValue; -FixedLine maFlButtons; -OKButtonmaBtnOk; -CancelButtonmaBtnCancel; +VclFrame* m_pFrame; +Edit* m_pEdValue; public: ScSolverValueDialog( Window * pParent ); -~ScSolverValueDialog(); voidSetOptionName( const OUString rName ); voidSetValue( double fValue ); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 479f3a4..256f334 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -409,10 +409,6 @@ ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) get(m_pNfValue, value); } -ScSolverIntegerDialog::~ScSolverIntegerDialog() -{ -} - void ScSolverIntegerDialog::SetOptionName( const OUString rName ) { m_pFrame-set_label(rName); @@ -436,35 +432,28 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const //-- ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) -: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVER_DOUBLE ) ), -maFtName( this, ScResId( FT_OPTIONNAME ) ), -maEdValue ( this, ScResId( ED_VALUE ) ), -maFlButtons ( this, ScResId( FL_BUTTONS ) ), -maBtnOk ( this, ScResId( BTN_OK ) ), -maBtnCancel ( this, ScResId( BTN_CANCEL ) ) -{ -FreeResource(); -} - -ScSolverValueDialog::~ScSolverValueDialog() +: ModalDialog( pParent, DoubleDialog, +modules/scalc/ui/doubledialog.ui ) { +get(m_pFrame, frame); +get(m_pEdValue, value); } void ScSolverValueDialog::SetOptionName( const OUString rName ) { -maFtName.SetText( rName ); +m_pFrame-set_label(rName); } void ScSolverValueDialog::SetValue( double fValue ) { -maEdValue.SetText( rtl::math::doubleToUString( fValue, +m_pEdValue-SetText(
[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - 2 files changed, 2 deletions(-) New commits: commit 5387c4f57519b8ff013e2e58b6ea8680b438c021 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 24 15:15:46 2013 +0200 distro-configs: remove no longer working --without-system-cairo ...after 85b120d06100e082ad45051d4f1c3c549569 Disallow --without-system-cairo combined with (implicit) --enable-gtk. Change-Id: I74f5e4f454f5e1724e258380bbbcd771bf58453a diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index d0f2b6d..de417a1 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -9,7 +9,6 @@ --without-system-libxml --without-system-jpeg --without-system-jars ---without-system-cairo --without-system-postgresql --without-junit --with-help diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index fecce80..860f583 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -56,7 +56,6 @@ --without-system-libxml --without-system-jpeg --without-system-jars ---without-system-cairo --without-system-mysql --without-system-postgresql --without-junit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7a26d7c1401d8a3d093cddc40d5d0044852cd91 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 Updated core Project: dictionaries ddce99b119fa7c565f0f6d783b2b136434ba9418 diff --git a/dictionaries b/dictionaries index f427334..ddce99b 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit f4273344b893afe67da57b36956d3f6fd4fef24e +Subproject commit ddce99b119fa7c565f0f6d783b2b136434ba9418 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.1' - pt_PT/pt_PT.dic
pt_PT/pt_PT.dic |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit ddce99b119fa7c565f0f6d783b2b136434ba9418 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 22 10:11:13 2013 +0100 remove duplicate entry Change-Id: I8c8dc81d31a4bedde4931e146bda478f0bf5a211 (cherry picked from commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83) diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index fad14ba..7f148c1 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43938 +43937 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -23,7 +23,6 @@ abanadura/p [CAT=nc,G=f,N=s] abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Support of csv files with .xls extension
Hi Kohei, great that you responded! Could you also take a look at https://bugs.freedesktop.org/show_bug.cgi?id=70100. There is a file which is detected by Excel 2010 as 'Excel 2' sheet and LO also sets the excel4 filter, but it fails in isExcel40 function from sc/source/ui/unoobj/exceldetect.cxx because it has a value like in BIFF5. Thanks in advance, Maxim Monastirsky ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 10 commits - connectivity/qa connectivity/source curl/ExternalPackage_curl.mk icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch icu
connectivity/qa/connectivity/commontools/FValue_test.cxx | 24 +++ connectivity/source/commontools/FValue.cxx |9 + curl/ExternalPackage_curl.mk |6 icu/UnpackedTarball_icu.mk |1 icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch | 36 + librelogo/source/LibreLogo/LibreLogo.py |3 libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch | 26 libvisio/UnpackedTarball_libvisio.mk |6 sal/qa/rtl/math/test-rtl-math.cxx|6 sal/rtl/math.cxx |4 scp2/source/ooo/file_library_ooo.scp |2 sot/source/sdstor/stgstrms.cxx | 16 +- vcl/Library_vcl.mk |6 vcl/generic/fontmanager/fontconfig.cxx | 47 +++ vcl/generic/glyphs/gcach_layout.cxx | 61 ++ vcl/inc/generic/glyphcache.hxx |5 16 files changed, 223 insertions(+), 35 deletions(-) New commits: commit 9df3ede147501d91c863c2a604d11fffcf99cb2c Author: Armin Le Grand a...@apache.org Date: Wed Oct 16 16:47:38 2013 +0100 i123485 secured file import scanning existing pages (cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 and adapted to the rewritten scanBuildPageChainCache) Reviewed-on: https://gerrit.libreoffice.org/6272 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com (cherry picked from commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0) Conflicts: sot/source/sdstor/stgstrms.cxx Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162 Reviewed-on: https://gerrit.libreoffice.org/6314 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 1561204..1c9af60 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -23,6 +23,7 @@ #include sal/log.hxx #include osl/file.hxx #include tools/tempfile.hxx +#include set #include sot/stg.hxx #include stgelem.hxx @@ -339,16 +340,23 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize) bool bError = false; sal_Int32 nBgn = nStart; -sal_Int32 nOldBgn = -1; sal_Int32 nOptSize = 0; -while( nBgn = 0 nBgn != nOldBgn ) + +// Track already scanned PageNumbers here and use them to +// see if an already counted page is re-visited +std::set sal_Int32 nUsedPageNumbers; + +while( nBgn = 0 !bError ) { if( nBgn = 0 ) m_aPagesCache.push_back(nBgn); -nOldBgn = nBgn; nBgn = pFat-GetNextPage( nBgn ); -if( nBgn == nOldBgn ) + +if( nUsedPageNumbers.find(nBgn) != nUsedPageNumbers.end() ) bError = true; +else +nUsedPageNumbers.insert(nBgn); + nOptSize += nPageSize; } if (bError) commit 25b55d380a315b972e93ba1d7e6b8b0fc1625b57 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 23 22:20:25 2013 +0200 curl: libcurl.so.4 goes into instset, not libcurl.so! Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file is not actually in the instset, just a libcurl.so with SONAME libcurl.so.4. (regression in LO 4.0.0) Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f (cherry picked from commit 30e1d4c0a9202d5c8057efdb0bfda11f46a25251) Reviewed-on: https://gerrit.libreoffice.org/6411 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk index 5f55260..e9cb7a1 100644 --- a/curl/ExternalPackage_curl.mk +++ b/curl/ExternalPackage_curl.mk @@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl. else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4)) else -# TODO: Do we really want the unversioned library in the installation? -# And if that's true, why do we need to deliver the versioned one at all? -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) endif else ifeq ($(OS)$(COM),WNTGCC) diff --git
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared sw/source
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m |8 +++ sw/source/core/view/viewsh.cxx | 11 -- 2 files changed, 9 insertions(+), 10 deletions(-) New commits: commit 8ff597b589f49a27ee75b7a8bd7301a90e7b4770 Author: Ptyl Dragon p...@cloudon.com Date: Thu Oct 24 16:48:28 2013 +0200 now iOS draws something (upside down) Change-Id: Ibf04322d34605fce30b2fa477de98a3e2ff9c2d1 diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m index 2381df9..be2e144 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m @@ -39,12 +39,12 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f; } -(void)initParams{ -self.params = @[[self createParam:@contextWidth extractor:^(CGFloat value){self.contextWidth = value;} value:100], -[self createParam:@contextHeight extractor:^(CGFloat value){self.contextHeight = value;} value:100], +self.params = @[[self createParam:@contextWidth extractor:^(CGFloat value){self.contextWidth = value;} value:300], +[self createParam:@contextHeight extractor:^(CGFloat value){self.contextHeight = value;} value:300], [self createParam:@tilePosX extractor:^(CGFloat value){self.tilePosX = value;} value:0], [self createParam:@tilePosY extractor:^(CGFloat value){self.tilePosY = value;} value:0], -[self createParam:@tileWidth extractor:^(CGFloat value){self.tileWidth = value;} value:100], -[self createParam:@tileHeight extractor:^(CGFloat value){self.tileHeight = value;} value:100] +[self createParam:@tileWidth extractor:^(CGFloat value){self.tileWidth = value;} value:300], +[self createParam:@tileHeight extractor:^(CGFloat value){self.tileHeight = value;} value:300] ]; } diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index af6b8af..3a978d4 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -58,6 +58,7 @@ #include vcl/bitmapex.hxx #include svtools/colorcfg.hxx #include vcl/bmpacc.hxx +#include vcl/alpha.hxx #include svtools/accessibilityoptions.hxx #include accessibilityoptions.hxx #include statstr.hrc @@ -1790,12 +1791,10 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int // SystemGraphicsData aData; // [setup the aData] // VirtualDevice aDevice(aData, [color depth]); -VirtualDevice aDevice; -aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); - -pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); -BitmapEx aBitmapEx(aDevice.GetBitmapEx(Point(0,0), aDevice.GetOutputSizePixel())); -Bitmap aBitmap = aBitmapEx.GetBitmap(); +//VirtualDevice aDevice; +//aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); +pViewShell-PaintTile(pViewShell-GetOut(), Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); +Bitmap aBitmap(pViewShell-GetOut()-GetBitmap(Point(0,0), pViewShell-GetOut()-PixelToLogic(Size(contextWidth, contextHeight; BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); touch_lo_copy_buffer((void *) readAccess-GetBuffer(), tileWidth, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - include/svx svx/source
include/svx/gallery1.hxx |4 +++- svx/source/gallery2/gallery1.cxx | 29 ++--- svx/source/gallery2/galtheme.cxx |2 +- 3 files changed, 30 insertions(+), 5 deletions(-) New commits: commit 626ac0b8caa8e5975f36e03ff6487c3b799d9314 Author: Michael Meeks michael.me...@collabora.com Date: Wed Oct 23 19:49:06 2013 +0100 fdo#69079 - fix multiple user gallery creations. Conflicts: include/svx/gallery1.hxx svx/source/gallery2/gallery1.cxx Change-Id: I0539e2708b973b8bea7bd63488277f00201c6c46 diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 4a7a9d3..5610c0f 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -53,7 +53,9 @@ private: public: -GalleryThemeEntry( const INetURLObject rBaseURL, const String rName, +GalleryThemeEntry( bool bCreateUniqueURL, + const INetURLObject rBaseURL, + const String rName, sal_Bool bReadOnly, sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 3d2f9dc..b6ec5e9 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -45,7 +45,16 @@ using namespace ::com::sun::star; // - GalleryThemeEntry - // - -GalleryThemeEntry::GalleryThemeEntry( const INetURLObject rBaseURL, const String rName, +static bool FileExists( const INetURLObject rURL, const rtl::OUString rExt ) +{ +INetURLObject aURL( rURL ); +aURL.setExtension( rExt ); +return FileExists( aURL ); +} + +GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, + const INetURLObject rBaseURL, + const String rName, sal_Bool _bReadOnly, sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) : nId ( _nId ), @@ -55,6 +64,19 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject rBaseURL, const Strin INetURLObject aURL( rBaseURL ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL ); +if (bCreateUniqueURL) +{ +INetURLObject aBaseNoCase( ImplGetURLIgnoreCase( rBaseURL ) ); +aURL = aBaseNoCase; +static sal_Int32 nIdx = 0; +while( FileExists( aURL, thm ) ) +{ // create new URLs +nIdx++; +aURL = aBaseNoCase; +aURL.setName( aURL.getName() + OUString::number(nIdx)); +} +} + aURL.setExtension( thm ); aThmURL = ImplGetURLIgnoreCase( aURL ); @@ -520,8 +542,9 @@ sal_Bool Gallery::CreateTheme( const String rThemeName ) { INetURLObject aURL( GetUserURL() ); aURL.Append( rThemeName ); -GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( aURL, rThemeName, - sal_False, sal_True, 0, sal_False ); +GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( +true, aURL, rThemeName, +sal_False, sal_True, 0, sal_False ); aThemeList.push_back( pNewEntry ); delete( new GalleryTheme( this, pNewEntry ) ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 54c7067..cc77541 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -751,7 +751,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject rURL, sa } INetURLObject aPathURL( rURL ); -pRet = new GalleryThemeEntry( aPathURL, aThemeName, +pRet = new GalleryThemeEntry( false, aPathURL, aThemeName, bReadOnly, sal_False, nThemeId, bThemeNameFromResource ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/newfrm.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit fa15571ba403b4e2050dd3e18e0459107904728b Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 14:53:53 2013 +0100 valgrind: bIsVirtPageNum uninitialized valgrind complains about this when viewing a help page Change-Id: I0f30f8b5121fa5e6ddbac0ea6e05005e40bc7fd9 diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 9676a90..e9c65f8 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -472,6 +472,14 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : mbBookMode( false ), mbSidebarChanged( false ), mbNeedGrammarCheck( false ), +bCheckSuperfluous( false ), +bIdleFormat( true ), +bBrowseWidthValid( false ), +bTurboAllowed( true ), +bAssertFlyPages( true ), +bIsVirtPageNum( false ), +bIsNewLayout( true ), +bCallbackActionEnabled ( false ), nBrowseWidth( MM50*4 ), //2cm minimum pTurbo( 0 ), pLastPage( 0 ), @@ -483,8 +491,6 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : nAccessibleShells( 0 ) { mnType = FRMC_ROOT; -bIdleFormat = bTurboAllowed = bAssertFlyPages = bIsNewLayout = sal_True; -bCheckSuperfluous = bBrowseWidthValid = sal_False; setRootFrm( this ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) New commits: commit d0af3045c3ff850387385599fdcef7f9ecf407cb Author: László Németh nem...@numbertext.org Date: Thu Oct 24 16:11:33 2013 +0200 librelogo: fix Writer/Draw synchronization in cropped SVG export Change-Id: Id7dc7a2853a8c56ee56eab55c078650e16c278fd diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index e830ed5..ac0fb2a 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1285,7 +1285,7 @@ def create_valid_svg_file(filename): f.write(s) def __groupend__(name = ): -global __group__, __grouplefthang__, __groupstack__ +global __group__, __grouplefthang__, __groupstack__, __halt__ g = 0 if __group__.getCount() 1: if __grouplefthang__ 0: @@ -1313,19 +1313,26 @@ def __groupend__(name = ): d = ctx.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop, ctx) draw = d.loadComponentFromURL(private:factory/sdraw, _blank, 0, ()) drawpage = draw.getDrawPages().getByIndex(0) + while XSCRIPTCONTEXT.getDocument() != draw: +if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]: + __halt__ = True + return +__time__.sleep(0.1) __dispatcher__(.uno:Paste, (), draw) __dispatcher__(.uno:FormatGroup, (), draw) pic = drawpage.getByIndex(0) pic.setPosition(__Point__((g.BoundRect.Width - g.Size.Width)//2, (g.BoundRect.Height - g.Size.Height)//2)) drawpage.Height, drawpage.Width = g.BoundRect.Height, g.BoundRect.Width - __time__.sleep(1) # avoid writing problem if not os.path.isabs(name): name = os.path.expanduser('~') + os.path.sep + name __dispatcher__(.uno:ExportTo, (__getprop__(URL, unohelper.systemPathToFileUrl(name)), __getprop__(FilterName, draw_svg_Export)), draw) - __time__.sleep(1) - create_valid_svg_file(name) draw.close(True) - + while XSCRIPTCONTEXT.getDocument() != _.doc: +if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]: + __halt__ = True + return +__time__.sleep(0.1) + create_valid_svg_file(name) __group__ = __groupstack__.pop() if __group__ and g: __group__.add(g) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source sc/qa sw/source
cui/source/tabpages/paragrph.cxx| 89 sc/qa/complex/cellRanges/CheckXCellRangesQuery.java | 15 ++- sw/source/ui/docvw/edtwin.cxx | 27 ++ 3 files changed, 41 insertions(+), 90 deletions(-) New commits: commit 55d4d0a749ae1430f65bb0a127c1b2b9251044d2 Author: Laurent Godard lgodard.li...@laposte.net Date: Thu Oct 24 16:16:36 2013 +0200 avoid localization issue use the sheet name to build the expected strings Change-Id: I5f079975921338b9449186cc33a0acde180679d5 Reviewed-on: https://gerrit.libreoffice.org/6419 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java index d7aac7ef..5039c2d7 100644 --- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java +++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java @@ -47,6 +47,8 @@ import org.junit.Test; import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; +import com.sun.star.container.XNamed; + /** * Check the XCellRangesQuery interface on the SheetCell service. test was * created for bug i20044. @@ -55,6 +57,7 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { XSpreadsheetDocument m_xSheetDoc = null; XCellRangesQuery m_xCell = null; XSpreadsheet m_xSpreadSheet = null; +String sSheetName = ; /** * Get all test methods. @@ -92,6 +95,10 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { m_xSpreadSheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0)); +// get the first sheet name +XNamed m_xNamed = (XNamed) AnyConverter.toObject(new Type(XNamed.class),m_xSpreadSheet); +sSheetName = m_xNamed.getName(); + // get the cell System.out.println(Getting a cell from sheet) ; oObj = m_xSpreadSheet.getCellByPosition(2, 3); @@ -167,9 +174,9 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { @Test public void checkEmptyCell() { System.out.println(Checking an empty cell...); // compare an empty cell with a cell with a value -assertTrue(\tQuery column differences did not return the correct value., _queryColumnDifferences(Sheet1.C4)); +assertTrue(\tQuery column differences did not return the correct value., _queryColumnDifferences(sSheetName+.C4)); // compare an empty cell with a cell with a value -assertTrue(\tQuery column differences did not return the correct value., _queryRowDifferences(Sheet1.C4)); +assertTrue(\tQuery column differences did not return the correct value., _queryRowDifferences(sSheetName+.C4)); // try to get this cell // assertTrue(\tQuery empty cells did not return the correct value., _queryEmptyCells(Sheet1.C4)); System.out.println(...done); @@ -195,9 +202,9 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { } // compare an cell with value 5 with a cell with value 15 -assertTrue(\tQuery column differences did not return the correct value., _queryColumnDifferences(Sheet1.C4)); +assertTrue(\tQuery column differences did not return the correct value., _queryColumnDifferences(sSheetName + .C4)); // compare an cell with value 5 with a cell with value 15 -assertTrue(\tQuery column differences did not return the correct value., _queryRowDifferences(Sheet1.C4)); +assertTrue(\tQuery column differences did not return the correct value., _queryRowDifferences(sSheetName+.C4)); // try to get nothing assertTrue(\tQuery empty cells did not return the correct value., _queryEmptyCells()); System.out.println(...done); commit 8e1bafcc37742073edacf53508057034a0e534ca Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 17:21:31 2013 +0300 Don't allow selection handle movement to wrap Change-Id: Idc189a84da1aa0ac510e003134580eafc03b4b9a diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 3a71de7..ffbd5f6 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2671,6 +2671,11 @@ static bool lcl_urlOverBackground(SwWrtShell rSh, const Point rDocPos) #if !HAVE_FEATURE_DESKTOP +// As such these two functions could be more or less anywhere, I have +// them now in this source file because the act of moving a selection +// end point is somewhat the same as what happens when one +// shift-clicks on either side of an existing selection. + void touch_lo_selection_start_move_impl(const void *documentHandle, int x, int y) @@ -2686,6 +2691,17 @@ void
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 4 commits - download.lst librelogo/source Makefile.fetch more_fonts/ExternalPackage_caladea.mk more_fonts/ExternalPackage_carlito.mk
Makefile.fetch |2 ++ download.lst |2 ++ librelogo/source/LibreLogo/LibreLogo.py| 17 - more_fonts/ExternalPackage_caladea.mk | 21 + more_fonts/ExternalPackage_carlito.mk | 21 + more_fonts/Module_more_fonts.mk|4 more_fonts/UnpackedTarball_caladea.mk | 14 ++ more_fonts/UnpackedTarball_carlito.mk | 14 ++ officecfg/registry/data/org/openoffice/VCL.xcu | 24 +++- scp2/source/ooo/file_font_ooo.scp |4 scp2/source/ooo/module_hidden_ooo.scp |2 ++ 11 files changed, 119 insertions(+), 6 deletions(-) New commits: commit e4b24b0f5816c232c9589ae498bd4337cc09058b Author: László Németh nem...@numbertext.org Date: Thu Oct 24 16:11:33 2013 +0200 librelogo: fix Writer/Draw synchronization in cropped SVG export Change-Id: Id7dc7a2853a8c56ee56eab55c078650e16c278fd diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 216bb0f..b524a8c 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1255,7 +1255,7 @@ def create_valid_svg_file(filename): f.write(s) def __groupend__(name = ): -global __group__, __grouplefthang__, __groupstack__ +global __group__, __grouplefthang__, __groupstack__, __halt__ g = 0 if __group__.getCount() 1: if __grouplefthang__ 0: @@ -1283,19 +1283,26 @@ def __groupend__(name = ): d = ctx.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop, ctx) draw = d.loadComponentFromURL(private:factory/sdraw, _blank, 0, ()) drawpage = draw.getDrawPages().getByIndex(0) + while XSCRIPTCONTEXT.getDocument() != draw: +if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]: + __halt__ = True + return +__time__.sleep(0.1) __dispatcher__(.uno:Paste, (), draw) __dispatcher__(.uno:FormatGroup, (), draw) pic = drawpage.getByIndex(0) pic.setPosition(__Point__((g.BoundRect.Width - g.Size.Width)//2, (g.BoundRect.Height - g.Size.Height)//2)) drawpage.Height, drawpage.Width = g.BoundRect.Height, g.BoundRect.Width - __time__.sleep(1) # avoid writing problem if not os.path.isabs(name): name = os.path.expanduser('~') + os.path.sep + name __dispatcher__(.uno:ExportTo, (__getprop__(URL, unohelper.systemPathToFileUrl(name)), __getprop__(FilterName, draw_svg_Export)), draw) - __time__.sleep(1) - create_valid_svg_file(name) draw.close(True) - + while XSCRIPTCONTEXT.getDocument() != _.doc: +if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]: + __halt__ = True + return +__time__.sleep(0.1) + create_valid_svg_file(name) __group__ = __groupstack__.pop() if __group__ and g: __group__.add(g) commit 77a56e7b2d09ba772ad536271667576921de6ee1 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 23 14:57:32 2013 +0100 bundle Carlito and Caladea Change-Id: Ibb68ad33764bcbab88e68c35805a00287177a5c8 diff --git a/download.lst b/download.lst index 996a509..ea91017 100644 --- a/download.lst +++ b/download.lst @@ -24,6 +24,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz +export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz +export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz export FONT_DEJAVU_TARBALL := f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip export FONT_GENTIUM_TARBALL := 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip export FONT_LIBERATION_NARROW_TARBALL := 0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz diff --git a/more_fonts/ExternalPackage_caladea.mk b/more_fonts/ExternalPackage_caladea.mk new file mode 100644 index 000..668fb5b --- /dev/null +++ b/more_fonts/ExternalPackage_caladea.mk @@ -0,0 +1,21 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_caladea,font_caladea)) + +$(eval $(call gb_ExternalPackage_set_outdir,fonts_caladea,$(INSTDIR))) + +$(eval $(call
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6574446e58763e72fec152624d015bb03206e670 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 24 16:29:23 2013 +0200 disable Liberation fonts on Windows Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index ccc1327..27b6d37 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -36,9 +36,11 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, extras_fonts.filelist ) // DejaVu fonts STD_FONT_FILELIST(gid_File_Fnt_DejaVu, fonts_dejavu.filelist) +#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1 // Liberation fonts STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, fonts_liberation_narrow.filelist) STD_FONT_FILELIST(gid_File_Fnt_Liberation, fonts_liberation.filelist) +#endif // Gentium fonts STD_FONT_FILELIST(gid_File_Fnt_Gentium, fonts_gentium.filelist) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Support of csv files with .xls extension
On Thu, 2013-10-24 at 16:34 +0300, Maxim Monastirsky wrote: Hi Kohei, great that you responded! Could you also take a look at https://bugs.freedesktop.org/show_bug.cgi?id=70100. There is a file which is detected by Excel 2010 as 'Excel 2' sheet and LO also sets the excel4 filter, but it fails in isExcel40 function from sc/source/ui/unoobj/exceldetect.cxx because it has a value like in BIFF5. The key here is that the bug report mentions that this xls file is generated by a third party software, which may write incorrect BOF ID for the files it generates. Ultimately the answer lies here: http://opengrok.libreoffice.org/xref/core/sc/source/filter/excel/read.cxx#145 Looks like our import filter code itself ignores this BOF ID and lumps 0x0809 toger with the ID's for BIFF2-4. If that's what the import filter does, then we should probably do the same in the file format detection code as well i.e. add 0x0809 to the list of correct BOF ID's for Excel 4.0 format or earlier. This shouldn't affect detection of more recent Excel file formats, since those formats use OLE to store workbook and other streams, and we use that to detect those versions, not the BOF ID's. As with the earlier bug you cited, this one should be an easy fix as well, and I believe you already have a fix for this? Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - jvmfwk/distributions
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |2 +- jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit cc73638cdaf139f018d83a191006f627f10ec9e2 Author: Petr Mladek pmla...@suse.cz Date: Fri May 17 19:23:09 2013 +0200 do not invalidate existing java setting just because license (bnc#820196) The date of the last modification was updated when the license text was added to the list of acceptable java vendors. Unfortuantely, this invalidates the existing user java configuration. It is not necessary becary because the list of valid vendors is the same. The easiest solution and puts bac the original modification date. We should also fix LO to automatically detect the java when the automatic detection is enabled. Sigh, I have fixed many years ago it is broken again. Let's fix this when we really bump the date. Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Change-Id: I80bc6bfa0abaec3c050ee2ed8ccfa6344a0c0cba diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 311bf81..fcfdcd8 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -20,7 +20,7 @@ javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - updated2013-05-02/updated + updated2004-01-30/updated vendorInfos vendor name=Sun Microsystems Inc. diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 5b33aad..cbe32da 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -20,7 +20,7 @@ javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - updated2013-05-02/updated + updated2004-01-30/updated vendorInfos vendor name=Sun Microsystems Inc. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit b7efab3a9841a9f01c5da07db870a22866b65b04 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 16:20:08 2013 +0100 valgrind: on success aHDFData is out of scope and pData points to data belonging to it Change-Id: I2a3c1f73e4cdcb07d21ef14cb410d351f39cdba8 diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index d9cd7ae..1b252f5 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -751,12 +751,12 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: listId[i] = id[i]; listAnchor[i] = anchor[i]; +helpdatafileproxy::HDFData aHDFData; const sal_Char* pData = NULL; if( pHdf ) { OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); -helpdatafileproxy::HDFData aHDFData; bool bSuccess = pHdf-getValueForKey( idi, aHDFData ); if( bSuccess ) pData = aHDFData.getData(); commit d94f3a68f77de906abd576c7e2f31e0a8586d154 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 16:18:41 2013 +0100 pEmpty is completely insane to use DbtToStringConverter protects against a NULL pointer, but not a pointer to the too short data that pEmpty provides Change-Id: I5d21e852ce0373eff7d3627e266b9cbc77f5dd09 diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index dd97078..d9cd7ae 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -746,15 +746,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: listAnchor.realloc( id.size() ); listTitle.realloc( id.size() ); -const sal_Char* pData = NULL; -const sal_Char pEmpty[] = ; - for( sal_uInt32 i = 0; i id.size(); ++i ) { listId[i] = id[i]; listAnchor[i] = anchor[i]; -pData = pEmpty; +const sal_Char* pData = NULL; + if( pHdf ) { OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2 librelogo/source
helpcontent2|2 - librelogo/source/ChangeLog | 13 librelogo/source/LibreLogo/LibreLogo.py | 48 3 files changed, 50 insertions(+), 13 deletions(-) New commits: commit 3617e1a37f7f77eb4d57ca455fca9507f1a15872 Author: László Németh nem...@numbertext.org Date: Thu Oct 24 17:22:15 2013 +0200 librelogo: more invisible settings (on UI, hatching), see ChangeLog Change-Id: Icb0d195ba82b023d370847242b4e3b5546fa0320 diff --git a/helpcontent2 b/helpcontent2 index 91f8b3c..0d8b37c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 91f8b3cb54e752a174ee10be4e528c7dcd4fb55e +Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog index 6453e71..0e1ed44 100644 --- a/librelogo/source/ChangeLog +++ b/librelogo/source/ChangeLog @@ -1,3 +1,16 @@ +2013-10-24 László Németh: +* synchronize Writer/Draw when saving cropped SVG to avoid program halt, + huge sleeps (the workaround) have been removed +* support hatching with 'INVISIBLE' filling color +* support PENUP in UI (Line Style -none-) +* support INVISIBLE filling color in UI (Area Style/Filling None) +* using 'INVISIBLE' line and filling colors set -none-/None in + Drawing Object Properties toolbar +* fix blinking LABEL (now the temporary text shape is invisible) +* support PENCAP settings (values: NONE, ROUND, SQUARE) +* fix black (not refreshed) invisible filling color (LO 4.1 problem) + reported by Levente Kovács in http://bug.openscope.org/browse/OOO-838 + 2013-08-29 László Németh: * fix bad selection of invisible turtle after HIDETURTLE CLEARSCREEN * fix SVG cropping in LibreOffice 4.1 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index ac0fb2a..9ad5622 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -112,6 +112,8 @@ from com.sun.star.drawing.LineJoint import NONE as __Joint_NONE__ from com.sun.star.drawing.LineJoint import BEVEL as __BEVEL__ from com.sun.star.drawing.LineJoint import MITER as __MITER__ from com.sun.star.drawing.LineJoint import ROUND as __ROUNDED__ +from com.sun.star.drawing.FillStyle import NONE as __FillStyle_NONE__ +from com.sun.star.drawing.LineStyle import NONE as __LineStyle_NONE__ from com.sun.star.drawing.LineStyle import SOLID as __LineStyle_SOLID__ from com.sun.star.drawing.LineStyle import DASH as __LineStyle_DASHED__ from com.sun.star.drawing.DashStyle import RECT as __DashStyle_RECT__ @@ -463,10 +465,18 @@ def __initialize__(): shape.FillColor, transparence = __splitcolor__(_.areacolor) shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor) elif shape.Visible: -_.areacolor = shape.FillColor + (int(255.0 * shape.FillTransparence/100) 24) -_.pencolor = shape.LineColor + (int(255.0 * shape.LineTransparence/100) 24) +if shape.FillStyle == __FillStyle_NONE__: +_.areacolor = 0x +else: +_.areacolor = shape.FillColor + (int(255.0 * shape.FillTransparence/100) 24) if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ / __MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ / __MM10_TO_TWIP__): _.pensize = shape.LineWidth * __MM10_TO_TWIP__ +if shape.LineStyle == __LineStyle_NONE__: # - none - +__pen__(0) +else: +if shape.LineStyle == __LineStyle_SOLID__: +__pen__(1) +_.pencolor = shape.LineColor + (int(255.0 * shape.LineTransparence/100) 24) shape.LineJoint = __ROUNDED__ shape.Shadow = True shape.FillColor, transparence = __splitcolor__(_.areacolor) @@ -886,6 +896,8 @@ def __go__(shapename, n, dot = False, preciseAngle = -1): shape.PolyPolygon = tuple([tuple( list(shape.PolyPolygon[-1]) + [last2])]) shape.LineWidth = _.pensize / __MM10_TO_TWIP__ shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor) +if shape.LineTransparence == 100: +shape.LineStyle = 0 __visible__(shape, True) shape.Name = __ACTUAL__ _.shapecache[__ACTUAL__] = shape @@ -909,15 +921,21 @@ def __fillit__(filled = True): shape.LineStyle, shape.LineDash = __linestyle__(_.linestyle) shape.LineJoint = _.linejoint shape.LineCap = _.linecap +shape.LineWidth = _.pensize / __MM10_TO_TWIP__ +shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor) +shape.FillColor, shape.FillTransparence = __splitcolor__(_.areacolor) if _.hatch: -shape.FillBackground = True +shape.FillBackground = True if shape.FillTransparence != 100 else False shape.FillHatch = _.hatch shape.FillStyle = 3 else:
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unobaseclass.hxx |3 --- sw/source/core/unocore/unobkm.cxx |4 ++-- sw/source/core/unocore/unoftn.cxx |6 ++ sw/source/core/unocore/unoidx.cxx | 16 +--- sw/source/core/unocore/unoobj.cxx |4 ++-- sw/source/core/unocore/unoobj2.cxx | 27 +-- sw/source/core/unocore/unoparagraph.cxx |4 ++-- sw/source/core/unocore/unorefmk.cxx | 10 -- sw/source/core/unocore/unosect.cxx |5 ++--- sw/source/core/unocore/unotext.cxx |8 +++- 10 files changed, 27 insertions(+), 60 deletions(-) New commits: commit be0adb9f0fc738fe8735d2e0802fd19091799d11 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Thu Oct 24 11:26:31 2013 -0200 fdo#54938: Remove SupportsServiceImpl from sw and use cppu instead Change-Id: I285a03f615e2f2a2656873a8f433a2599bd62c28 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 483bd29..3dfe62f 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -148,9 +148,6 @@ namespace sw { ::com::sun::star::uno::Sequence OUString GetSupportedServiceNamesImpl( size_t const nServices, char const*const pServices[]); -sal_Bool SupportsServiceImpl( -size_t const nServices, char const*const pServices[], -OUString const rServiceName); } // namespace sw diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 06467b2..8e57246 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -21,6 +21,7 @@ #include unobookmark.hxx #include osl/mutex.hxx #include cppuhelper/interfacecontainer.h +#include cppuhelper/supportsservice.hxx #include vcl/svapp.hxx #include TextCursorHelper.hxx @@ -392,8 +393,7 @@ static const size_t g_nServicesBookmark( sal_Bool SAL_CALL SwXBookmark::supportsService(const OUString rServiceName) throw (uno::RuntimeException) { -return ::sw::SupportsServiceImpl( -g_nServicesBookmark, g_ServicesBookmark, rServiceName); +return cppu::supportsService(this, rServiceName); } uno::Sequence OUString SAL_CALL diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 84aedbb..fcefbf0 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -20,6 +20,7 @@ #include osl/mutex.hxx #include cppuhelper/interfacecontainer.h +#include cppuhelper/supportsservice.hxx #include vcl/svapp.hxx #include comphelper/sequence.hxx #include comphelper/servicehelper.hxx @@ -206,10 +207,7 @@ static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString rServiceName) throw (uno::RuntimeException) { -SolarMutexGuard g; -return ::sw::SupportsServiceImpl( -(m_pImpl-m_bIsEndnote) ? g_nServicesEndnote : g_nServicesFootnote, -g_ServicesFootnote, rServiceName); +return cppu::supportsService(this, rServiceName); } uno::Sequence OUString SAL_CALL diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index c2efe98..ef8fdce 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -30,6 +30,7 @@ #include osl/mutex.hxx #include cppuhelper/interfacecontainer.h +#include cppuhelper/supportsservice.hxx #include vcl/svapp.hxx #include editeng/unolingu.hxx #include hints.hxx @@ -2378,9 +2379,7 @@ sal_Bool SAL_CALL SwXDocumentIndexes::supportsService(const OUString rServiceName) throw (uno::RuntimeException) { -return ::sw::SupportsServiceImpl( -SAL_N_ELEMENTS(g_ServicesDocumentIndexes), -g_ServicesDocumentIndexes, rServiceName); +return cppu::supportsService(this, rServiceName); } uno::Sequence OUString SAL_CALL @@ -2577,13 +2576,10 @@ static char const*const g_ServicesIndexStyleAccess[] = }; sal_Bool SAL_CALL -SwXDocumentIndex::StyleAccess_Impl::supportsService( -const OUString rServiceName) +SwXDocumentIndex::StyleAccess_Impl::supportsService(const OUString rServiceName) throw (uno::RuntimeException) { -return ::sw::SupportsServiceImpl( -SAL_N_ELEMENTS(g_ServicesIndexStyleAccess), -g_ServicesIndexStyleAccess, rServiceName); +return cppu::supportsService(this, rServiceName); } uno::Sequence OUString SAL_CALL @@ -2715,9 +2711,7 @@ SwXDocumentIndex::TokenAccess_Impl::supportsService( const OUString rServiceName) throw (uno::RuntimeException) { -return ::sw::SupportsServiceImpl( -SAL_N_ELEMENTS(g_ServicesIndexTokenAccess), -g_ServicesIndexTokenAccess, rServiceName); +return cppu::supportsService(this, rServiceName); } uno::Sequence OUString SAL_CALL diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index bae9789..0ffc5b9
[Libreoffice-commits] core.git: 10 commits - connectivity/Package_postgresql-sdbc.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_unorc.mk cppuhelper/source desktop/Module_desktop.mk desktop/Pac
connectivity/Package_postgresql-sdbc.mk |4 ++- cppuhelper/Module_cppuhelper.mk |1 cppuhelper/Package_unorc.mk | 16 -- cppuhelper/source/unorc | 23 desktop/Module_desktop.mk |1 desktop/Package_scripts.mk| 24 +++-- desktop/Package_scripts_install.mk| 33 -- external/hyphen/ExternalPackage_hyphen.mk | 20 -- external/hyphen/ExternalProject_hyphen.mk |1 external/hyphen/Module_hyphen.mk | 14 +++- extras/Package_wordbook.mk|4 ++- sdext/Package_pdfimport_xpdfimport.mk |4 ++- solenv/gbuild/Extension.mk| 12 +- solenv/gbuild/HelpTarget.mk |8 +++ swext/Extension_wiki-publisher.mk | 16 -- sysui/Package_share.mk|4 ++- xmlhelp/Module_xmlhelp.mk |1 xmlhelp/Package_xsl.mk| 18 xsltml/ExternalPackage_xsltml.mk | 22 xsltml/Module_xsltml.mk |1 20 files changed, 52 insertions(+), 175 deletions(-) New commits: commit ccf4f1d80e82b2fa5156f1a351a5e1cd8dde3be0 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 17:23:29 2013 +0200 hyphen: stop building hyph_en_US.dic too Change-Id: I05929be5dbc41ba6889bd593ad0ce0061367ea37 diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk index e7d3673..573fbae 100644 --- a/external/hyphen/ExternalProject_hyphen.mk +++ b/external/hyphen/ExternalProject_hyphen.mk @@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ $(if $(filter C52U,$(COM)$(CPU)),CFLAGS=-m64) \ $(MAKE) \ - $(if $(filter YESYES,$(SYSTEM_HYPH)$(WITH_MYSPELL_DICTS)),hyph_en_US.dic) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 1dde6dd..80dae1f 100644 --- a/external/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk @@ -9,23 +9,26 @@ $(eval $(call gb_Module_Module,hyphen)) -ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),) +ifeq ($(SYSTEM_HYPH),NO) + $(eval $(call gb_Module_add_targets,hyphen,\ UnpackedTarball_hyphen \ )) + ifeq ($(COM),MSC) -ifeq ($(SYSTEM_HYPH),NO) $(eval $(call gb_Module_add_targets,hyphen,\ StaticLibrary_hyphen \ )) -endif else + $(eval $(call gb_Module_add_targets,hyphen,\ ExternalProject_hyphen \ )) -endif -endif + +endif # $(COM) + +endif # $(SYSTEM_HYPH) # vim: set noet sw=4 ts=4: commit d1f46c8a3f25370a8cb5b360cd23835e693a906c Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 17:18:05 2013 +0200 hyphen: remove ExternalPackage_hyphen It only contained hyph_en_US.dic, which is actually unused; the usage in dictionaries (for a writingaids.zip) was removed years ago in commit 72682b9ac937472b9c48c8a9be70be902ff645e8. Change-Id: I523c60614bddb8596ccff52d3c4d648111846856 diff --git a/external/hyphen/ExternalPackage_hyphen.mk b/external/hyphen/ExternalPackage_hyphen.mk deleted file mode 100644 index 13303cc..000 --- a/external/hyphen/ExternalPackage_hyphen.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,hyphen,hyphen)) - -ifeq ($(WITH_MYSPELL_DICTS),YES) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,hyphen,bin,\ -hyph_en_US.dic \ -)) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 2ab3245..1dde6dd 100644 --- a/external/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,hyphen)) ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),) $(eval $(call gb_Module_add_targets,hyphen,\ UnpackedTarball_hyphen \ - ExternalPackage_hyphen \ )) ifeq ($(COM),MSC) commit 56bb796673657c9f8683bbff08070c77c4c889cd Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 16:19:50 2013 +0200 xmlhelp: remove Package_xsl Change-Id: Id0a5213b39886e2f6929f7ff2c014ed861d1da91 diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 42da363..da5be96 100644 ---
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=be0adb9f0fc738fe8735d2e0802fd19091799d11 fdo#54938: Remove SupportsServiceImpl from sw and use cppu instead The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 128 +++ sw/source/filter/ww8/docxattributeoutput.hxx |4 2 files changed, 132 insertions(+) New commits: commit b391da28fffa1f71967079189e7d60ff16ec2784 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 24 17:52:09 2013 +0200 DOCX filter: initial table style export based on InteropGrabBag Change-Id: I7b31322b50c8c924e5df3c32e3c2da8093709938 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c5a80a4..fe48ee0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2660,8 +2660,136 @@ void DocxAttributeOutput::DocDefaults( ) m_pSerializer-endElementNS(XML_w, XML_docDefaults); } +void DocxAttributeOutput::TableStyles() +{ +// Do we have table styles from InteropGrabBag available? +uno::Referencebeans::XPropertySet xPropertySet(m_rExport.pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW); +uno::Sequencebeans::PropertyValue aInteropGrabBag; +xPropertySet-getPropertyValue(InteropGrabBag) = aInteropGrabBag; +uno::Sequencebeans::PropertyValue aTableStyles; +for (sal_Int32 i = 0; i aInteropGrabBag.getLength(); ++i) +{ +if (aInteropGrabBag[i].Name == tableStyles) +{ +aInteropGrabBag[i].Value = aTableStyles; +break; +} +} +if (!aTableStyles.getLength()) +return; + +for (sal_Int32 i = 0; i aTableStyles.getLength(); ++i) +{ +uno::Sequencebeans::PropertyValue aTableStyle; +aTableStyles[i].Value = aTableStyle; +TableStyle(aTableStyle); +} +} + +StringTokenMap const aTblCellMarTokens[] = { +{left, XML_left}, +{right, XML_right}, +{start, XML_start}, +{end, XML_end}, +{top, XML_top}, +{bottom, XML_bottom}, +{0, 0} +}; + +/// Export of w:tblCellMar in a table style. +void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr pSerializer, uno::Sequencebeans::PropertyValue rTblCellMar) +{ +if (!rTblCellMar.hasElements()) +return; + +pSerializer-startElementNS(XML_w, XML_tblCellMar, FSEND); +for (sal_Int32 i = 0; i rTblCellMar.getLength(); ++i) +{ +if (sal_Int32 nToken = lcl_getToken(aTblCellMarTokens, rTblCellMar[i].Name)) +{ +comphelper::SequenceAsHashMap aMap(rTblCellMar[i].Value.get uno::Sequencebeans::PropertyValue ()); +pSerializer-singleElementNS(XML_w, nToken, +FSNS(XML_w, XML_w), OString::number(aMap[w].getsal_Int32()), +FSNS(XML_w, XML_type), OUStringToOString(aMap[type].getOUString(), RTL_TEXTENCODING_UTF8).getStr(), +FSEND); +} +} +pSerializer-endElementNS(XML_w, XML_tblCellMar); +} + +/// Export of w:tblInd in a table style. +void lcl_TableStyleTblInd(sax_fastparser::FSHelperPtr pSerializer, uno::Sequencebeans::PropertyValue rTblInd) +{ +if (!rTblInd.hasElements()) +return; + +sax_fastparser::FastAttributeList* pAttributeList = pSerializer-createAttrList(); +for (sal_Int32 i = 0; i rTblInd.getLength(); ++i) +{ +if (rTblInd[i].Name == w) +pAttributeList-add(FSNS(XML_w, XML_w), OString::number(rTblInd[i].Value.getsal_Int32())); +else if (rTblInd[i].Name == type) +pAttributeList-add(FSNS(XML_w, XML_type), OUStringToOString(rTblInd[i].Value.getOUString(), RTL_TEXTENCODING_UTF8).getStr()); +} +XFastAttributeListRef xAttributeList(pAttributeList); +pSerializer-singleElementNS(XML_w, XML_tblInd, xAttributeList); +} + +/// Export of w:tblPr in a table style. +void lcl_TableStyleTblPr(sax_fastparser::FSHelperPtr pSerializer, uno::Sequencebeans::PropertyValue rTblPr) +{ +if (!rTblPr.hasElements()) +return; + +pSerializer-startElementNS(XML_w, XML_tblPr, FSEND); + +uno::Sequencebeans::PropertyValue aTblInd, aTblCellMar; +for (sal_Int32 i = 0; i rTblPr.getLength(); ++i) +{ +if (rTblPr[i].Name == tblInd) +aTblInd = rTblPr[i].Value.get uno::Sequencebeans::PropertyValue (); +else if (rTblPr[i].Name == tblCellMar) +aTblCellMar = rTblPr[i].Value.get uno::Sequencebeans::PropertyValue (); +} +lcl_TableStyleTblInd(pSerializer, aTblInd); +lcl_TableStyleTblCellMar(pSerializer, aTblCellMar); + +pSerializer-endElementNS(XML_w, XML_tblPr); +} + +void DocxAttributeOutput::TableStyle(uno::Sequencebeans::PropertyValue rStyle) +{ +bool bDefault = false; +OUString aStyleId, aName; +uno::Sequencebeans::PropertyValue aTblPr; +for (sal_Int32 i = 0; i rStyle.getLength(); ++i) +{ +if (rStyle[i].Name == default) +bDefault = rStyle[i].Value.getsal_Bool(); +else if (rStyle[i].Name == styleId) +aStyleId = rStyle[i].Value.getOUString(); +else if (rStyle[i].Name == name) +
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/vba/vbawindow.cxx | 83 +++-- sc/source/ui/vba/vbawindow.hxx |2 2 files changed, 56 insertions(+), 29 deletions(-) New commits: commit b9a4efe219b27adb09dbb56efb829b1e88f88ef7 Author: Pedro Giffuni p...@apache.org Date: Mon Aug 13 17:05:00 2012 + i106278 - Window.ActiveSheet,Window.FreezePanes,Window.Split, Window.View not working correctly. Patch by: lihuiibm Reviewed by:Chen Peng diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index caf68a0..99ec6eb 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -597,25 +597,33 @@ ScVbaWindow::getFreezePanes() throw (uno::RuntimeException) } void SAL_CALL -ScVbaWindow::setFreezePanes( ::sal_Bool /*_bFreezePanes*/ ) throw (uno::RuntimeException) +ScVbaWindow::setFreezePanes( ::sal_Bool _bFreezePanes ) throw (uno::RuntimeException) { uno::Reference sheet::XViewPane xViewPane( getController(), uno::UNO_QUERY_THROW ); uno::Reference sheet::XViewSplitable xViewSplitable( xViewPane, uno::UNO_QUERY_THROW ); uno::Reference sheet::XViewFreezable xViewFreezable( xViewPane, uno::UNO_QUERY_THROW ); -if( xViewSplitable-getIsWindowSplit() ) +if( _bFreezePanes ) { -// if there is a split we freeze at the split -sal_Int32 nColumn = getSplitColumn(); -sal_Int32 nRow = getSplitRow(); -xViewFreezable-freezeAtPosition( nColumn, nRow ); +if( xViewSplitable-getIsWindowSplit() ) +{ +// if there is a split we freeze at the split +sal_Int32 nColumn = getSplitColumn(); +sal_Int32 nRow = getSplitRow(); +xViewFreezable-freezeAtPosition( nColumn, nRow ); +} +else +{ +// otherwise we freeze in the center of the visible sheet +table::CellRangeAddress aCellRangeAddress = xViewPane-getVisibleRange(); +sal_Int32 nColumn = aCellRangeAddress.StartColumn + (( aCellRangeAddress.EndColumn - aCellRangeAddress.StartColumn )/2 ); +sal_Int32 nRow = aCellRangeAddress.StartRow + (( aCellRangeAddress.EndRow - aCellRangeAddress.StartRow )/2 ); +xViewFreezable-freezeAtPosition( nColumn, nRow ); +} } else { -// otherwise we freeze in the center of the visible sheet -table::CellRangeAddress aCellRangeAddress = xViewPane-getVisibleRange(); -sal_Int32 nColumn = aCellRangeAddress.StartColumn + (( aCellRangeAddress.EndColumn - aCellRangeAddress.StartColumn )/2 ); -sal_Int32 nRow = aCellRangeAddress.StartRow + (( aCellRangeAddress.EndRow - aCellRangeAddress.StartRow )/2 ); -xViewFreezable-freezeAtPosition( nColumn, nRow ); +//remove the freeze panes +xViewSplitable-splitAtPosition(0,0); } } @@ -640,8 +648,7 @@ ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException) uno::Reference excel::XRange xRange = ActiveCell(); sal_Int32 nRow = xRange-getRow(); sal_Int32 nColumn = xRange-getColumn(); -xViewFreezable-freezeAtPosition( nColumn-1, nRow-1 ); -SplitAtDefinedPosition( sal_True ); +SplitAtDefinedPosition( nColumn-1, nRow-1 ); } } @@ -658,10 +665,8 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti if( getSplitColumn() != _splitcolumn ) { uno::Reference sheet::XViewFreezable xViewFreezable( getController(), uno::UNO_QUERY_THROW ); -sal_Bool bFrozen = getFreezePanes(); sal_Int32 nRow = getSplitRow(); -xViewFreezable-freezeAtPosition( _splitcolumn, nRow ); -SplitAtDefinedPosition( !bFrozen ); +SplitAtDefinedPosition( _splitcolumn, nRow ); } } @@ -684,8 +689,7 @@ sal_Int32 SAL_CALL ScVbaWindow::getSplitRow() throw (uno::RuntimeException) { uno::Reference sheet::XViewSplitable xViewSplitable( getController(), uno::UNO_QUERY_THROW ); -sal_Int32 nValue = xViewSplitable-getSplitRow(); -return nValue ? nValue - 1 : nValue; +return xViewSplitable-getSplitRow(); } void SAL_CALL @@ -694,10 +698,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException) if( getSplitRow() != _splitrow ) { uno::Reference sheet::XViewFreezable xViewFreezable( getController(), uno::UNO_QUERY_THROW ); -sal_Bool bFrozen = getFreezePanes(); sal_Int32 nColumn = getSplitColumn(); -xViewFreezable-freezeAtPosition( nColumn , _splitrow ); -SplitAtDefinedPosition( !bFrozen ); +SplitAtDefinedPosition( nColumn, _splitrow ); } } @@ -716,15 +718,30 @@ ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeExcepti xViewSplitable-splitAtPosition( 0, static_castsal_Int32( fVertiPixels ) ); } -void ScVbaWindow::SplitAtDefinedPosition(sal_Bool _bUnFreezePane) +void
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/vba/vbarange.cxx | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 091a75a1740f1d018135f9ed0c585703ba3247d0 Author: Noel Power noel.po...@suse.com Date: Tue May 28 17:33:33 2013 +0100 some Worksheet.Change support Change-Id: I91203e74d54adba17a20ef7b7d835d9ac49855be (cherry picked from commit 20d792d6379600df8b56a2735f9dd1cb63967e4d) diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index a2470f1..7c6af04 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1831,6 +1831,7 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi uno::Reference sheet::XCellSeries xCellSeries(mxRange, uno::UNO_QUERY_THROW ); xCellSeries-fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue ); +fireChangeEvent(); } void @@ -3095,7 +3096,28 @@ ScVbaRange::Replace( const OUString What, const OUString Replacement, const un // OOo.org afaik uno::Reference util::XSearchDescriptor xSearch( xDescriptor, uno::UNO_QUERY ); +uno::Reference container::XIndexAccess xIndexAccess = xReplace-findAll( xSearch ); xReplace-replaceAll( xSearch ); +if ( xIndexAccess.is() xIndexAccess-getCount() 0 ) +{ +for ( sal_Int32 i = 0; i xIndexAccess-getCount(); ++i ) +{ +uno::Reference table::XCellRange xCellRange( xIndexAccess-getByIndex( i ), uno::UNO_QUERY ); +if ( xCellRange.is() ) +{ +uno::Reference excel::XRange xRange( new ScVbaRange( mxParent, mxContext, xCellRange ) ); +uno::Reference container::XEnumerationAccess xEnumAccess( xRange, uno::UNO_QUERY_THROW ); +uno::Reference container::XEnumeration xEnum = xEnumAccess-createEnumeration(); +while ( xEnum-hasMoreElements() ) +{ +uno::Reference excel::XRange xNextRange( xEnum-nextElement(), uno::UNO_QUERY_THROW ); +ScVbaRange* pRange = dynamic_cast ScVbaRange * ( xNextRange.get() ); +if ( pRange ) +pRange-fireChangeEvent(); +} +} +} +} } return sal_True; // always } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Why typing in Writer instantiates the JVM on Mac OS X
With problems popping up for users after upgrading to Mac OS X Mavericks (which replaces a previously installed Java with a download and install stub), I discovered the odd fact that indeed at least since LO 4.1.2 (but probably even earlier already, just had no time to verify), and on Mac OS X only, thanks to the bundled WikiPublisher extension we instantiate a JVM as soon as you start soffice --writer and type x. Debugging it on a recent master build: #0 stoc_javavm::JavaVirtualMachine::getJavaVM (this=0x1ed5e484, rProcessId=@0xbffb9568) at core/stoc/source/javavm/javavm.cxx:685 #1 0x1eee815b in non-virtual thunk to stoc_javavm::JavaVirtualMachine::getJavaVM(com::sun::star::uno::Sequencesigned char const) (this=0x1ed5e4b4, rProcessId=@0xbffb9568) at core/stoc/source/javavm/javavm.cxx:929 #2 0x1eeaf9d8 in stoc_javaloader::JavaComponentLoader::getJavaLoader (this=0x1edd173c) at core/stoc/source/javaloader/javaloader.cxx:162 #3 0x1eeb1c52 in stoc_javaloader::JavaComponentLoader::activate (this=0x1edd173c, rImplName=@0x7a924090, blabla=@0xbffb97a0, rLibName=@0xbffb9910, xKey=@0xbffb9798) at core/stoc/source/javaloader/javaloader.cxx:357 #4 0x1eeb1e4d in non-virtual thunk to stoc_javaloader::JavaComponentLoader::activate(rtl::OUString const, rtl::OUString const, rtl::OUString const, com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey const) (this=0x1edd1750, rImplName=@0x7a924090, blabla=@0xbffb97a0, rLibName=@0xbffb9910, xKey=@0xbffb9798) at core/stoc/source/javaloader/javaloader.cxx:363 #5 0x00a7a8f6 in cppuhelper::ServiceManager::loadImplementation (this=0x857b0c8, context=@0x857b114, info=@0x7a924070, factory1=0xbffb9a00, factory2=0xbffb99f8) at core/cppuhelper/source/servicemanager.cxx:678 #6 0x00a7c628 in cppuhelper::ServiceManager::findServiceImplementation (this=0x857b0c8, context=@0x857b114, specifier=@0xbffb9de0) at core/cppuhelper/source/servicemanager.cxx:1667 #7 0x00a7bbeb in cppuhelper::ServiceManager::createInstanceWithContext (this=0x857b0c8, aServiceSpecifier=@0xbffb9de0, Context=@0x857b114) at core/cppuhelper/source/servicemanager.cxx:791 #8 0x00a7b582 in cppuhelper::ServiceManager::createInstance (this=0x857b0c8, aServiceSpecifier=@0xbffb9de0) at core/cppuhelper/source/servicemanager.cxx:745 #9 0x00a7b5cb in non-virtual thunk to cppuhelper::ServiceManager::createInstance(rtl::OUString const) (this=0x857b0f4, aServiceSpecifier=@0xbffb9de0) at core/cppuhelper/source/servicemanager.cxx:746 #10 0x0df1a927 in framework::DispatchProvider::implts_searchProtocolHandler (this=0x12784ce0, aURL=@0xbffba788) at core/framework/source/dispatch/dispatchprovider.cxx:502 #11 0x0df19338 in framework::DispatchProvider::implts_queryFrameDispatch (this=0x12784ce0, xFrame=@0xbffba220, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/dispatch/dispatchprovider.cxx:407 #12 0x0df16ee8 in framework::DispatchProvider::queryDispatch (this=0x12784ce0, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/dispatch/dispatchprovider.cxx:120 #13 0x0df19a25 in non-virtual thunk to framework::DispatchProvider::queryDispatch(com::sun::star::util::URL const, rtl::OUString const, long) (this=0x12784cf4, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/dispatch/dispatchprovider.cxx:123 #14 0x13687e2e in SwXDispatchProviderInterceptor::queryDispatch (this=0x18efaedc, aURL=@0xbffba788, aTargetFrameName=@0xbffba700, nSearchFlags=0) at core/sw/source/ui/uno/unodispatch.cxx:87 #15 0x13687fb5 in non-virtual thunk to SwXDispatchProviderInterceptor::queryDispatch(com::sun::star::util::URL const, rtl::OUString const, long) (this=0x18efaef0, aURL=@0xbffba788, aTargetFrameName=@0xbffba700, nSearchFlags=0) at core/sw/source/ui/uno/unodispatch.cxx:90 #16 0x0df1d016 in framework::InterceptionHelper::queryDispatch (this=0x12784c70, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/dispatch/interceptionhelper.cxx:85 #17 0x0df1d155 in non-virtual thunk to framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const, rtl::OUString const, long) (this=0x12784c84, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/dispatch/interceptionhelper.cxx:87 #18 0x0e018cf7 in framework::Frame::queryDispatch (this=0x1278eae8, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/services/frame.cxx:2078 #19 0x0e018da5 in non-virtual thunk to framework::Frame::queryDispatch(com::sun::star::util::URL const, rtl::OUString const, long) (this=0x1278eaf0, aURL=@0xbffba788, sTargetFrameName=@0xbffba700, nSearchFlags=0) at core/framework/source/services/frame.cxx:2080 #20 0x0e0ec9b9 in framework::MenuBarManager::Activate (this=0x19d27e54, pMenu=0x7d253cf0) at core/framework/source/uielement/menubarmanager.cxx:922 #21 0x0e0eb944 in
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 Marcos Souza marcos.souza@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |marcos.souza@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #12 from Marcos Souza marcos.souza@gmail.com --- I saw a lot of places like this: sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAscii( SCTABVIEWOBJ_SERVICE ) || rServiceName.equalsAscii( SCVIEWSETTINGS_SERVICE ); } So, can we just exchange this to cppu::supportsService? Or we need to some another pieces of code? OBS: I believe all places that test the supportsService like this have this same function: uno::SequenceOUString SAL_CALL ScTabViewObj::getSupportedServiceNames() throw(uno::RuntimeException) { uno::SequenceOUString aRet(2); OUString* pArray = aRet.getArray(); pArray[0] = OUString( SCTABVIEWOBJ_SERVICE ); pArray[1] = OUString( SCVIEWSETTINGS_SERVICE ); return aRet; } with the same service name added into uno::Sequence. With this change we can have a more standard code, at least talking about the way we get uno service names :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - shell/source
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6dfe65a4f588e7698d84516abe339cd7b520329e Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 4 19:36:57 2013 +0200 fdo#67534: try to avoid file locking in Explorer shell extensions Change-Id: I287395f6c25b1bfb9b9482166ae6f34d9af8f455 diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 3b77d28..f1fb321 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -106,7 +106,8 @@ long BufferStream::sseek (long offset, int origin) FileStream::FileStream(const char *filename) : file(0) { -file = fopen(filename, rb); +// fdo#67534: avoid locking to not interfere with soffice opening the file +file = _fsopen(filename, rb, _SH_DENYNO); } FileStream::~FileStream() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 5c635c7773da618ad948c8b595deba53f8653cf9 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 16:18:41 2013 +0100 pEmpty is completely insane to use DbtToStringConverter protects against a NULL pointer, but not a pointer to the too short data that pEmpty provides Change-Id: I5d21e852ce0373eff7d3627e266b9cbc77f5dd09 (cherry picked from commit d94f3a68f77de906abd576c7e2f31e0a8586d154) Reviewed-on: https://gerrit.libreoffice.org/6421 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 447d1e0..331aa20 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -762,15 +762,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: listAnchor.realloc( id.size() ); listTitle.realloc( id.size() ); -const sal_Char* pData = NULL; -const sal_Char pEmpty[] = ; - for( sal_uInt32 i = 0; i id.size(); ++i ) { listId[i] = id[i]; listAnchor[i] = anchor[i]; -pData = pEmpty; +const sal_Char* pData = NULL; + if( pHdf ) { OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 090d7f01fdbdb0abff52b86b5145216c6835acfc Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 24 16:20:08 2013 +0100 valgrind: on success aHDFData is out of scope and pData points to data belonging to it (cherry picked from commit b7efab3a9841a9f01c5da07db870a22866b65b04) Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com Change-Id: I2a3c1f73e4cdcb07d21ef14cb410d351f39cdba8 diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 331aa20..0c4bdab 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -767,12 +767,12 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: listId[i] = id[i]; listAnchor[i] = anchor[i]; +helpdatafileproxy::HDFData aHDFData; const sal_Char* pData = NULL; if( pHdf ) { OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); -helpdatafileproxy::HDFData aHDFData; bool bSuccess = pHdf-getValueForKey( idi, aHDFData ); if( bSuccess ) pData = aHDFData.getData(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||70809, 70842 --- Comment #97 from Cor Nouws c...@nouenoff.nl --- Hi, Let me be 'brave' and add: Bug 70809 - [EDITING] Selecting with mouse: too fast changing to next/previous page Bug 70842 - EDITING: Large document with many pictures causes freezing in Writer when scrolling with scroll bar -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 33655] allow admins to hide enable experimental features option
https://bugs.freedesktop.org/show_bug.cgi?id=33655 bfoman bfo.bugm...@spamgourmet.com changed: What|Removed |Added CC||bfo.bugm...@spamgourmet.com --- Comment #13 from bfoman bfo.bugm...@spamgourmet.com --- (In reply to comment #12) I can give the details. From LibreOffice 4.2 it is even possible via Group Policy under Windows. Please do so - is there a wiki article about this topic? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - chart2/source
chart2/source/view/main/ChartView.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99d9f949ee052cb83195edd414a2aa9b8c5a9b0e Author: Felix Zhang fezh...@suse.com Date: Tue Sep 4 14:40:43 2012 +0800 bnc#759197: adjust chart layout distance Change-Id: Ifae4faeb234630dcce79851a0ad8bb0c6960f9f7 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index e5ae969..670c6f9 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2011,7 +2011,7 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( double lcl_getPageLayoutDistancePercentage() { -return 0.02; +return 0.006; } bool getAvailablePosAndSizeForDiagram( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0daa2f6a1d0b2727ae1b323a803c9c5fd8ad70a8 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 24 18:42:22 2013 +0200 cygwin: there is no sudo on Windows Change-Id: I8df4b379d98ba14a5cef93cefec9df16eefeb083 diff --git a/configure.ac b/configure.ac index 6b64984..49cfae7 100644 --- a/configure.ac +++ b/configure.ac @@ -12751,7 +12751,7 @@ git clone git://anongit.freedesktop.org/libreoffice/contrib/dev-tools cd dev-tools/make-3.82-gbuild ./configure --prefix=/opt/lo make -sudo make install +make install Then re-run autogen.sh ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
dev-tools: make-4.0-gbuild
Hi, I pushed make-4.0-gbuild to dev-tools some minutes ago. It compiled fine for me under Windows and Linux and the build on Windows started fine. Please feel free to test it. First I wanted to upload it to gerrit, but due to missing Change-Ids in the commits it was not possible... Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - external/fontconfig external/freetype vcl/inc
external/fontconfig/ExternalProject_fontconfig.mk |2 +- external/freetype/ExternalProject_freetype.mk |4 ++-- vcl/inc/salgdi.hxx|3 --- 3 files changed, 3 insertions(+), 6 deletions(-) New commits: commit 49f6c5907a2ec8c1886e3157de2c843d332aabcf Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 23:12:32 2013 +0300 Fix freetype and fontconfig problems We need to do a make install in freetype so that what freetype-config --libs outputs is correct. We don't use freetype-config ourselves but fontconfig does, and it builds some test programs. The bundled freetype and fontconfig are built only for Android. Change-Id: Ib622cc48a0c4eb6a72188bc83c8d36b39f97fdca diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 74438d0..e4de004 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --with-arch=arm \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ - --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \ + --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ $(MAKE) \ ) diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index ba22a64..aa9a1b7 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -20,10 +20,10 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : --disable-shared \ --without-zlib \ --without-bzip2 \ - --prefix=$(OUTDIR) --includedir=$(call gb_UnpackedTarball_get_dir,freetype)/include \ + --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ chmod +x builds/unix/freetype-config \ -$(MAKE) \ +$(MAKE) install \ touch $@ # vim: set noet sw=4 ts=4: commit 01a51764c5eff1c883d3a19381ab4d8971471492 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 20:00:27 2013 +0300 Bin unused #defines Change-Id: I5a6eb741c0669d2f1e5bfbe302066be863ec0249 diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index d4a219d..d0edf59 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -56,10 +56,7 @@ namespace basegfx { // - SalGraphics-Codes - // - -#define SAL_SETFONT_REMOVEANDMATCHNEW ((sal_uInt16)0x0001) -#define SAL_SETFONT_USEDRAWTEXT ((sal_uInt16)0x0002) #define SAL_SETFONT_USEDRAWTEXTARRAY((sal_uInt16)0x0004) -#define SAL_SETFONT_UNICODE ((sal_uInt16)0x0008) #define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000) #define SAL_COPYAREA_WINDOWINVALIDATE ((sal_uInt16)0x0001) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/collab/sendfunc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e886cc7fa1849efd899ba16fce6a0b84371e5ea1 Author: Michael Meeks michael.me...@collabora.com Date: Thu Oct 24 21:17:37 2013 +0100 compile fix. Change-Id: I50bbdc75e41b23fe64cb0a17dea1290c763a93e1 diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 8bf3e14..68d1775 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -309,7 +309,7 @@ ScDocFuncSend::~ScDocFuncSend() void ScDocFuncSend::EnterListAction( sal_uInt16 nNameResId ) { // Want to group these operations for the other side ... -String aUndo( ScGlobal::GetRscString( nNameResId ) ); +OUString aUndo( ScGlobal::GetRscString( nNameResId ) ); ScChangeOpWriter aOp( enterListAction ); aOp.appendInt( nNameResId ); // nasty but translate-able ... SendMessage( aOp ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 33655] allow admins to hide enable experimental features option
https://bugs.freedesktop.org/show_bug.cgi?id=33655 --- Comment #14 from Michael Meeks michael.me...@collabora.com --- Andras - if so, sounds awesome we should just close this then I guess. Do we have a GPO template for that ? :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
minutes of ESC call ...
* Present: + Norbert, David, Eike, Robinson, Lionel, Tsahi, Caolan, Kendy, Markus, Ahmad, Adam, Michael M, Michael S, cloph, Stephan, Miklos, Andras, Bjoern * Completed Action Items: + setup infrastructure to build bibisect repos (Cloph / Bjoern / Norbert) [ The ubuntu one is now up to date again, is published: https://bugs.freedesktop.org/show_bug.cgi?id=70652 ] + create script to auto-mail users list for each API Change commit (Bjoern) [ Easyhack: https://bugs.freedesktop.org/show_bug.cgi?id=70667 ] + find better way to export from Coverity categories of non-security critical bugs (Caolan) [ In progress. Works in theory, but in practice slow and due to network issues practical limit of just a few hundred ] [ discussed with Coverity at LinxConEurope - they're implementing a feature to do what we need = punt ] + ask Florian for a minimal / simple solution for larger bug docs (Robinson) [ use a directory on OwnCloud for now ] * Pending Action Items: + Include new C* font google replacements into vanilla install (Caolan) + New templates (Ahmad) + Template has to be hard-coded in code. Ideally as real documents. [ work in progress hard-coding templates as code ] + produce a VM for the load / crash regressions (Cloph / Markus) [ VM created, currently busy harvesting test documents, should be done in parallel - 9x scripts side by side ... ] + partition document test loads / run them on tinderboxen (Norbert) + produce a VM with callgrind metrics (Matus) AI: poke Matus (Michael) + get setup wrt. mobile app-store access (Cloph / Thorsten) [ in progress around 4.1.3 ] + draw bugzilla migration threads together propose funding to the board (Robinson) [ discuss on the QA list, proposal in the next week ] * Release Engineering update (Cloph) + 4.0.6 retrospective + released today at noon, delayed by couple of missing approvals ? + 4.1.3 status + test builds for RC2 up-loaded, but Windows late. + otherwise on-track for release next week + 4.2 Alpha release planned for Nov 4th. + GSOC / Android iOS remote releases from master + as above, in progress for 4.1.3 + reinvestigate/clarify our communication on review deadlines etc. (Bjoern) + Petr used to lean on people to review open patches before tag creation + missed patches before 4.0.6 and 4.1.3 - not enough review before tag creation. + what to do ? + make developers more responsible for deadlines ? + or ask Cloph to help baby-sit un-reviewed patches ? + need some advanced notice / baby-sitting of patch reviews. + Cloph been extremely busy + sometimes we're not sure if we already passed the deadline (Miklos) + possible to poke on IRC to get these unwound noisily ! * Best-practise around commit messages (Michael) eg. commit c3ef735fd5d8866c8ce28b89744150e733087427 [ not truly mine ] eg. commit 359472b2b50165966c27c239eccd3ecfb03e2acc + git scales well with the real data not the meta-data so much (Miklos) + concern that we don't put lots of IRC log, gdb traces in commit msgs (Michael) + concern that commit msgs are too short generally (Norbert) + commit msgs should have a length that reflects the complexity of the change, but not too verbose. * larger code structural changes - eg. external/ move ? (Bjoern) + good idea but surprising - discussed at ESC ? http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html + after sitting for 4 days on gerrit / bugzilla etc. + silent approval by at least two core devs (Eike replied, David T. CCed on bug) + David T. also merged a lot of the changes :-) + the 'make module' on cmdline doesn't work anymore (Norbert) + can do 'make liborcus' still - fixed it (Mst) * EasyHack exhaustion (Michael) + purpose of easy hacks is to get people involved in the project. + creating them takes work. + experienced guys having done a few should move onto harder ones and not fix the easiest of hacks: leaving them for newbies. + a great thing to work on 'next' is .ui file conversion: + a huge almost un-bounded problem. + or onto finishing the string conversion bits. + really positive progress from interaction with the ML, thanks Bjoern * FOSDEM: + I believe we need to submit talks directly to Pentabarf ourselves AI: + poke people more, and get submission details from Italo (Kendy) + Travel can be covered by TDF - planned for 2x days after FOSDEM. + is 2x days long enough ? * Google C* font replacements / update (Caolan) + should we back-port to 4.1.x ? * QA update (Robinson) +
[Libreoffice-commits] core.git: android/Bootstrap
android/Bootstrap/Makefile.shared |1 - 1 file changed, 1 deletion(-) New commits: commit 96c7e0f52615936edf474a593aaff2d96f610259 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 23:42:02 2013 +0300 No libs in $(OUTDIR)/lib any more Change-Id: If1781415f49f86fea0de5a05a38c878d3924812b diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index b5368f4..5906fa6 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -81,7 +81,6 @@ clean: android_version_setup properties LIBS = \ -Wl,--start-group \ - $(wildcard $(OUTDIR)/lib/lib*.a) \ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ $(HARFBUZZ_LIBS) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #98 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #97) Let me be 'brave' and add: Of course, the real brave people will be the dev(s) that, seeing the progress of improvements and cleaning up, will dive into these smelly issues :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - ios/experimental solenv/gbuild vcl/inc
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 14 +++ solenv/gbuild/platform/IOS_ARM_GCC.mk |5 ++ vcl/inc/ios/iosvcltypes.h | 20 -- 3 files changed, 18 insertions(+), 21 deletions(-) New commits: commit b7e5ab6f65eb682bfa200459d745d3bc4056e42a Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 25 00:47:22 2013 +0300 No libs in solver now any more Change-Id: I6f0f91c5fdb467fea2c706b4d426a973277c5230 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index aac083b..96cfb5d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -117,13 +117,13 @@ define gb_LinkTarget__command_dynamiclink $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ - $(wildcard $(OUTDIR)/lib/*.a) \ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ $(HUNSPELL_LIBS) \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ @@ -132,6 +132,9 @@ define gb_LinkTarget__command_dynamiclink $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ $(T_LIBS) \ commit a9759f706b0abd202e704004bdfa7b69fe93bbd0 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 24 23:34:26 2013 +0300 Add a few sources from vcl Change-Id: Iaddbfb48a071baaf84ee7bde38f40449f342dce8 diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index 89e04be..4a4dce7 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -78,6 +78,13 @@ BE9086FF16FF02B3004400A1 /* svptext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; path = ../../../../vcl/headless/svptext.cxx; sourceTree = group; }; BE90870016FF02B3004400A1 /* svpvd.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = group; }; BE954A2E1704F9500040D517 /* iosinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iosinst.cxx; path = ../../../../vcl/ios/iosinst.cxx; sourceTree = group; }; + BE96AEB118196DCE00BD1AC4 /* svpbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; path = ../../../../vcl/headless/svpbmp.cxx; sourceTree = group; }; + BE96AEB218196DCE00BD1AC4 /* svpdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpdata.cxx; path = ../../../../vcl/headless/svpdata.cxx; sourceTree = group; }; + BE96AEB318196DCE00BD1AC4 /* svpframe.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpframe.cxx; path = ../../../../vcl/headless/svpframe.cxx; sourceTree = group; }; + BE96AEB418196DCE00BD1AC4 /* svpgdi.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpgdi.cxx; path = ../../../../vcl/headless/svpgdi.cxx; sourceTree = group; }; + BE96AEB518196DCE00BD1AC4 /* svpvd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = group; }; + BE96AEB6181971AF00BD1AC4 /* svpinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpinst.cxx; path =
Re: Why typing in Writer instantiates the JVM on Mac OS X
On Thu, Oct 24, 2013 at 12:02 PM, Stephan Bergmann sberg...@redhat.com wrote: With problems popping up for users after upgrading to Mac OS X Mavericks So... I installed a libreoffice 4.1 (latest stable release) I made sure that java was working for libreoffice. then I upgraded to maverick immediately after the install was done, I started libreoffice again... then selected 'Writer'... typed a charactere A pop up showed-up warning me that Java 1.6 is not avaialble, and asked me if I wanted to install it. I answered no to the request to install java at this point there is no more lo running, although there was no crash-report dialog. I started again... a lo crash recovery windows was presented for the writer document I was on... I said no to recovery and proceeded with creating a new writter document.. same symptom... this time I replied 'yes' to the install of java after java has been installed, Libreoffice is restarted automatically, and a lo-crash-recovery windows is presented again... After that lo works normally Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/drawdoc.hxx | 12 ++-- sd/source/core/drawdoc.cxx | 14 +++--- sd/source/core/drawdoc3.cxx |6 +++--- sd/source/core/drawdoc4.cxx |6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) New commits: commit 324b47aabcddc75e98ef56769e24362668e26ebc Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Oct 25 10:54:51 2013 +0900 sal_Bool to bool Change-Id: I4fe71f0418b3c2c9b0ca261c5b24fe2d093f7bb9 diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 9040534..d8e2de7 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -151,8 +151,8 @@ private: SdCustomShowList* mpCustomShowList; ::sd::DrawDocShell* mpDocSh; SdTransferable *mpCreatingTransferable; -sal_BoolmbHasOnlineSpellErrors; -sal_BoolmbInitialOnlineSpellingEnabled; +boolmbHasOnlineSpellErrors; +boolmbInitialOnlineSpellingEnabled; OUStringmaBookmarkFile; ::sd::DrawDocShellRef mxBookmarkDocShRef; @@ -160,7 +160,7 @@ private: ::com::sun::star::uno::Reference ::com::sun::star::presentation::XPresentation2 mxPresentation; -sal_BoolmbNewOrLoadCompleted; +boolmbNewOrLoadCompleted; sal_BoolmbOnlineSpell; sal_BoolmbSummationOfParagraphs; @@ -171,7 +171,7 @@ private: LanguageTypemeLanguageCTL; SvxNumType mePageNumType; ::sd::DrawDocShellRef mxAllocedDocShRef; // = AllocModel() -sal_BoolmbAllocDocSh; // = AllocModel() +boolmbAllocDocSh; // = AllocModel() DocumentTypemeDocType; CharClass* mpCharClass; ::com::sun::star::lang::Locale* mpLocale; @@ -229,7 +229,7 @@ public: DocumentTypeGetDocumentType() const { return meDocType; } -voidSetAllocDocSh(sal_Bool bAlloc); +voidSetAllocDocSh(bool bAlloc); voidCreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } @@ -426,7 +426,7 @@ public: voidNewOrLoadCompleted(DocCreationMode eMode); voidNewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); -sal_BoolIsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } +boolIsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } ::sd::FrameView* GetFrameView(sal_uLong nPos) { return nPos maFrameViewList.size() ? maFrameViewList[nPos] : NULL; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index e252589..f0c14c6 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -156,16 +156,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) , mpCustomShowList(NULL) , mpDocSh(static_cast ::sd::DrawDocShell*(pDrDocSh)) , mpCreatingTransferable( NULL ) -, mbHasOnlineSpellErrors(sal_False) -, mbInitialOnlineSpellingEnabled(sal_True) -, mbNewOrLoadCompleted(sal_False) +, mbHasOnlineSpellErrors(false) +, mbInitialOnlineSpellingEnabled(true) +, mbNewOrLoadCompleted(false) , mbStartWithPresentation( false ) , mbExitAfterPresenting( false ) , meLanguage( LANGUAGE_SYSTEM ) , meLanguageCJK( LANGUAGE_SYSTEM ) , meLanguageCTL( LANGUAGE_SYSTEM ) , mePageNumType(SVX_ARABIC) -, mbAllocDocSh(sal_False) +, mbAllocDocSh(false) , meDocType(eType) , mpCharClass(NULL) , mpLocale(NULL) @@ -386,7 +386,7 @@ SdDrawDocument::~SdDrawDocument() mpOnlineSearchItem = NULL; CloseBookmarkDoc(); -SetAllocDocSh(sal_False); +SetAllocDocSh(false); ClearModel(sal_True); @@ -482,7 +482,7 @@ SdrModel* SdDrawDocument::AllocModel() const { // Create a DocShell which is then returned with GetAllocedDocSh() SdDrawDocument* pDoc = (SdDrawDocument*) this; -pDoc-SetAllocDocSh(sal_False); +pDoc-SetAllocDocSh(false); pDoc-mxAllocedDocShRef = new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType); pDoc-mxAllocedDocShRef-DoInitNew(NULL); @@ -657,7 +657,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) } } -mbNewOrLoadCompleted = sal_True; +mbNewOrLoadCompleted = true; // Update all linked pages SdPage* pPage = NULL; diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 3a20796..4ce381f 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1046,13 +1046,13 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( } if (bOLEObjFound) -pBMView-GetDoc().SetAllocDocSh(sal_True); +pBMView-GetDoc().SetAllocDocSh(true); SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView-GetMarkedObjModel(); bOK = pView-Paste(*pTmpDoc, aObjPos, pPage);
[Libreoffice-qa] Trouble bibisecting - 'com::sun::star::uno::RuntimeException'
Hi I am trying to bibisect one particular issue, but have no luck thus far. I have downloaded huge file with bibisect repo, zsync'ed it with newest changes and unpacked into working directory, as wiki page says to do. When I did: ./opt/program/soffice -env:UserInstallation=file:///tmp/soffice-bisect I got error message about libreglo.so not found. According to bug 67313, lo prefixes were introduced recently to differentiate LibreOffice libraries from other libraries on some systems. So I did ln -s opt/ure/lib/libreg.so opt/ure/lib/libreglo.so to make sure that file exists. Problem persisted, so I figured out that soffice.bin is simply not looking where it should be for libreglo.so file. Therefore, I added opt/ure/lib/ to my LD_LIBRARY_PATH: export LD_LIBRARY_PATH='/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/lib/i486-linux-gnu:/usr/lib/i486-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib32:/usr/lib32:opt/ure/lib/' (I am not sure if mentioning all system paths written in /etc/ld.so.conf.d/ is necessary, but it wouldn't hurt, would it?) But now LO splash screen appears for a brief moment and then disappears, with messages left in terminal window: Warning: failed to launch javaldx - java may not function correctly Gtk-Message: (for origin information, set GTK_DEBUG): failed to retrieve property `gtk-toolbar-style' of type `GtkToolbarStyle' from rc file value ((GString*) 0x1facee0) of type `GtkToolbarStyle' /home/minio/.gtkrc-2.0:14: error: unexpected character `=', expected keyword - e.g. `style' terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' I figured out it might be problem with GTK libraries, so I forced generic X interface: export SAL_USE_VCLPLUGIN=gen export OOO_FORCE_DESKTOP=none But then, problem persists. The only message I get is: terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' I have also tried debugging startup process; gdb log is attached by the end of the message. Does any of that makes any sense to you? How can I fix this error and start bibisecting? I am using Debian testing updated on daily manner, amd64 architecture. gdb log: GNU gdb (GDB) 7.6 (Debian 7.6-5) Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as x86_64-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs/... Reading symbols from /home/minio/sources/lo-bibisect/binrepo/opt/program/soffice.bin...(no debugging symbols found)...done. /home/minio/sources/lo-bibisect/binrepo/opt/program/gdbtrace: Nie ma takiego pliku ani katalogu. (gdb) run Starting program: /home/minio/sources/lo-bibisect/binrepo/opt/program/soffice.bin --backtrace -env:UserInstallation=file:///tmp/soffice-bisect warning: Could not load shared library symbols for linux-vdso.so.1. Do you need set solib-search-path or set sysroot? [Thread debugging using libthread_db enabled] Using host libthread_db library /lib/x86_64-linux-gnu/libthread_db.so.1. [New Thread 0x7fffe881d700 (LWP 32762)] [New Thread 0x7fffe53c3700 (LWP 306)] terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' Program received signal SIGABRT, Aborted. 0x76d6e1e5 in raise () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x76d6e1e5 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x76d71398 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x77659605 in __gnu_cxx::__verbose_terminate_handler() () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #3 0x77657766 in ?? () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #4 0x77657793 in std::terminate() () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #5 0x776579bf in __cxa_throw () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #6 0x7fffe5f293dc in configmgr::Components::Components(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext const) () from /home/minio/sources/lo-bibisect/binrepo/opt/program/../program/configmgr.uno.so #7 0x7fffe5f29dcf in configmgr::Components::getSingleton(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext const) () from /home/minio/sources/lo-bibisect/binrepo/opt/program/../program/configmgr.uno.so #8 0x7fffe5f2c9b9 in configmgr::configuration_provider::(anonymous namespace)::Service::createInstanceWithArguments(rtl::OUString const, com::sun::star::uno::Sequencecom::sun::star::uno::Any const) () from /home/minio/sources/lo-bibisect/binrepo/opt/program/../program/configmgr.uno.so #9 0x73af7983 in utl::ConfigManager::acquireTree(utl::ConfigItem) () from /home/minio/sources/lo-bibisect/binrepo/opt/program/libutllo.so #10
Re: [Libreoffice-qa] Trouble bibisecting - 'com::sun::star::uno::RuntimeException'
Dnia 2013-10-24, o godz. 10:54:10 Mirosław Zalewski mini...@poczta.onet.pl napisał(a): I have downloaded huge file with bibisect repo If anyone wonders, by huge file I mean 17G 4.0+ version: http://people.canonical.com/~j-lallement/libreoffice/binrepo/bibisect-4.0.tar.lzma It seems that there are also other bibsect archives, around 4G in size, but I have not touched them yet. -- Best regards Mirosław Zalewski ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Trouble bibisecting - 'com::sun::star::uno::RuntimeException'
I decided to use violence and removed my binrepo directory and then extracted bibisect.tar.lzma content again. After following these guides step-by-step: https://wiki.documentfoundation.org/QA/HowToBibisect http://flosmind.wordpress.com/libreoffice-bisecting/ http://www.youtube.com/watch?v=SA88flop4MM Bibisected LibreOffice is starting as it should be and I have managed to track down commit I was looking for. I am not sure why it did not work before and does work now. It might be that git checkout command is neccessary, and Florian's blog post does not mention it. Or maybe I have messed up my repo to the state that git tracking mechanism and source tree were out of sync. If anyone knows why it might have happened, please share - it might be useful information for future bibisecters. -- Best regards Mirosław Zalewski ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Trouble bibisecting - 'com::sun::star::uno::RuntimeException'
On Thu, Oct 24, 2013 at 8:41 AM, Mirosław Zalewski mini...@poczta.onet.pl wrote: I decided to use violence and removed my binrepo directory and then extracted bibisect.tar.lzma content again. :-) After following these guides step-by-step: https://wiki.documentfoundation.org/QA/HowToBibisect http://flosmind.wordpress.com/libreoffice-bisecting/ http://www.youtube.com/watch?v=SA88flop4MM Bibisected LibreOffice is starting as it should be and I have managed to track down commit I was looking for. Good, good. I am not sure why it did not work before and does work now. It might be that git checkout command is neccessary, and Florian's blog post does not mention it. Or maybe I have messed up my repo to the state that git tracking mechanism and source tree were out of sync. That's possible. IIRC, Joren said that he had a problem with his git tree being stuck in a weird state. Joren -- did you ever figured out what went wrong with your bibisect repo, and have you managed to repair it? I wonder if it would be possible to wipe out local changes in the git repo just using zsync commands? (I'm not so familiar with the way that zsync works) If anyone knows why it might have happened, please share - it might be useful information for future bibisecters. Bjoern might have some insight here, but it might just be gremlins in the repo. It's unfortunate that the repo is such a large re-download if/when it breaks. --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 4.0.6 RC2 test builds available
Hi Jean-Baptiste Jean-Baptiste Faure wrote This link (for example) : https://www.libreoffice.org/download/?type=deb-x86_64version=4.0.6lang=fr It gives only the RC1. Never mind RC2. The final version (aka 4.0.6.2 or just 4.0.6) was already announced http://nabble.documentfoundation.org/The-Document-Foundation-announces-LibreOffice-4-0-6-tp4079543.html Best regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-ANN-LibreOffice-4-0-6-RC2-test-builds-available-tp4078636p4079627.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] minutes of ESC call ...
* Present: + Norbert, David, Eike, Robinson, Lionel, Tsahi, Caolan, Kendy, Markus, Ahmad, Adam, Michael M, Michael S, cloph, Stephan, Miklos, Andras, Bjoern * Completed Action Items: + setup infrastructure to build bibisect repos (Cloph / Bjoern / Norbert) [ The ubuntu one is now up to date again, is published: https://bugs.freedesktop.org/show_bug.cgi?id=70652 ] + create script to auto-mail users list for each API Change commit (Bjoern) [ Easyhack: https://bugs.freedesktop.org/show_bug.cgi?id=70667 ] + find better way to export from Coverity categories of non-security critical bugs (Caolan) [ In progress. Works in theory, but in practice slow and due to network issues practical limit of just a few hundred ] [ discussed with Coverity at LinxConEurope - they're implementing a feature to do what we need = punt ] + ask Florian for a minimal / simple solution for larger bug docs (Robinson) [ use a directory on OwnCloud for now ] * Pending Action Items: + Include new C* font google replacements into vanilla install (Caolan) + New templates (Ahmad) + Template has to be hard-coded in code. Ideally as real documents. [ work in progress hard-coding templates as code ] + produce a VM for the load / crash regressions (Cloph / Markus) [ VM created, currently busy harvesting test documents, should be done in parallel - 9x scripts side by side ... ] + partition document test loads / run them on tinderboxen (Norbert) + produce a VM with callgrind metrics (Matus) AI: poke Matus (Michael) + get setup wrt. mobile app-store access (Cloph / Thorsten) [ in progress around 4.1.3 ] + draw bugzilla migration threads together propose funding to the board (Robinson) [ discuss on the QA list, proposal in the next week ] * Release Engineering update (Cloph) + 4.0.6 retrospective + released today at noon, delayed by couple of missing approvals ? + 4.1.3 status + test builds for RC2 up-loaded, but Windows late. + otherwise on-track for release next week + 4.2 Alpha release planned for Nov 4th. + GSOC / Android iOS remote releases from master + as above, in progress for 4.1.3 + reinvestigate/clarify our communication on review deadlines etc. (Bjoern) + Petr used to lean on people to review open patches before tag creation + missed patches before 4.0.6 and 4.1.3 - not enough review before tag creation. + what to do ? + make developers more responsible for deadlines ? + or ask Cloph to help baby-sit un-reviewed patches ? + need some advanced notice / baby-sitting of patch reviews. + Cloph been extremely busy + sometimes we're not sure if we already passed the deadline (Miklos) + possible to poke on IRC to get these unwound noisily ! * Best-practise around commit messages (Michael) eg. commit c3ef735fd5d8866c8ce28b89744150e733087427 [ not truly mine ] eg. commit 359472b2b50165966c27c239eccd3ecfb03e2acc + git scales well with the real data not the meta-data so much (Miklos) + concern that we don't put lots of IRC log, gdb traces in commit msgs (Michael) + concern that commit msgs are too short generally (Norbert) + commit msgs should have a length that reflects the complexity of the change, but not too verbose. * larger code structural changes - eg. external/ move ? (Bjoern) + good idea but surprising - discussed at ESC ? http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html + after sitting for 4 days on gerrit / bugzilla etc. + silent approval by at least two core devs (Eike replied, David T. CCed on bug) + David T. also merged a lot of the changes :-) + the 'make module' on cmdline doesn't work anymore (Norbert) + can do 'make liborcus' still - fixed it (Mst) * EasyHack exhaustion (Michael) + purpose of easy hacks is to get people involved in the project. + creating them takes work. + experienced guys having done a few should move onto harder ones and not fix the easiest of hacks: leaving them for newbies. + a great thing to work on 'next' is .ui file conversion: + a huge almost un-bounded problem. + or onto finishing the string conversion bits. + really positive progress from interaction with the ML, thanks Bjoern * FOSDEM: + I believe we need to submit talks directly to Pentabarf ourselves AI: + poke people more, and get submission details from Italo (Kendy) + Travel can be covered by TDF - planned for 2x days after FOSDEM. + is 2x days long enough ? * Google C* font replacements / update (Caolan) + should we back-port to 4.1.x ? * QA update (Robinson) +
Re: [Libreoffice-qa] daily vs. 4.-0+ bibisect repos [was: Trouble bibisecting - 'com::sun::star::uno::RuntimeException']
Hi all I spent afternoon with git manual and repeatedly removing/unpacking bibisect archives and I think I understand a little more now. Dnia 2013-10-24, o godz. 11:29:42 dk...@torfree.net napisał(a): I am confused about the names daily and 4.0+ for bibisect repositoriies. Does it make sense now to say daily at all? I gather vaguely from messages on the dev list that the maintenance process for the bibisect repository or repositories has not settled down to its final state. But if my confusion has led Miros#322;aw into confusion, I should correct HowToBibisect https://wiki.documentfoundation.org/QA/HowToBibisect promptly, even if only as an interim measure. But first, somebody please tell me what is what. As far as I am concerned, daily and 4.0+ were the smallest source of my confusion. But there are many other problems with instructions. First and foremost, we have two repositories from two men. These not only serve different purpose, but also are set up differently, which means that user must perform different steps depending on which one he has. Unfortunately, these differences are never laid out systematically. I learned them by trial and error. I think that versions table could use another column with name of man who created archive in question. Then we can reference to them as Bjoern archive and Jean archive. If one is to seriously bibisect, he has to download two packages: 1. Bjoern 4.0, which covers everything from 2011-08-06 (about midway between branching 3.4 and 3.5 from master) to 2012-12-08 (around branching 4.0 from master). 2. Either Bjoern 2013-10-12 or Jean 4.0+. They both cover roughly the same area, since 2012-12-08 to 2013-09-17 (later date is subject to change). The difference between them is density of builds - Jean archive is far denser, which means that each build covers fewer commits, which means that finding patch that introduced regression is easier for developer with bisect log. But we pay for this with almost 4 times bigger package. Also, Jean package was supposed to be updated daily, while Bjoern apparently never made such commitment. But at the moment they both are not updated for a month and they both stop at about the same moment in time. Of course second package is more important, as we are mainly interested in newer regressions. But there are still bugs that can be bibisected only with older package. When we download and unpack archive, we must set up working environment. And that depends which package we have used. In Bjoern packages (well, 4.0 that is; I did not checked 2012-10-12, but assume it is set up the same way) our main concern is HEAD set up at oldest commit. This way `git rev-parse HEAD` will produce ID of oldest commit. If we blindly follow instructions at wiki, we will end up assigning latest tag to oldest possible commit. Our second problem is that we have empty git working tree. Both of them can be fixed by issuing: git checkout master We are ready to go. We can assign latest tag to ID returned by git rev-parse and oldest tag to 65fd30f5cb4. Then we can issue bibisect command. In Jean package, on the other hand, HEAD is set up to latest commit. But since our git working tree is empty, git thinks that we have one uncommitted change (the one that removes everything...). We can assign tags to commits, but then bibisect command will bring working tree to messed state. This command, mentioned at very beginning of Bibisecting section at wiki: git checkout latest will not refresh working directory content, because git IS already at latest tree version. Wiki says that we should execute `soffice` command, but this will not be possible. The second command, `git checkout oldest`, will leave us with broken git tree. My assumptions why it happens are outlined below. We can fix all these problems and go ahead with wiki instructions by forcing git to restore working tree content to state it was supposed to be at current revision: git checkout-index -a Then we can tag latest and oldest commits (commands are already on the wiki), checkout any commit and start bisecting. BTW: git bisect will pick up commit in the middle between known good and bad version and bring working tree to state of that revision. Therefore, `git checkout {oldest,latest}` are needed only to verify that bug was introduced in one of builds that we have access to. Actually, we can check only oldest commit. If we are on 4.0+ or 2012-10-12 and the bug is present, then we must check Bjoern 4.0 archive; if we are on Bjoern 4.0 and bug is present in oldest revision, then we must set whiteboard to prebibisect, because it was introduced somewhere before August of 2011. Finally, there is that thing why `git checkout oldest` does not work in Jean archive (it leaves with broken LO due to renamed libraries). I suppose that `git checkout` does not use full restore, but differential/incremental one. That is: if we want to switch from revision X to revision Y, git will
[Libreoffice-qa] [Solved] Re: Windows builds (last 2013-10-16)
Hi, Nice to see Tinderbox #42 producing again daily installation files for master, from 23-Oct-2013 20:21. Thanks. Miguel Ángel. -- View this message in context: http://nabble.documentfoundation.org/Windows-builds-last-2013-10-16-tp4078857p4079693.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 70824] New: UI: two-sided printing on HP LJ 4050DN
https://bugs.freedesktop.org/show_bug.cgi?id=70824 Priority: medium Bug ID: 70824 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: two-sided printing on HP LJ 4050DN Severity: normal Classification: Unclassified OS: Windows (All) Reporter: przem...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.2.3 release Component: Printing and PDF export Product: LibreOffice Problem description: Steps to reproduce: Print to HP DJ 4050 DN (two-sided) Current behavior: the printer pulls two sheets of paper from the tray and prints on one side of each sheet But if export document to PDF, that from PDF form printing correctly Expected behavior: Operating System: Windows 7 Version: 4.1.2.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70825] New: editing index entry triggers undesired changes
https://bugs.freedesktop.org/show_bug.cgi?id=70825 Priority: medium Bug ID: 70825 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: editing index entry triggers undesired changes Severity: major Classification: Unclassified OS: Windows (All) Reporter: ulrich.wi...@rz.uni-regensburg.de Hardware: x86 (IA32) Status: UNCONFIRMED Version: 4.0.5.2 release Component: Writer Product: LibreOffice When editing index entries, I see several unwanted changes: When changing an entry like Foo to foo (or Jokes to Joke) the selection of the index entry extends to several words When selecting the next or previous index entry (from the dialog), all the visited index entries are deleted(!) Fortunately you can undo those if you realize in time. I did not see these problems in the latest 3.6.7 realease. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70826] New: Add dialog to merge similar index entries
https://bugs.freedesktop.org/show_bug.cgi?id=70826 Priority: medium Bug ID: 70826 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Add dialog to merge similar index entries Severity: enhancement Classification: Unclassified OS: All Reporter: ulrich.wi...@rz.uni-regensburg.de Hardware: Other Status: UNCONFIRMED Version: 4.0.5.2 release Component: Writer Product: LibreOffice When creating an index, the index frequently ends up with similar words that should be the same word, like plural vs. singular, capitalized vs. non-capitalized, or things like filesystem vs. file system, real time vs. real-time, etc. It would be nice if there'd be a dialog to select several index phrases to combine them to a single index phrase, optionally creating a see also .. type of index entry, like Non-maskable interrupt . see NMI. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70531] FILESAVE: Exporting PDF to existing file name returns two dialogs instead of one
https://bugs.freedesktop.org/show_bug.cgi?id=70531 grofaty grof...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs