Licensing
I might have forgotten to mention previously with my patches: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards, Robert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest_javamaker.mk testtools/Module_testtools.mk
testtools/CustomTarget_bridgetest_javamaker.mk | 39 + testtools/Module_testtools.mk | 12 +++ 2 files changed, 45 insertions(+), 6 deletions(-) New commits: commit 77d4789c0eaa7e5cfe7e03870261c61065c7010d Author: David Ostrovsky david.ostrov...@gmx.de Date: Thu May 10 09:10:23 2012 +0200 bridgetest_javamaker target added Change-Id: Ice0a284683d67168624aeb9d737ff219c9074251 diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk new file mode 100644 index 000..25709ee --- /dev/null +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -0,0 +1,39 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker)) + +TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker) + +$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done + +$(TTBJ)/done : $(OUTDIR)/rdb/bridgetest.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -nD -O$(TTBJ)/class -X$(OUTDIR)/bin/types.rdb $) touch $@) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index 79ebf69..16da8e3 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -26,16 +26,16 @@ $(eval $(call gb_Module_Module,testtools)) -#$(eval $(call gb_Module_add_targets,testtools,\ -#Jar_testComponent \ -#)) - -ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,testtools,\ InternalUnoApi_bridgetest \ +CustomTarget_bridgetest_javamaker \ )) -endif +#ifneq ($(SOLAR_JAVA),) +#$(eval $(call gb_Module_add_targets,testtools,\ # Jar_testComponent \ +#)) +#endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest_javamaker.mk
testtools/CustomTarget_bridgetest_javamaker.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ce6f6685e9c278f4d32f97fd56acc08fd860a71 Author: David Ostrovsky david.ostrov...@gmx.de Date: Thu May 10 09:58:05 2012 +0200 bridgetest.rdb path fixed Change-Id: If458cbafeeb75d76c5efca9a979bb45242da89a1 diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index 25709ee..86eedde 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -30,7 +30,7 @@ TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker) $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done -$(TTBJ)/done : $(OUTDIR)/rdb/bridgetest.rdb \ +$(TTBJ)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \ $(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs_native, \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 46 + writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 + 2 files changed, 20 insertions(+), 28 deletions(-) New commits: commit 78e02045791fb179a031ef7a5bbacb8a71669cba Author: Miklos Vajna vmik...@suse.cz Date: Thu May 10 10:07:10 2012 +0200 RTFDocumentImpl::runProps: avoid copypaste Change-Id: I3b1f03c0a3236461e753ef236881313ea7daa0d0 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 1fd3d4d..a1f27be 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -439,6 +439,22 @@ void RTFDocumentImpl::checkNeedPap() } } +void RTFDocumentImpl::runProps() +{ +if (!m_pCurrentBuffer) +{ +writerfilter::ReferenceProperties::Pointer_t const pProperties( +new RTFReferenceProperties(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms) +); +Mapper().props(pProperties); +} +else +{ +RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms)); +m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue)); +} +} + void RTFDocumentImpl::runBreak() { sal_uInt8 sBreak[] = { 0xd }; @@ -979,20 +995,7 @@ void RTFDocumentImpl::text(OUString rString) if (m_aStates.top().nDestinationState == DESTINATION_NORMAL || m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT || m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT) -{ -if (!m_pCurrentBuffer) -{ -writerfilter::ReferenceProperties::Pointer_t const pProperties( -new RTFReferenceProperties(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms) -); -Mapper().props(pProperties); -} -else -{ -RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue)); -} -} +runProps(); if (!m_pCurrentBuffer) Mapper().utext(reinterpret_castsal_uInt8 const*(rString.getStr()), rString.getLength()); else @@ -1419,20 +1422,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) bool bNeedPap = m_bNeedPap; checkNeedPap(); if (bNeedPap) -{ -if (!m_pCurrentBuffer) -{ -writerfilter::ReferenceProperties::Pointer_t const pProperties( -new RTFReferenceProperties(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms) -); -Mapper().props(pProperties); -} -else -{ -RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aCharacterAttributes, m_aStates.top().aCharacterSprms)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue)); -} -} +runProps(); if (!m_pCurrentBuffer) parBreak(); else if (m_aStates.top().nDestinationState != DESTINATION_SHAPETEXT) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 2e23b0d..0f1a4ca 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -405,6 +405,8 @@ namespace writerfilter { void text(rtl::OUString rString); // Sends a single character to dmapper, taking care of buffering. void singleChar(sal_uInt8 nValue); +// Sends run properties to dmapper, taking care of buffering. +void runProps(); void parBreak(); void tableBreak(); void checkNeedPap(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
Maybe it's some kind of length limitation somewhere? Can you perhaps do a subst w: C:/cywin/home/tinderbox/libreoffice cd w: make And see if that helps? On 2012-05-09 19:12, Lubos Lunak wrote: I don't understand what the actual problem is, because if I copypaste the command and run it manually, it works without problems. I've also checked the arguments passed to cl.exe and they seem to be split properly (attached). Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: reportdesign/source
reportdesign/source/filter/xml/xmlExport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3ec5c6a8f3c623d500d447ba89863c69486b74c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu May 10 10:21:27 2012 +0200 -Wself-assign Change-Id: I89e93fdd9e89d37230321d52efe6d2ff91c60767 diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 035bd22..03512be 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -822,7 +822,7 @@ void ORptExport::exportContainer(const Reference XSection _xSection) { #if OSL_DEBUG_LEVEL 0 sal_Int32 nRowSpan = aRowSpanFind-second; -nRowSpan = nRowSpan; +(void) nRowSpan; sal_Int32 nColSpanTemp = aColIter-nColSpan; (void) nColSpanTemp; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: reportdesign/source
reportdesign/source/filter/xml/xmlExport.cxx |6 -- 1 file changed, 6 deletions(-) New commits: commit 0d79369ead281a2346b8c249497af174419ddd96 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu May 10 11:34:31 2012 +0300 Bin a few lines of apparently leftover temporary debugging code Change-Id: Idc543cc7f45c3dbaf3a49c8edeaaa0b5f59492ac diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 03512be..686ab66 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -820,12 +820,6 @@ void ORptExport::exportContainer(const Reference XSection _xSection) ::std::mapsal_Int32,sal_Int32::iterator aRowSpanFind = aRowSpan.find(nColIndex); if ( aRowSpanFind != aRowSpan.end() ) { -#if OSL_DEBUG_LEVEL 0 -sal_Int32 nRowSpan = aRowSpanFind-second; -(void) nRowSpan; -sal_Int32 nColSpanTemp = aColIter-nColSpan; -(void) nColSpanTemp; -#endif nColSpan = 1; if ( !--(aRowSpanFind-second) ) aRowSpan.erase(aRowSpanFind); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sorttree.cxx | 32 ++- 1 file changed, 31 insertions(+), 1 deletion(-) New commits: commit ce1ac0851fe2e975f3fb47178730b914608610cf Author: Andras Timar ati...@suse.com Date: Thu May 10 10:38:20 2012 +0200 error handling in SortTree custom action Change-Id: I03a06d09e3e84b6cb13bd68e8be4caebb1b9f5ab diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx index 25c6c6d..41695e2 100644 --- a/setup_native/source/win32/customactions/sellang/sorttree.cxx +++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx @@ -23,15 +23,45 @@ extern C UINT __stdcall SortTree(MSIHANDLE) // Sort items (languages) in SelectionTree control, fdo#46355 HWND hwndMSI = FindWindow(TEXT(MsiDialogCloseClass), NULL); +if (hwndMSI == NULL) +{ +OutputDebugString(SortTree: MsiDialogCloseClass not found\n); +return ERROR_SUCCESS; +} HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT(SysTreeView32), NULL); +if (hwndTV == NULL) +{ +OutputDebugString(SortTree: SysTreeView32 not found\n); +return ERROR_SUCCESS; +} HTREEITEM treeRoot = TreeView_GetRoot(hwndTV); +if (treeRoot == NULL) +{ +OutputDebugString(SortTree: TreeView_GetRoot failed\n); +return ERROR_SUCCESS; +} HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot); +if (optional == NULL) +{ +OutputDebugString(SortTree: Optional Components branch not found\n); +return ERROR_SUCCESS; +} HTREEITEM dicts = TreeView_GetChild(hwndTV, optional); +if (dicts == NULL) +{ +OutputDebugString(SortTree: Dictionaries branch not found\n); +return ERROR_SUCCESS; +} TreeView_SortChildren(hwndTV, dicts, TRUE); HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional); +if (langs == NULL) +{ +OutputDebugString(SortTree: Additional UI Languages branch not found\n); +return ERROR_SUCCESS; +} TreeView_SortChildren(hwndTV, langs, TRUE); - return ERROR_SUCCESS; +return ERROR_SUCCESS; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-5] fdo#46355 sort SelectionTree control of Custom Setup with a custom action
2012/5/7 Jesús Corrius je...@softcatala.org: Hi Andras, If it fails, nothing special will happen. The control will not be sorted, that is. I don't think we should stop and rollback the install. We ignore the return code of most of our custom actions. The behavior of FindWindow or FindWindowEx is different if some of the parameters are NULL (If hwndParent is NULL, the function uses the desktop window as the parent window). Although I agree that it is highly unlikely that we do any collateral damage, a few IFs will ensure that the code does what we want in all cases. So I would put them even if we never show any error message. OK, what about this: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ce1ac0851fe2e975f3fb47178730b914608610cf Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/rtftok/data/fdo49692.rtf | 17 + sw/qa/extras/rtftok/rtftok.cxx | 25 + writerfilter/source/rtftok/rtfvalue.cxx |6 +++--- writerfilter/source/rtftok/rtfvalue.hxx |2 +- 4 files changed, 46 insertions(+), 4 deletions(-) New commits: commit f55c92211630b4e90531645dbd8ae3350fd9a437 Author: Miklos Vajna vmik...@suse.cz Date: Thu May 10 10:35:47 2012 +0200 fdo#49692 RTFValue::Clone(): copy m_bForceString as well Change-Id: Ib8f06ff33fd9c01ea4a1e47c97cfa12f2ced7318 diff --git a/sw/qa/extras/rtftok/data/fdo49692.rtf b/sw/qa/extras/rtftok/data/fdo49692.rtf new file mode 100644 index 000..bcd7004 --- /dev/null +++ b/sw/qa/extras/rtftok/data/fdo49692.rtf @@ -0,0 +1,17 @@ +{\rtf1 +{\*\listtable +{\list\listtemplateid1 +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow0 +{\leveltext \'00;} +{\levelnumbers;} +\fi0\li0} +\listid1} +} +{\listoverridetable +{\listoverride\listid1\listoverridecount0\ls1} +} +\ilvl0 +\ls1 +EULA +\par +} diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index 92f722c..bff076a 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -91,6 +91,7 @@ public: void testN757651(); void testFdo49501(); void testFdo49271(); +void testFdo49692(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -125,6 +126,7 @@ public: CPPUNIT_TEST(testN757651); CPPUNIT_TEST(testFdo49501); CPPUNIT_TEST(testFdo49271); +CPPUNIT_TEST(testFdo49692); #endif CPPUNIT_TEST_SUITE_END(); @@ -696,6 +698,29 @@ void Test::testFdo49271() CPPUNIT_ASSERT_EQUAL(25.f, fValue); } +void Test::testFdo49692() +{ +load(fdo49692.rtf); + +uno::Referencebeans::XPropertySet xPropertySet(getStyles(NumberingStyles)-getByName(WWNum1), uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xLevels(xPropertySet-getPropertyValue(NumberingRules), uno::UNO_QUERY); +uno::Sequencebeans::PropertyValue aProps; +xLevels-getByIndex(0) = aProps; // 1st level + +for (int i = 0; i aProps.getLength(); ++i) +{ +const beans::PropertyValue rProp = aProps[i]; + +if (rProp.Name == Suffix) +{ +rtl::OUString sValue; +rProp.Value = sValue; + +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength()); +} +} +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index 530bb1c..13613fa 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -35,12 +35,12 @@ using rtl::OUString; RTFValue::RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Referencedrawing::XShape xShape, -uno::Referenceio::XInputStream xStream) +uno::Referenceio::XInputStream xStream, bool bForceString) : m_nValue(nValue), m_sValue(sValue), m_xShape(xShape), m_xStream(xStream), -m_bForceString(false) +m_bForceString(bForceString) { m_pAttributes.reset(new RTFSprms(rAttributes)); m_pSprms.reset(new RTFSprms(rSprms)); @@ -176,7 +176,7 @@ std::string RTFValue::toString() const RTFValue* RTFValue::Clone() { -return new RTFValue(m_nValue, m_sValue, *m_pAttributes, *m_pSprms, m_xShape, m_xStream); +return new RTFValue(m_nValue, m_sValue, *m_pAttributes, *m_pSprms, m_xShape, m_xStream, m_bForceString); } RTFSprms RTFValue::getAttributes() diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index c2ad524..d5c6b3e 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -41,7 +41,7 @@ namespace writerfilter { public: typedef boost::shared_ptrRTFValue Pointer_t; RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Referencedrawing::XShape rShape, -uno::Referenceio::XInputStream rStream); +uno::Referenceio::XInputStream rStream, bool bForceString); RTFValue(int nValue); RTFValue(rtl::OUString sValue, bool bForce = false); RTFValue(RTFSprms rAttributes); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Proper process to follow when pushing to feature/gsoc-calc-perf
On Wed, 2012-05-09 at 22:18 -0500, Daniel Bankston wrote: Thank you, Markus and Kohei. I intend to follow the smaller-buildable-easier-to-read-commits-with-a-specific-purpose guideline. :-) Cool - and, of course - people like to read the git commits list as well, so in a way (depending what you touch) your patches can get a reasonable audience. Thanks for asking ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - editeng/inc editeng/source reportdesign/source sc/source sw/source unusedcode.easy vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx
editeng/inc/editeng/unofield.hxx |3 - editeng/source/editeng/impedit4.cxx| 25 editeng/source/uno/unofield.cxx| 20 ++- reportdesign/source/ui/report/ReportController.cxx |2 reportdesign/source/ui/report/ReportSection.cxx|3 - sc/source/filter/inc/drawingmanager.hxx| 20 --- sc/source/filter/oox/drawingmanager.cxx| 60 - sw/source/core/txtnode/txtedt.cxx | 27 - unusedcode.easy| 19 ++ vcl/Library_vcl.mk |6 ++ vcl/inc/vcl/gradient.hxx |1 vcl/source/gdi/gradient.cxx| 10 --- vcl/unx/generic/printer/ppdparser.cxx |2 13 files changed, 62 insertions(+), 136 deletions(-) New commits: commit 4453b52924db6ed8843f7dce1b0664cdce387742 Author: Caolán McNamara caol...@redhat.com Date: Thu May 10 10:18:01 2012 +0100 callcatcher: update unused code list Change-Id: I286988eabcc2d813008597b3657c366d510f8ab6 diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx index 39cf2e6..bbd2a1e 100644 --- a/editeng/inc/editeng/unofield.hxx +++ b/editeng/inc/editeng/unofield.hxx @@ -74,7 +74,8 @@ public: SvxFieldData* CreateFieldData() const throw(); void SetAnchor( ::com::sun::star::uno::Reference ::com::sun::star::text::XTextRange xAnchor ) { mxAnchor = xAnchor; } -UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextField ) +static const ::com::sun::star::uno::Sequence sal_Int8 getUnoTunnelId() throw(); +virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence sal_Int8 aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::uno::XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 4f4bb69..b0a51eb 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -253,7 +253,25 @@ inline Time setTime( util::DateTime rDate ) // // class SvxUnoTextField // -UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField ); +namespace +{ +class theSvxUnoTextFieldUnoTunnelId : public rtl::Static UnoTunnelIdInit, theSvxUnoTextFieldUnoTunnelId {}; +} + +const ::com::sun::star::uno::Sequence sal_Int8 SvxUnoTextField::getUnoTunnelId() throw() +{ +return theSvxUnoTextFieldUnoTunnelId::get().getSeq(); +} + +sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const ::com::sun::star::uno::Sequence sal_Int8 rId ) throw(::com::sun::star::uno::RuntimeException) +{ +if( rId.getLength() == 16 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + rId.getConstArray(), 16 ) ) +{ +return sal::static_int_castsal_Int64(reinterpret_castsal_IntPtr(this)); +} +return 0; +} SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() : OComponentHelper( getMutex() ) diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 6a1953c..f79a7b3 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -92,9 +92,6 @@ public: /** Returns true, if the object list is empty. */ inline bool empty() const { return maObjects.empty(); } -/** Tries to insert the passed object into the last group or appends it. */ -voidinsertGrouped( const BiffDrawingObjectRef rxDrawingObj ); - /** Creates and inserts all UNO shapes into the passed shape container. */ voidconvertAndInsert( BiffDrawingBase rDrawing, const ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes rxShapes, @@ -145,15 +142,6 @@ public: const ::com::sun::star::awt::Rectangle* pParentRect = 0 ) const; protected: -/** Reads the object name in a BIFF5 OBJ record. */ -voidreadNameBiff5( BiffInputStream rStrm, sal_uInt16 nNameLen ); -/** Reads the macro link in a BIFF3 OBJ record. */ -voidreadMacroBiff3( BiffInputStream rStrm, sal_uInt16 nMacroSize ); -/** Reads the macro link in a BIFF4 OBJ record. */ -voidreadMacroBiff4( BiffInputStream rStrm, sal_uInt16 nMacroSize ); -/** Reads the macro link in a BIFF5 OBJ record. */ -voidreadMacroBiff5( BiffInputStream rStrm, sal_uInt16 nMacroSize ); - /** Converts the passed line formatting to the passed property map. */ void
Re: [REVIEW-3-5] fdo#46355 sort SelectionTree control of Custom Setup with a custom action
OK, what about this: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ce1ac0851fe2e975f3fb47178730b914608610cf Looks good and perfectly safe for the 3-5 branch, IMO. Thanks for this. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9980e69e172ebaea9f6cde78187b3e7693647621 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu May 10 11:26:57 2012 +0200 Don't bundle stdelibs on Linux by default Change-Id: Ib498067bad7b370dc5ab58e728de9f64f375a1a8 diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 4b77cba..cc68194 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -2,7 +2,6 @@ --with-system-dicts --without-unix-wrapper --without-system-zlib ---without-system-stdlibs --without-system-poppler --without-system-openssl --without-system-mozilla @@ -21,6 +20,7 @@ --with-external-thes-dir=/usr/share/mythes --with-external-hyph-dir=/usr/share/hyphen --with-external-dict-dir=/usr/share/hunspell +--with-system-stdlibs --enable-extension-integration --enable-opengl --enable-odk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-5] fdo#37044 crash on mac with transliteration
https://bugs.freedesktop.org/show_bug.cgi?id=37044 This is one of our oldest bugs, looking at the backtraces I'm fairly sure this has to be triggered by having two differently-layout structs called TransliterationChgData, one in sw and one in editeng, seeing as the crash is happening in editeng on calling TransliterationChgData::push_back in sw and it has no place going anywhere near editeng. So simply renaming the two structs to be different would likely fix it, http://cgit.freedesktop.org/libreoffice/core/commit/?id=7080d629c82422a419d38051536c7711f8abe53e attached backport to 3-5 to fix minor conflicts. C. From 805864fd06f7dddc69420c878235452baa330842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com Date: Thu, 10 May 2012 10:15:34 +0100 Subject: [PATCH] Resolves: fdo#37044 two different TransliterationChgData structs There are two structs called TransliterationChgData with different layout. The crashes on MacOSX must be due to this. Rename them so they've different names. Change-Id: I887a33bed26b339e229b7fb1ef8192f6fae3 (cherry picked from commit 7080d629c82422a419d38051536c7711f8abe53e) Conflicts: editeng/source/editeng/impedit4.cxx --- editeng/source/editeng/impedit4.cxx | 25 + sw/source/core/txtnode/txtedt.cxx | 21 - 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index ff441f1..5b80c17 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2659,16 +2659,17 @@ void ImpEditEngine::SetAutoCompleteText( const String rStr, sal_Bool bClearTipW Help::ShowQuickHelp( pActiveView-GetWindow(), Rectangle(), String(), 0 ); } - -struct TransliterationChgData +namespace { -sal_uInt16 nStart; -xub_StrLen nLen; -EditSelection aSelection; -String aNewText; -uno::Sequence sal_Int32 aOffsets; -}; - +struct eeTransliterationChgData +{ +sal_uInt16 nStart; +xub_StrLen nLen; +EditSelection aSelection; +String aNewText; +uno::Sequence sal_Int32 aOffsets; +}; +} EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, sal_Int32 nTransliterationMode ) { @@ -2721,8 +2722,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, //! This way the offsets for the yet to be changed words will be //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector -std::vector TransliterationChgDataaChanges; -TransliterationChgData aChgData; +std::vector eeTransliterationChgDataaChanges; +eeTransliterationChgData aChgData; if (nTransliterationMode == i18n::TransliterationModulesExtra::TITLE_CASE) { @@ -2945,7 +2946,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, // yet unchanged text parts remain the same. for (size_t i = 0; i aChanges.size(); ++i) { -const TransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; +const eeTransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; bChanges = sal_True; if (rData.nLen != rData.aNewText.Len()) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 186d4ea..d153212 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1498,13 +1498,16 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo rHyphInf ) return sal_False; } -struct TransliterationChgData +namespace { -xub_StrLen nStart; -xub_StrLen nLen; -String sChanged; -Sequence sal_Int32aOffsets; -}; +struct swTransliterationChgData +{ +xub_StrLen nStart; +xub_StrLen nLen; +String sChanged; +Sequence sal_Int32aOffsets; +}; +} // change text to Upper/Lower/Hiragana/Katagana/... void SwTxtNode::TransliterateText( @@ -1527,8 +1530,8 @@ void SwTxtNode::TransliterateText( //! This way the offsets for the yet to be changed words will be //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector -std::vector TransliterationChgDataaChanges; -TransliterationChgData aChgData; +std::vector swTransliterationChgDataaChanges; +swTransliterationChgData aChgData; if (rTrans.getType() ==
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 1173bb0dc01ef504ea453a272b77b0b4d92a662f Author: Miklos Vajna vmik...@suse.cz Date: Thu May 10 11:50:39 2012 +0200 fdo#49692 fix RTF export of empty paragraph numbering rules When there is a numbering rule, the fallback text is constructed so that whitespace separates the numbering and the paragraph text. When the numbering is empty, we don't need that separator. Change-Id: I17a11ddd73addc8c95a0c2b54402e6dd2705d094 diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0012294..3629384 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2513,10 +2513,9 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL else sTxt = pTxtNd-GetNumString(); -m_aStyles.append(' '); - if (sTxt.Len()) { +m_aStyles.append(' '); m_aStyles.append(m_rExport.OutString(sTxt, m_rExport.eDefaultEncoding)); } @@ -2524,7 +2523,8 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL { if( OUTLINE_RULE != pRule-GetRuleType() ) { -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); +if (sTxt.Len()) +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); m_aStyles.append('}'); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); if( nLvl 8 )// RTF knows only 9 levels ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
I was under the impression I'd already done this, but here goes: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Kind regards, - Theo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - editeng/source sw/source
editeng/source/editeng/impedit4.cxx | 25 + sw/source/core/txtnode/txtedt.cxx | 21 - 2 files changed, 25 insertions(+), 21 deletions(-) New commits: commit 414152c1ed10ec01b6ea385960c53304e4ec95cc Author: Caolán McNamara caol...@redhat.com Date: Thu May 10 10:15:34 2012 +0100 Resolves: fdo#37044 two different TransliterationChgData structs There are two structs called TransliterationChgData with different layout. The crashes on MacOSX must be due to this. Rename them so they've different names. Change-Id: I887a33bed26b339e229b7fb1ef8192f6fae3 (cherry picked from commit 7080d629c82422a419d38051536c7711f8abe53e) Conflicts: editeng/source/editeng/impedit4.cxx Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index ff441f1..5b80c17 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2659,16 +2659,17 @@ void ImpEditEngine::SetAutoCompleteText( const String rStr, sal_Bool bClearTipW Help::ShowQuickHelp( pActiveView-GetWindow(), Rectangle(), String(), 0 ); } - -struct TransliterationChgData +namespace { -sal_uInt16 nStart; -xub_StrLen nLen; -EditSelection aSelection; -String aNewText; -uno::Sequence sal_Int32 aOffsets; -}; - +struct eeTransliterationChgData +{ +sal_uInt16 nStart; +xub_StrLen nLen; +EditSelection aSelection; +String aNewText; +uno::Sequence sal_Int32 aOffsets; +}; +} EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, sal_Int32 nTransliterationMode ) { @@ -2721,8 +2722,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, //! This way the offsets for the yet to be changed words will be //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector -std::vector TransliterationChgDataaChanges; -TransliterationChgData aChgData; +std::vector eeTransliterationChgDataaChanges; +eeTransliterationChgData aChgData; if (nTransliterationMode == i18n::TransliterationModulesExtra::TITLE_CASE) { @@ -2945,7 +2946,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection rSelection, // yet unchanged text parts remain the same. for (size_t i = 0; i aChanges.size(); ++i) { -const TransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; +const eeTransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; bChanges = sal_True; if (rData.nLen != rData.aNewText.Len()) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 186d4ea..d153212 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1498,13 +1498,16 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo rHyphInf ) return sal_False; } -struct TransliterationChgData +namespace { -xub_StrLen nStart; -xub_StrLen nLen; -String sChanged; -Sequence sal_Int32aOffsets; -}; +struct swTransliterationChgData +{ +xub_StrLen nStart; +xub_StrLen nLen; +String sChanged; +Sequence sal_Int32aOffsets; +}; +} // change text to Upper/Lower/Hiragana/Katagana/... void SwTxtNode::TransliterateText( @@ -1527,8 +1530,8 @@ void SwTxtNode::TransliterateText( //! This way the offsets for the yet to be changed words will be //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector -std::vector TransliterationChgDataaChanges; -TransliterationChgData aChgData; +std::vector swTransliterationChgDataaChanges; +swTransliterationChgData aChgData; if (rTrans.getType() == (sal_uInt32)TransliterationModulesExtra::TITLE_CASE) { @@ -1732,7 +1735,7 @@ void SwTxtNode::TransliterateText( // yet unchanged text parts remain the same. for (size_t i = 0; i aChanges.size(); ++i) { -TransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; +swTransliterationChgData rData = aChanges[ aChanges.size() - 1 - i ]; if (pUndo) pUndo-AddChanges( *this, rData.nStart, rData.nLen, rData.aOffsets );
[PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration
On 10/05/12 11:45, Caolán McNamara wrote: https://bugs.freedesktop.org/show_bug.cgi?id=37044 This is one of our oldest bugs, looking at the backtraces I'm fairly sure this has to be triggered by having two differently-layout structs called TransliterationChgData, one in sw and one in editeng, seeing as the crash is happening in editeng on calling TransliterationChgData::push_back in sw and it has no place going anywhere near editeng. always amazing at how native linkers on the various platforms find new and different ways to completely screw things up. So simply renaming the two structs to be different would likely fix it, http://cgit.freedesktop.org/libreoffice/core/commit/?id=7080d629c82422a419d38051536c7711f8abe53e attached backport to 3-5 to fix minor conflicts. pushed to libreoffice-3-5. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/inc sfx2/sdi sfx2/source
sfx2/inc/sfx2/objsh.hxx |1 sfx2/inc/sfx2/sfxsids.hrc |1 sfx2/inc/sfx2/viewfrm.hxx |2 sfx2/sdi/frmslots.sdi |4 - sfx2/sdi/sfx.sdi | 27 -- sfx2/source/doc/objmisc.cxx | 36 -- sfx2/source/view/impviewframe.hxx |1 sfx2/source/view/viewfrm.cxx |9 --- sfx2/source/view/viewfrm2.cxx | 94 -- 9 files changed, 3 insertions(+), 172 deletions(-) New commits: commit d16c1b9290e11ca31850523a2b01426bca0937a3 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 10 12:09:21 2012 +0200 Removed unused SID_FRAMETITLE ...which was only ever written to, never read. This in turn allowed SfxViewFrame::UpdateTitle to return void instead of String, and made SfxObjectShell::UpdateTitle become unused. (The title appears to be created via SfxBaseModel::getTitle instead these days?) Change-Id: I5e1115a707134058a1f3a0beaa180eb471c817e6 diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index fdb53b2..3c1837b 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -562,7 +562,6 @@ public: virtual ::com::sun::star::uno::Sequence ::rtl::OUString GetEventNames(); Window* GetDialogParent( SfxMedium* pMedium=0 ); -String UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 ); static SfxObjectShell* CreateObject( const String rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const String rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference ::com::sun::star::lang::XComponent diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index c6fbdc4..fbd8995 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -374,7 +374,6 @@ #define SID_PLUGFRAMEARG(SID_SFX_START + 666) #define SID_NEWWINDOWFOREDIT(SID_SFX_START + 667) -#define SID_FRAMETITLE (SID_SFX_START + 668) #define SID_DOCTEMPLATE (SID_SFX_START + 538) #define SID_JSCALL (SID_SFX_START + 1382) diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index 266e058..5a99c48 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -163,7 +163,7 @@ public: voidShowStatusText( const String rText ); voidHideStatusText(); -String UpdateTitle(); +voidUpdateTitle(); static void ActivateToolPanel( const ::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame i_rFrame, const ::rtl::OUString i_rPanelURL ); diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi index c17b2b1..7ad2317 100644 --- a/sfx2/sdi/frmslots.sdi +++ b/sfx2/sdi/frmslots.sdi @@ -392,10 +392,6 @@ interface TopWindow : BrowseWindow ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] -SID_FRAMETITLE // ole(no) api(play/rec) -[ -StateMethod = StateView_Impl ; -] SID_CLOSEWIN // ole(no) api(final/play/rec) [ ExecMethod = Exec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 7ae6fd2..396fbb7 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -1884,33 +1884,6 @@ SfxTemplateItem FrameStyle SID_STYLE_FAMILY3 ] //-- -SfxStringItem FrameTitle SID_FRAMETITLE - -[ -/* flags: */ -AutoUpdate = FALSE, -Cachable = Cachable, -FastCall = FALSE, -HasCoreId = FALSE, -HasDialog = FALSE, -ReadOnlyDoc = TRUE, -Toggle = FALSE, -Container = FALSE, -RecordAbsolute = FALSE, -RecordPerSet; -Synchron; - -Readonly = TRUE, - -/* config: */ -AccelConfig = FALSE, -MenuConfig = FALSE, -StatusBarConfig = FALSE, -ToolBoxConfig = FALSE, -GroupId = ; -] - -//-- SfxStringItem FullName SID_PROGFILENAME [ diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 2d6398b..900858c 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1844,42 +1844,6 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) return pWindow; } -String SfxObjectShell::UpdateTitle( SfxMedium* pMed, sal_uInt16 nDocViewNumber ) -{ -// Title of the windows -String aTitle; -if ( pMed ) -{ -INetURLObject aTmp( pMed-GetName() ); -aTitle = aTmp.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); -} -else -{ -pMed = GetMedium(); -aTitle = GetTitle(SFX_TITLE_CAPTION); -String aName(aTitle); -if (
Re: 3.5.3rc1 win32 / debug package ...
On Wed, May 9, 2012 at 10:07 PM, Michael Meeks michael.me...@suse.com wrote: Hi there, Trying to get a good stack trace from vcl, I downloaded 3.5.3rc1 from: http://dev-builds.libreoffice.org/win32-debug/libreoffice-3-5/ I get a beautiful crash in the MSVC++ debugger, but no symbols; I try to add vcllo.pdb from LOdev 3.5\program and it moans: The symbol file vcllo.pdb does not match the module. In order to match the module must be from the same exact compilation. I looked at the package and it seems *some* modules are missing debugging symbols. Most probably something is not working right in the build system when the debug flag is enabled. In any case, the right way to do it would be to automatically generate all PDBs for each released version, for example in: solver\wntmsci.pro\pdb. Then we put those generated PDBs online at symbols.libreoffice.org. With that, any Microsoft debugging tool can access to the symbols with the following path: SRV*c:\symbols*http://symbols.libreoffice.org [1] The advantages of this approach are: - You don't need to download a debug version. - If you have the symbols of all released versions in the servers, the debugging tools will find the right ones for your version automatically. - It's possible to create very nice stack traces automatically if LibreOffice crashes for regular users to report. . On the other side, if you have a server that recieves the crashes without debugging symbols, you can make automatic prepocessing and classification of the bugs once you get the dump from the clients in the server side. In any case, I will try to find some time to look at the issue in my debug builds. Sigh. [1] http://support.microsoft.com/kb/311503 -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration
always amazing at how native linkers on the various platforms find new and different ways to completely screw things up. Isn't this more a case of it just working by accident on ELF and Windows platforms? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration
On 10/05/12 12:18, Tor Lillqvist wrote: always amazing at how native linkers on the various platforms find new and different ways to completely screw things up. Isn't this more a case of it just working by accident on ELF and Windows platforms? to some extent yes (in that if you have a default global namespace like ELF pretty much anything works only by accident :), but really why does the function end up being exported from the editeng shared object so that sw can call it? don't we use default hidden visibility on Mac platform? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] fdo#38786 RTF import ignores \chpgn
Hi, Today's RTF regression fix. :-) See http://cgit.freedesktop.org/libreoffice/core/commit/?id=116016d It depends on a trivial refactoring: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f1fdcde I'm attaching a backport of both. Thanks, Miklos From 3db2211850ec4b1f07ad0208942945719ef344ad Mon Sep 17 00:00:00 2001 From: Miklos Vajna vmik...@suse.cz Date: Wed, 25 Apr 2012 11:28:49 +0200 Subject: [PATCH 1/2] avoid code duplication by introducing RTFDocumentImpl::singleChar --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 86 ++-- writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 + 2 files changed, 24 insertions(+), 64 deletions(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f36e763..0a93829a 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -886,6 +886,24 @@ bool RTFFrame::inFrame() || nY 0; } +void RTFDocumentImpl::singleChar(sal_uInt8 nValue) +{ +sal_uInt8 sValue[] = { nValue }; +if (!m_pCurrentBuffer) +{ +Mapper().startCharacterGroup(); +Mapper().text(sValue, 1); +Mapper().endCharacterGroup(); +} +else +{ +m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); +RTFValue::Pointer_t pValue(new RTFValue(*sValue)); +m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); +m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); +} +} + void RTFDocumentImpl::text(OUString rString) { bool bRet = true; @@ -1137,22 +1155,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) if (aBuf.toString().equals(EQ)) m_bEq = true; else -{ -sal_uInt8 sFieldStart[] = { 0x13 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldStart, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -RTFValue::Pointer_t pValue(new RTFValue(*sFieldStart)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); -} -} +singleChar(0x13); m_aStates.top().nDestinationState = DESTINATION_FIELDINSTRUCTION; } break; @@ -3096,42 +3099,12 @@ int RTFDocumentImpl::popState() m_aFormfieldSprms-clear(); } if (!m_bEq) -{ -sal_uInt8 sFieldSep[] = { 0x14 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldSep, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -RTFValue::Pointer_t pValue(new RTFValue(*sFieldSep)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); -} -} +singleChar(0x14); } else if (m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT) { if (!m_bEq) -{ -sal_uInt8 sFieldEnd[] = { 0x15 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldEnd, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -RTFValue::Pointer_t pValue(new RTFValue(*sFieldEnd)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); -} -} +singleChar(0x15); else m_bEq = false; } @@ -3542,22 +3515,7 @@ int RTFDocumentImpl::popState() else if (aState.nDestinationState == DESTINATION_FIELD) { if (aState.nFieldStatus == FIELD_INSTRUCTION) -{ -sal_uInt8 sFieldEnd[] = { 0x15 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldEnd, 1); -Mapper().endCharacterGroup(); -} -else -{ -
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/colorscale.hxx | 19 ++ sc/source/core/data/colorscale.cxx | 193 - sc/source/filter/inc/condformatbuffer.hxx | 25 +++ sc/source/filter/oox/condformatbuffer.cxx | 55 +++- sc/source/filter/oox/condformatcontext.cxx |2 5 files changed, 276 insertions(+), 18 deletions(-) New commits: commit 777bbda955407c56805de3a3f4e96b0c13be6570 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu May 10 12:40:06 2012 +0200 finally support min/max and percentile in color scales Still some updating problems. If min or max is changed the whole area is not updated. Change-Id: I9a513fd9c0613d48ce33524672a31078d8aedf46 diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 65a2fd6..b71c38b 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -69,12 +69,13 @@ private: double GetMinValue() const; double GetMaxValue() const; -void calcMinMax(double nMin, double nMax) const; +void calcMinMax(double nMin, double nMax) const; public: ScColorScaleFormat(ScDocument* pDoc); Color* GetColor(const ScAddress rAddr) const; void AddEntry(ScColorScaleEntry* pEntry); +void SetRange(const ScRangeList rList); typedef ColorScaleEntries::iterator iterator; typedef ColorScaleEntries::const_iterator const_iterator; diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c970f37..3cc0e5a 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -32,14 +32,19 @@ ScColorScaleEntry::ScColorScaleEntry(double nVal, const Color rCol): mnVal(nVal), -maColor(rCol) -{ +maColor(rCol), +mbMin(false), +mbMax(false), +mbPercent(false){ } ScColorScaleEntry::ScColorScaleEntry(const ScColorScaleEntry rEntry): mnVal(rEntry.mnVal), -maColor(rEntry.maColor) +maColor(rEntry.maColor), +mbMin(false), +mbMax(false), +mbPercent(false) { } @@ -204,12 +209,17 @@ double ScColorScaleFormat::GetMaxValue() const return aMaxVal;; } -void ScColorScaleFormat::calcMinMax(double rMin, double rMax) const +void ScColorScaleFormat::calcMinMax(double rMin, double rMax) const { rMin = GetMinValue(); rMax = GetMaxValue(); } +void ScColorScaleFormat::SetRange(const ScRangeList rList) +{ +maRanges = rList; +} + namespace { sal_uInt8 GetColorValue( double nVal, double nVal1, sal_uInt8 nColVal1, double nVal2, sal_uInt8 nColVal2 ) @@ -233,6 +243,24 @@ Color CalcColor( double nVal, double nVal1, const Color rCol1, double nVal2, co return Color(nColRed, nColGreen, nColBlue); } +double CalcValue(double nMin, double nMax, ScColorScaleFormat::const_iterator itr) +{ +if(itr-GetPercent()) +{ +return nMin + (nMax-nMin)*(itr-GetValue()/100); +} +else if(itr-GetMin()) +{ +return nMin; +} +else if(itr-GetMax()) +{ +return nMax; +} + +return itr-GetValue(); +} + } Color* ScColorScaleFormat::GetColor( const ScAddress rAddr ) const @@ -253,23 +281,28 @@ Color* ScColorScaleFormat::GetColor( const ScAddress rAddr ) const if (maColorScales.size() 2) return NULL; +double nMin = std::numeric_limitsdouble::max(); +double nMax = std::numeric_limitsdouble::min(); +calcMinMax(nMin, nMax); + +// this check is for safety +if(nMin = nMax) +return NULL; + const_iterator itr = begin(); -double nValMin = itr-GetValue(); +double nValMin = CalcValue(nMin, nMax, itr); Color rColMin = itr-GetColor(); ++itr; -double nValMax = itr-GetValue(); +double nValMax = CalcValue(nMin, nMax, itr); Color rColMax = itr-GetColor(); -double nMin; -double nMax; -calcMinMax(nMin, nMax); - ++itr; while(itr != end() nVal nValMin) { rColMin = rColMax; nValMin = nValMax; rColMax = itr-GetColor(); +nValMax = CalcValue(nMin, nMax, itr); nValMax = itr-GetValue(); ++itr; } diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 0b6ddf7..89ba949 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -172,7 +172,7 @@ void ColorScaleRule::importCfvo( const AttributeList rAttribs ) { maColorScaleRuleEntries[mnCfvo].mbMax = true; } -else if( aType == percent ) +else if( aType == percentile ) { maColorScaleRuleEntries[mnCfvo].mbPercent = true; } @@ -696,6 +696,7 @@ void CondFormatRule::finalizeImport( const Reference XSheetConditionalEntries mpColor-AddEntries( pFormat ); sal_Int32 nIndex = rDoc.AddColorScaleFormat(pFormat); +ScRangeList aList; // apply attributes to cells // const ApiCellRangeList rRanges = mrCondFormat.getRanges(); @@ -709,7 +710,10
Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration
that sw can call it? don't we use default hidden visibility on Mac platform? Don't think so. At least in that Mac build tree I have that uses Xcode 3 and its gcc 4.0.1 and the 10.4 SDK, config_host.mk ends up with HAVE_GCC_VISIBILITY_FEATURE blank. On the other hand, solenv/gbuild/platform/macosx.mk unconditionally sets gb_COMPILERDEFS += -DHAVE_GCC_VISIBILITY_FEATURE ? Weird. Either visibility is something that really works as expected only with gcc and ELF (because, I guess, that is what those who expect it to work use;), or then the configure.in fails to recognize it working well enough. Is visibility, as we want it, something that also the object and/or dynamic library format(s) need to support, or can it be implemented just in a compiler? Note that Xcode 3 and the 10.4 SDK are obsolete but we keep requiring them as the official build environment because we want to keep producing binaries that work on 10.4. It is possible now, though, to build LO master also using a current (4.3.x) Xcode, and its Clang even, against the 10.6 SDK, but it has not been tested really that much. I now remember that I had to add a few lines to disable HAVE_GCC_VISIBILITY_FEATURE in configure.in when using Clang for MacOSX, because of some weird linking errors in connectivity and dbaccess. But maybe if the root cause to chose could be resolved, visiility could be used in that build configuration, at least? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3.5.3rc1 win32 / debug package ...
On Thu, 2012-05-10 at 12:13 +0200, Jesús Corrius wrote: In any case, the right way to do it would be to automatically generate all PDBs for each released version, for example in: solver\wntmsci.pro\pdb. Then we put those generated PDBs online at symbols.libreoffice.org. Right ! I wonder if we can do that for master / 3.6 builds - Fridrich ? having a symbol server: With that, any Microsoft debugging tool can access to the symbols with the following path: SRV*c:\symbols*http://symbols.libreoffice.org [1] Would be awesome save lots of developer time I suspect. :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3.5.3rc1 win32 / debug package ...
Then we put those generated PDBs online at symbols.libreoffice.org. But is it documented how to set up such a symbol server? And would we then need to bump the version numbers in the DLLs/EXEs in each and every nightly build? Presumably the MS debuggers want to be quite sure that some symbol file actually matches the executable being debugged. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
On 10/05/12 12:43, Tor Lillqvist wrote: that sw can call it? don't we use default hidden visibility on Mac platform? Don't think so. At least in that Mac build tree I have that uses Xcode 3 and its gcc 4.0.1 and the 10.4 SDK, config_host.mk ends up with HAVE_GCC_VISIBILITY_FEATURE blank. On the other hand, solenv/gbuild/platform/macosx.mk unconditionally sets gb_COMPILERDEFS += -DHAVE_GCC_VISIBILITY_FEATURE ? Weird. indeed that looks silly. Either visibility is something that really works as expected only with gcc and ELF (because, I guess, that is what those who expect it to work use;), or then the configure.in fails to recognize it working well enough. i'm not all that familiar with how MachO linker works (other than its fancy install_names :). Is visibility, as we want it, something that also the object and/or dynamic library format(s) need to support, or can it be implemented just in a compiler? hidden visibility is definitely desirable, because it prevents accidental collisions like this bug and probably also improves performance (though not sure if measurably so). however it could be the case that with MachO something inherently doesn't work or is buggy in the toolchain, but i guess we could only find that out by trying (and fixing the couple of cases where it doesn't work in non-inherent accidental ways). Note that Xcode 3 and the 10.4 SDK are obsolete but we keep requiring them as the official build environment because we want to keep producing binaries that work on 10.4. It is possible now, though, to build LO master also using a current (4.3.x) Xcode, and its Clang even, against the 10.6 SDK, but it has not been tested really that much. would be nice if we could get rid of that ancient compiler; is it possible to use something newer while targeting 10.4? if not, i'd strongly consider raising the Mac baseline for LO4, Apple doesn't support 10.4 with updates any more anyway AFAIK. I now remember that I had to add a few lines to disable HAVE_GCC_VISIBILITY_FEATURE in configure.in when using Clang for MacOSX, because of some weird linking errors in connectivity and dbaccess. But maybe if the root cause to chose could be resolved, visiility could be used in that build configuration, at least? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards, Mattias Johnsson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3.5.3rc1 win32 / debug package ...
2012/5/10 Tor Lillqvist t...@iki.fi: Then we put those generated PDBs online at symbols.libreoffice.org. But is it documented how to set up such a symbol server? And would we then need to bump the version numbers in the DLLs/EXEs in each and every nightly build? Presumably the MS debuggers want to be quite sure that some symbol file actually matches the executable being debugged. I think first we should have the symbol server for Jesus' debug build. Or he should publish the PDB files along with the installer. Using PDB files for release builds does not sound good to me, because I don't think we should produce release builds with debug configuration (i.e. no optimizations). Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3.5.3rc1 win32 / debug package ...
On 10/05/12 13:13, Andras Timar wrote: Using PDB files for release builds does not sound good to me, because I don't think we should produce release builds with debug configuration (i.e. no optimizations). ah, another developer who doesn't know what our configure options do (or are supposed to do anyway) :) so there are 3 options, and --enable-symbols differs from the other 2 in that it only adds symbols to the output, it does not enable any debugging feature, or assertion, it does not disable optimizations, and it is primarily used not by developers, but by distributors who want to be able to produce reliable stack traces for _product_ builds, i.e. the Fedora RPM spec unconditionally sets --enable-symbols. AC_ARG_ENABLE(symbols, AS_HELP_STRING([--enable-symbols], [Include debugging symbols in output. WARNING - a complete build needs a lot of space (roughly 10 GiB) and takes much longer (enables -g compiler flag for GCC or equivalent).]), ,) AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Include debugging symbols like with --enable-symbols, disable compiler optimization and inlining plus extra debugging code like assertions. Extra large build! (enables -g compiler flag and dmake debug=true) If you need even more verbose output, build a module with build -- debug=true dbglevel=2. You can also use this switch as follows: --enable-debug=all -sw/ -Library_sc to enable symbols only for the specified gbuild-build targets (all means everything, - prepended means not to enable, / appended means everything in the directory, there is no ordering, more specific overrides more general, and disabling takes precedence).])) AC_ARG_ENABLE(dbgutil, AS_HELP_STRING([--enable-dbgutil], [Include additional debugging utilities, such as assertions, object counting, etc. Larger build. Independent from --enable-debug. Note that this option makes the build ABI incompatible: It is not possible to mix object files or libraries from a --enable-dbgutil and a --disable-dbgutil build.])) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18nutil/source
i18nutil/source/utility/paper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a50a33c3a7505f78d1ab82b746f1234f404e411e Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 10 13:45:10 2012 +0200 Fix fdo#49720: Dropped unnecessary sh -c from popen call Change-Id: I5de4ce4e26d995c447c99c8558f621dba6cdf110 diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index a79089d..0f6b813 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -262,7 +262,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper() // try libpaper // #i78617# workaround missing paperconf command -FILE* pPipe = popen( sh -c paperconf 2/dev/null, r ); +FILE* pPipe = popen( paperconf 2/dev/null, r ); if( pPipe ) { Paper ePaper = PAPER_USER; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to add color scales to ODF?
Markus Mohrhard wrote: conditionalFormatting sqref=C2:D5 cfRule type=colorScale priority=1 colorScale cfvo type=num val=0/ cfvo type=num val=10/ color rgb=FF63BE7B/ color rgb=EF9C/ /colorScale /cfRule /conditionalFormatting I'm open for suggestions how I can add this sanely to ods. I would like to support as much from MSO 2010's color scale feature as possible but have no idea yet what I can achieve in the remaining 4 weeks. Hi Markus, you're the man on the ground, so I'd guess you'll know best how to do it, and do it future-proof. That said, conceptually, ODF has historically preferred attributes over too deeply nested element hierarchies - which tend to provide less structure. Cheers, pgpvXNxwtMbd6.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
Interestingly enough, the reason why in my 10.4 Mac build tree (using Xcode 3, and thus gcc 4.0.1 and the 10.4 SDK), HAVE_VISIBILITY_FEATURE gets unset is that the checking if STL headers are visibility safe test fails. The earlier checking whether ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 supports -fvisibility=hidden test does succeed. The latter test fails because of some weird error related to include paths, config log says: error: string: No such file or directory. (Note that for the actual LO compilation standard headers are found without problem, it's just the way the compiler is run in this configure test where it fails.) I guess that test needs to be tweaked to be more reliable. Sigh, the pain of supporting an increasingly obsolete tool-chain that isn't even installable on a current OS without tricks any more. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
On Thursday 10 of May 2012, Noel Grandin wrote: Maybe it's some kind of length limitation somewhere? Can you perhaps do a subst w: C:/cywin/home/tinderbox/libreoffice cd w: make And see if that helps? That seems to be it. Rather lame that this problem leads to such a misleading error message :(. On 2012-05-09 19:12, Lubos Lunak wrote: I don't understand what the actual problem is, because if I copypaste the command and run it manually, it works without problems. I've also checked the arguments passed to cl.exe and they seem to be split properly (attached). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
What version of Visual Studio and what version of windows are you running? Would be nice to know where this happens so we can add it to the FAQ. On 2012-05-10 14:09, Lubos Lunak wrote: That seems to be it. Rather lame that this problem leads to such a misleading error message :(. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
On Thursday 10 of May 2012, Noel Grandin wrote: What version of Visual Studio and what version of windows are you running? Would be nice to know where this happens so we can add it to the FAQ. Windows Server 2008R2 Enterprise, Service Pack 1 Visual Studio 2008 I'm not sure how to find out what exactly the culprint is or how to possibly do anything more than document it. On 2012-05-10 14:09, Lubos Lunak wrote: That seems to be it. Rather lame that this problem leads to such a misleading error message :(. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: framework/inc framework/source
framework/inc/framework/titlehelper.hxx |8 +++ framework/source/fwe/helper/titlehelper.cxx | 31 +++- 2 files changed, 17 insertions(+), 22 deletions(-) New commits: commit b43f5ccb6b09493daee401d2dd1f907e23ad6c3e Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 10 14:32:38 2012 +0200 Reduce broadcasting noise on initial title computation ...otherwise, SfxBaseModel::getTitle calls itself recursively until TitleHelper::m_sTitle has converged. Change-Id: I90577d1c2e4275ff2187d6531a1ca61e8355819b diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index a86bbaf..2fe6797 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -163,10 +163,10 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex void impl_sendTitleChangedEvent (); -void impl_updateTitle (); -void impl_updateTitleForModel (const css::uno::Reference css::frame::XModel xModel); -void impl_updateTitleForController (const css::uno::Reference css::frame::XController xController); -void impl_updateTitleForFrame (const css::uno::Reference css::frame::XFrame xFrame); +void impl_updateTitle (bool init = false); +void impl_updateTitleForModel (const css::uno::Reference css::frame::XModel xModel, bool init); +void impl_updateTitleForController (const css::uno::Reference css::frame::XController xController, bool init); +void impl_updateTitleForFrame (const css::uno::Reference css::frame::XFrame xFrame, bool init); void impl_startListeningForModel (const css::uno::Reference css::frame::XModel xModel); void impl_startListeningForController (const css::uno::Reference css::frame::XController xController); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index c963a2b..574a21e 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -125,7 +125,7 @@ void TitleHelper::setOwner(const css::uno::Reference css::uno::XInterface xO return m_sTitle; // Title seams to be unused till now ... do bootstraping -impl_updateTitle (); +impl_updateTitle (true); return m_sTitle; @@ -314,7 +314,7 @@ void TitleHelper::impl_sendTitleChangedEvent () } //--- -void TitleHelper::impl_updateTitle () +void TitleHelper::impl_updateTitle (bool init) { // SYNCHRONIZED - ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -328,25 +328,20 @@ void TitleHelper::impl_updateTitle () if (xModel.is ()) { -impl_updateTitleForModel (xModel); -return; +impl_updateTitleForModel (xModel, init); } - -if (xController.is ()) +else if (xController.is ()) { -impl_updateTitleForController (xController); -return; +impl_updateTitleForController (xController, init); } - -if (xFrame.is ()) +else if (xFrame.is ()) { -impl_updateTitleForFrame (xFrame); -return; +impl_updateTitleForFrame (xFrame, init); } } //--- -void TitleHelper::impl_updateTitleForModel (const css::uno::Reference css::frame::XModel xModel) +void TitleHelper::impl_updateTitleForModel (const css::uno::Reference css::frame::XModel xModel, bool init) { // SYNCHRONIZED - ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -404,7 +399,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference css::fram // WORKAROUND: the notification is currently sent always, // can be changed after shared mode is supported per UNO API -sal_Bool bChanged= sal_True; // (! m_sTitle.equals(sTitle)); +sal_Bool bChanged= !init; // m_sTitle != sTitle m_sTitle= sTitle; m_nLeasedNumber = nLeasedNumber; @@ -417,7 +412,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference css::fram } //--- -void TitleHelper::impl_updateTitleForController (const css::uno::Reference css::frame::XController xController) +void TitleHelper::impl_updateTitleForController (const css::uno::Reference css::frame::XController xController, bool init) { // SYNCHRONIZED - ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -471,7 +466,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference css: aLock.reset (); ::rtl::OUString sNewTitle = sTitle.makeStringAndClear (); -sal_BoolbChanged= (! m_sTitle.equals(sNewTitle)); +sal_BoolbChanged= !init m_sTitle != sNewTitle; m_sTitle= sNewTitle;
License Statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards Daniel -- http://www.danielnaber.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
blanket license statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards, Anders Jonsson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
Hello. All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Best regards. -- Octavio. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
failed unit test: sal_osl_file
I am trying to build master commit id 5c2c0e3, pulled 2012-05-08, on ubuntu-natty (11.04), and it is failing in unit test sal_osl_file. An excerpt from the terminal output from `make sal` is in attachment 20120509c. I think the bad address passed to free() is just a secondary error, right? Is it of interest on its own account? A backtrace from gdb is in attachment 20120509d. I think I see the following ... (*) sal/inc/osl/file.hxx line 1645 sets Directory._pData to 0 ( Directory::isOpen(), defined at line 1691 of the same file, and Directory::close(), particularly line 1712 of the same file, suggest that _pData equal NULL is the normal state for a closed Directory. ) (*) qa/osl/file/osl_File.cxx line 5562 applies that to testDirectory and in particular to testDirectory._pData. (*) the same file, line 5563, frame 19 in the gdb backtrace, invokes Directory::getNextItem on testDirectory. (*) sal/inc/osl/file.hxx line 1772, frame 18 in the gdb backtrace, passes that zero as parameter 1 to osl_getNextDirectoryItem. (*) sal/osl/unx/file_misc.cxx line 321, frame 17 in the gdb backtrace, asserts that parameter 1 of osl_getNextDirectoryItem is non zero, and we are doomed to failure. So, I ask ... (*) Am I reading the code correctly? (*) If so, how could this unit test have ever come close to working? (*) What should I do? (*) The presence of same-named data members _pData in related classes FileBase, Directory, and DirectoryItem is a normal programming convention. I should just get over my confusion. Right? (*) Those three data members _pData are of three different types, each typedef'd to `void *`. So the compiler will not diagnose the use of one where another was intended. This is not something to be fixed. Right? Thank you for your help. Terry. [ build CUT ] sal_osl_file *** glibc detected *** /home/terry/lo_hacking/git/libo/solver/unxlngi6/bin/cppunit/cppunittester: free(): invalid pointer: 0x400877e4 *** === Backtrace: = /lib/i386-linux-gnu/libc.so.6(+0x6cbe1)[0x40324be1] /lib/i386-linux-gnu/libc.so.6(+0x6e50b)[0x4032650b] /lib/i386-linux-gnu/libc.so.6(cfree+0x6d)[0x4032969d] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libstdc++.so.6(_ZdlPv+0x21)[0x4021c4d1] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcj+0x1d)[0x400fd16f] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZNSs4_Rep10_M_destroyERKSaIcE+0x4b)[0x400fcf9f] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libstdc++.so.6(_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE8overflowEi+0x16f)[0x401f83bf] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libstdc++.so.6(_ZNSt15basic_streambufIcSt11char_traitsIcEE6xsputnEPKci+0x3d)[0x401fc8fd] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libstdc++.so.6(_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_i+0x1ba)[0x401f25ba] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libstdc++.so.6(_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc+0x3c)[0x401f285c] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libuno_sal.so.3(+0x1a168)[0x4003b168] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libuno_sal.so.3(+0x1a2d5)[0x4003b2d5] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libuno_sal.so.3(sal_detail_logFormat+0x2c)[0x4003b31d] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libuno_sal.so.3(osl_getNextDirectoryItem+0x4e)[0x4005d8e8] /home/terry/lo_hacking/git/libo/workdir/unxlngi6/LinkTarget/CppunitTest/libtest_sal_osl_file.so(+0x7e6a)[0x40993e6a] /home/terry/lo_hacking/git/libo/workdir/unxlngi6/LinkTarget/CppunitTest/libtest_sal_osl_file.so(+0x3b2aa)[0x409c72aa] /home/terry/lo_hacking/git/libo/workdir/unxlngi6/LinkTarget/CppunitTest/libtest_sal_osl_file.so(+0xdce1)[0x40999ce1] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZNK7CppUnit21TestCaseMethodFunctorclEv+0x4e)[0x401170f6] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN7CppUnit16DefaultProtector7protectERKNS_7FunctorERKNS_16ProtectorContextE+0x28)[0x401005e6] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZNK7CppUnit14ProtectorChain14ProtectFunctorclEv+0x33)[0x4010f2a1] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN7CppUnit14ProtectorChain7protectERKNS_7FunctorERKNS_16ProtectorContextE+0x132)[0x4010f170] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN7CppUnit10TestResult7protectERKNS_7FunctorEPNS_4TestERKSs+0x59)[0x40125845] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN7CppUnit8TestCase3runEPNS_10TestResultE+0x152)[0x40116c26] /home/terry/lo_hacking/git/libo/solver/unxlngi6/lib/libcppunit-1.12.so.1(_ZN7CppUnit13TestComposite15doRunChildTestsEPNS_10TestResultE+0x66)[0x401178dc]
% help building libreoffice ....
Hi Everbody ¡! I am new about to build LibreOffice. Actually , I have some time with the next error when I try to do the make : = (94/160) Building module remotebridges = Entering /home/Jose.Ortiz/git2/libo/io/inc Entering /home/Jose.Ortiz/git2/libo/remotebridges/source/unourl_resolver Entering /home/Jose.Ortiz/git2/libo/io/source/connector remotebridges deliver Module 'remotebridges' delivered successfully. 0 files copied, 4 files unchanged Entering /home/Jose.Ortiz/git2/libo/io/source/acceptor Entering /home/Jose.Ortiz/git2/libo/io/source/TextInputStream Entering /home/Jose.Ortiz/git2/libo/io/source/stm Entering /home/Jose.Ortiz/git2/libo/io/source/TextOutputStream io deliver Module 'io' delivered successfully. 0 files copied, 16 files unchanged --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /home/Jose.Ortiz/git2/libo/binaryurp/prj ERROR: error 65280 occurred while making /home/Jose.Ortiz/git2/libo/xmlreader/prj ERROR: error 65280 occurred while making /home/Jose.Ortiz/git2/libo/ucbhelper/prj it seems you are using a threaded build, which means that the actual compile error is probably hidden far above, and could be inside any of these other modules: binaryurp ucbhelper please re-run build inside each one to isolate the problem. --- /usr/bin/sh cd C:/software/cygwin/home/Jose.Ortiz/git2/libo source ./Env.Host.sh cd xmlreader make clean # optional make -r when I try to build xmlreader, the error is the next one : [ build RES ] awk: fatal: can't open source file `C:/software/cygwinc:/software/cygwin/home/Jose.Ortiz/git2/libo/solenv/gbuild/processdeps.awk' for reading (No such file or directory) So, there is a problem with the path C:/software/cygwinc:/software/cygwin/home ...Especially with the concat of paths C:/software/cygwin and /cygwinc:/software/cygwin/home. I check the paths in the Env_host.sh and I don´t see the path C:/software/cygwinc:/software/cygwin/home in this fileSo..Any idea to solve this problem ...? Jose Ortiz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Licensing (blanket statement)
Hi there, as per subject, better put: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Thanks, -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
Maybe it's a cygwin thing? I'm running a version that's about a month old (had to update because of other issues). I think it's 1.7.11 If you're out of date, could you try updating and see if that fixes it? On 2012-05-10 14:26, Lubos Lunak wrote: Windows Server 2008R2 Enterprise, Service Pack 1 Visual Studio 2008 I'm not sure how to find out what exactly the culprint is or how to possibly do anything more than document it. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: % help building libreoffice ....
On Wed, 2012-05-09 at 15:33 -0500, ORTIZ MARTINEZ JOSE ASUNCION wrote: So, there is a problem with the path ”C:/software/cygwinc:/software/cygwin/home….” …Especially with the concat of paths C:/software/cygwin and /cygwinc:/software/cygwin/home. Looks like the problem is having the tree inside /home on cygwin. This *was* a known problem, but I thought that had gotten fixed recently :-( You might have better luck if you build libreoffice under cygwin in a dir that's not under /home or under /tmp C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
On 05/10/2012 01:06 PM, Tor Lillqvist wrote: i'm not all that familiar with how MachO linker works (other than its fancy install_names :). You mean the weird @__ stuff? I think that is something we can get rid of once we stop supporting 10.4. Nah, @loader_path is conceptionally superior to @rpath. :) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
On 05/10/2012 01:56 PM, Tor Lillqvist wrote: Interestingly enough, the reason why in my 10.4 Mac build tree (using Xcode 3, and thus gcc 4.0.1 and the 10.4 SDK), HAVE_VISIBILITY_FEATURE gets unset is that the checking if STL headers are visibility safe test fails. The earlier checking whether ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 supports -fvisibility=hidden test does succeed. The latter test fails because of some weird error related to include paths, config log says: error: string: No such file or directory. (Note that for the actual LO compilation standard headers are found without problem, it's just the way the compiler is run in this configure test where it fails.) I guess that test needs to be tweaked to be more reliable. Sigh, the pain of supporting an increasingly obsolete tool-chain that isn't even installable on a current OS without tricks any more. That might explain why my 10.4-based builds started to fail the other day (something I haven't come around to look into yet, though)... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 95 - writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 2 files changed, 33 insertions(+), 64 deletions(-) New commits: commit dfcc1669f68783e8f648cef57d3e36277ae27cec Author: Miklos Vajna vmik...@suse.cz Date: Mon May 7 09:50:02 2012 +0200 fdo#38786 implement RTF_CHPGN Change-Id: I0ae693193b4fc8ed155e2d71b06daa80d46da47c Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0a93829..330bc25 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1606,6 +1606,15 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) parBreak(); } break; +case RTF_CHPGN: +{ +OUString aStr(RTL_CONSTASCII_USTRINGPARAM(PAGE)); +singleChar(0x13); +text(aStr); +singleChar(0x14); +singleChar(0x15); +} +break; default: #if OSL_DEBUG_LEVEL 1 OSL_TRACE(%s: TODO handle symbol '%s', OSL_THIS_FUNC, lcl_RtfToString(nKeyword)); commit 470c54202cedc4a36cbf28b38e50af44708606a0 Author: Miklos Vajna vmik...@suse.cz Date: Wed Apr 25 11:28:49 2012 +0200 avoid code duplication by introducing RTFDocumentImpl::singleChar Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f36e763..0a93829 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -886,6 +886,24 @@ bool RTFFrame::inFrame() || nY 0; } +void RTFDocumentImpl::singleChar(sal_uInt8 nValue) +{ +sal_uInt8 sValue[] = { nValue }; +if (!m_pCurrentBuffer) +{ +Mapper().startCharacterGroup(); +Mapper().text(sValue, 1); +Mapper().endCharacterGroup(); +} +else +{ +m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); +RTFValue::Pointer_t pValue(new RTFValue(*sValue)); +m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); +m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); +} +} + void RTFDocumentImpl::text(OUString rString) { bool bRet = true; @@ -1137,22 +1155,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) if (aBuf.toString().equals(EQ)) m_bEq = true; else -{ -sal_uInt8 sFieldStart[] = { 0x13 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldStart, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -RTFValue::Pointer_t pValue(new RTFValue(*sFieldStart)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); -} -} +singleChar(0x13); m_aStates.top().nDestinationState = DESTINATION_FIELDINSTRUCTION; } break; @@ -3096,42 +3099,12 @@ int RTFDocumentImpl::popState() m_aFormfieldSprms-clear(); } if (!m_bEq) -{ -sal_uInt8 sFieldSep[] = { 0x14 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldSep, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -RTFValue::Pointer_t pValue(new RTFValue(*sFieldSep)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_TEXT, pValue)); -m_pCurrentBuffer-push_back(make_pair(BUFFER_ENDRUN, RTFValue::Pointer_t())); -} -} +singleChar(0x14); } else if (m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT) { if (!m_bEq) -{ -sal_uInt8 sFieldEnd[] = { 0x15 }; -if (!m_pCurrentBuffer) -{ -Mapper().startCharacterGroup(); -Mapper().text(sFieldEnd, 1); -Mapper().endCharacterGroup(); -} -else -{ -m_pCurrentBuffer-push_back(make_pair(BUFFER_STARTRUN, RTFValue::Pointer_t())); -
[PUSHED][3-5] Re: [REVIEW:3-5] fdo#38786 RTF import ignores \chpgn
On 10/05/12 12:36, Miklos Vajna wrote: Hi, Today's RTF regression fix. :-) See http://cgit.freedesktop.org/libreoffice/core/commit/?id=116016d It depends on a trivial refactoring: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f1fdcde I'm attaching a backport of both. pushed to libreoffice-3-5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC2012] Introduction / Signed PDF export
Hello, My name is Gökçen Eraslan, I'm a FLOSS developer and Computer Science M.S. student in Bogazici University of Turkey. Previously I worked for TUBITAK (The Scientific and Technological Research Council of Turkey, equivalent of NSF in Turkey) for 4 years. I was the developer and release manager of the Pardus Linux distribution project[1] which is a government funded project aiming to develop a mature Linux distribution along with technological innovations (a brand new package manager, installer, configuration system etc.) as well as encouraging free software development in Turkey in order to avoid the massive sums needed for the license fees of proprietary operating systems. But lately Pardus project is somehow suspended (details here[2]) and most of the core developers left Pardus. Anyway, my GSoC proposal is to add digital signing to PDF export feature. This is an idea from the ideas page[3]. Although I've fixed an easyhack[4], I'm not experienced in LibreOffice codebase but since document signing (not PDF signing) is supported by LibreOffice right now, (I hope) listing and choosing certificates (provided from the certificate database of Mozilla applications) will be easy using the existing classes. Right now, I'm reading PDF reference documents[5] published by Adobe. Next planned step is to be familiar with PKCS#1, PKCS#7 and PKCS#12 standards and to learn code pointers to PDF export code. I also have some question about the implementation details: * The signing method: What kind of signature handler we may use? ByteRange method is sufficient and for the SubFilter value of the signature dictionary, adbe.x509.rsa.sha is OK, right? In this case, Cert entry of the Signature dictionary will contain X.509 certificate chain and Contents key wil contain the byte range digest. * Is the MDP (modification detection and prevention) required? This is used for object signatures, right? But the byte-range based document signatures is more suitable. I think I must also investigate the status of the digital signature verification in Linux PDF readers and maybe poppler, so the users must be able to verify the signed PDF files :) * Which PDF version should be preferred? As far as I can see, SHA256 digestion is introduced in PDF 1.6, so the decision of digest method may effect the minimum PDF version to be used, right? That's all for now. Cheers. [1] http://www.pardus.org.tr/en [2] http://developer.pardus.org.tr/people/ozan/blog/?p=144 [3] http://wiki.documentfoundation.org/Development/Gsoc/Ideas#Sign_PDF_documents_on_export [4] https://bugs.freedesktop.org/show_bug.cgi?id=46538 [5] http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/pdf/pdfs/pdf_reference_archives/PDFReference15_v5.pdf -- Gökçen Eraslan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforfind.cxx | 13 + svl/source/numbers/zforfind.hxx |6 +- 2 files changed, 14 insertions(+), 5 deletions(-) New commits: commit 803b5513eff8f8c185a91e91aee235dfab38d3bc Author: Eike Rathke er...@redhat.com Date: Thu May 10 16:19:44 2012 +0200 resolved fdo#46233 value 12 with AM/PM can't be clock time diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index cce08f9..31f9c2c 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -860,11 +860,12 @@ inline bool ImpSvNumberInputScan::GetNextNumber( sal_uInt16 i, sal_uInt16 j ) //--- // GetTimeRef -void ImpSvNumberInputScan::GetTimeRef( +bool ImpSvNumberInputScan::GetTimeRef( double fOutNumber, sal_uInt16 nIndex, // j-value of the first numeric time part of input, default 0 sal_uInt16 nAnz ) // count of numeric time parts { +bool bRet = true; sal_uInt16 nHour; sal_uInt16 nMinute = 0; sal_uInt16 nSecond = 0; @@ -893,6 +894,7 @@ void ImpSvNumberInputScan::GetTimeRef( else { nHour = 0; +bRet = false; SAL_WARN( svl.items, ImpSvNumberInputScan::GetTimeRef: bad number index); } if (nDecPos == 2 nAnz == 2) // 45.5 @@ -903,7 +905,9 @@ void ImpSvNumberInputScan::GetTimeRef( nSecond = (sal_uInt16) sStrArray[nNums[nIndex++]].ToInt32(); if (nIndex - nStartIndex nAnz) fSecond100 = StringToDouble( sStrArray[nNums[nIndex]], true ); -if (nAmPm == -1 nHour != 12) // PM +if (nAmPm nHour 12)// not a valid AM/PM clock time +bRet = false; +else if (nAmPm == -1 nHour != 12)// PM nHour += 12; else if (nAmPm == 1 nHour == 12) // 12 AM nHour = 0; @@ -912,6 +916,7 @@ void ImpSvNumberInputScan::GetTimeRef( (double)nMinute*60 + (double)nSecond + fSecond100)/86400.0; +return bRet; } @@ -3171,7 +3176,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( break; case NUMBERFORMAT_TIME: -GetTimeRef(fOutNumber, 0, nAnzNums); +res = GetTimeRef(fOutNumber, 0, nAnzNums); if ( nSign 0 ) fOutNumber = -fOutNumber; break; @@ -3190,7 +3195,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( if ( res ) { double fTime; -GetTimeRef( fTime, nCounter, nAnzNums - nCounter ); +res = GetTimeRef( fTime, nCounter, nAnzNums - nCounter ); fOutNumber += fTime; } } diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index c57c90a..7c2e8eb 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -294,7 +294,11 @@ private: sal_uInt16 i, sal_uInt16 j ); -void GetTimeRef(// Converts time - double (only decimals) +/** Converts time - double (only decimals) + +@return TRUE if time, FALSE if not (e.g. hours 12 with AM/PM) + */ +bool GetTimeRef( double fOutNumber, // result as double sal_uInt16 nIndex, // Index of hour in input sal_uInt16 nAnz ); // Count of time substrings in input ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/msfilter/svdfppt.cxx | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit ea923cd424f6426d69a7fb375f5ac9e19ec2246a Author: Radek Doulik r...@novell.com Date: Thu May 10 16:21:45 2012 +0200 use com::sun::star::table::BorderLine2 instead of older BorderLine (n#758914) - older BorderLine doesn't seem to work in case InnerLineWidth and OuterLineWidth are set to equal positive value and distance is set to 0 (possible regression) - using the newer API solves the problem for us Change-Id: I69f10a0e947352d20b78dbdc39b7c9af95f8603b diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d61ab39..0501d4a 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -120,7 +120,8 @@ #include editeng/scripttypeitem.hxx #include com/sun/star/awt/Gradient.hpp #include com/sun/star/table/XMergeableCellRange.hpp -#include com/sun/star/table/BorderLine.hpp +#include com/sun/star/table/BorderLine2.hpp +#include com/sun/star/table/BorderLineStyle.hpp #include vcl/virdev.hxx #include algorithm #include set @@ -7305,7 +7306,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable xTabl { SfxItemSet aSet( pLine-GetMergedItemSet() ); XLineStyle eLineStyle(((XLineStyleItem)pLine-GetMergedItem( XATTR_LINESTYLE )).GetValue()); -com::sun::star::table::BorderLine aBorderLine; +com::sun::star::table::BorderLine2 aBorderLine; switch( eLineStyle ) { case XLINE_DASH : @@ -7313,16 +7314,14 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable xTabl { Color aLineColor( ((XLineColorItem)pLine-GetMergedItem( XATTR_LINECOLOR )).GetColorValue() ); aBorderLine.Color = aLineColor.GetColor(); -aBorderLine.OuterLineWidth = static_cast sal_Int16 ( ((const XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 ); -aBorderLine.InnerLineWidth = static_cast sal_Int16 ( ((const XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 ); -aBorderLine.LineDistance = 0; +aBorderLine.LineWidth = static_cast sal_Int16 ( ((const XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 ); +aBorderLine.LineStyle = eLineStyle == XLINE_SOLID ? table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED; } break; case XLINE_NONE : { -aBorderLine.OuterLineWidth = 0; -aBorderLine.InnerLineWidth = 0; -aBorderLine.LineDistance = 0; +aBorderLine.LineWidth = 0; +aBorderLine.LineStyle = table::BorderLineStyle::NONE; } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx |6 +++--- sw/source/filter/ww8/rtfexport.cxx | 18 ++ sw/source/filter/ww8/wrtw8sty.cxx |2 +- 3 files changed, 6 insertions(+), 20 deletions(-) New commits: commit 07d01742c69f1c0335bc7e1b57abd8341ce255e7 Author: Miklos Vajna vmik...@suse.cz Date: Thu May 10 16:45:50 2012 +0200 i#119219 fix non-unicode RTF export There were two problems here: - non-unicode charset being set to Shift JIS for all UTF-8 text - non-unicode text using UTF-8 Change-Id: I533d3e950a4ebd611b5d5db8a95e724e729a641f diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 3629384..b3da716 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -412,10 +412,10 @@ void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ m_aRun-append(m_aStyles.makeStringAndClear()); } -void RtfAttributeOutput::RunText( const String rText, rtl_TextEncoding eCharSet ) +void RtfAttributeOutput::RunText( const String rText, rtl_TextEncoding /*eCharSet*/ ) { SAL_INFO(sw.rtf, OSL_THIS_FUNC); -RawText( rText, 0, eCharSet ); +RawText( rText, 0, m_rExport.eCurrentEncoding ); } OStringBuffer RtfAttributeOutput::RunText() @@ -1911,7 +1911,7 @@ void RtfAttributeOutput::CharFont( const SvxFontItem rFont) m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH); m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F); m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont)); -m_rExport.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset(sw::ms::rtl_TextEncodingToWinCharset(rFont.GetCharSet())); +m_rExport.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset(rtl_getBestWindowsCharsetFromTextEncoding(rFont.GetCharSet())); } void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem rFontSize) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 8101125..801ed5b 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -882,27 +882,13 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEn if (c = ' ' c = '~') aBuf.append((sal_Char)c); else { -//If we can't convert to the dest encoding, or if -//its an uncommon multibyte sequence which most -//readers won't be able to handle correctly, then -//If we can't convert to the dest encoding, then -//export as unicode OUString sBuf(c, 1); OString sConverted; -sal_uInt32 nFlags = -RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | -RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR; -bool bWriteAsUnicode = !(sBuf.convertToString(sConverted, -eDestEnc, nFlags)) -|| (RTL_TEXTENCODING_UTF8==eDestEnc); // #i43933# do not export UTF-8 chars in RTF; -if (bWriteAsUnicode) -sBuf.convertToString(sConverted, -eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS); +sBuf.convertToString(sConverted, eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS); const sal_Int32 nLen = sConverted.getLength(); -if (bWriteAsUnicode pUCMode) +if (pUCMode) { -// then write as unicode - character if (*pUCMode != nLen) { aBuf.append(\\uc); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 700066b..f475108 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -735,7 +735,7 @@ void wwFont::WriteRtf( const RtfAttributeOutput* rAttrOutput ) const { rAttrOutput-FontFamilyType( meFamily, *this ); rAttrOutput-FontPitchType( mePitch ); -rAttrOutput-FontCharset( sw::ms::rtl_TextEncodingToWinCharset( meChrSet ) ); +rAttrOutput-FontCharset( rtl_getBestWindowsCharsetFromTextEncoding( meChrSet ) ); rAttrOutput-StartFont( msFamilyNm ); if ( mbAlt ) rAttrOutput-FontAlternateName( msAltNm ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-5] fdo#47644 performance regression on largish .doc
fdo#47644 big 18 meg .doc is super dooper slow to load, mostly because of the extra checks I added to sanity test .doc file during parsing. Turns out that seeking backwards in the those ole2 formats is incredibly slow, this might affect other formats like xls and ppt that use some of the shared msfilter code. 1st attachment gets us back to where we came from in terms of performance there. The second one is maybe a bit more contentious for 3-5, but I include it for a look-over. Basically there's a page chain in the ole2 format and to seek to a location you walk through the chain until you get to the correct page. I see that in practice most documents have their chain in a presorted order (I have no idea if having them unsorted is actually a sign of a broken document or if its legal) so we can do a far faster binary_search if we walk the chain once and hold on to the results. So second attachment keeps the chain if its one of the circumstances where we have to parse the whole thing anyway, and if not (the usual one) then if we're seeking an (fairly arbitrary) large number of steps where its likely that the cost-benefit is in favour of it then generate the chain once and hold on to it for reuse until there any event which might invalidate the chain. Second patch knocks about 50 seconds off load time. First patch knocks some unknown but 10 mins off load time. C. Don't even think about measuring on a gcc dbgutil build btw, the concept checking of the stl lower_bound is a huge cost so the times aren't even roughly uniformly slower on dbgutil vs product but spike dramatically on some stl stuff. From 1e89ba85d89858ae8c3263a4e6b5b522016fe445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com Date: Thu, 10 May 2012 15:41:17 +0100 Subject: [PATCH] Resolves: fdo#47644 compound storage backend is poor at knowing stream size --- sot/inc/sot/stg.hxx |3 +++ sot/inc/sot/storage.hxx |1 + sot/source/sdstor/stg.cxx|7 +++ sot/source/sdstor/storage.cxx|7 +++ sot/source/sdstor/ucbstorage.cxx |5 + tools/inc/tools/stream.hxx |3 ++- tools/source/stream/stream.cxx |6 +++--- 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index c8d18da..3071017 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -90,6 +90,7 @@ public: virtual sal_uLong Tell() = 0; virtual voidFlush() = 0; virtual sal_BoolSetSize( sal_uLong nNewSize ) = 0; +virtual sal_uLong GetSize() const = 0; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ) = 0; virtual sal_BoolCommit() = 0; virtual sal_BoolRevert() = 0; @@ -171,6 +172,7 @@ public: virtual sal_uLong Tell() { return nPos; } virtual voidFlush(); virtual sal_BoolSetSize( sal_uLong nNewSize ); +virtual sal_uLong GetSize() const; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ); virtual sal_BoolCommit(); virtual sal_BoolRevert(); @@ -266,6 +268,7 @@ public: virtual sal_uLong Tell(); virtual voidFlush(); virtual sal_BoolSetSize( sal_uLong nNewSize ); +virtual sal_uLong GetSize() const; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ); virtual sal_BoolCommit(); virtual sal_BoolRevert(); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 26258bc..4f602e9 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -96,6 +96,7 @@ public: sal_BoolGetProperty( const String rName, ::com::sun::star::uno::Any rValue ); ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream GetXInputStream() const; +virtual sal_Size remainingSize(); }; #ifndef SOT_DECL_SOTSTORAGESTREAM_DEFINED diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 4c4be65..18e95f6 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -252,6 +252,13 @@ sal_Bool StorageStream::SetSize( sal_uLong nNewSize ) return sal_False; } +sal_uLong StorageStream::GetSize() const +{ +if( Validate() ) +return pEntry-GetSize(); +return 0; +} + sal_Bool StorageStream::Commit() { if( !Validate() ) diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 897f9fe..4d24f1f 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -298,6 +298,13 @@ sal_uInt32 SotStorageStream::GetSize() const return nSize; } +sal_Size SotStorageStream::remainingSize() +{ +if (pOwnStm) +return pOwnStm-GetSize() - Tell(); +return SvStream::remainingSize(); +} + /* |*SotStorageStream::CopyTo() |* diff --git
Re: ODF proposal for number:fill-character element (was: support for repeating format code in calc)
On Wed, 2012-05-09 at 20:53 +0200, Eike Rathke wrote: Hi, On Tuesday, 2012-04-24 21:31:41 +0200, Eike Rathke wrote: Given that I think we'd need a number:fill-character or some such attribute to go with 16.27 Data Styles http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part1.html#__RefHeading__1416346_253892949 with the limitation that it can be present only once (if that is what Excel does) and specyfing what happens in these three conditions. Taking http://wiki.oasis-open.org/office/How_to_propose_a_change_or_addition_to_ODF http://wiki.oasis-open.org/office/ProposalTemplate here is what I could come up with. Noel, Kohei: did I miss anything? Is that what Excel does, specifically the adjustment described? All number:*-style elements covered where it can occur? Quite frankly I'm clueless about these number format thing, so I don't think my judgment will help any more than yours. I'll just give you my blanket approval if that gives you any comfort. Best, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-marketing] LibreOffice developer digest
Cor Nouws píše v Út 08. 05. 2012 v 16:40 +0200: Thorsten Behrens wrote (08-05-12 12:42) yeah, $subject is not new, but I thought I would run this idea past you folks here again. ;) It would be just wonderful, if we could have a weekly digest on the TDF blog highlighting what has happened in developer land, in layman's terms. Examples of what I have in mind: I have some 10-15 items collected already. Waiting for next step in handling... Wonderful. Could you please cutpaste them? I wonder how they look like. BTW: How did you collect them? The following ways come to my mind: + git changelog: + not easy; it used to be 500 commits per week when I did the statistics; + well, a good reader might be able to find some gold there just by checking the 500 lines of subjects + developer mailing list: + many people already read it + it does not mention features done by core developers that have write access to git + also it does not mention interesting stuff from other areas (QA, user interface, ...) + changes at http://wiki.documentfoundation.org/ReleaseNotes/3.5 + easy to see diff from last week + developers are lazy to document their features there Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: failed unit test: sal_osl_file
On Wed, 2012-05-09 at 17:17 -0400, Terrence Enger wrote: I am trying to build master commit id 5c2c0e3, pulled 2012-05-08, on ubuntu-natty (11.04), and it is failing in unit test sal_osl_file. You didn't flip from a system cppunit to an internal one without a rebuild inbetween, or anything like that ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
OK, so we know (a) it's not a cygwin thing (b) its not a visual C thing, because we're both on the same version (c) it works on a Windows7 box, but not a WindowsServer2008 box. So it's probably a bug that was fixed sometime in the WindowsVista or Windows7 timeframe. We could probably implement a configure check that looks like if $OS == WINDOWS $OS_VERSION Vista length($ROOT_PATH)XXX complain_loudly_and_exit() where we know XXX is less than 36 and more than 2, because C:/cygwin/home/tinderbox/libreoffice causes it to break and W: does not. Would you be able to figure out what the point is where it starts to break? On 2012-05-10 17:15, Lubos Lunak wrote: On Thursday 10 of May 2012, Noel Grandin wrote: Maybe it's a cygwin thing? I'm running a version that's about a month old (had to update because of other issues). I think it's 1.7.11 If you're out of date, could you try updating and see if that fixes it? It was quite recent cygwin even before, but the problem persists even with the most recent, 1.7.15. On 2012-05-10 14:26, Lubos Lunak wrote: Windows Server 2008R2 Enterprise, Service Pack 1 Visual Studio 2008 I'm not sure how to find out what exactly the culprint is or how to possibly do anything more than document it. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-marketing] LibreOffice developer digest
Hi Petr, Petr Mladek wrote (10-05-12 17:11) Wonderful. Could you please cutpaste them? I wonder how they look like. thanks for your interest! Attached an ods with the rough data I have now. Thinking about a strategy to get that in WordPress quickly (without difficult mouse editing of links... Someone a hint?) :-\ (will post part of it, will keep part for next blog) BTW: How did you collect them? The following ways come to my mind: + git changelog: Yup, just this. I see it once or sometimes more each day. And picking out interesting stuff goes fast after some practising ;-) Regards, -- - Cor - http://nl.libreoffice.org TestInfoAboutMasterForBlog.ods Description: application/vnd.oasis.opendocument.spreadsheet ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/Library_scfilt.mk sc/source vcl/inc vcl/source
sc/Library_scfilt.mk |5 sc/source/filter/excel/xecontent.cxx | 29 +- sc/source/ui/docshell/docfunc.cxx| 38 +-- sc/source/ui/docshell/docsh.cxx |2 - sc/source/ui/docshell/docsh3.cxx |2 - sc/source/ui/docshell/docsh4.cxx |2 - sc/source/ui/inc/areasdlg.hxx|2 - sc/source/ui/inc/autofmt.hxx |4 +-- sc/source/ui/inc/docfunc.hxx |4 +-- sc/source/ui/inc/docsh.hxx |2 - sc/source/ui/miscdlgs/autofmt.cxx|2 - sc/source/ui/pagedlg/areasdlg.cxx|8 +++ sc/source/ui/unoobj/docuno.cxx |3 +- sc/source/ui/view/tabview.cxx|8 +++ sc/source/ui/view/tabvwsh3.cxx |2 - vcl/inc/vcl/settings.hxx |2 - vcl/source/app/settings.cxx |4 +-- 17 files changed, 63 insertions(+), 56 deletions(-) New commits: commit cf6516632379688fa2b4c66f5e1644355fb424fe Author: Caolán McNamara caol...@redhat.com Date: Thu May 10 16:33:53 2012 +0100 WaE: unsafe mix of bool and sal_Bool Change-Id: Ie2fcc1a5404c62dc15b98f99f89631795df91b01 diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 61b7f9d..e5a4b2c 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -142,6 +142,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/lotus/lotus \ sc/source/filter/lotus/memory \ sc/source/filter/lotus/op \ +sc/source/filter/lotus/optab \ sc/source/filter/lotus/tool \ sc/source/filter/qpro/biff \ sc/source/filter/qpro/qpro \ @@ -216,8 +217,4 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/oox/worksheetsettings \ )) -$(eval $(call gb_Library_add_noexception_objects,scfilt,\ - sc/source/filter/lotus/optab \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index fb974d9..6a23166 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -785,35 +785,44 @@ namespace { const char* GetOperatorString(ScConditionMode eMode, bool bFrmla2) { +const char *pRet = ; switch(eMode) { case SC_COND_EQUAL: -return equal; +pRet = equal; +break; case SC_COND_LESS: -return lessThan; +pRet = lessThan; +break; case SC_COND_GREATER: -return greaterThan; +pRet = greaterThan; +break; case SC_COND_EQLESS: -return lessThanOrEqual; +pRet = lessThanOrEqual; +break; case SC_COND_EQGREATER: -return greaterThanOrEqual; +pRet = greaterThanOrEqual; +break; case SC_COND_NOTEQUAL: -return notEqual; +pRet = notEqual; +break; case SC_COND_BETWEEN: bFrmla2 = true; -return between; +pRet = between; +break; case SC_COND_NOTBETWEEN: bFrmla2 = true; -return notBetween; +pRet = notBetween; +break; case SC_COND_DUPLICATE: case SC_COND_NOTDUPLICATE: case SC_COND_DIRECT: case SC_COND_NONE: default: -return ; +pRet = ; break; } -return ; +return pRet; } const char* GetTypeString(ScConditionMode eMode) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 379887f..5227044 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -193,7 +193,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress rPos) rDocShell.MakeDrawLayer(); ScDocument* pDoc = rDocShell.GetDocument(); -sal_Bool bUndo (pDoc-IsUndoEnabled()); +bool bUndo (pDoc-IsUndoEnabled()); ScDrawLayer* pModel = pDoc-GetDrawLayer(); SCCOL nCol = rPos.Col(); SCROW nRow = rPos.Row(); @@ -229,7 +229,7 @@ sal_Bool ScDocFunc::DetectiveDelPred(const ScAddress rPos) { ScDocument* pDoc = rDocShell.GetDocument(); -sal_Bool bUndo(pDoc-IsUndoEnabled()); +bool bUndo(pDoc-IsUndoEnabled()); ScDrawLayer* pModel = pDoc-GetDrawLayer(); if (!pModel) return false; @@ -273,7 +273,7 @@ sal_Bool ScDocFunc::DetectiveAddSucc(const ScAddress rPos) rDocShell.MakeDrawLayer(); ScDocument* pDoc = rDocShell.GetDocument(); -sal_Bool bUndo(pDoc-IsUndoEnabled()); +bool bUndo(pDoc-IsUndoEnabled()); ScDrawLayer* pModel = pDoc-GetDrawLayer(); SCCOL nCol = rPos.Col(); SCROW nRow = rPos.Row(); @@ -309,7 +309,7 @@ sal_Bool ScDocFunc::DetectiveDelSucc(const ScAddress rPos) { ScDocument* pDoc = rDocShell.GetDocument(); -sal_Bool bUndo (pDoc-IsUndoEnabled()); +bool bUndo (pDoc-IsUndoEnabled());
Re: Dictionaries stuff
Tomáš Chvátal píše v Út 24. 04. 2012 v 22:07 +0200: This led me to unfortunate conclusion that there is NO official page where to figure which are latest version and how to obtain them. Many dictionaries are available via extensions, so http://extensions.libreoffice.org/ might be a good place to find them. In the past I downloaded them using a script. It read links from a wiki page but it is not longer available :-( Also, we had a contributor that updated the openSUSE packages semi-automatically. Unfortunately, he has not been active last year. Anyway, you could find the last package sources at https://build.opensuse.org/package/files?package=libreoffice-hyphenproject=LibreOffice%3AUnstable https://build.opensuse.org/package/show?package=libreoffice-thesaurusproject=LibreOffice%3AUnstable https://build.opensuse.org/package/show?package=myspell-dictionariesproject=LibreOffice%3AUnstable Interesting might be the .data file that mentions URLs where we took the dictionary from. Otherwise, we had the same issues, with e.g. version scheme, poor English documentation, as described by Caolan. The best thing would be to motivate author to keep the extensions site up-to-date or better update the dictionaries in the git dictionaries repository. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sot/inc sot/source tools/inc tools/source
sot/inc/sot/stg.hxx |3 +++ sot/inc/sot/storage.hxx |1 + sot/source/sdstor/stg.cxx|7 +++ sot/source/sdstor/storage.cxx|7 +++ sot/source/sdstor/ucbstorage.cxx |5 + tools/inc/tools/stream.hxx |3 ++- tools/source/stream/stream.cxx |6 +++--- 7 files changed, 28 insertions(+), 4 deletions(-) New commits: commit aef4d0ea8ba7f5e169dc04812490a103cd858f0c Author: Caolán McNamara caol...@redhat.com Date: Thu May 10 15:41:17 2012 +0100 Resolves: fdo#47644 compound storage backend is poor at knowing stream size Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index c8d18da..3071017 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -90,6 +90,7 @@ public: virtual sal_uLong Tell() = 0; virtual voidFlush() = 0; virtual sal_BoolSetSize( sal_uLong nNewSize ) = 0; +virtual sal_uLong GetSize() const = 0; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ) = 0; virtual sal_BoolCommit() = 0; virtual sal_BoolRevert() = 0; @@ -171,6 +172,7 @@ public: virtual sal_uLong Tell() { return nPos; } virtual voidFlush(); virtual sal_BoolSetSize( sal_uLong nNewSize ); +virtual sal_uLong GetSize() const; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ); virtual sal_BoolCommit(); virtual sal_BoolRevert(); @@ -266,6 +268,7 @@ public: virtual sal_uLong Tell(); virtual voidFlush(); virtual sal_BoolSetSize( sal_uLong nNewSize ); +virtual sal_uLong GetSize() const; virtual sal_BoolCopyTo( BaseStorageStream * pDestStm ); virtual sal_BoolCommit(); virtual sal_BoolRevert(); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 26258bc..4f602e9 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -96,6 +96,7 @@ public: sal_BoolGetProperty( const String rName, ::com::sun::star::uno::Any rValue ); ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream GetXInputStream() const; +virtual sal_Size remainingSize(); }; #ifndef SOT_DECL_SOTSTORAGESTREAM_DEFINED diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 4c4be65..18e95f6 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -252,6 +252,13 @@ sal_Bool StorageStream::SetSize( sal_uLong nNewSize ) return sal_False; } +sal_uLong StorageStream::GetSize() const +{ +if( Validate() ) +return pEntry-GetSize(); +return 0; +} + sal_Bool StorageStream::Commit() { if( !Validate() ) diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 897f9fe..4d24f1f 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -298,6 +298,13 @@ sal_uInt32 SotStorageStream::GetSize() const return nSize; } +sal_Size SotStorageStream::remainingSize() +{ +if (pOwnStm) +return pOwnStm-GetSize() - Tell(); +return SvStream::remainingSize(); +} + /* |*SotStorageStream::CopyTo() |* diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index b6fb581..020fb9a 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1566,6 +1566,11 @@ sal_Bool UCBStorageStream::GetProperty( const String rName, ::com::sun::star::u return sal_False; } +sal_uLong UCBStorageStream::GetSize() const +{ +return pImp-GetSize(); +} + UCBStorage::UCBStorage( SvStream rStrm, sal_Bool bDirect ) { String aURL = GetLinkedFile( rStrm ); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 0ad9585..e577ca8 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -379,7 +379,7 @@ public: sal_SizeSeekRel( sal_sSize nPos ); sal_SizeTell() const { return nBufFilePos+nBufActualPos; } //length between current (Tell()) pos and end of stream -sal_SizeremainingSize(); +virtual sal_Size remainingSize(); voidFlush(); sal_BoolIsEof() const { return bIsEof; } // next Tell() = nSize @@ -678,6 +678,7 @@ public: sal_BoolIsObjectMemoryOwner() { return bOwnsData; } voidSetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; } sal_SizeGetResizeOffset() const { return nResize; } +virtual sal_Size remainingSize() { return GetSize() - Tell(); } }; // diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 3e870b4..84d652c 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1820,9 +1820,9
Re: hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
This patch makes visibility detection work for me in my 10.4 tree. The build is still going so I can't say if the result will work;) Anyway, a summary of the changes here: - Don't hardcode the -shared, -fpic and -Wl,-z,defs options or the .so suffix for shared libraries Use platform-specific ones, just for Mac OS X so far. - On Mac OS X, at least in my configuration, I need to pass an -isysroot flag when running $CC -E, otherwise headers weren't found. - For Mac OS X, for gbuildified modules, pass -DHAVE_GCC_VISIBILITY_FEATURE to the compiler only if configure detected visibility working, and in that case also pass -fvisibility=hidden, which is what HAVE_GCC_VISIBILITY_FEATURE being defined is supposed to mean. Pass also -fvisibility-inlines-hidden if that seemed to work. (For old build system modules, -fvisibility=hidden was already being used also on Mac OS X if HAVE_GCC_VISIBILITY_FEATURE had been detected. --tml diff --git a/configure.in b/configure.in index b09a935..4322a07 100644 --- a/configure.in +++ b/configure.in @@ -140,6 +140,18 @@ test_xrender=yes test_cups=yes test_fontconfig=yes +# Default values, as such probably valid just for Linux, set +# differently below just for Mac OS X,but at least better than +# hardcoding these as we used to do. Much of this is duplicated also +# in solenv for old build system and for gbuild, ideally we should +# perhaps define stuff like this only here in configure.in? + +LINKFLAGSSHL=-shared +PICSWITCH=-fpic +DLLPOST=.so + +LINKFLAGSNOUNDEFS=-Wl,-z,defs + case $host_os in solaris*) @@ -244,6 +256,16 @@ darwin*) # Mac OS X or iOS _os=Darwin fi enable_systray=no +# See comment above the case $host_os +LINKFLAGSSHL=-dynamiclib -single_module + +# -fPIC is default +PICSWITCH= + +DLLPOST=.dylib + +# -undefined error is the default +LINKFLAGSNOUNDEFS= ;; freebsd*) @@ -4661,6 +4683,11 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then AC_LANG_PUSH([C++]) +save_CPPFLAGS=$CPPFLAGS +if test -n $MACOSX_SDK_PATH; then +CPPFLAGS=-isysroot $MACOSX_SDK_PATH $CPPFLAGS +fi + if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then AC_MSG_CHECKING([if STL headers are visibility safe]) AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no) @@ -4674,7 +4701,7 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then sharedlink_ldflags_save=$LDFLAGS -LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden -fpic -shared +LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden $PICSWITCH $LINKFLAGSSHL AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -4682,7 +4709,13 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then using namespace std; ]], [[ istringstream strm( test ); return 0; -]])],[$EGREP -q unresolvable conftest.err; +]])], +# Ugh, surely bad to assume an error message will contain +# the word unresolvable, a problem with +# -fvisibility-inlines-hidden and STL headers might cause +# some more obscure message on some platform, and anway, +# the error message could be localised. +[$EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi],[gccvisok=no ]) AC_MSG_RESULT([$gccvisok]) @@ -4708,16 +4741,15 @@ struct S2: S1int { virtual ~S2(); }; struct S3: S2 { virtual ~S3(); }; S3::~S3() {} _ACEOF gccvisinlineshiddenok=yes -if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so /dev/null 2/dev/null; then +if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1$DLLPOST; then gccvisinlineshiddenok=no else -if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o libconftest2.so /dev/null 2/dev/null; then +if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 $LINKFLAGSNOUNDEFS -o libconftest2$DLLPOST; then gccvisinlineshiddenok=no fi fi -rm -f libconftest1.so libconftest2.so - +rm -f libconftest1$DLLPOST libconftest2$DLLPOST AC_MSG_RESULT([$gccvisinlineshiddenok]) if test $gccvisinlineshiddenok = no; then AC_MSG_WARN([Your gcc/clang is not -fvisibility-inlines-hidden safe, disabling that.]) @@ -4767,6 +4799,8 @@ _ACEOF fi fi +CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) fi diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 9241cda..5ad4f3d 100644 --- a/solenv/gbuild/platform/macosx.mk +++
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 5df9e10d27a071f878ed160f99129a7f3c34f5ed Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu May 10 18:29:12 2012 +0200 do not prepend \n twice, it confuses KFileDialog (rhbz#820439) Draw - Export - filetype combo was broken. Change-Id: I9349749274498d5834dd63e73f3856434b1ab8d9 diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 140af9c..3537bfe 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -342,9 +342,6 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString , const uno::Sequencebeans::StringPair filters) throw( lang::IllegalArgumentException, uno::RuntimeException ) { -if (!_filter.isNull()) -_filter.append(QString(\n)); - const sal_uInt16 length = filters.getLength(); for (sal_uInt16 i = 0; i length; ++i) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-5] fdo#47644 performance regression on largish .doc
Hi there, On Thu, 2012-05-10 at 16:06 +0100, Caolán McNamara wrote: fdo#47644 big 18 meg .doc is super dooper slow to load, mostly because of the extra checks I added to sanity test .doc file during parsing. :-) 1st attachment gets us back to where we came from in terms of performance there. Great - I've pushed that to libreoffice-3-5. The second one is maybe a bit more contentious for 3-5, but I include it for a look-over. Basically there's a page chain in the ole2 format and to seek to a location you walk through the chain until you get to the correct page. Yep - it's a FAT structure; nasty one-slot linked list. I see that in practice most documents have their chain in a presorted order (I have no idea if having them unsorted is actually a sign of a broken document or if its legal) It is legal, but it's highly unlikely. So second attachment keeps the chain if its one of the circumstances where we have to parse the whole thing anyway, and if not (the usual one) then if we're seeking an (fairly arbitrary) large number of steps where its likely that the cost-benefit is in favour of it then generate the chain once and hold on to it for reuse until there any event which might invalidate the chain. So - I'm a bit lost with the second patch. The FAT is essentially a linked list; and we walk it to find the block we want, so: nRel = 3; - go three steps along the linked list. A - B - C == C ... Your pageCache looks like the right approach, and turns this into a simple vector we can rapidly look up: [0] = A, [1] = B, [2] = C And so on - hopefully I'm there so far :-) With the 512 byte block size we expect, that turns a 100Mb OLE2 stream into a 800k vector (which is just fine). Second patch knocks about 50 seconds off load time. First patch knocks some unknown but 10 mins off load time. My question is thus about: [snip] std::vectorsal_Int32::iterator aI; if (m_bSortedPageChain) aI = std::lower_bound(m_aPagesCache.begin(), m_aPagesCache.end(), nBgn); else aI = std::find(m_aPagesCache.begin(), m_aPagesCache.end(), nBgn); if (aI == m_aPagesCache.end()) { SAL_WARN(sot, Unknown page position); nBgn = STG_EOF; } else { size_t nBgnDistance = std::distance(m_aPagesCache.begin(), aI); size_t nIndex = nBgnDistance + nRel; if (nIndex m_aPagesCache.size()) { nRel = m_aPagesCache.size() - nBgnDistance; nIndex = m_aPagesCache.size() - 1; } else nRel = 0; nLast = nIndex ? m_aPagesCache[nIndex - 1] : STG_EOF; nBgn = m_aPagesCache[nIndex]; } [/snip] Surely that should read: nBgn = m_aPageCache[nRel]; or did I go a bit crazy ? [ I'm trying to turn the above into that mentally and giving up ;-]. Otherwise the clearing of the cache looks sensible; though the: StgFATStrm::SetPage(); should prolly just update that vector as well as doing the nasty fat walk so: m_aPageCache[nBlocks] = nNewPage; or somesuch (assuming it is long enough for that). Otherwise it looks really lovely. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
minutes of ESC call ...
* Present: + Andras, Mirek, Michael, Kendy, Stephan, Eike, Fridrich, David, Michael S, Petr, Rainer, Mitch, Caolan, Markus, Cedric, Tor, Kohei * Completed Action Items + ask Astron to show up and/or Mirek for UI team (Michael) + concrete bugzilla component proposal for next time (Michael S) + re-visit ChromeOS fonts in another week's time (Caolan) + potential issues with fontconfig fallbacks AA: + switch to them in master if no reply (Caolan) + send magic who-has-accounts command to Cedric (Norbert) * Pending Action Items + [working on it] pull up misc. internal versions for 3.6 (Fridrich) + latest cairo build bust on Windows - cairo needed for svg + propose repeat-format bits to the ODF/TC (Eike / Thorsten) AA: + Kohei needs to ack / sign off for Thorsten (Kohei) + rename VCL API to make it GetBeamerFoo fix (Michael) + add encryption default UI option in 3.6 (Thorsten) + write 2 paragraph gerrit teaser to dev-list for gerrit (Bjoern) + [pending] think over consequences of moving master - 3.6 on release etc. (Rainer) + some technical issues to be cleared, needs admin help [next week] * Action Items review * GSOC update (Cedric) + make sure students are ready, beginning of coding in 11 days * UI / design intro (Mirek) + Mirek: from czech republic, 19, enthusiastic :-) + working on GSOC projects, testing a new process + analysing the proposals, one more week to get some tentative designs. + working on web buttons, conference banner etc. * UI: Alexander's nice new templates + better than what we have now + GSOC project around templates management / new document dialog + Licensing for templates: CC0 is ideal ... + templates must be entirely original CC0 work. + currently have only 5-6 templates. AA: + get Alexander commit access give a free hand (Michael) * UI: lots of talks wrt. document themes + styles for the whole document + something we'd like to do + using well-defined style names and sticking to them, easy to switch between them. + we need to be able to style the built-in / default styles, with no name / just an ID in ODF. + existing feature to import styles from another doc (Michael S) * Release Engineering update (Petr) + 3.5.4 - freeze on May 14th (Monday) + please merge pending / outstanding patches + lots of nice fixes already, looks promising + Petr to decide if we need a new 3.5.x release during 3.6 ? + 3.6 status + June 4th feature-freeze: ~three weeks out * build machines (Fridrich) + both Linux build machines outside the VPN + unwinding over-complex build environment + reducing need to ship custom std libs AA: + look at bytemark / win32 tinderboxes (Fridrich) * bugs with patches in bugzilla (Michael) + unwound half a dozen or more + please encourage people to send patches to the mailing list * OLE2 performance issue (Caolan) + major regression fix as side-effect of stricter security validation of streams. + fix / patch and further speedup sent to list for review * QA update (Rainer/Petr) + add new components + sdk, framework, graphics, filters + bugzilla assistant - reads components from wiki + add them with different style. AA: + create new components next week (Rainer) + thoughts on a live / current issues ticker: - wiki page looks ugly, release in 3 days etc. + avoids mailing list panics etc. ? + RSS feed / mailing-list for that ? - too late. AA: + connect Rainer / sysadmins about ticker (Thorsten) + Tango / icon problems + printer icons look greyed out in menus + Astron / Alex are the best contacts AA: + ask Jimmac for update Tango icons (Mirek/Astron) * 3.5 most annoying bugs ... + 67 open (of 211) older 68/205 71/205 68/199 74/201 73/193 66/183 32% 33% 35% 34%37%38% 36% + https://bugs.freedesktop.org/showdependencytree.cgi?id=37361hide_resolved=1 * 3.5 bugs tagged with 'regression' + 145(-4) bugs open of 532(+27) total * Componentcount net * + Writer - 53 (+1) + Presentation - 22 (-3) + LibreOffice - 13 (-3) + Spreadsheet - 10 (+0) + Drawing - 9 (+0) + Database - 9 (+1) + Writer / RTF - 8 (-2) + Basic- 2 (+0) +
[PATCH] Release notes: use bug titles instead of commit messages if possible
Hi, looking at our release notes http://wiki.documentfoundation.org/Releases/3.5.3/RC1 I think it is confusing for users to see the git commit messages there. For example: clrContourCache for SwAnchoredDrawObjects (fdo#45376) [Andreas Schierl] What about using the bug names? Mozilla does the same: http://www.mozilla.org/en-US/firefox/11.0/releasenotes/buglist.html The rough patch for bin/lo-commit-stat is attached. (But please note, that I am an absolute Perl n00b. :) Unfortunately it does not work with Novell bugzilla. :( Refusals? Thoughts? Advices? Thanks, Ivan 0001-lo-commit-stat-use-bug-titles-instead-of-commit-mess.patch Description: application/mbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/scdetect.cxx | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) New commits: commit aeb1451dff06ad00b1719f9bc45a2c8bdfa904f8 Author: Eike Rathke er...@redhat.com Date: Thu May 10 19:07:47 2012 +0200 resolved fdo#49639 import .xls with HTML as such, not CSV This restores the previous behavior for this content type, regression introduced with the fix for fdo#40021 a5eadc6aaafec92df23c57e258882a2c98ece0ad diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6ef1429..7fe787d 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -441,14 +441,13 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream ) } else { -bool bIsXLS = false; SvStream* pStream = aMedium.GetInStream(); const SfxFilter* pPreselectedFilter = pFilter; -bool bCsvSelected = (pPreselectedFilter ? -pPreselectedFilter-GetFilterName().EqualsAscii( pFilterAscii ) : false); -if ( pPreselectedFilter ( ( pPreselectedFilter-GetName().SearchAscii(Excel) != STRING_NOTFOUND ) || -( !aPreselectedFilterName.Len() bCsvSelected ) ) ) -bIsXLS = true; +bool bCsvSelected = (pPreselectedFilter +pPreselectedFilter-GetFilterName().EqualsAscii( pFilterAscii )); +bool bExcelSelected = (pPreselectedFilter +(pPreselectedFilter-GetName().SearchAscii(Excel) != STRING_NOTFOUND)); +bool bIsXLS = (bExcelSelected || (bCsvSelected !aPreselectedFilterName.Len())); pFilter = 0; if ( pStream ) { @@ -750,12 +749,14 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream ) const sal_Size nTrySize = 80; rtl::OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); +bool bMaybeHtml = HTMLParser::IsHTMLFormat( aHeader.getStr()); + if ( aHeader.copy(0, 5).equalsL({\\rtf, 5) ) { // test for RTF pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) ); } -else if ( bIsXLS bMaybeText ) +else if ( bIsXLS (bMaybeText !bMaybeHtml) ) { aHeader = comphelper::string::stripStart(aHeader, ' '); // Detect Excel 2003 XML here only if XLS was preselected. @@ -769,7 +770,7 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream ) pFilter = pPreselectedFilter; else if ( bCsvSelected bMaybeText ) pFilter = pPreselectedFilter; -else if ( HTMLParser::IsHTMLFormat(aHeader.getStr()) ) +else if ( bMaybeHtml ) { // test for HTML ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-5] resolved fdo#49639 import .xls with HTML as such, not CSV
Hi, Please review attached patch and commit to 3-5. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=49639 FILEOPEN html content .xls files shows text.csv with html tags instead of Spreadsheet contents Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD From 59961c892be4ac18e3d1d57c81448cf4ee9338e4 Mon Sep 17 00:00:00 2001 Message-Id: 59961c892be4ac18e3d1d57c81448cf4ee9338e4.1336669804.git.er...@redhat.com From: Eike Rathke er...@redhat.com Date: Thu, 10 May 2012 19:05:48 +0200 Subject: [PATCH] resolved fdo#49639 import .xls with HTML as such, not CSV MIME-Version: 1.0 Content-Type: multipart/mixed; boundary=erAck-patch-parts This is a multi-part message in MIME format. --erAck-patch-parts Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit This restores the previous behavior for this content type, regression introduced with the fix for fdo#40021 c2a26cf9dab637c292e431d5cdf7bab5bbda571d --- sc/source/ui/unoobj/scdetect.cxx |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) --erAck-patch-parts Content-Type: text/x-patch; name=0001-resolved-fdo-49639-import-.xls-with-HTML-as-such-not.patch Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename=0001-resolved-fdo-49639-import-.xls-with-HTML-as-such-not.patch diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 556d54f..59ae14b 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -737,12 +737,14 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream ) const sal_Size nTrySize = 80; ByteString aHeader = read_uInt8s_AsOString(rStr, nTrySize); +bool bMaybeHtml = HTMLParser::IsHTMLFormat( aHeader.GetBuffer()); + if ( aHeader.CompareTo( {\\rtf, 5 ) == COMPARE_EQUAL ) { // test for RTF pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterRtf) ); } -else if ( bIsXLS bMaybeText ) +else if ( bIsXLS (bMaybeText !bMaybeHtml) ) { aHeader = comphelper::string::stripStart(aHeader, ' '); // Detect Excel 2003 XML here only if XLS was preselected. @@ -756,7 +758,7 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream ) pFilter = pPreselectedFilter; else if ( pPreselectedFilter-GetFilterName().EqualsAscii(pFilterAscii) bMaybeText ) pFilter = pPreselectedFilter; -else if ( HTMLParser::IsHTMLFormat( aHeader.GetBuffer() ) ) +else if ( bMaybeHtml ) { // test for HTML --erAck-patch-parts-- pgpLxfsBrFHfj.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi Michael, On Thursday, 2012-05-10 17:47:41 +0100, Michael Meeks wrote: + propose repeat-format bits to the ODF/TC (Eike / Thorsten) AA: + Kohei needs to ack / sign off for Thorsten (Kohei) Actually Noel should that sign off, as he's working on it. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpOFKAeRAdUE.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Raphaël raph...@hotmail.com changed: What|Removed |Added Depends on||35427 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Licensing
Hi, all of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Best regards, Roland Baudin -- X File Explorer http://roland65.free.fr/xfe Toutes Choses http://roland65.free.fr/ttc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Licensing
Hi, all of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Best regards, Roland Baudin -- X File Explorer http://roland65.free.fr/xfe Toutes Choses http://roland65.free.fr/ttc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #304 from Raphaël raph...@hotmail.com 2012-05-10 11:02:03 PDT --- I added bug 35427 - Impossible to hide horizontal scrollbar in writer when zoom is over 100%. It's very annoying for users working with 'optimal zoom' on a small screen. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salobj.cxx | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 44e52d6698742edc8295bdcb7ad06ff370e5e6a6 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu May 10 21:26:05 2012 +0300 fdo#45081: We never registered the SAL_OBJECT_CHILDCLASSNAMEA window class A crucial line of code that called RegisterClassExA() for that window class had been deleted by accident in commit cda4a293608514783d38d470799cfbf97b245cc6 Code cleanup in May 2011, whoa. So apparently that window class is not needed for much except embedded video in Impress? Change-Id: I I19e70cefcf47aaf8a12a62539e0dacc5adb3c3b1 diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index e91ca8d..cbaef77 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA; aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA; -pSalData-mbObjClassInit = TRUE; +if ( RegisterClassExA( aWndClassEx ) ) +pSalData-mbObjClassInit = TRUE; } } @@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) if ( !hWndChild ) { +#if OSL_DEBUG_LEVEL 1 +char *msg = NULL; +FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_FROM_SYSTEM, + NULL, GetLastError(), 0, + (LPSTR) msg, 0, NULL); +MessageBoxA(NULL, msg, CreateWindowExA failed, MB_OK); +#endif delete pObject; return NULL; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Cherry-pick request: 44e52d6698742edc8295bdcb7ad06ff370e5e6a6
Single-line fix for the quite annoying and embarrassing fdo#45081. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/win
vcl/win/source/window/salobj.cxx | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 0a2f81a35d338c8e2d2da55df3fb221fa1de5bba Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu May 10 13:49:01 2012 -0500 fdo#45081: We never registered the SAL_OBJECT_CHILDCLASSNAMEA window class A crucial line of code that called RegisterClassExA() for that window class had been deleted by accident in commit cda4a293608514783d38d470799cfbf97b245cc6 Code cleanup in May 2011, whoa. So apparently that window class is not needed for much except embedded video in Impress? Change-Id: I I19e70cefcf47aaf8a12a62539e0dacc5adb3c3b1 Signed-off-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 29125c0..5c847b9 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) aWndClassEx.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA; aWndClassEx.lpszClassName = SAL_OBJECT_CHILDCLASSNAMEA; -pSalData-mbObjClassInit = TRUE; +if ( RegisterClassExA( aWndClassEx ) ) +pSalData-mbObjClassInit = TRUE; } } @@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) if ( !hWndChild ) { +#if OSL_DEBUG_LEVEL 1 +char *msg = NULL; +FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_FROM_SYSTEM, + NULL, GetLastError(), 0, + (LPSTR) msg, 0, NULL); +MessageBoxA(NULL, msg, CreateWindowExA failed, MB_OK); +#endif delete pObject; return NULL; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cherry-pick request: 44e52d6698742edc8295bdcb7ad06ff370e5e6a6
On Thu, May 10, 2012 at 11:39 AM, Tor Lillqvist t...@iki.fi wrote: Single-line fix for the quite annoying and embarrassing fdo#45081. +1 pushed on 3-5 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/submodules' - 2 commits - g helpcontent2
g| 76 ++- helpcontent2 |2 - 2 files changed, 76 insertions(+), 2 deletions(-) New commits: commit 8679710bd72dfb9e3ef55fa40885fc2475763684 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu May 10 14:06:29 2012 -0500 tweak g to deal with submodules Change-Id: I61c606b23f24233617b75f2f5da9ca4844ca1b22 diff --git a/g b/g index 545a058..a283d2c 100755 --- a/g +++ b/g @@ -2,8 +2,11 @@ # # Wrapper for git to handle more subdirs at the same time # -echo Do not use ./g anymore, we have submodules now +deprecated() +{ +echo Do not use ./g fetch/pull/clone, we have submodules now, use ./g update to update the needed module, otherwise work on the core repo with git directly exit 1 +} # no params, no action if [ $# -eq 0 ] ; then @@ -96,6 +99,72 @@ refresh_all_hooks() done } +update_submodule() +{ +local module=$1 +local active=$2 +local old_module=$1 + +if [ $active = yes ] ; then + if [ $module == helpcontent2 ] ; then + old_module=help + fi + if [ -d $module -a ! -L $module ] ; then + if [ -d $module/.git/. ] ; then + if [ -z $(git config --get submodule.$module.url) ] ; then + git submodule init $module + else + echo $module is already initialized + fi + else + if [ -d clone/$old_module/.git/. ] ; then + echo re-use clone/$old_module as a base for $module and fetch + cp -rp clone/$old_module/.git $module/. + fi + echo init submodule $module + git submodule init $module + fi + echo update submodule $module + git submodule update $module + else + echo Error: $module is not a directory, so pre-submodule time? 12 + exit 1 + fi +else + for key in $(git config --get-regex submodule.$module | cut -d' ' -f 1) ; do + if [ -n $key ] ; then + echo remove $key from .git/config + git config --unset $key + fi + done +fi +} + +update_submodules() +{ +local m +local active +local module + +if [ -f ./bin/repo-list ] ; then + for module in binfilter helpcontent2 dictionaries translations ; do + active=no + for m in $(cat ./bin/repo-list) ; do + if [ $m = help ] ; then + m=helpcontent2 + fi + if [ $m = $module ] ; then + active=yes + fi + done + update_submodule $module $active + done +else + echo you need to autogen before trying ot update the submodules 12 + exit 1 +fi +} + postprocess() { rc=$1 @@ -154,10 +223,12 @@ done case $COMMAND in apply) + deprecated EXTRA=-p0 --stat --apply --index --ignore-space-change --whitespace=error RELATIVIZE=0 ;; clone|fetch|pull) + deprecated DO_HOOK_REFRESH=true ;; diff) @@ -175,6 +246,9 @@ case $COMMAND in PUSH_ALL=1 fi ;; +update) + update_submodules + exit 0; esac # absolutize the parameters first commit 92892765bdbe3c95fd029067f13e719cfce95468 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu May 10 14:06:00 2012 -0500 helpcontent2 tweak Change-Id: Id0fa59062e5943944bb7ad541be235a532ac5744 diff --git a/helpcontent2 b/helpcontent2 index d0b8fb8..6c1b76c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d0b8fb86d851c9e3f1257c972494021320dda6d0 +Subproject commit 6c1b76c38f0fc469a2cbf41ffacde4d76df11ead ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ODF proposal for number:fill-character element
On 09/05/12 19:53, Eike Rathke wrote: Hi, On Tuesday, 2012-04-24 21:31:41 +0200, Eike Rathke wrote: Given that I think we'd need a number:fill-character or some such attribute to go with 16.27 Data Styles http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part1.html#__RefHeading__1416346_253892949 with the limitation that it can be present only once (if that is what Excel does) and specyfing what happens in these three conditions. Taking http://wiki.oasis-open.org/office/How_to_propose_a_change_or_addition_to_ODF http://wiki.oasis-open.org/office/ProposalTemplate here is what I could come up with. Noel, Kohei: did I miss anything? Is that what Excel does, specifically the adjustment described? Allnumber:*-style elements covered where it can occur? lame I know, but as far as I can see ( and that's just with very limited experience playing with this feature ) excel ( the one and only version I checked ) seems to just insert 0..n characters as needed to fill the available width. As far as I could see with some quick testing left/right/center justification didn't seem to affect the output when the repeat character was present in the format ( is that what you mean by the adjustment you mention ? ) Anyway the behaviour above is how I interpret what you wrote ( hopefully that matches what you meant ) The problem is there may well be behavioural wrinkles yet unseen :-/ As for the style types that are covered the ones mentioned seem reasonable ( I admit I don't quite know which style types available from Excel's custom category tally with those we provide, I certainly see numeric, currency, percentage, date time type formats in there all of which afaict can take the repeat character ) Do we need to cover what might happen in a word table ? ( for me I would prefer to steer away from that if possible as I don't know what is reasonable behaviour there ) Also do we need to specify the behaviour with multiple occurrences of the 'number:fill-character' attributes? we did mention that in a previous discussion ( i am of course ok with vague to none ;-) ) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source
sc/source/filter/oox/worksheethelper.cxx | 59 +++ 1 file changed, 29 insertions(+), 30 deletions(-) New commits: commit e4ced293cab1551a2470eac833f8c0d7f35472e7 Author: Daniel Bankston daniel.dev.libreoff...@gmail.com Date: Thu May 10 14:04:42 2012 -0500 Remove extra XCell call and pass cell value directly to ScDocument. Change-Id: Idb16d82dad08f1028a065cba568682477fe41313 diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 3a3abc2..ebc8278 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -58,6 +58,7 @@ #include autofilterbuffer.hxx #include commentsbuffer.hxx #include condformatbuffer.hxx +#include document.hxx #include drawingfragment.hxx #include drawingmanager.hxx #include formulaparser.hxx @@ -77,7 +78,7 @@ namespace xls { // -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; @@ -263,17 +264,17 @@ public: /** Returns the XDrawPage interface of the draw page of the current sheet. */ Reference XDrawPage getDrawPage() const; /** Returns the size of the entire drawing page in 1/100 mm. */ -const Size getDrawPageSize() const; +const awt::Size getDrawPageSize() const; /** Returns the absolute position of the top-left corner of the cell in 1/100 mm. */ -Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; +awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the size of the cell in 1/100 mm. */ -SizegetCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; +awt::SizegetCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the address of the cell that contains the passed point in 1/100 mm. */ -CellAddress getCellAddressFromPosition( const Point rPosition ) const; +CellAddress getCellAddressFromPosition( const awt::Point rPosition ) const; /** Returns the cell range address that contains the passed rectangle in 1/100 mm. */ -CellRangeAddressgetCellRangeFromRectangle( const Rectangle rRect ) const; +CellRangeAddressgetCellRangeFromRectangle( const awt::Rectangle rRect ) const; /** Returns the buffer for cell contents and cell formatting. */ inline SheetDataBuffer getSheetData() { return maSheetData; } @@ -314,7 +315,7 @@ public: /** Extends the used area of this sheet by the passed cell range. */ voidextendUsedArea( const CellRangeAddress rRange ); /** Extends the shape bounding box by the position and size of the passed rectangle. */ -voidextendShapeBoundingBox( const Rectangle rShapeRect ); +voidextendShapeBoundingBox( const awt::Rectangle rShapeRect ); /** Sets base width for all columns (without padding pixels). This value is only used, if base width has not been set with setDefaultColumnWidth(). */ @@ -407,8 +408,8 @@ private: BiffSheetDrawingPtr mxBiffDrawing; /// Collection of all BIFF/DFF shapes. OUStringmaDrawingPath; /// Path to DrawingML fragment. OUStringmaVmlDrawingPath; /// Path to legacy VML drawing fragment. -SizemaDrawPageSize; /// Current size of the drawing page in 1/100 mm. -Rectangle maShapeBoundingBox; /// Bounding box for all shapes from all drawings. +awt::SizemaDrawPageSize; /// Current size of the drawing page in 1/100 mm. +awt::Rectangle maShapeBoundingBox; /// Bounding box for all shapes from all drawings. ISegmentProgressBarRef mxProgressBar; /// Sheet progress bar. ISegmentProgressBarRef mxRowProgress; /// Progress bar for row/cell processing. ISegmentProgressBarRef mxFinalProgress; /// Progress bar for finalization. @@ -589,23 +590,23 @@ Reference XDrawPage WorksheetGlobals::getDrawPage() const return xDrawPage; } -const Size WorksheetGlobals::getDrawPageSize() const +const awt::Size WorksheetGlobals::getDrawPageSize() const { OSL_ENSURE( (maDrawPageSize.Width 0) (maDrawPageSize.Height 0), WorksheetGlobals::getDrawPageSize - called too early, size invalid ); return maDrawPageSize; } -Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const +awt::Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const { -Point aPoint; +awt::Point aPoint; PropertySet aCellProp( getCell( CellAddress( getSheetIndex(), nCol, nRow ) ) ); aCellProp.getProperty( aPoint, PROP_Position ); return aPoint; } -Size
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source
sc/source/filter/oox/worksheethelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0dcc758b404272e252ab086f92c9a9426ee887e2 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu May 10 21:44:05 2012 +0200 remove accidently introduced tabs Change-Id: Ieb4b30e60b0fca93484afecd71554320da0f42ed diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index ebc8278..42e3f70 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1546,7 +1546,7 @@ void WorksheetHelper::setManualRowHeight( sal_Int32 nRow ) void WorksheetHelper::putValue( const CellAddress rAddress, double fValue ) const { - getScDocument().SetValue( (SCCOL)rAddress.Column, (SCROW)rAddress.Row, (SCTAB)rAddress.Sheet, fValue ); +getScDocument().SetValue( (SCCOL)rAddress.Column, (SCROW)rAddress.Row, (SCTAB)rAddress.Sheet, fValue ); } void WorksheetHelper::putFormulaResult( const CellAddress rAddress, double fValue ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - download
download |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2c1460684efcdd9fec4881d2cb4b2b301b62536f Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu May 10 14:48:18 2012 -0500 make fetch now use ./g update to set-up the submodules Change-Id: I2451ff33651e3d27c157a020ca60ab5cddd5282d diff --git a/download b/download index de7e5fc..91a46cc 100755 --- a/download +++ b/download @@ -50,7 +50,7 @@ check_file() if [ -d .git ] ; then #if [ -z $GIT_LINK_SRC ]; then -./g -f clone +./g update #else # space-saving clone from another local workdir #mkdir clone ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_
I would have thought that command line is more than 1024 chars. It reaches 1050 chars of arguments. But [1] defeated me. Longer path found is around 120 chars and a known limit is around 250 chars, so one more fail. Win2008 Win 7 are very close relatively to fixes, so I am pretty sure the difference is not there. [1] : http://support.microsoft.com/kb/830473 My 2 cents Mat M Le Thu, 10 May 2012 17:30:20 +0200, Noel Grandin n...@peralex.com a écrit: OK, so we know (a) it's not a cygwin thing (b) its not a visual C thing, because we're both on the same version (c) it works on a Windows7 box, but not a WindowsServer2008 box. So it's probably a bug that was fixed sometime in the WindowsVista or Windows7 timeframe. We could probably implement a configure check that looks like if $OS == WINDOWS $OS_VERSION Vista length($ROOT_PATH)XXX complain_loudly_and_exit() where we know XXX is less than 36 and more than 2, because C:/cygwin/home/tinderbox/libreoffice causes it to break and W: does not. Would you be able to figure out what the point is where it starts to break? On 2012-05-10 17:15, Lubos Lunak wrote: On Thursday 10 of May 2012, Noel Grandin wrote: Maybe it's a cygwin thing? I'm running a version that's about a month old (had to update because of other issues). I think it's 1.7.11 If you're out of date, could you try updating and see if that fixes it? It was quite recent cygwin even before, but the problem persists even with the most recent, 1.7.15. On 2012-05-10 14:26, Lubos Lunak wrote: Windows Server 2008R2 Enterprise, Service Pack 1 Visual Studio 2008 I'm not sure how to find out what exactly the culprint is or how to possibly do anything more than document it. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in solenv/gbuild
configure.in | 46 +-- solenv/gbuild/platform/macosx.mk | 14 +++ 2 files changed, 54 insertions(+), 6 deletions(-) New commits: commit a24a980424ec2ec81b13c8e5a95394d62cbf7406 Author: Tor Lillqvist t...@iki.fi Date: Thu May 10 22:59:30 2012 +0300 Make visibility tests work as intended on Mac OS X If the tests detect that visibiliy works, then use it also in gbuild. In the old build system, -fvisibility=hidden was already being used on Mac OS X if HAVE_GCC_VISIBILITY_FEATURE had been detected. In configure.in, let's not hardcode the -shared, -fpic and -Wl,-z,defs options or the .so suffix used in visibility-related tests. Factor them out and use platform-specific options. Done just for Mac OS X so far. Using the Linux options for Mac OS X caused visibility tests to silently and misleadingly fail. Yes, it is silly to now define some platform-specific options in three places: configure.in, solenv/inc/* for the old build system, and solenv/gbuild/platform/* for gbuild. At least with my Xcode3 installation, I need to pass an -isysroot flag pointing to the SDK when running $CC -E, otherwise headers weren't found. This was then misinterpreted as the visibility tests failing. Pass -DHAVE_GCC_VISIBILITY_FEATURE to the compiler if configure detected visibility working. In that case also pass -fvisibility=hidden. HAVE_GCC_VISIBILITY_FEATURE being defined is supposed to mean that the -fvisibility=hidden option is used, I think. Pass also -fvisibility-inlines-hidden if that was detected to work. Change-Id: I I I58d566fcb07584246e91f45e683ce9b31208edba diff --git a/configure.in b/configure.in index b09a935..4322a07 100644 --- a/configure.in +++ b/configure.in @@ -140,6 +140,18 @@ test_xrender=yes test_cups=yes test_fontconfig=yes +# Default values, as such probably valid just for Linux, set +# differently below just for Mac OS X,but at least better than +# hardcoding these as we used to do. Much of this is duplicated also +# in solenv for old build system and for gbuild, ideally we should +# perhaps define stuff like this only here in configure.in? + +LINKFLAGSSHL=-shared +PICSWITCH=-fpic +DLLPOST=.so + +LINKFLAGSNOUNDEFS=-Wl,-z,defs + case $host_os in solaris*) @@ -244,6 +256,16 @@ darwin*) # Mac OS X or iOS _os=Darwin fi enable_systray=no +# See comment above the case $host_os +LINKFLAGSSHL=-dynamiclib -single_module + +# -fPIC is default +PICSWITCH= + +DLLPOST=.dylib + +# -undefined error is the default +LINKFLAGSNOUNDEFS= ;; freebsd*) @@ -4661,6 +4683,11 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then AC_LANG_PUSH([C++]) +save_CPPFLAGS=$CPPFLAGS +if test -n $MACOSX_SDK_PATH; then +CPPFLAGS=-isysroot $MACOSX_SDK_PATH $CPPFLAGS +fi + if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then AC_MSG_CHECKING([if STL headers are visibility safe]) AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no) @@ -4674,7 +4701,7 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then sharedlink_ldflags_save=$LDFLAGS -LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden -fpic -shared +LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden $PICSWITCH $LINKFLAGSSHL AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -4682,7 +4709,13 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \); then using namespace std; ]], [[ istringstream strm( test ); return 0; -]])],[$EGREP -q unresolvable conftest.err; +]])], +# Ugh, surely bad to assume an error message will contain +# the word unresolvable, a problem with +# -fvisibility-inlines-hidden and STL headers might cause +# some more obscure message on some platform, and anway, +# the error message could be localised. +[$EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi],[gccvisok=no ]) AC_MSG_RESULT([$gccvisok]) @@ -4708,16 +4741,15 @@ struct S2: S1int { virtual ~S2(); }; struct S3: S2 { virtual ~S3(); }; S3::~S3() {} _ACEOF gccvisinlineshiddenok=yes -if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so /dev/null 2/dev/null; then +if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1$DLLPOST; then gccvisinlineshiddenok=no else -if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o libconftest2.so
Re: hidden visibility on mac (Re: [PUSHED][3-5] Re: [REVIEW 3-5] fdo#37044 crash on mac with transliteration)
This patch makes visibility detection work for me in my 10.4 tree. The build is still going so I can't say if the result will work;) Yes, seems to work, so pushed. Will see if it breaks something for others, or for instance with Xcode 2 and/or PPC. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Proposed patch for XKeycodeToKeysym deprecated
Hello, In vcl, compilation of master failed with these messages : /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx: In function ‘KeySym sal_XModifier2Keysym(Display*, XModifierKeymap*, int)’: /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:785:12: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:787:32: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx: In member function ‘KeySym SalDisplay::GetKeySym(XKeyEvent*, unsigned char*, int*, KeySym*, int*, XIC) const’: /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:1486:26: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:1486:76: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] cc1plus: all warnings being treated as errors make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/vcl/unx/generic/app/saldisp.o] Erreur 1 make[1]: *** Attente des tâches non terminées /home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx: In member function ‘bool x11::SelectionManager::handleDragEvent(XEvent)’: /home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx:2734:23: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] /home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx:2734:78: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations] cc1plus: all warnings being treated as errors make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/vcl/unx/generic/dtrans/X11_selection.o] Erreur 1 Since /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx hasn't changed recently and that compilation was OK yesterday, it must be due to my last update of Debian today (x86-64). Xlib.h is from the package libx11-dev The version is : 2:1.4.99.901-2 So I propose this patch : http://nabble.documentfoundation.org/file/n3978158/proposed_patch_vcl.txt proposed_patch_vcl.txt Any idea about this ? Julien. -- View this message in context: http://nabble.documentfoundation.org/PATCH-Proposed-patch-for-XKeycodeToKeysym-deprecated-tp3978158.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sot/source
sot/source/sdstor/stgstrms.cxx | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) New commits: commit 75e7643e22bcf674739ca890bfc06f80e872624b Author: Caolán McNamara caol...@redhat.com Date: Thu May 10 21:46:53 2012 +0100 Related: fdo#47644 get out of bounds conditions right Change-Id: Icac9a8337296f92af5007a051f00388a64955178 diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 88bc416..3ee485e 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -455,17 +455,14 @@ sal_Bool StgStrm::Pos2Page( sal_Int32 nBytePos ) } else { -size_t nBgnDistance = std::distance(m_aPagesCache.begin(), aI); +size_t nBgnIndex = std::distance(m_aPagesCache.begin(), aI); +size_t nIndex = nBgnIndex + nRel; -size_t nIndex = nBgnDistance + nRel; - -if (nIndex m_aPagesCache.size()) -{ -nRel = m_aPagesCache.size() - nBgnDistance; +if (nIndex = m_aPagesCache.size()) nIndex = m_aPagesCache.size() - 1; -} -else -nRel = 0; + +size_t nSuccessfulStepsTaken = nIndex - nBgnIndex; +nRel -= nSuccessfulStepsTaken; nLast = nIndex ? m_aPagesCache[nIndex - 1] : STG_EOF; nBgn = m_aPagesCache[nIndex]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-5] fdo#47644 performance regression on largish .doc
On Thu, 2012-05-10 at 17:37 +0100, Michael Meeks wrote: Surely that should read: nBgn = m_aPageCache[nRel]; or did I go a bit crazy ? [ I'm trying to turn the above into that mentally and giving up ;-]. how about a 4 element chain of 10 11 12 13 with a scenario of nBgn = 11, nRel = 2, desired result is 13 so nBgn of 11 gives a nBgnDistance of 1 so desired nIndex is 3, nBgnDistance (1) + nRel (2); so nBgn = m_aPagesCache[nIndex]; and set nRel to 0 to indicate successfully stepped to desired page with an alternative scenario of nBgn = 11, nRel = 8 get nBgnDistance of 1 again, so desired nIndex of 9, clip it as its out of scale to the max of 3, reduce nRel by how valid steps we took (2) to give 6 un-achievable steps oops my out-of-bounds code is all wrong :-) fixed with 75e7643e22bcf674739ca890bfc06f80e872624b StgFATStrm::SetPage(); should prolly just update that vector as well as doing the nasty fat walk so: m_aPageCache[nBlocks] = nNewPage; would have to check around the insertion point if the sort order is still valid afterwards I guess, throwing away everything is my current cowardly conservative approach on any modifications C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source
sc/source/filter/oox/worksheethelper.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 3248f6f3a304279f0bd1daf798aef7e614589520 Author: Daniel Bankston daniel.e.banks...@gmail.com Date: Thu May 10 15:56:59 2012 -0500 Remove extra XText call and pass string directly to ScDocument Change-Id: I568b86f34335bb9290ae796a6140d6e4ff65752b diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 42e3f70..0f6fb0a 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1558,9 +1558,7 @@ void WorksheetHelper::putFormulaResult( const CellAddress rAddress, double fVal void WorksheetHelper::putString( const CellAddress rAddress, const OUString rText ) const { -Reference XText xText( getCell( rAddress ), UNO_QUERY ); -OSL_ENSURE( xText.is(), WorksheetHelper::putString - missing text interface ); -if( xText.is() ) xText-setString( rText ); +getScDocument().SetString( (SCCOL)rAddress.Column, (SCROW)rAddress.Row, (SCTAB)rAddress.Sheet, rText ); } void WorksheetHelper::putRichString( const CellAddress rAddress, const RichString rString, const Font* pFirstPortionFont ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - salhelper/inc solenv/gbuild
salhelper/inc/salhelper/condition.hxx |2 - solenv/gbuild/platform/macosx.mk | 46 +- 2 files changed, 24 insertions(+), 24 deletions(-) New commits: commit fdca78702117f5972641896c675a0e12d44557e7 Author: Tor Lillqvist t...@iki.fi Date: Fri May 11 00:28:43 2012 +0300 It seems also nested struct needs SALHELPER_DLLPUBLIC for Mac OS X visibility Change-Id: Ifd7a248b49a00df2e01f537074d0a94e9de09b10 diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx index c50bc87..befa43f 100644 --- a/salhelper/inc/salhelper/condition.hxx +++ b/salhelper/inc/salhelper/condition.hxx @@ -92,7 +92,7 @@ namespace salhelper ConditionWaiter(Condition aCond); -struct timedout { +struct SALHELPER_DLLPUBLIC timedout { timedout(); timedout(timedout const ); commit 991e3520bc09a66504819d05807f10aa8de805ce Author: Tor Lillqvist t...@iki.fi Date: Thu May 10 23:45:38 2012 +0300 Argh, make the use of -fvisibility=hidden actually happen Move initialisations of gb_CFLAGS and gb_CXXFLAGS earlier, like in unxgcc.mk. Change-Id: I2382edad42f0f52bcbb062ec6930e2cfe12ec8ca diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5ad4f3d..3348853 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -47,6 +47,29 @@ gb_OSDEFS := \ $(EXTRA_CDEFS) \ +gb_CFLAGS := \ + -isysroot $(gb_SDKDIR) \ + $(gb_CFLAGS_COMMON) \ + -fPIC \ + -fno-strict-aliasing \ +#-Wshadow \ break in compiler headers already + +# For -Wno-non-virtual-dtor see http://markmail.org/message/664jsoqe6n6smy3b +# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org from +# Feb 1, 2006: +gb_CXXFLAGS := \ + -isysroot $(gb_SDKDIR) \ + $(gb_CXXFLAGS_COMMON) \ + -fPIC \ + -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor \ + -fno-strict-aliasing \ + -fsigned-char \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \ + #-Wshadow \ break in compiler headers already + #-fsigned-char \ might be removed? + #-malign-natural \ might be removed? + ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) gb_COMPILERDEFS += \ -DHAVE_GCC_VISIBILITY_FEATURE \ @@ -71,29 +94,6 @@ gb_COMPILERDEFS += \ endif -gb_CFLAGS := \ - -isysroot $(gb_SDKDIR) \ - $(gb_CFLAGS_COMMON) \ - -fPIC \ - -fno-strict-aliasing \ -#-Wshadow \ break in compiler headers already - -# For -Wno-non-virtual-dtor see http://markmail.org/message/664jsoqe6n6smy3b -# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org from -# Feb 1, 2006: -gb_CXXFLAGS := \ - -isysroot $(gb_SDKDIR) \ - $(gb_CXXFLAGS_COMMON) \ - -fPIC \ - -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ - -fno-strict-aliasing \ - -fsigned-char \ - $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \ - #-Wshadow \ break in compiler headers already - #-fsigned-char \ might be removed? - #-malign-natural \ might be removed? - ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
To whom it may concern All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Thanks and regards Keith McRae ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - 2 commits - sc/source
sc/source/filter/oox/worksheethelper.cxx | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) New commits: commit 1ef72f5bf48516113b0f3b25e52d124229a792b2 Author: Daniel Bankston daniel.e.banks...@gmail.com Date: Thu May 10 17:12:09 2012 -0500 Removed sneaky evil tabs. Change-Id: Ibf27039e2449e5452f8401b298ee30fe13682c89 diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 642fa4d..49ab86a 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1554,8 +1554,8 @@ void WorksheetHelper::putValue( const CellAddress rAddress, double fValue ) con void WorksheetHelper::putFormulaResult( const CellAddress rAddress, double fValue ) const { ScDocument rDoc = getScDocument(); - ScAddress aCellPos; - ScUnoConversion::FillScAddress( aCellPos, rAddress ); +ScAddress aCellPos; +ScUnoConversion::FillScAddress( aCellPos, rAddress ); if ( rDoc.GetCellType( aCellPos ) == CELLTYPE_FORMULA ) { ScFormulaCell* pCell = (ScFormulaCell *)rDoc.GetCell( aCellPos ); commit 2ee400c8dcd6088eccd4bcb70ffb0342ac002cbc Author: Daniel Bankston daniel.e.banks...@gmail.com Date: Thu May 10 17:01:37 2012 -0500 Pass forumlaResult value directly to ScDocument - Removed extra call to XCell2 and instead passed formula result directly to ScDocument. Change-Id: Ifea731e44f12a048b76f8d5a4cc2d0619a56bbbc diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0f6fb0a..642fa4d 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -56,8 +56,10 @@ #include oox/helper/propertyset.hxx #include addressconverter.hxx #include autofilterbuffer.hxx +#include cell.hxx #include commentsbuffer.hxx #include condformatbuffer.hxx +#include convuno.hxx #include document.hxx #include drawingfragment.hxx #include drawingmanager.hxx @@ -1551,9 +1553,16 @@ void WorksheetHelper::putValue( const CellAddress rAddress, double fValue ) con void WorksheetHelper::putFormulaResult( const CellAddress rAddress, double fValue ) const { -Reference XCell2 xCell( getCell( rAddress ), UNO_QUERY ); -OSL_ENSURE( xCell.is(), WorksheetHelper::putFormulaResult - missing cell interface ); -if( xCell.is() ) xCell-setFormulaResult( fValue ); +ScDocument rDoc = getScDocument(); + ScAddress aCellPos; + ScUnoConversion::FillScAddress( aCellPos, rAddress ); +if ( rDoc.GetCellType( aCellPos ) == CELLTYPE_FORMULA ) +{ +ScFormulaCell* pCell = (ScFormulaCell *)rDoc.GetCell( aCellPos ); +pCell-SetHybridDouble( fValue ); +pCell-ResetDirty(); +pCell-ResetChanged(); +} } void WorksheetHelper::putString( const CellAddress rAddress, const OUString rText ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/condformatbuffer.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit d0e4d1f397e9302aeb32aa7590292d9b86fe954b Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri May 11 01:22:12 2012 +0200 map percentile and percent into the same element This is most likely wrong but I have not yet an idea what should be the difference between these two. Change-Id: I3ee87de8d3b3f9a495ee653576a533690d66a3d0 diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 89ba949..bce9ed4 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -172,8 +172,14 @@ void ColorScaleRule::importCfvo( const AttributeList rAttribs ) { maColorScaleRuleEntries[mnCfvo].mbMax = true; } +else if( aType == percent ) +{ +maColorScaleRuleEntries[mnCfvo].mbPercent = true; +} else if( aType == percentile ) { +// this is most likely wrong but I have no idea what the difference +// between percent and percentile should be when calculating colors maColorScaleRuleEntries[mnCfvo].mbPercent = true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
blanket license statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Regards, Luke Dixon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to add color scales to ODF?
Hey Thorsten, I'm open for suggestions how I can add this sanely to ods. I would like to support as much from MSO 2010's color scale feature as possible but have no idea yet what I can achieve in the remaining 4 weeks. Hi Markus, you're the man on the ground, so I'd guess you'll know best how to do it, and do it future-proof. That said, conceptually, ODF has historically preferred attributes over too deeply nested element hierarchies - which tend to provide less structure. The question here is more how to deal with having the conditional formatting information stored inside the style section. Color scales and data bars are a special form of conditional formatting that have nothing to do with styles. I could add them with some work into the styles section of the ods file but this just feels wrong. A possible way a color scale entry would look like is: colorScale range=$A$4:$D$10 entry type=value val=10 col=ff11ff entry type=max col=ff /colorScale colorScale range=$H3:$I$20 entry type=min col=ff11ff entry type=percent val=30 col=aa entry type=percent val=70 col=bb entry type=max col=ff /colorScale For color scales and data bars( that are more or less just another way to represent the same information ) there are quite some differences to normal conditional formatting. One important difference is that the range the color scale is applied to is really important (min, max, percent, percentile) don't make sense without a range. They don't refer to a fixed style information, the color mentioned in the xml is only there to calculate the real color. I think the types are totally different to the types defined for normal conditional formatting, except for formula and value they always refer to the range. I know that these ideas and comment don't really help finding a solution for my problem but right now I mostly know what color scales are not. And the first thing I had to learn is that they don't really fit into our existing conditional formatting system. This is not limited to odf, I have exactly the same problem with style system vs. dynamically calculating the formatting information in my implementation Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#46223: Fix Presenter Console help screen layout
The code for laying out the Presenter Console help screen has a number of errors: 1. It starts with an initial guess for the font size, then attempts to reduce that size until a suitable value is found. This fails when the initial guess is already too small. 2. It fails to take the space taken up by the Close button into account. As a result, help text may overlap the Close button. 3. Long lines are only wrapped next to commas, and never at spaces. This can cause text to get clipped horizontally, instead of being correctly wrapped. This patch fixes these issues. Wrapping still prefers commas to spaces, but if a sequence containing no commas cannot fit on a single line, it resorts to space-based wrapping. This way, clipping can only occur if a single long word cannot fit on a line - hardly a plausible scenario. 0001-fdo-46223-Fix-Presenter-Console-help-screen-layout.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/colorscale.hxx | 11 sc/source/core/data/colorscale.cxx| 41 ++ sc/source/filter/inc/condformatbuffer.hxx |3 +- sc/source/filter/oox/condformatbuffer.cxx | 15 +- 4 files changed, 62 insertions(+), 8 deletions(-) New commits: commit cdd36980f1e9517280d579a2467f46f87fec8237 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri May 11 06:47:37 2012 +0200 repaint for every change when using formulas in color scales Change-Id: I1eb42ac75228dee00079c86e7c378efb72f16e28 diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index a95eec6..8a5b203 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -59,6 +59,7 @@ public: bool GetMin() const; bool GetMax() const; bool GetPercent() const; +bool HasFormula() const; void SetMin(bool bMin); void SetMax(bool bMax); void SetPercent(bool bPercent); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c24fc35..33aff61 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -104,6 +104,11 @@ bool ScColorScaleEntry::GetPercent() const return mbPercent; } +bool ScColorScaleEntry::HasFormula() const +{ +return mpCell; +} + void ScColorScaleEntry::SetMin(bool bMin) { mbMin = bMin; @@ -369,7 +374,13 @@ bool ScColorScaleFormat::CheckEntriesForRel(const ScRange rRange) const for(const_iterator itr = begin(); itr != end(); ++itr) { if(itr-GetMin() || itr-GetMax()) +{ bNeedUpdate = true; +break; +} + +if(itr-HasFormula()) +return true; } // TODO: check also if the changed value is the new min/max commit fc48c494347124dffddccca7d75707a22ca65f75 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri May 11 06:38:57 2012 +0200 import formulas for color scales from xlsx Change-Id: If19c6486c95cab0106bf04a4ec68359f7a4ed220 diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 7eb6342..b8b2d65 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -84,6 +84,7 @@ struct ColorScaleRuleModelEntry bool mbMin; bool mbMax; bool mbPercent; +rtl::OUString maFormula; ColorScaleRuleModelEntry(): maColor(), @@ -101,7 +102,7 @@ public: void importCfvo( const AttributeList rAttribs ); void importColor( const AttributeList rAttribs ); -void AddEntries( ScColorScaleFormat* pFormat ); +void AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, const ScAddress rAddr ); private: const CondFormat mrCondFormat; diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index bce9ed4..dd6150f 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -182,6 +182,11 @@ void ColorScaleRule::importCfvo( const AttributeList rAttribs ) // between percent and percentile should be when calculating colors maColorScaleRuleEntries[mnCfvo].mbPercent = true; } +else if( aType == formula ) +{ +rtl::OUString aFormula = rAttribs.getString( XML_val, rtl::OUString() ); +maColorScaleRuleEntries[mnCfvo].maFormula = aFormula; +} ++mnCfvo; } @@ -212,7 +217,7 @@ void ColorScaleRule::importColor( const AttributeList rAttribs ) ++mnCol; } -void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat ) +void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, const ScAddress rAddr ) { //assume that both vectors contain the same entries // TODO: check it @@ -228,6 +233,9 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat ) if(rEntry.mbPercent) pEntry-SetPercent(true); +if(!rEntry.maFormula.isEmpty()) +pEntry-SetFormula(rEntry.maFormula, pDoc, rAddr, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1); + pFormat-AddEntry( pEntry ); } } @@ -699,7 +707,6 @@ void CondFormatRule::finalizeImport( const Reference XSheetConditionalEntries ScDocument rDoc = getScDocument(); ScColorScaleFormat* pFormat = new ScColorScaleFormat(rDoc); -mpColor-AddEntries( pFormat ); sal_Int32 nIndex = rDoc.AddColorScaleFormat(pFormat); ScRangeList aList; @@ -720,6 +727,10 @@ void CondFormatRule::finalizeImport( const Reference XSheetConditionalEntries aList.Append(aRange); } pFormat-SetRange(aList); +if(aList.size()) +mpColor-AddEntries( pFormat, rDoc, aList.front()-aStart ); +else +mpColor-AddEntries( pFormat, rDoc, ScAddress() ); } } commit caa7f3f564cbf2ee695e806916041b2694710b6b Author: Markus Mohrhard