LibreOffice Gerrit News for core on 2014-06-20
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Convert DLG_ASS to .ui in https://gerrit.libreoffice.org/9834 from Mihály Palenik about module extras, sd End of freshness + Dropdown combo-/listboxes should support accessible action togglePopup in https://gerrit.libreoffice.org/9833 from Niklas Johansson about module accessibility + Start translation of German comments in https://gerrit.libreoffice.org/9832 from Philipp Weissenbacher about module svl + Translate German comments, fix some ws in https://gerrit.libreoffice.org/9831 from Philipp Weissenbacher about module sc + fdo#80195 IFERROR() fails to return correct value in https://gerrit.libreoffice.org/9830 from Winfried Donkers about module sc * Merged changes on master for project core changed in the last 25 hours: + fdo#79599: use \highlightN instead of \chcbpatN in RTF import and export in https://gerrit.libreoffice.org/9776 from Norbert X + fdo#78590: Fix for Corruption of para with framePr drawing object into in https://gerrit.libreoffice.org/9389 from Rohit Deshmukh + related fdo#63230: Fix unit test for fdo#44286 to run in all locales in https://gerrit.libreoffice.org/9826 from Isamu Mogi * Abandoned changes on master for project core changed in the last 25 hours: + completely fixed fdo#79599, added unit-tests for it in https://gerrit.libreoffice.org/9778 from Norbert X + fixed unit-test for fdo#61909 which is related to fdo#79599 fix in https://gerrit.libreoffice.org/9777 from Norbert X + fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2 in https://gerrit.libreoffice.org/9327 from Winfried Donkers * Open changes needing tweaks, but being untouched for more than a week: + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + configure, gbuild: remove Cygwin paths from make environment in https://gerrit.libreoffice.org/9698 from Michael Stahl + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa sw/source
oox/source/export/vmlexport.cxx |2 +- sw/qa/extras/ooxmlexport/data/fdo79591.docx |binary sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 15 +++ sw/source/filter/ww8/docxsdrexport.cxx |2 +- 4 files changed, 17 insertions(+), 2 deletions(-) New commits: commit 7ea1bbe712cef48a97faffdf03b45f2812a93e62 Author: Dinesh Patil dinesh.pa...@synerzip.com Date: Thu Jun 12 11:34:32 2014 +0530 fdo#79591 Values for docPr name and shape ID attributes were set invalid Values set for docPr name and shape ID attributes in RT file were not valid as per UTF-8 encoding format and hence was showing RT document as corrupt with error message invalid character. Calling add() function with current parameters is causing issue and setting invalid values so modified the second parameter which will set valid values to the specified parameters. Reviewed on: https://gerrit.libreoffice.org/9746 Change-Id: I3b48e53adbe5ed844235e596bb98eb396133845a diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 490bc7b..69242d6 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -821,7 +821,7 @@ void VMLExport::Commit( EscherPropertyContainer rProps, const Rectangle rRect OUString idStr = SvxMSDffManager::MSDFFReadZString(aStream, it-nPropSize, true); aStream.Seek(0); if (!IsWaterMarkShape(m_pSdrObject-GetName())) - m_pShapeAttrList-add(XML_ID, OUStringToOString(idStr, RTL_TEXTENCODING_UTF8)); + m_pShapeAttrList-add(XML_ID, OUStringToOString(idStr, RTL_TEXTENCODING_UTF8).getStr()); bAlreadyWritten[ESCHER_Prop_wzName] = true; } diff --git a/sw/qa/extras/ooxmlexport/data/fdo79591.docx b/sw/qa/extras/ooxmlexport/data/fdo79591.docx new file mode 100644 index 000..32a61de Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79591.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 25a6cf7..20ee7c3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -1811,6 +1811,21 @@ DECLARE_OOXMLEXPORT_TEST(testTextboxRoundedCorners, textbox-rounded-corners.doc CPPUNIT_ASSERT_EQUAL(OUString(a), xCell-getString()); } +DECLARE_OOXMLEXPORT_TEST(testfdo79591, fdo79591.docx) +{ +/* Values set for docPr name and shape ID attributes + * in RT file were not valid as per UTF-8 encoding format + * and hence was showing RT document as corrupt with error + * message invalid character + */ +xmlDocPtr pXmlDoc = parseExport(word/document.xml); +if (!pXmlDoc) + return; + +assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:docPr, name, ); +assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:shape, ID, ); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 42e9f9c..d3efe2a 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -724,7 +724,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt* sax_fastparser::FastAttributeList* pDocPrAttrList = pFS-createAttrList(); pDocPrAttrList-add(XML_id, OString::number(nAnchorId).getStr()); -pDocPrAttrList-add(XML_name, OUStringToOString(pSdrObject-GetName(), RTL_TEXTENCODING_UTF8)); +pDocPrAttrList-add(XML_name, OUStringToOString(pSdrObject-GetName(), RTL_TEXTENCODING_UTF8).getStr()); if (!pSdrObject-GetTitle().isEmpty()) pDocPrAttrList-add(XML_title, OUStringToOString(pSdrObject-GetTitle(), RTL_TEXTENCODING_UTF8)); if (!pSdrObject-GetDescription().isEmpty()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Useful string function in inputwin.cxx
Hi Philipp, On Thu, Jun 19, 2014 at 10:18:28PM +0200, Philipp Weissenbacher p.weissenbac...@gmail.com wrote: Would that be something one could move to another place (like ustring.cxx) where other code could use it too? If you do that, you probably want to add it to include/comphelper/string.hxx: // OUString helper functions that are not widespread or mature enough to // go into the stable URE API I would say best to do that if there are at least two users for it. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo79968.docx |binary sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx |binary sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 42 +++ sw/source/filter/ww8/docxattributeoutput.cxx | 18 + 5 files changed, 60 insertions(+) New commits: commit 9f8785074512d6442fd97d67860fd625ac4d6bb1 Author: Yogesh Bharate yogesh.bhar...@synerzip.com Date: Fri Jun 13 16:15:16 2014 +0530 fdo#79968: fdo#79969: Fix for embedded powerpoint excel sheet in docx. Problem Description: fdo#79968: 1. Document contains embedded powerpoint in docx. 2. After RT, embedded powerpoint object is not preserved. 3. In this case, .sldx is get converted to .bin due to this powerpoint slides is getting converted to picture. fdo#79969: 1. Document contains embedded excel work sheet. 2. After RT, embedded excel sheet is not preserved. 3. In this case, .xlsm is get converted to .xls. 4. Similar case happened with binary excel work sheet. Implementation: Added sMediaType, sRelationType sFileExtension for embedded excel sheet, binary excel sheet powerpoint slide. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/9765 Change-Id: I8f94e3f9293f2ac98b61f919d60ca556695b26c2 diff --git a/sw/qa/extras/ooxmlexport/data/fdo79968.docx b/sw/qa/extras/ooxmlexport/data/fdo79968.docx new file mode 100644 index 000..2da7ddc Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79968.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx new file mode 100644 index 000..0e41399 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx new file mode 100644 index 000..6fd11f3 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 5b0244e..7368b46 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3648,6 +3648,48 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78590, FDO78590.docx) assertXPath ( pXmlDoc, /w:document/w:body/w:p[1]/w:pPr/w:framePr, h, 1669 ); } +DECLARE_OOXMLEXPORT_TEST(testfdo79968_sldx, fdo79968.docx) +{ +// This UT for DOCX embedded with powerpoint slide +xmlDocPtr pXmlDoc = parseExport([Content_Types].xml); + +if (!pXmlDoc) + return; + +assertXPath(pXmlDoc, + /ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.presentationml.slide'], +PartName, +/word/embeddings/oleObject1.sldx); +} + +DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb, fdo79969_xlsb.docx) +{ +// This UT for DOCX embedded with binary excel work sheet. +xmlDocPtr pXmlDoc = parseExport([Content_Types].xml); + +if (!pXmlDoc) + return; + +assertXPath(pXmlDoc, + /ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.binary.macroEnabled.12'], +PartName, +/word/embeddings/oleObject1.xlsb); +} + +DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, fdo79969_xlsm.docx) +{ +// This UT for DOCX embedded with excel work sheet. +xmlDocPtr pXmlDoc = parseExport([Content_Types].xml); + +if (!pXmlDoc) + return; + +assertXPath(pXmlDoc, + /ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.macroEnabled.12'], +PartName, +/word/embeddings/oleObject1.xlsm); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index ebaaecb..06230f4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4328,6 +4328,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode, const Size rSize, const S sRelationType = http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;; sFileExtension = xlsx; } +else if(sProgID.startsWith(Excel.SheetBinaryMacroEnabled.12) ) +{ +sMediaType = application/vnd.ms-excel.sheet.binary.macroEnabled.12; +sRelationType = http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;; +sFileExtension = xlsb; +} +else if( sProgID.startsWith(Excel.SheetMacroEnabled.12) ) +{ +sMediaType = application/vnd.ms-excel.sheet.macroEnabled.12; +sRelationType =
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx |binary sw/qa/extras/ooxmlimport/data/fdo78904.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 ++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 23 -- 4 files changed, 28 insertions(+), 6 deletions(-) New commits: commit 75fc9e669f209472ec6a282848166d96d02d84d9 Author: Umesh Kadam umesh.ka...@synerzip.com Date: Fri Jun 13 17:26:19 2014 +0530 fdo#78904 : LO hangs while saving the document. - In case of framePr attributes being omitted in original xml, LO defaults such attributes to incorrect values. - Correcting these values in this fix. - This fix stops LO from getting hang while saving the document, the actual fix needs to be somewhere in the table layout. We need to restrict the frame from being considered as part of the table as MSO does not allow frame to be part of a table. Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60 Reviewed-on: https://gerrit.libreoffice.org/9774 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx new file mode 100644 index 000..dce50f3 Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx differ diff --git a/sw/qa/extras/ooxmlimport/data/fdo78904.docx b/sw/qa/extras/ooxmlimport/data/fdo78904.docx new file mode 100644 index 000..c171ae2 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo78904.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a2c4997..d1b7730 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1175,6 +1175,17 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, tools-line-numbering.docx) CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue); } +DECLARE_OOXMLIMPORT_TEST(testfdo78904, fdo78904.docx) +{ +uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); +if (xIndexAccess-getCount()) +{ +uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(0)), getPropertysal_Int32(xFrame, HoriOrientPosition)); +} +} + DECLARE_OOXMLIMPORT_TEST(testFdo60922, fdo60922.docx) { // This was 0, not 100, due to wrong import of w:position w:val=0 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index cbf7ea3..8b1ea55 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -42,6 +42,7 @@ #include com/sun/star/text/HoriOrientation.hpp #include com/sun/star/text/VertOrientation.hpp #include com/sun/star/text/ReferenceFieldPart.hpp +#include com/sun/star/text/RelOrientation.hpp #include com/sun/star/text/ReferenceFieldSource.hpp #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/TextContentAnchorType.hpp @@ -772,6 +773,8 @@ void lcl_AddRangeAndStyle( //define some default frame width - 0cm ATM: this allow the frame to be wrapped around the text #define DEFAULT_FRAME_MIN_WIDTH 0 +#define DEFAULT_FRAME_MIN_HEIGHT 0 +#define DEFAULT_VALUE 0 void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) { @@ -826,7 +829,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) pFrameProperties[1].Value = rAppendContext.pLastParagraphProperties-Geth() 0 ? rAppendContext.pLastParagraphProperties-Geth() : -pStyleProperties-Geth(); +pStyleProperties-Geth() 0 ? pStyleProperties-Geth() : DEFAULT_FRAME_MIN_HEIGHT; pFrameProperties[2].Value = sal_Int16( rAppendContext.pLastParagraphProperties-GethRule() = 0 ? @@ -841,13 +844,17 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) pStyleProperties-GetxAlign() = 0 ? pStyleProperties-GetxAlign() : text::HoriOrientation::NONE ); pFrameProperties[4].Value = nHoriOrient; +//set a non negative default value pFrameProperties[5].Value = rAppendContext.pLastParagraphProperties-IsxValid() ? -rAppendContext.pLastParagraphProperties-Getx() : pStyleProperties-Getx(); +rAppendContext.pLastParagraphProperties-Getx() : +pStyleProperties-IsxValid() ? pStyleProperties-Getx() : DEFAULT_VALUE; + +//Default the anchor in case FramePr_hAnchor is missing ECMA 17.3.1.11
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLParserState.cxx | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) New commits: commit cfbd50c957e9ab12ee843f9239561ed741f5a3e2 Author: Jan Holesovsky ke...@collabora.com Date: Fri Jun 20 10:28:29 2014 +0200 writerfilter: Minor cleanup in OOXMLParserState. Change-Id: Ib715d2794c9a6f036ad809641fb0dda2d10a1968 diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index 87644aa..eae35fa 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -122,8 +122,7 @@ void OOXMLParserState::resolveCharacterProperties(Stream rStream) } } -void OOXMLParserState::setCharacterProperties -(OOXMLPropertySet::Pointer_t pProps) +void OOXMLParserState::setCharacterProperties(OOXMLPropertySet::Pointer_t pProps) { if (mpCharacterProps.get() == NULL) mpCharacterProps = pProps; @@ -131,8 +130,7 @@ void OOXMLParserState::setCharacterProperties mpCharacterProps-add(pProps); } -void OOXMLParserState::setCellProperties -(OOXMLPropertySet::Pointer_t pProps) +void OOXMLParserState::setCellProperties(OOXMLPropertySet::Pointer_t pProps) { if (!mCellProps.empty()) { @@ -145,8 +143,7 @@ void OOXMLParserState::setCellProperties } } -void OOXMLParserState::setRowProperties -(OOXMLPropertySet::Pointer_t pProps) +void OOXMLParserState::setRowProperties(OOXMLPropertySet::Pointer_t pProps) { if (!mRowProps.empty()) { @@ -202,8 +199,7 @@ void OOXMLParserState::resolveTableProperties(Stream rStream) } } -void OOXMLParserState::setTableProperties -(OOXMLPropertySet::Pointer_t pProps) +void OOXMLParserState::setTableProperties(OOXMLPropertySet::Pointer_t pProps) { if (!mTableProps.empty()) { @@ -240,8 +236,8 @@ void OOXMLParserState::incContextCount() void OOXMLParserState::startTxbxContent() { -if( inTxbxContent ) -SAL_WARN( writerfilter, Nested w:txbxContent ); +SAL_WARN_IF(inTxbxContent, writerfilter, Nested w:txbxContent); + inTxbxContent = true; // Do not save and reset section group state, it'd cause a new page. //savedInSectionGroup = mbInSectionGroup; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Which source files / documentation - line routing - connecting edges between nodes?
Folks, I am new to the LibraOffice code base. I am trying to find the source code files / documentation for routing connectors in drawings (LibraOffice Impress). I would like to understand the algorithm / design. I have downloaded the complete repository from GIT - have been searching the code but cannot find what I am looking for. Any suggestions for: (1) Actual source file names? (2) Method / Function names? (3) Good key words to search for (Nodes, Edges)? The perfect solution would be documentation / presentation / white-papers on how this is designed / implemented. Thank you for any help. Rob ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx |binary 1 file changed New commits: commit 36b1c27b26e113651a6ac9000677920886786503 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 11:54:45 2014 +0200 CppunitTest_sw_ooxmlsdrexport: clean up testFDO77122 The document contained a few unrelated shapes and it was reported that those cause testcase failures, depending on the version of some system libraries (at least Ubuntu 14.04 is reported to be affected). Change-Id: I1aaf02441e2bc30d1a5465b038211deb240a5b69 diff --git a/sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx b/sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx index 1c953c2..48a5f64 100644 Binary files a/sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx and b/sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Which source files / documentation - line routing - connecting edges between nodes?
Hi, On Fri, Jun 20, 2014 at 10:54:53AM +0100, Rob Collins wrote: Folks, I am new to the LibraOffice code base. I am trying to find the source code files / documentation for routing connectors in drawings (LibraOffice Impress). I would like to understand the algorithm / design. (1) Actual source file names? svx/source/svdraw/svdoedge.cxx (2) Method / Function names? SdrEdgeObj::ImpRecalcEdgeTrack The perfect solution would be documentation / presentation / white-papers on how this is designed / implemented. There is an overview of possible types of connector paths at line 1524 (someone has translated it to English already, too). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - offapi/com sw/source vcl/unx
offapi/com/sun/star/accessibility/AccessibleEventId.idl |7 sw/source/core/access/accpara.cxx | 11 ++ vcl/unx/gtk/a11y/atklistener.cxx|8 vcl/unx/gtk/a11y/atkwrapper.cxx | 26 vcl/unx/gtk/a11y/atkwrapper.hxx |1 5 files changed, 47 insertions(+), 6 deletions(-) New commits: commit 6e791a6a1e170bb46765848411bf23d39738e4a3 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 6 10:23:03 2014 + coverity#736301 the 2nd arg is a gpointer Change-Id: I66e57d570c5ae70e69eea2d44812a72a3b67509e diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 5b4da23..b93f6eb 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -599,7 +599,7 @@ atk_object_wrapper_class_init (AtkObjectWrapperClass *klass) static void atk_object_wrapper_init (AtkObjectWrapper *wrapper, - AtkObjectWrapperClass) + AtkObjectWrapperClass*) { wrapper-mpAction = NULL; wrapper-mpComponent = NULL; commit e9f0fb287cb58d7139bc39e0df89a2b521816aab Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Tue Feb 4 15:07:51 2014 +0100 fdo#35105: notify role change through a new UNO a11y event A new UNO accessibility event called ROLE_CHANGED has been created. It should be triggered when an accessible object changes its role and every accessibility toolkit should use its own methods to make that change effective. Code to support the event in ATK has been added. Change-Id: I132e303bdb148967231334458c3cfa369c36ec8f Reviewed-on: https://gerrit.libreoffice.org/7853 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl index 7e31996..20d0d05 100644 --- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl +++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl @@ -380,6 +380,13 @@ constants AccessibleEventId const short PAGE_CHANGED =38; const short SECTION_CHANGED =39; const short COLUMN_CHANGED =40; + +/** Constant used to indicate that the role of an accessible object has +changed. + +@since LibreOffice 4.3 +*/ +const short ROLE_CHANGED =41; }; }; }; }; }; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index b4baca3..6dcfb8b 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -440,7 +440,16 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired ) bIsHeading = bNewIsHeading; } -if( bNewIsHeading != bOldIsHeading || rText != sOldText ) +if( bNewIsHeading != bOldIsHeading ) +{ +// The role has changed +AccessibleEventObject aEvent; +aEvent.EventId = AccessibleEventId::ROLE_CHANGED; + +FireAccessibleEvent( aEvent ); +} + +if( rText != sOldText ) { OUString sNewDesc( GetDescription() ); OUString sOldDesc; diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index f1614d8..f13a0a3 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -549,6 +549,14 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject aEven g_signal_emit_by_name( G_OBJECT( atk_obj ), property_change::accessible-hypertext-offset); break; +case accessibility::AccessibleEventId::ROLE_CHANGED: +{ +uno::Reference accessibility::XAccessibleContext xContext; +xContext = getAccessibleContextFromSource( aEvent.Source ); +atk_object_wrapper_set_role( mpWrapper, xContext-getAccessibleRole() ); +break; +} + default: g_warning( Unknown event notification %d, aEvent.EventId ); break; diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index ab0b275..5b4da23 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -877,6 +877,14 @@ void atk_object_wrapper_remove_child(AtkObjectWrapper* wrapper, AtkObject *child /*/ +void atk_object_wrapper_set_role(AtkObjectWrapper* wrapper, sal_Int16 role) +{ +AtkObject *atk_obj = ATK_OBJECT( wrapper ); +atk_object_set_role( atk_obj, mapToAtkRole( role ) ); +} + +/*/ + #define RELEASE(i) if( i ) { i-release(); i = NULL; } void atk_object_wrapper_dispose(AtkObjectWrapper* wrapper) diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/column-break.rtf |1 + sw/qa/extras/rtfimport/rtfimport.cxx |6 ++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 8 insertions(+) New commits: commit 3ea80a46860f7fe510b206845b56daad1e2d1c56 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 12:52:03 2014 +0200 RTF import: handle column break at the very start of the document Change-Id: Ib7d166bf1b1e5d5216d822b2b0396aa4dc535c6f diff --git a/sw/qa/extras/rtfimport/data/column-break.rtf b/sw/qa/extras/rtfimport/data/column-break.rtf new file mode 100644 index 000..185fcd0 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/column-break.rtf @@ -0,0 +1 @@ +{\rtf1\cols2\column hello\par} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 3dec26e..d834fb8 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1759,6 +1759,12 @@ DECLARE_RTFIMPORT_TEST(testFontOverride, font-override.rtf) CPPUNIT_ASSERT_EQUAL(OUString(Arial), getPropertyOUString(getRun(getParagraph(1), 1), CharFontName)); } +DECLARE_RTFIMPORT_TEST(testColumnBreak, column-break.rtf) +{ +// Column break at the very start of the document was ignored. +CPPUNIT_ASSERT_EQUAL(style::BreakType_COLUMN_BEFORE, getPropertystyle::BreakType(getParagraph(2), BreakType)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3a7ebfb..1be8c91 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2243,6 +2243,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) if (pNum.get() pNum-getInt() 1) bColumns = true; } +checkFirstRun(); if (bColumns) { sal_uInt8 sBreak[] = { 0xe }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Harbuzz requirements clarification
Hello guys, When trying to build 4.3 on openSUSE-12.3 I get this error: /home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.0.beta2-buildfix1/vcl/generic/glyphs/gcach_layout.cxx: In member function 'virtual bool HbLayoutEngine::layout(ServerFontLayout, ImplLayoutArgs)': [ 2748s] /home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.0.beta2-buildfix1/vcl/generic/glyphs/gcach_layout.cxx:423:28: error: 'HB_BUFFER_FLAG_DEFAULT' was not declared in this scope So I would like to know if this should be fixed or if the required version of harbuzz should be updated. Cheers Tom ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/gsoc14-libcmis'
New branch 'feature/gsoc14-libcmis' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit 966c38038352a347f25d690f18a2059d6f78b9fa Author: Armin Le Grand a...@apache.org Date: Fri Jun 20 11:51:09 2014 + i121410 Secured usage of pTextGroup diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6622cda..1986212 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1786,7 +1786,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasAnimateForm ) { -if( pTextGroup-getAnimateForm() != bAnimateForm ) +if( pTextGroup.get() pTextGroup-getAnimateForm() != bAnimateForm ) { if( (pTextGroup-getTextGrouping() = 0) (nTextGrouping == -1 ) ) { @@ -1804,22 +1804,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextGrouping ) { -if( (pTextGroup-getTextGrouping() != nTextGrouping) ) +if( pTextGroup.get() pTextGroup-getTextGrouping() != nTextGrouping ) { pEffectSequence-setTextGrouping( pTextGroup, nTextGrouping ); bChanged = true; } } -if (!bDoSetAnimateFormFirstbNeedDoSetAnimateForm) +if (!bDoSetAnimateFormFirst bNeedDoSetAnimateForm) { -pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); -bChanged = true; +if( pTextGroup.get() ) +{ +pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); +bChanged = true; +} } if( bHasTextGroupingAuto ) { -if( pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) +if( pTextGroup.get() pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) { pEffectSequence-setTextGroupingAuto( pTextGroup, fTextGroupingAuto ); bChanged = true; @@ -1828,7 +1831,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextReverse ) { -if( pTextGroup-getTextReverse() != bTextReverse ) +if( pTextGroup.get() pTextGroup-getTextReverse() != bTextReverse ) { pEffectSequence-setTextReverse( pTextGroup, bTextReverse ); bChanged = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Damien Chambe license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Damien Chambe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source cui/uiconfig
cui/source/options/personalization.cxx | 21 + cui/source/options/personalization.hxx |2 +- cui/uiconfig/ui/select_persona_dialog.ui |4 3 files changed, 14 insertions(+), 13 deletions(-) New commits: commit 84deacb87c1437d8409e4b7df4e182275f9723b8 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Fri Jun 20 15:38:26 2014 +0530 Improved search: the images are displayed as they are downloaded. Previously, all the search result images were displayed in one go, but now the images are shown as they are downloaded. Change-Id: I95990f36c242a0c90bd2b2fd65fd76953f46bcc2 diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index e592126..f708d43 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -166,15 +166,10 @@ void SelectPersonaDialog::SetProgress( OUString rProgress ) } } -void SelectPersonaDialog::SetImages( std::vectorImage rImageList ) +void SelectPersonaDialog::SetImages( Image aImage, sal_Int32 nIndex ) { -sal_Int32 nCount = 0; -for( std::vectorImage::iterator it=rImageList.begin(); it!=rImageList.end(); ++it ) -{ -m_vResultList[nCount]-Show(); -m_vResultList[nCount]-SetModeImage( *it ); -nCount++; -} +m_vResultList[nIndex]-Show(); +m_vResultList[nIndex]-SetModeImage( aImage ); } void SelectPersonaDialog::AddPersonaSetting( OUString rPersonaSetting ) @@ -465,7 +460,7 @@ void SearchAndParseThread::execute() std::vectorOUString vLearnmoreURLs = pHandler-getLearnmoreURLs(); std::vectorOUString::iterator it; -std::vectorImage vResultList; +sal_Int32 nIndex = 0; GraphicFilter aFilter; Graphic aGraphic; @@ -476,14 +471,16 @@ void SearchAndParseThread::execute() INetURLObject aURLObj( sPreviewFile ); aFilter.ImportGraphic( aGraphic, aURLObj ); Bitmap aBmp = aGraphic.GetBitmap(); -vResultList.push_back( Image( aBmp ) ); + +// for VCL to be able to do visual changes in the thread +SolarMutexGuard aGuard; +m_pPersonaDialog-SetImages( Image( aBmp ), nIndex++ ); +m_pPersonaDialog-setOptimalLayoutSize(); m_pPersonaDialog-AddPersonaSetting( aPersonaSetting ); } -// for VCL to be able to do visual changes in the thread SolarMutexGuard aGuard; -m_pPersonaDialog-SetImages( vResultList ); sProgress = ; m_pPersonaDialog-SetProgress( sProgress ); m_pPersonaDialog-setOptimalLayoutSize(); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index fb26c70..da17122 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -87,7 +87,7 @@ public: OUString GetSelectedPersona() const; void SetProgress( OUString ); -void SetImages( std::vectorImage); +void SetImages( Image, sal_Int32 ); void AddPersonaSetting( OUString ); void ClearSearchResults(); void SetAppliedPersonaSetting( OUString ); diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index cf551dc..51d8bcb 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -154,6 +154,10 @@ property name=vexpandTrue/property property name=row_spacing6/property property name=column_spacing6/property +property name=width_request624/property +property name=height_request219/property +property name=row_homogeneousTrue/property +property name=column_homogeneousTrue/property child object class=GtkButton id=result1 property name=can_focusTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit f75b2bf96efada53c47dee3deeb8751c2ee6937f Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 14:52:43 2014 +0200 CppunitTest_sw_ooxmlsdrexport: this define should no longer be necessary Change-Id: I5e4540b5bf47dde53021a300118052da47b90eff diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 20ee7c3..b7ecbfe 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -1548,11 +1548,8 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77122, LinkedTextBoxes.docx) if (!pXmlDoc) return; //ensure that the text box links are preserved. -// FIXME why does this fail on Mac? -#if !defined(MACOSX) assertXPath(pXmlDoc, //wps:txbx[1], id, 1); assertXPath(pXmlDoc, //wps:linkedTxbx[1], id, 1); -#endif } DECLARE_OOXMLEXPORT_TEST(test76734_2K7, test76734_2K7.docx) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa
sc/inc/document.hxx|5 ++-- sc/qa/unit/data/ods/copy-merged-number-formats.ods |binary sc/qa/unit/subsequent_filters-test.cxx | 25 + 3 files changed, 28 insertions(+), 2 deletions(-) New commits: commit 01dd299bded81700bc976881c6ea954a09015f9f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Jun 20 09:54:25 2014 -0400 fdo#71076: Write test for this. This was actually just one element of all that contributed to this bug. Unfortunately it's a bit hard to test the others. Change-Id: I7a0d88c0b829e7b7859aecfc20df87f6837ecb4a diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 700086d..5d6cc27 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1217,13 +1217,14 @@ public: /** * Copy only raw cell values to another document. Formula cells are - * converted to raw cells. No formatting info are copied. + * converted to raw cells. No formatting info are copied except for + * number formats. * * @param rSrcRange source range in the source document * @param nDestTab table in the clip document to copy to. * @param pDestDoc document to copy to */ -void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab, ScDocument* pDestDoc); +SC_DLLPUBLIC void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab, ScDocument* pDestDoc); /** * Copy only cell, nothing but cell to another document. diff --git a/sc/qa/unit/data/ods/copy-merged-number-formats.ods b/sc/qa/unit/data/ods/copy-merged-number-formats.ods new file mode 100644 index 000..39555e0 Binary files /dev/null and b/sc/qa/unit/data/ods/copy-merged-number-formats.ods differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 2e5a8f6..bdc58b8 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -174,6 +174,7 @@ public: void testExternalRefCacheXLSX(); void testExternalRefCacheODS(); void testHybridSharedStringODS(); +void testCopyMergedNumberFormats(); CPPUNIT_TEST_SUITE(ScFiltersTest); CPPUNIT_TEST(testBasicCellContentODS); @@ -252,6 +253,7 @@ public: CPPUNIT_TEST(testExternalRefCacheXLSX); CPPUNIT_TEST(testExternalRefCacheODS); CPPUNIT_TEST(testHybridSharedStringODS); +CPPUNIT_TEST(testCopyMergedNumberFormats); CPPUNIT_TEST_SUITE_END(); private: @@ -2583,6 +2585,29 @@ void ScFiltersTest::testHybridSharedStringODS() xDocSh-DoClose(); } +void ScFiltersTest::testCopyMergedNumberFormats() +{ +ScDocShellRef xDocSh = loadDoc(copy-merged-number-formats., ODS); +CPPUNIT_ASSERT(xDocSh.Is()); +ScDocument* pDoc = xDocSh-GetDocument(); + +// Cells B1, C1 and D1 are formatted as dates. +OUString aStrB1 = pDoc-GetString(ScAddress(1,0,0)); +OUString aStrC1 = pDoc-GetString(ScAddress(2,0,0)); +OUString aStrD1 = pDoc-GetString(ScAddress(3,0,0)); + +ScDocument aCopyDoc; +aCopyDoc.InsertTab(0, CopyHere); +pDoc-CopyStaticToDocument(ScRange(1,0,0,3,0,0), 0, aCopyDoc); + +// Make sure the date formats are copied to the new document. +CPPUNIT_ASSERT_EQUAL(aStrB1, aCopyDoc.GetString(ScAddress(1,0,0))); +CPPUNIT_ASSERT_EQUAL(aStrC1, aCopyDoc.GetString(ScAddress(2,0,0))); +CPPUNIT_ASSERT_EQUAL(aStrD1, aCopyDoc.GetString(ScAddress(3,0,0))); + +xDocSh-DoClose(); +} + ScFiltersTest::ScFiltersTest() : ScBootstrapFixture( /sc/qa/unit/data ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source vcl/unx
vcl/source/control/scrbar.cxx| 52 +++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 ++ 2 files changed, 44 insertions(+), 13 deletions(-) New commits: commit a734be318f82ae1da793702cb8aee50864023b73 Author: Jürgen Schmidt j...@apache.org Date: Fri Jun 20 12:05:03 2014 + #121627# merge fix from aoo410 branch that fixes the geometry calculations for scroll bars diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 4f75b66..d2b7659 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -354,18 +354,33 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } else { -Size aBtnSize( aSize.Height(), aSize.Height() ); -maBtn2Rect.Top()= maBtn1Rect.Top(); -maBtn2Rect.Left() = aSize.Width()-aSize.Height(); -maBtn1Rect.SetSize( aBtnSize ); -maBtn2Rect.SetSize( aBtnSize ); +if (aBtn1Region.IsEmpty() aBtn2Region.IsEmpty()) +{ +Size aBtnSize( aSize.Height(), aSize.Height() ); +maBtn2Rect.Top() = maBtn1Rect.Top(); +maBtn2Rect.Left() = aSize.Width()-aSize.Height(); +maBtn1Rect.SetSize( aBtnSize ); +maBtn2Rect.SetSize( aBtnSize ); +} +else +{ +maBtn1Rect.SetEmpty(); +maBtn2Rect.SetEmpty(); +} } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA, aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) +{ maTrackRect = aTrackRegion; +} else -maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); +{ +if ( ! maBtn1Rect.IsEmpty()) +maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); +else +maTrackRect = aControlRegion; +} // Check if available space is big enough for thumb ( min thumb size = ScrBar width/height ) mnThumbPixRange = maTrackRect.Right() - maTrackRect.Left(); @@ -395,18 +410,31 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } else { -const Size aBtnSize( aSize.Width(), aSize.Width() ); -maBtn2Rect.Left() = maBtn1Rect.Left(); -maBtn2Rect.Top()= aSize.Height()-aSize.Width(); -maBtn1Rect.SetSize( aBtnSize ); -maBtn2Rect.SetSize( aBtnSize ); +if (aBtn1Region.IsEmpty() aBtn2Region.IsEmpty()) +{ +const Size aBtnSize( aSize.Width(), aSize.Width() ); +maBtn2Rect.Left() = maBtn1Rect.Left(); +maBtn2Rect.Top()= aSize.Height()-aSize.Width(); +maBtn1Rect.SetSize( aBtnSize ); +maBtn2Rect.SetSize( aBtnSize ); +} +else +{ +maBtn1Rect.SetEmpty(); +maBtn2Rect.SetEmpty(); +} } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA, aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) maTrackRect = aTrackRegion; else -maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); +{ +if ( ! maBtn1Rect.IsEmpty()) +maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); +else +maTrackRect = aControlRegion; +} // Check if available space is big enough for thumb mnThumbPixRange = maTrackRect.Bottom() - maTrackRect.Top(); diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index bf5065b..47b8bcd 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -982,7 +982,10 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion ); rNativeContentRegion = rNativeBoundingRegion; -returnVal = sal_True; +if (rNativeBoundingRegion.GetWidth()0 rNativeBoundingRegion.GetHeight()0) +returnVal = sal_True; +else +returnVal = sal_False; } if( (nType == CTRL_MENUBAR) (nPart == PART_ENTIRE_CONTROL) ) { ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: odk/examples odk/Package_examples.mk
odk/Package_examples.mk |1 + odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx |2 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 6e714e618353b9eccf04efc15a5987ee10793309 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jun 20 16:15:11 2014 +0200 Fix SDK examples Change-Id: I68099725c43adeab144d53737f60f778b3aebf73 diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index b6aaae7..4463c8f 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -411,6 +411,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, cpp/complextoolbarcontrols/ProtocolHandler.xcu \ cpp/complextoolbarcontrols/WriterListener.cxx \ cpp/complextoolbarcontrols/WriterWindowState.xcu \ +cpp/complextoolbarcontrols/description.xml \ cpp/complextoolbarcontrols/exports.cxx \ cpp/complextoolbarcontrols/logo_big.png \ cpp/complextoolbarcontrols/logo_small.png \ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index b44ba02..ed34981 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -770,7 +770,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), -PROPERTY_ID_CURSORNAME, ::cppu::UnoTypeOUString::get(), PropertyAttribute::READONLY); +PROPERTY_ID_CURSORNAME, ::cppu::UnoTypertl::OUString::get(), PropertyAttribute::READONLY); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, ::cppu::UnoTypesal_Int32::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index 5b91333..5676354 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -269,7 +269,7 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), -PROPERTY_ID_CURSORNAME, ::cppu::UnoTypeOUString::get(), 0); +PROPERTY_ID_CURSORNAME, ::cppu::UnoTypertl::OUString::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source sw/qa
starmath/source/parse.cxx|4 +++- sw/qa/core/data/ooxml/pass/fdo79973.docx |binary 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 077121eb0debc1c78cf46038e2b90a0c2f381c44 Author: PriyankaGaikwad priyanka.gaik...@synerzip.com Date: Fri Jun 20 18:53:29 2014 +0530 fdo#79973 : LO crashes while opening the document. Description: - If the equation ends with two dots(.) then file get crash. - In SmParser::NextToken() the file get crash because string index is out of bound. Change-Id: I5f25814220d556d53c10d4ca33a38b4d0d451438 Reviewed-on: https://gerrit.libreoffice.org/9840 Reviewed-by: Muthu Subramanian K muthus...@gmail.com Tested-by: Muthu Subramanian K muthus...@gmail.com diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index c78a040..b7373f1 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -884,11 +884,13 @@ void SmParser::NextToken() sal_Int32 nTxtStart = m_nBufferIndex; sal_Unicode cChar; +// if the equation ends with dot(.) then increment m_nBufferIndex till end of string only do { cChar = m_aBufferString[ ++m_nBufferIndex ]; } -while ( cChar == '.' || rtl::isAsciiDigit( cChar ) ); +while ( (cChar == '.' || rtl::isAsciiDigit( cChar )) + ( m_nBufferIndex m_aBufferString.getLength() - 1 ) ); m_aCurToken.aText = m_aBufferString.copy( nTxtStart, m_nBufferIndex - nTxtStart ); aRes.EndPos = m_nBufferIndex; diff --git a/sw/qa/core/data/ooxml/pass/fdo79973.docx b/sw/qa/core/data/ooxml/pass/fdo79973.docx new file mode 100644 index 000..48bf510 Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79973.docx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Harbuzz requirements clarification
On Fri, Jun 20, 2014 at 01:32:24PM +0200, Tomáš Chvátal wrote: Hello guys, When trying to build 4.3 on openSUSE-12.3 I get this error: /home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.0.beta2-buildfix1/vcl/generic/glyphs/gcach_layout.cxx: In member function 'virtual bool HbLayoutEngine::layout(ServerFontLayout, ImplLayoutArgs)': [ 2748s] /home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.0.beta2-buildfix1/vcl/generic/glyphs/gcach_layout.cxx:423:28: error: 'HB_BUFFER_FLAG_DEFAULT' was not declared in this scope This was fixed in master a few weeks ago (may be we can backport this) but you can simply replace it with HB_BUFFER_FLAGS_DEFAULT. So I would like to know if this should be fixed or if the required version of harbuzz should be updated. Personally I'd advice to always use the latest and greatest HarfBuzz whenever possible. Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/textboxhelper.cxx | 29 + sw/source/core/draw/dcontact.cxx | 11 +++ 2 files changed, 40 insertions(+) New commits: commit 23d8fd8dcde97e3e60ebcc75d05d9b39d3bc5a30 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 16:33:13 2014 +0200 SwDrawContact::Changed: sync position/size between draw shape and its textbox This takes care of moving / resizing the textbox when the draw shape has been resized. Change-Id: If4c6f0bcdd03e00e3e49b0d30de3e1d0595977d4 diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 06bbc7f..7e70b4e 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -13,6 +13,7 @@ #include fmtanchr.hxx #include fmtcnct.hxx #include fmtornt.hxx +#include fmtfsize.hxx #include doc.hxx #include docsh.hxx #include docary.hxx @@ -510,6 +511,34 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt rShape, SfxItemSet rSet) aTextBoxSet.Put(aOrient); } break; +case RES_FRM_SIZE: +{ +// In case the shape got resized, then we need to adjust both +// the position and the size of the textbox (e.g. larger +// rounded edges of a rectangle - need to push right/down the +// textbox). +SwFmtVertOrient aVertOrient(rShape.GetVertOrient()); +SwFmtHoriOrient aHoriOrient(rShape.GetHoriOrient()); +SwFmtFrmSize aSize(pFmt-GetFrmSize()); + +Rectangle aRect = getTextRectangle(rShape, /*bAbsolute=*/false); +if (!aRect.IsEmpty()) +{ +aVertOrient.SetPos(aVertOrient.GetPos() + aRect.getY()); +aTextBoxSet.Put(aVertOrient); + +aHoriOrient.SetPos(aHoriOrient.GetPos() + aRect.getX()); +aTextBoxSet.Put(aHoriOrient); + +aSize.SetWidth(aRect.getWidth()); +aSize.SetHeight(aRect.getHeight()); +aTextBoxSet.Put(aSize); +} +} +break; +default: +SAL_WARN(sw.core, SwTextBoxHelper::syncFlyFrmAttr: unhandled which-id: nWhich); +break; } if (aIter.IsAtEnd()) diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 4377594..1c400da 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -41,10 +41,12 @@ #include fmtanchr.hxx #include node.hxx #include fmtcntnt.hxx +#include fmtfsize.hxx #include pagefrm.hxx #include rootfrm.hxx #include frmtool.hxx #include flyfrm.hxx +#include textboxhelper.hxx #include frmfmt.hxx #include dflyobj.hxx #include dcontact.hxx @@ -1382,6 +1384,15 @@ void SwDrawContact::_Changed( const SdrObject rObj, pAnchorFrm-Prepare( PREP_FLY_ATTR_CHG, GetFmt() ); } } + +if (SwTextBoxHelper::findTextBox(GetFmt())) +{ +// Just notify the textbox that the size has changed, the actual object size is not interesting. +SfxItemSet aResizeSet(GetFmt()-GetDoc()-GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0); +SwFmtFrmSize aSize; +aResizeSet.Put(aSize); +SwTextBoxHelper::syncFlyFrmAttr(*GetFmt(), aResizeSet); +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 56/3d895d861c04adb2e18a18d1b54276bfe65a7a
56/3d895d861c04adb2e18a18d1b54276bfe65a7a |1 + 1 file changed, 1 insertion(+) New commits: commit b12b5146128729b0f2f5f73016b14964468856ba Author: Caolán McNamara caol...@redhat.com Date: Fri Jun 20 16:18:46 2014 +0100 Notes added by 'git notes add' diff --git a/56/3d895d861c04adb2e18a18d1b54276bfe65a7a b/56/3d895d861c04adb2e18a18d1b54276bfe65a7a new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/56/3d895d861c04adb2e18a18d1b54276bfe65a7a @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/34be318f82ae1da793702cb8aee50864023b73
a7/34be318f82ae1da793702cb8aee50864023b73 |1 + 1 file changed, 1 insertion(+) New commits: commit e1700c08914f051d6fa24dfe3b4dbc206ce0 Author: Caolán McNamara caol...@redhat.com Date: Fri Jun 20 16:22:58 2014 +0100 Notes added by 'git notes add' diff --git a/a7/34be318f82ae1da793702cb8aee50864023b73 b/a7/34be318f82ae1da793702cb8aee50864023b73 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/a7/34be318f82ae1da793702cb8aee50864023b73 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa sw/qa
chart2/qa/extras/chart2export.cxx | 11 -- sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 109 +- sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 115 +++- sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 43 ++ 4 files changed, 47 insertions(+), 231 deletions(-) New commits: commit 465503f52de6892a996467fd006ad1c25a2c1816 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 17:04:08 2014 +0200 sw: clean up leftover TextBox TODOs Change-Id: I12782690368789849ea2ce2ed08ad4838a0a55db diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 851d674..51eb6c3 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -696,16 +696,7 @@ void Chart2ExportTest::testShapeFollowedByChart() OUString aValueOfFirstDocPR = getXPath(pXmlDoc, /w:document/w:body/w:p[3]/w:r[1]/w:drawing[1]/wp:inline[1]/wp:docPr[1], id); OUString aValueOfSecondDocPR; -uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); -if (xIndexAccess-getCount()) -{ -// TODO TextBox: remove this when TextBox is enabled by default -// This second run is a bug, should be the first ideally -aValueOfSecondDocPR = getXPath(pXmlDoc, /w:document/w:body/w:p[3]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1], id); -} -else -aValueOfSecondDocPR = getXPath(pXmlDoc, /w:document/w:body/w:p[3]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1], id); +aValueOfSecondDocPR = getXPath(pXmlDoc, /w:document/w:body/w:p[3]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1], id); CPPUNIT_ASSERT( aValueOfFirstDocPR != aValueOfSecondDocPR ); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7368b46..b1869ca 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -622,23 +622,11 @@ DECLARE_OOXMLEXPORT_TEST(testFdo48557, fdo48557.odt) // Inner margins of the textframe wasn't exported. uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); -if (xIndexAccess-getCount() 0) -{ -// TODO TextBox: remove this when TextBox is enabled by default -uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, LeftBorderDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, RightBorderDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TopBorderDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, BottomBorderDistance)); -} -else -{ -uno::Referencebeans::XPropertySet xFrame(getShape(1), uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextLeftDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextRightDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextUpperDistance)); -CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextLowerDistance)); -} +uno::Referencebeans::XPropertySet xFrame(getShape(1), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextLeftDistance)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextRightDistance)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextUpperDistance)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(150), getPropertysal_Int32(xFrame, TextLowerDistance)); } DECLARE_OOXMLEXPORT_TEST(testI120928, i120928.docx) @@ -984,17 +972,9 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66781, fdo66781.docx) DECLARE_OOXMLEXPORT_TEST(testFdo60990, fdo60990.odt) { -// TODO TextBox: remove this when TextBox is enabled by default -uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); -bool bTextBox = xIndexAccess-getCount() == 0; - // The shape had no background, no paragraph adjust and no font color. uno::Referencebeans::XPropertySet xShape(getShape(1), uno::UNO_QUERY); -if (bTextBox) -CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), getPropertysal_Int32(xShape, FillColor)); -else -CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), getPropertysal_Int32(xShape, BackColor)); +
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/sfxbasemodel.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 12a4b817ca0527c282842fe30fa73a390500 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jun 20 17:22:50 2014 +0200 Missing null check As Kendy found out, In Writer: Enable the drawing functions [view - toolbars - drawing], choose 'Line Callout 1' among the presets Callouts [to the left from the stars], and attempt to click and drag in the document to insert it triggers assert in SvRefT::operator* introduced in 160ae9889e4d16217a7cca7d930f776f5a645ec8 Catch illegal null pointer dereferences early. Given how most places in sfx2/source/doc/sfxbasemodel.cxx already check for null m_pObjectShell, looks like this had just been missing here, and the SfxDocInfoListener_Impl's modified has probably never been called, so it went unnoticed that its m_rShell was a null reference. Change-Id: I6b6dad831938d5fa89340895b98797686b60c5cc diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 15a76db..19dd94c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -821,9 +821,12 @@ IMPL_SfxBaseModel_DataContainer::impl_setDocumentProperties( const Reference document::XDocumentProperties rxNewDocProps) { m_xDocumentProperties.set(rxNewDocProps, UNO_QUERY_THROW); -Referenceutil::XModifyBroadcaster const xMB(m_xDocumentProperties, -UNO_QUERY_THROW); -xMB-addModifyListener(new SfxDocInfoListener_Impl(*m_pObjectShell)); +if (m_pObjectShell.Is()) +{ +Referenceutil::XModifyBroadcaster const xMB( +m_xDocumentProperties, UNO_QUERY_THROW); +xMB-addModifyListener(new SfxDocInfoListener_Impl(*m_pObjectShell)); +} } // document::XDocumentPropertiesSupplier: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit 553f88e3d65fd25f645c22589de575924c3879fc Author: Armin Le Grand a...@apache.org Date: Fri Jun 20 11:51:09 2014 + Resolves: #i121410# Secured usage of pTextGroup (cherry picked from commit 966c38038352a347f25d690f18a2059d6f78b9fa) Change-Id: Ibbd68e8c102f2d80ea5b7610b9a97704a282e6ea diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2891489..775c8e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1500,7 +1500,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasAnimateForm ) { -if( pTextGroup-getAnimateForm() != bAnimateForm ) +if( pTextGroup.get() pTextGroup-getAnimateForm() != bAnimateForm ) { if( (pTextGroup-getTextGrouping() = 0) (nTextGrouping == -1 ) ) { @@ -1518,22 +1518,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextGrouping ) { -if( (pTextGroup-getTextGrouping() != nTextGrouping) ) +if( pTextGroup.get() pTextGroup-getTextGrouping() != nTextGrouping ) { pEffectSequence-setTextGrouping( pTextGroup, nTextGrouping ); bChanged = true; } } -if (!bDoSetAnimateFormFirstbNeedDoSetAnimateForm) +if (!bDoSetAnimateFormFirst bNeedDoSetAnimateForm) { -pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); -bChanged = true; +if( pTextGroup.get() ) +{ +pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); +bChanged = true; +} } if( bHasTextGroupingAuto ) { -if( pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) +if( pTextGroup.get() pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) { pEffectSequence-setTextGroupingAuto( pTextGroup, fTextGroupingAuto ); bChanged = true; @@ -1542,7 +1545,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextReverse ) { -if( pTextGroup-getTextReverse() != bTextReverse ) +if( pTextGroup.get() pTextGroup-getTextReverse() != bTextReverse ) { pEffectSequence-setTextReverse( pTextGroup, bTextReverse ); bChanged = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source cui/uiconfig
cui/source/options/personalization.cxx | 38 ++ cui/source/options/personalization.hxx |1 cui/uiconfig/ui/select_persona_dialog.ui | 110 +-- 3 files changed, 142 insertions(+), 7 deletions(-) New commits: commit cb5236f244cc7231816af3c191be3987daf3c673 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Fri Jun 20 21:20:37 2014 +0530 Added some pre-defined search terms. The user can now enter his/her own search term or can use the commonly used search terms to browse for themes. Change-Id: Ife4ad6b820784a6321f5b916a0069a915c114c7e diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index f708d43..ec7 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -38,6 +38,26 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent ) get( m_pSearchButton, search_personas ); m_pSearchButton-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); +get( m_vSearchSuggestions[0], suggestion1 ); +m_vSearchSuggestions[0]-SetText( libreoffice ); +m_vSearchSuggestions[0]-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); + +get( m_vSearchSuggestions[1], suggestion2 ); +m_vSearchSuggestions[1]-SetText( science ); +m_vSearchSuggestions[1]-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); + +get( m_vSearchSuggestions[2], suggestion3 ); +m_vSearchSuggestions[2]-SetText( firefox ); +m_vSearchSuggestions[2]-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); + +get( m_vSearchSuggestions[3], suggestion4 ); +m_vSearchSuggestions[3]-SetText( nasa ); +m_vSearchSuggestions[3]-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); + +get( m_vSearchSuggestions[4], suggestion5 ); +m_vSearchSuggestions[4]-SetText( harry potter ); +m_vSearchSuggestions[4]-SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); + get( m_pEdit, search_term ); m_pEdit-SetPlaceholderText( Search term... ); @@ -85,9 +105,23 @@ OUString SelectPersonaDialog::GetSelectedPersona() const return OUString(); } -IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, /*pButton*/ ) +IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton ) { -OUString searchTerm = m_pEdit-GetText(); +OUString searchTerm; +if( pButton == m_pSearchButton) +searchTerm = m_pEdit-GetText(); +else +{ +for( sal_Int32 nIndex = 0; nIndex 5; nIndex++ ) +{ +if( pButton == m_vSearchSuggestions[nIndex] ) +{ +searchTerm = m_vSearchSuggestions[nIndex]-GetDisplayText(); +break; +} +} +} + if( searchTerm.isEmpty( ) ) return 0; diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index da17122..8e0520e 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -74,6 +74,7 @@ private: PushButton *m_pSearchButton;/// The search button FixedText *m_pProgressLabel;/// The label for showing progress of search PushButton *m_vResultList[9]; /// List of buttons to show search results +PushButton *m_vSearchSuggestions[9];/// List of buttons for the search suggestions PushButton *m_pOkButton;/// The OK button PushButton *m_pCancelButton;/// The Cancel button diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 51d8bcb..7497c5f 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -104,7 +104,6 @@ property name=can_focusTrue/property property name=hexpandTrue/property property name=invisible_charâ/property -property name=invisible_char_setTrue/property property name=primary_icon_activatableFalse/property property name=secondary_icon_activatableFalse/property /object @@ -136,9 +135,12 @@ /packing /child child - object class=GtkLabel id=progress_label + object class=GtkLabel id=label2 property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesOr, use these commonly used terms to _browse themes:/property +property name=use_underlineTrue/property /object packing property name=expandFalse/property @@ -147,15 +149,113 @@ /packing /child child + object class=GtkBox
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/6c38038352a347f25d690f18a2059d6f78b9fa
96/6c38038352a347f25d690f18a2059d6f78b9fa |1 + 1 file changed, 1 insertion(+) New commits: commit bf788c8cd39a57c6487a8a7db4fbab1d8f2e2404 Author: Caolán McNamara caol...@redhat.com Date: Fri Jun 20 16:57:59 2014 +0100 Notes added by 'git notes add' diff --git a/96/6c38038352a347f25d690f18a2059d6f78b9fa b/96/6c38038352a347f25d690f18a2059d6f78b9fa new file mode 100644 index 000..f4eaf8b --- /dev/null +++ b/96/6c38038352a347f25d690f18a2059d6f78b9fa @@ -0,0 +1 @@ +merged as: 553f88e3d65fd25f645c22589de575924c3879fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit 3a01b4cc63551b7628e6c16835d93256e6c7668a Author: Armin Le Grand a...@apache.org Date: Fri Jun 20 11:51:09 2014 + Resolves: #i121410# Secured usage of pTextGroup (cherry picked from commit 966c38038352a347f25d690f18a2059d6f78b9fa) Change-Id: Ibbd68e8c102f2d80ea5b7610b9a97704a282e6ea (cherry picked from commit 553f88e3d65fd25f645c22589de575924c3879fc) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2891489..775c8e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1500,7 +1500,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasAnimateForm ) { -if( pTextGroup-getAnimateForm() != bAnimateForm ) +if( pTextGroup.get() pTextGroup-getAnimateForm() != bAnimateForm ) { if( (pTextGroup-getTextGrouping() = 0) (nTextGrouping == -1 ) ) { @@ -1518,22 +1518,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextGrouping ) { -if( (pTextGroup-getTextGrouping() != nTextGrouping) ) +if( pTextGroup.get() pTextGroup-getTextGrouping() != nTextGrouping ) { pEffectSequence-setTextGrouping( pTextGroup, nTextGrouping ); bChanged = true; } } -if (!bDoSetAnimateFormFirstbNeedDoSetAnimateForm) +if (!bDoSetAnimateFormFirst bNeedDoSetAnimateForm) { -pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); -bChanged = true; +if( pTextGroup.get() ) +{ +pEffectSequence-setAnimateForm( pTextGroup, bAnimateForm ); +bChanged = true; +} } if( bHasTextGroupingAuto ) { -if( pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) +if( pTextGroup.get() pTextGroup-getTextGroupingAuto() != fTextGroupingAuto ) { pEffectSequence-setTextGroupingAuto( pTextGroup, fTextGroupingAuto ); bChanged = true; @@ -1542,7 +1545,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( bHasTextReverse ) { -if( pTextGroup-getTextReverse() != bTextReverse ) +if( pTextGroup.get() pTextGroup-getTextReverse() != bTextReverse ) { pEffectSequence-setTextReverse( pTextGroup, bTextReverse ); bChanged = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx| 66 +++ chart2/qa/extras/charttest.hxx | 39 +++ chart2/qa/extras/data/ods/axis-numformats-linked.ods |binary 3 files changed, 105 insertions(+) New commits: commit aac149e4ad06e207e6c1b14f11867dbfbd343ab2 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Jun 20 11:45:57 2014 -0400 fdo#71767: Write test for this. Not a direct test for the reported bug, but to ensure that the reworked properties survive import and export. Change-Id: I6c5a4c98eca5180251f04a24346290dedc7a diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 51eb6c3..80aab30 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -62,6 +62,7 @@ public: void testFdo78290LineChartMarkerX(); void testFdo78290ScatterChartMarkerX(); void testFdo78290CombinationChartMarkerX(); +void testAxisNumberFormatODS(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); @@ -95,6 +96,7 @@ public: CPPUNIT_TEST(testFdo78290LineChartMarkerX); CPPUNIT_TEST(testFdo78290ScatterChartMarkerX); CPPUNIT_TEST(testFdo78290CombinationChartMarkerX); +CPPUNIT_TEST(testAxisNumberFormatODS); CPPUNIT_TEST_SUITE_END(); protected: @@ -672,6 +674,70 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX() assertXPath(pXmlDoc, /c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1],val,7); } +void Chart2ExportTest::testAxisNumberFormatODS() +{ +struct +{ +void check( const Referencechart2::XChartDocument xChartDoc ) +{ +Referenceutil::XNumberFormatsSupplier xNFS(xChartDoc, UNO_QUERY_THROW); +Referenceutil::XNumberFormats xNumberFormats = xNFS-getNumberFormats(); +CPPUNIT_ASSERT(xNumberFormats.is()); + +Referencechart2::XAxis xAxisX = getAxisFromDoc(xChartDoc, 0, 0, 0); +Referencechart2::XTitled xTitle(xAxisX, UNO_QUERY_THROW); +OUString aTitleText = getTitleString(xTitle); +CPPUNIT_ASSERT_EQUAL(OUString(Linked To Source), aTitleText); + +Referencebeans::XPropertySet xPS(xAxisX, UNO_QUERY_THROW); + +sal_Int32 nNumFmt = -1; +xPS-getPropertyValue(NumberFormat) = nNumFmt; +CPPUNIT_ASSERT_MESSAGE(Failed to get a number format value from X axis., nNumFmt != -1); +Referencebeans::XPropertySet xNumPS = xNumberFormats-getByKey(nNumFmt); +CPPUNIT_ASSERT(xNumPS.is()); +sal_Int16 nType = util::NumberFormat::UNDEFINED; +xNumPS-getPropertyValue(Type) = nType; +CPPUNIT_ASSERT_MESSAGE(X axis should be percentage format., (nType util::NumberFormat::PERCENT)); + +bool bNumFmtLinked = false; +xPS-getPropertyValue(LinkNumberFormatToSource) = bNumFmtLinked; +CPPUNIT_ASSERT_MESSAGE(X axis should have its number format linked to source., bNumFmtLinked); + +Referencechart2::XAxis xAxisY = getAxisFromDoc(xChartDoc, 0, 1, 0); +xTitle.set(xAxisY, UNO_QUERY_THROW); +aTitleText = getTitleString(xTitle); +CPPUNIT_ASSERT_EQUAL(OUString(Not Linked), aTitleText); + +xPS.set(xAxisY, UNO_QUERY_THROW); + +nNumFmt = -1; +xPS-getPropertyValue(NumberFormat) = nNumFmt; +CPPUNIT_ASSERT_MESSAGE(Failed to get a number format value from Y axis., nNumFmt != -1); +xNumPS = xNumberFormats-getByKey(nNumFmt); +CPPUNIT_ASSERT(xNumPS.is()); +nType = util::NumberFormat::UNDEFINED; +xNumPS-getPropertyValue(Type) = nType; +CPPUNIT_ASSERT_MESSAGE(Y axis should be a normal number format., (nType util::NumberFormat::NUMBER)); + +bNumFmtLinked = true; +xPS-getPropertyValue(LinkNumberFormatToSource) = bNumFmtLinked; +CPPUNIT_ASSERT_MESSAGE(Y axis should not have its number format linked to source., !bNumFmtLinked); +} + +} aTest; + +load(/chart2/qa/extras/data/ods/, axis-numformats-linked.ods); + +Referencechart2::XChartDocument xChartDoc = getChartDocFromSheet(0, mxComponent); +aTest.check(xChartDoc); + +// Reload the document and make sure everything remains intact. +reload(calc8); +xChartDoc = getChartDocFromSheet(0, mxComponent); +aTest.check(xChartDoc); +} + void Chart2ExportTest::testBarChartRotation() { load (/chart2/qa/extras/data/docx/, barChartRotation.docx); diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 5d0d15e..e0969f4 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -38,11 +38,17 @@ #include com/sun/star/chart2/XChartTypeContainer.hpp #include com/sun/star/chart2/XCoordinateSystemContainer.hpp #include
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/textboxhelper.cxx |2 +- sw/source/core/draw/dcontact.cxx | 27 +++ 2 files changed, 20 insertions(+), 9 deletions(-) New commits: commit 34d4658584ae58b1022f84367a31c234c0e326a3 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Jun 20 17:48:33 2014 +0200 SwDrawContact: recaclc textbox size on shape adjustment change as well Change-Id: I65abec66d56f2bf83e28c85589638cea5f3a7a0c diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 7e70b4e..70f3ef8 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -538,7 +538,7 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt rShape, SfxItemSet rSet) break; default: SAL_WARN(sw.core, SwTextBoxHelper::syncFlyFrmAttr: unhandled which-id: nWhich); -break; +break; } if (aIter.IsAtEnd()) diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 1c400da..11ffaf8 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1152,6 +1152,19 @@ class NestedUserCallHdl } }; +/// Notify the format's textbox that it should reconsider its position / size. +void lcl_textBoxSizeNotify(SwFrmFmt* pFmt) +{ +if (SwTextBoxHelper::findTextBox(pFmt)) +{ +// Just notify the textbox that the size has changed, the actual object size is not interesting. +SfxItemSet aResizeSet(pFmt-GetDoc()-GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0); +SwFmtFrmSize aSize; +aResizeSet.Put(aSize); +SwTextBoxHelper::syncFlyFrmAttr(*pFmt, aResizeSet); +} +} + // !!!ATTENTION!!! The object may commit suicide!!! void SwDrawContact::_Changed( const SdrObject rObj, @@ -1385,15 +1398,13 @@ void SwDrawContact::_Changed( const SdrObject rObj, } } -if (SwTextBoxHelper::findTextBox(GetFmt())) -{ -// Just notify the textbox that the size has changed, the actual object size is not interesting. -SfxItemSet aResizeSet(GetFmt()-GetDoc()-GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0); -SwFmtFrmSize aSize; -aResizeSet.Put(aSize); -SwTextBoxHelper::syncFlyFrmAttr(*GetFmt(), aResizeSet); -} +lcl_textBoxSizeNotify(GetFmt()); } +else if (eType == SDRUSERCALL_RESIZE) +// Even if the bounding box of the shape didn't change, +// notify about the size change, as an adjustment change +// may affect the size of the underlying textbox. +lcl_textBoxSizeNotify(GetFmt()); } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/tp_RangeChooser.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 55f47e58de100ce1ee22f76b0afb00be6bae2d2b Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Fri Jun 20 15:09:14 2014 +0200 mark numbers as untranslatable Change-Id: Iaa592297e8a946c121b9eaedbbab136db7593316 Reviewed-on: https://gerrit.libreoffice.org/9838 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui index 0d32774..c289911 100644 --- a/chart2/uiconfig/ui/tp_RangeChooser.ui +++ b/chart2/uiconfig/ui/tp_RangeChooser.ui @@ -202,7 +202,7 @@ property name=can_focusTrue/property property name=invisible_charâ/property property name=width_chars5/property -property name=text translatable=yes0/property +property name=text translatable=no0/property property name=input_purposenumber/property /object packing @@ -218,7 +218,7 @@ property name=can_focusTrue/property property name=invisible_charâ/property property name=width_chars5/property -property name=text translatable=yes0/property +property name=text translatable=no0/property /object packing property name=left_attach3/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3258c4f7b79ceedace3b4bdc88a818b45c7593ca Author: Niklas Johansson sleeping.pil...@gmail.com Date: Thu Jun 19 22:44:29 2014 +0200 Dropdown combo-/listboxes should support accessible action togglePopup At least VoiceOver needs it to be able to open the dropdown in a native way (through AXShowMenu). The list still isn't accessible on mac but that is an other issue. Change-Id: I825b54536dfc9743b722eb55873bde3d5eef953d Reviewed-on: https://gerrit.libreoffice.org/9833 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index a1281db..d754875 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -461,11 +461,11 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n ::osl::Guard ::osl::Mutex aGuard( GetMutex() ); if (nIndex0 || nIndex=getAccessibleActionCount()) throw ::com::sun::star::lang::IndexOutOfBoundsException(); -//Solution:When combo_box,it should not has action information. -//return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP); -if (m_aBoxType == LISTBOX) -return ::rtl::OUString(); -return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP); + +if (m_bIsDropDownBox) +TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP); +else +::rtl::OUString(); } Reference XAccessibleKeyBinding VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source
connectivity/source/drivers/file/FPreparedStatement.cxx |9 +++- connectivity/source/drivers/file/FStatement.cxx | 31 +--- connectivity/source/inc/file/FStatement.hxx |4 +- 3 files changed, 36 insertions(+), 8 deletions(-) New commits: commit f6b9cc2c5b2133b5a44f54ed307bbe9e1e02e5fc Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jun 17 18:12:45 2014 +0200 fdo#80084 file driver PreparedStatement: close previous ResultSet on reexec This partially reverts commit d87c2c59c9c1d5f5825f355c9eb941fdf95b42f6 sdbc file driver (Prepared)Statement: created ResultSet owned by *caller* From that commit, we keep the part about not reusing the same ResultSet on reexecution (client code may have disposed it or closed it), but we revert the part about not closing / disposing the previous ResultSet on reexecution. Change-Id: I4946207f9740484b2f5fbc3575a5708fe39f357c Reviewed-on: https://gerrit.libreoffice.org/9823 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 6fb706b..81ac7a9 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -101,15 +101,16 @@ void OPreparedStatement::construct(const OUString sql) throw(SQLException, Run ReferenceXResultSet OPreparedStatement::makeResultSet() { +closeResultSet(); + OResultSet *pResultSet = createResultSet(); ReferenceXResultSet xRS(pResultSet); initializeResultSet(pResultSet); initResultSet(pResultSet); +m_xResultSet = xRS; return xRS; } - - Any SAL_CALL OPreparedStatement::queryInterface( const Type rType ) throw(RuntimeException, std::exception) { Any aRet = OStatement_BASE2::queryInterface(rType); @@ -145,6 +146,8 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); + +closeResultSet(); } @@ -157,6 +160,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc // since we don't support the XMultipleResults interface, nobody will ever get that ResultSet... Reference XComponent xComp(xRS, UNO_QUERY); +assert(xComp.is() || !xRS.is()); if (xComp.is()) xComp-dispose(); @@ -512,7 +516,6 @@ void OPreparedStatement::describeParameter() } } } - void OPreparedStatement::initializeResultSet(OResultSet* pRS) { OStatement_Base::initializeResultSet(pRS); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index a95af1c..65f587f 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -95,10 +95,23 @@ OStatement_Base::~OStatement_Base() delete m_pSQLAnalyzer; } +void OStatement_Base::disposeResultSet() +{ +SAL_INFO( connectivity.drivers, file ocke.jans...@sun.com OStatement_Base::disposeResultSet ); +// free the cursor if alive +Reference XComponent xComp(m_xResultSet.get(), UNO_QUERY); +assert(xComp.is() || !m_xResultSet.get().is()); +if (xComp.is()) +xComp-dispose(); +m_xResultSet.clear(); +} + void OStatement_BASE2::disposing() { ::osl::MutexGuard aGuard(m_aMutex); +disposeResultSet(); + if(m_pSQLAnalyzer) m_pSQLAnalyzer-dispose(); @@ -173,17 +186,26 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, s dispose(); } - -void OStatement_Base::reset() throw (SQLException) +void OStatement_Base::closeResultSet () throw (SQLException) { +SAL_INFO( connectivity.drivers, file ocke.jans...@sun.com OStatement_Base::clearMyResultSet ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); -clearWarnings (); +Reference XCloseable xCloseable(m_xResultSet.get(), UNO_QUERY); +assert(xCloseable.is() || !m_xResultSet.get().is()); +if (xCloseable.is()) +{ +try +{ +xCloseable-close(); +} +catch( const DisposedException ) { } +} +m_xResultSet.clear(); } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -252,6 +274,7 @@ Reference XResultSet SAL_CALL OStatement::executeQuery( const OUString sql ) OResultSet* pResult = createResultSet(); xRS = pResult; initializeResultSet(pResult); +m_xResultSet = xRS; pResult-OpenImpl(); diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 1abb479..3bf0432 100644 ---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - odk/examples odk/Package_examples.mk xmloff/source
odk/Package_examples.mk |1 + odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx |2 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx |2 +- xmloff/source/chart/SchXMLExport.cxx|8 4 files changed, 3 insertions(+), 10 deletions(-) New commits: commit 62e3e3c7c8b76e163e7671963d83d7f7ce958309 Author: Tor Lillqvist t...@collabora.com Date: Thu Jun 12 19:51:40 2014 +0300 WaE: unused function 'isString' Change-Id: I991cbf4a0203debaa98887d2db3fec9654dc1c5b (cherry picked from commit 1b450cfd425a988157d5a7eff86091ba12bc10f4) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index dfa4d0dc..0c5147f 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2549,14 +2549,6 @@ namespace //no doubles and no texts return false; } - -bool isString(const OUString rString) -{ -if(rString.startsWith(\) rString.endsWith(\)) -return true; - -return false; -} } void SchXMLExportHelper_Impl::exportSeries( commit e91686d27844b1d2428788adad489f54e3357efc Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jun 20 16:15:11 2014 +0200 Fix SDK examples Change-Id: I68099725c43adeab144d53737f60f778b3aebf73 (cherry picked from commit 6e714e618353b9eccf04efc15a5987ee10793309) diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index b6aaae7..4463c8f 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -411,6 +411,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, cpp/complextoolbarcontrols/ProtocolHandler.xcu \ cpp/complextoolbarcontrols/WriterListener.cxx \ cpp/complextoolbarcontrols/WriterWindowState.xcu \ +cpp/complextoolbarcontrols/description.xml \ cpp/complextoolbarcontrols/exports.cxx \ cpp/complextoolbarcontrols/logo_big.png \ cpp/complextoolbarcontrols/logo_small.png \ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index b44ba02..ed34981 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -770,7 +770,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), -PROPERTY_ID_CURSORNAME, ::cppu::UnoTypeOUString::get(), PropertyAttribute::READONLY); +PROPERTY_ID_CURSORNAME, ::cppu::UnoTypertl::OUString::get(), PropertyAttribute::READONLY); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, ::cppu::UnoTypesal_Int32::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index 5b91333..5676354 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -269,7 +269,7 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), -PROPERTY_ID_CURSORNAME, ::cppu::UnoTypeOUString::get(), 0); +PROPERTY_ID_CURSORNAME, ::cppu::UnoTypertl::OUString::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/b5155645ee41433cfd225b2947bc3add03b0a4
69/b5155645ee41433cfd225b2947bc3add03b0a4 |1 + 1 file changed, 1 insertion(+) New commits: commit 471753a6f6e69843d5504924cab7306625beeb56 Author: Caolán McNamara caol...@redhat.com Date: Fri Jun 20 17:20:44 2014 +0100 Notes added by 'git notes add' diff --git a/69/b5155645ee41433cfd225b2947bc3add03b0a4 b/69/b5155645ee41433cfd225b2947bc3add03b0a4 new file mode 100644 index 000..25cc96f --- /dev/null +++ b/69/b5155645ee41433cfd225b2947bc3add03b0a4 @@ -0,0 +1 @@ +ignore: ooxml module ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/examples
odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java | 29 -- odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java | 22 ++- odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java | 22 ++- odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java| 22 ++- 4 files changed, 38 insertions(+), 57 deletions(-) New commits: commit dc795cbd2dcb50e555945a91925616c7b3e58ee9 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jun 20 18:26:11 2014 +0200 Make Linguistic SDK example use __getComponentFactory ...instead of legacy __getServiceFactory. This fixes a subtle bug: When these Java extensions are live-deployed, they are offloaded to an additional uno process. Their __getServiceFactory methods were called with the uno process (component context's) service manager, which they stored away for later use in OneInstanceFactory.createInstance. So even if later on an instance was created with the main LO process's component context, the uno process's component context would be used to instantiate the (C++) com.sun.star.linguistic2.LinguProperties service (in the uno process!), and that happens to internally use comphelper::getProcessServiceFactory, which would be null in the uno process, comphelper::getProcessServiceFactory comphelper::getProcessComponentContext (anonymous namespace)::getConfigurationProvider utl::ConfigManager::acquireTree utl::ConfigManager::addConfigItem utl::ConfigItem::ConfigItem SvtLinguConfigItem::SvtLinguConfigItem SvtLinguConfig::GetConfigItem SvtLinguConfig::GetConfigItem SvtLinguConfig::GetProperty LinguProps::getPropertyValue gcc3::callVirtualMethod ... Change-Id: Ib6f5a5dd6d0adbbe14d60aaff3a8b6ba24235d11 diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java index 2a33ecb..63c2718 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java @@ -32,11 +32,11 @@ * */ -import com.sun.star.lang.XSingleServiceFactory; +import com.sun.star.lang.XSingleComponentFactory; import com.sun.star.lang.XServiceInfo; import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.beans.XPropertySet; +import com.sun.star.uno.XComponentContext; import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; @@ -49,32 +49,29 @@ import java.lang.reflect.Constructor; public class OneInstanceFactory implements -XSingleServiceFactory, +XSingleComponentFactory, XServiceInfo { Class aMyClass; String aSvcImplName; String[]aSupportedSvcNames; XInterface xInstantiatedService; -XMultiServiceFactoryxMultiFactory; public OneInstanceFactory( Class aMyClass, String aSvcImplName, -String[]aSupportedSvcNames, -XMultiServiceFactoryxMultiFactory ) +String[]aSupportedSvcNames ) { this.aMyClass = aMyClass; this.aSvcImplName = aSvcImplName; this.aSupportedSvcNames = aSupportedSvcNames; -this.xMultiFactory = xMultiFactory; xInstantiatedService = null; } -// XSingleServiceFactory +// XSingleComponentFactory -public Object createInstance() +public Object createInstanceWithContext( XComponentContext context ) throws com.sun.star.uno.Exception, com.sun.star.uno.RuntimeException { @@ -91,15 +88,17 @@ public class OneInstanceFactory implements //!! workaround for services not always being created //!! via 'createInstanceWithArguments' XInitialization xIni = UnoRuntime.queryInterface( -XInitialization.class, createInstance()); +XInitialization.class, createInstanceWithContext(context)); if (xIni != null) { Object[] aArguments = new Object[]{ null, null }; -if (xMultiFactory != null) +if (context != null) { XPropertySet xPropSet = UnoRuntime.queryInterface( -XPropertySet.class , xMultiFactory.createInstance( -com.sun.star.linguistic2.LinguProperties ) ); +XPropertySet.class, +context.getServiceManager().createInstanceWithContext( +com.sun.star.linguistic2.LinguProperties, +context ) ); aArguments[0] =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/generic
vcl/generic/glyphs/gcach_layout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4090d9f9bfa7fbe9b25147f3c661c99714e83a6 Author: Thorsten Behrens t...@documentfoundation.org Date: Wed May 28 00:48:49 2014 +0200 Fix build to work with older harfbuzz versions. Whee, seems hb has changed naming, with 0.9.11 it is spelled as quoted. newer versions have a mapping in hb-deprecated.h ... Change-Id: I425ded33e6b9928aadca9f6988437a021fcecbfb (cherry picked from commit b3911e8adb34c6ee72577e58658b2cb72c6e79a3) diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index cbf3f9c..3f065bb 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -420,7 +420,7 @@ bool HbLayoutEngine::layout(ServerFontLayout rLayout, ImplLayoutArgs rArgs) static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs(); -int nHbFlags = HB_BUFFER_FLAG_DEFAULT; +int nHbFlags = HB_BUFFER_FLAGS_DEFAULT; if (nMinRunPos == 0) nHbFlags |= HB_BUFFER_FLAG_BOT; /* Beginning-of-text */ if (nEndRunPos == rArgs.mnLength) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78904, which changed state. Bug 78904 Summary: FILESAVE: LO hangs while saving attached .docx file https://bugs.freedesktop.org/show_bug.cgi?id=78904 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Harbuzz requirements clarification
Hi, On Fri, Jun 20, 2014 at 05:48:56PM +0300, Khaled Hosny khaledho...@eglug.org wrote: This was fixed in master a few weeks ago (may be we can backport this) but you can simply replace it with HB_BUFFER_FLAGS_DEFAULT. Backported as http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-3id=a4090d9f9bfa7fbe9b25147f3c661c99714e83a6 Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e62764108a1832e746f68768c29eaa90606903a7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jun 20 20:59:48 2014 +0100 hmm, that's not right Change-Id: Id714a54b08127c594c108c824bb0dedd74bb5c06 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index d754875..117fc73 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -463,9 +463,9 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n throw ::com::sun::star::lang::IndexOutOfBoundsException(); if (m_bIsDropDownBox) -TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP); -else -::rtl::OUString(); +return TK_RES_STRING(RID_STR_ACC_ACTION_TOGGLEPOPUP); + +return OUString(); } Reference XAccessibleKeyBinding VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 5 commits - chart2/opengl chart2/Package_opengl.mk chart2/source
chart2/Package_opengl.mk|2 chart2/opengl/screenTextFragmentShader.glsl |3 chart2/opengl/textFragmentShader.glsl |3 chart2/opengl/textFragmentShaderBatch.glsl | 20 + chart2/opengl/textVertexShaderBatch.glsl| 22 ++ chart2/source/view/inc/GL3DRenderer.hxx | 44 +++- chart2/source/view/main/3DChartObjects.cxx | 11 - chart2/source/view/main/GL3DRenderer.cxx| 288 +++- 8 files changed, 342 insertions(+), 51 deletions(-) New commits: commit e4939a72af3baff282a50bf1bce76c3184f26403 Author: weigao wei...@multicorewareinc.com Date: Wed Jun 18 08:21:41 2014 -0700 add code to call batch texture render Change-Id: I09da7c49eb11da9ea2bc18a5e13f2fd2c0d6bd8f diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 065b5fb..5f2167c 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -143,6 +143,23 @@ struct TextInfo float vertex[12]; }; +struct TextureArrayInfo +{ +size_t subTextureNum; +int textureArrayWidth; +int textureArrayHeight; +GLuint textureID; +}; +struct TextInfoBatch +{ +size_t batchNum; +std::vectorglm::vec4 idList; +std::vectorTextureArrayInfo texture; +std::vectorglm::vec3 vertexList; +std::vectorglm::vec3 textureCoordList; +}; + + struct BatchBarInfo { std::vector glm::mat4 modelMatrixList; @@ -235,6 +252,18 @@ private: void UpdateBatch3DUniformBlock(); void RenderBatchBars(bool bNewScene); void CheckGLSLVersion(); +void RenderTextShapeBatch(); +void ReleaseTextShapesBatch(); +void CreateTextTextureSingle(const boost::shared_arraysal_uInt8 bitmapBuf, + ::Size maSizePixels, + glm::vec3 vTopLeft,glm::vec3 vTopRight, + glm::vec3 vBottomRight, glm::vec3 vBottomLeft, + sal_uInt32 nUniqueId); +void CreateTextTextureBatch(const boost::shared_arraysal_uInt8 bitmapBuf, + ::Size maSizePixels, + glm::vec3 vTopLeft,glm::vec3 vTopRight, + glm::vec3 vBottomRight, glm::vec3 vBottomLeft, + sal_uInt32 nUniqueId); private: struct ShaderResources @@ -290,6 +319,14 @@ private: GLint m_3DBatchNormalID; GLint m_3DBatchColorID; +//Batch render text +bool mbTexBatchSupport; +GLint m_BatchTextProID; +GLint m_BatchTextMatrixID; +GLint m_BatchTextVertexID; +GLint m_BatchTextTexCoordID; +GLint m_BatchTextTexID; + ShaderResources(); ~ShaderResources(); @@ -362,7 +399,7 @@ private: std::vector TextInfo m_TextInfoList; std::vector TextInfo m_ScreenTextInfoList; GLuint m_TextTexCoordBuf; - +GLuint m_TextTexCoordBufBatch; int m_uiSelectFrameCounter; std::vectorglm::vec3 m_Vertices; @@ -392,6 +429,7 @@ private: MaterialParameters m_Batchmaterial; GLuint m_Batch3DUBOBuffer; GLint m_Batch3DActualSizeLight; +TextInfoBatch m_TextInfoBatch; //for 3.0 version int m_iLightNum; glm::vec4 m_Ambient; diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index cf22a86..60b3cb2 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -88,6 +88,7 @@ OpenGL3DRenderer::OpenGL3DRenderer(): OpenGL3DRenderer::~OpenGL3DRenderer() { +ReleaseShapes(); // delete buffers glDeleteBuffers(1, m_CubeVertexBuf); glDeleteBuffers(1, m_CubeNormalBuf); @@ -103,10 +104,18 @@ OpenGL3DRenderer::~OpenGL3DRenderer() glDeleteBuffers(1, m_Batch3DUBOBuffer); glDeleteBuffers(1, m_3DUBOBuffer); glDeleteBuffers(1, m_3DUBOBuffer); +glDeleteBuffers(1, m_TextTexCoordBufBatch); glDeleteFramebuffers(1, mnPickingFbo); glDeleteRenderbuffers(1, mnPickingRboDepth); glDeleteRenderbuffers(1, mnPickingRboColor); + +for (size_t i = 0; i m_TextInfoBatch.texture.size(); i++) +{ +glDeleteTextures(1, m_TextInfoBatch.texture[i].textureID); +} +m_TextInfoBatch.texture.clear(); + } OpenGL3DRenderer::ShaderResources::ShaderResources() @@ -139,6 +148,12 @@ OpenGL3DRenderer::ShaderResources::ShaderResources() , m_3DBatchNormalID(0) , m_3DBatchColorID(0) , m_b330Support(false) +, m_BatchTextProID(0) +, m_BatchTextMatrixID(0) +, m_BatchTextVertexID(0) +, m_BatchTextTexCoordID(0) +, m_BatchTextTexID(0) +, mbTexBatchSupport(false) { } @@ -149,6 +164,7 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources() glDeleteProgram(m_ScreenTextProID); glDeleteProgram(m_3DProID); glDeleteProgram(m_3DBatchProID); +glDeleteProgram(m_BatchTextProID); } void OpenGL3DRenderer::CheckGLSLVersion() @@ -204,6 +220,27 @@ void
[Libreoffice-commits] core.git: 13 commits - chart2/opengl chart2/Package_opengl.mk chart2/source sdext/source
chart2/Package_opengl.mk |2 chart2/opengl/screenTextFragmentShader.glsl |3 chart2/opengl/textFragmentShader.glsl|3 chart2/opengl/textFragmentShaderBatch.glsl | 23 + chart2/opengl/textVertexShaderBatch.glsl | 23 + chart2/source/controller/main/ChartController.cxx| 50 -- chart2/source/controller/main/ChartController.hxx| 46 -- chart2/source/controller/main/ChartController_Window.cxx | 34 - chart2/source/view/charttypes/GL3DBarChart.cxx | 10 chart2/source/view/inc/GL3DRenderer.hxx | 44 ++ chart2/source/view/main/3DChartObjects.cxx | 11 chart2/source/view/main/GL3DRenderer.cxx | 315 +++ sdext/source/pdfimport/wrapper/wrapper.cxx |2 13 files changed, 367 insertions(+), 199 deletions(-) New commits: commit ac0989d5eaad3f8ab52b0288e345f30527dc45a4 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sat Jun 21 04:20:49 2014 +0200 avoid manual OpenGL extension checking Change-Id: I75faa82fc2eef7f3bfd3546d64f47dee6a0b7d08 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 06a1163..090685b 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -200,34 +200,7 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources() void OpenGL3DRenderer::CheckGLSLVersion() { -char version[256] = {0}; -strcpy(version, (char *)glGetString(GL_SHADING_LANGUAGE_VERSION)); -char *p = version; -int iVersion = 0; -//get the first point -while ((*p != '\0') (*p != '.')) -{ -iVersion = iVersion * 10 + ((*p) - 0x30); -p++; -} -if (iVersion 3) -{ -maResources.m_b330Support = false; -return; -} -if (iVersion 3) -{ -maResources.m_b330Support = true; -return; -} -p++; -iVersion = *p - 0x30; -if (iVersion = 3) -{ -maResources.m_b330Support = true; -return; -} -maResources.m_b330Support = false; +maResources.m_b330Support = GLEW_VERSION_3_3 == 1; } void OpenGL3DRenderer::ShaderResources::LoadShaders() @@ -252,17 +225,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() m_3DBatchNormalID = glGetAttribLocation(m_3DBatchProID, vertexNormalModelspace); m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, barColor); //check whether the texture array is support -GLint numExtensions = 0; -glGetIntegerv(GL_NUM_EXTENSIONS, numExtensions); -for( GLint i = 0; i numExtensions; ++i ) -{ -OUString currExt = ::rtl::OUString::createFromAscii((char*)glGetStringi(GL_EXTENSIONS, i)); -if (currExt == GL_EXT_texture_array) -{ -mbTexBatchSupport = true; -break; -} -} +mbTexBatchSupport = GLEW_EXT_texture_array == 1; if (mbTexBatchSupport) { m_BatchTextProID = OpenGLHelper::LoadShaders(textVertexShaderBatch, textFragmentShaderBatch); commit 00272efc1c71bdbd7fc0126f411765f482eaa2fb Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sat Jun 21 03:58:43 2014 +0200 I don't see a good reason for marking private methods with SAL_CALL Change-Id: I9b73b6b6073b3249317f4e1124d840930cbe558f diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 40cae9c..ee8b60a 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -541,12 +541,12 @@ private: voidimpl_deleteDrawViewController(); //executeDispatch methods -void SAL_CALL executeDispatch_ObjectProperties(); -void SAL_CALL executeDispatch_FormatObject( const OUString rDispatchCommand ); -void SAL_CALL executeDlg_ObjectProperties( const OUString rObjectCID ); +void executeDispatch_ObjectProperties(); +void executeDispatch_FormatObject( const OUString rDispatchCommand ); +void executeDlg_ObjectProperties( const OUString rObjectCID ); boolexecuteDlg_ObjectProperties_withoutUndoGuard( const OUString rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); -void SAL_CALL executeDispatch_ChartType(); +void executeDispatch_ChartType(); voidexecuteDispatch_InsertTitles(); voidexecuteDispatch_InsertLegend(); @@ -588,16 +588,16 @@ private: voidexecuteDispatch_DeleteMajorGrid(); voidexecuteDispatch_DeleteMinorGrid(); -void SAL_CALL executeDispatch_InsertSpecialCharacter(); -void SAL_CALL executeDispatch_EditText( const Point* pMousePixel =
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ChartController.cxx|6 +++--- chart2/source/controller/main/ChartController_Position.cxx |2 +- chart2/source/controller/main/ChartController_Properties.cxx |8 chart2/source/controller/main/ChartController_TextEdit.cxx |4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) New commits: commit fb06300b73b6b9d3794a5c60ecffa7802d821fce Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sat Jun 21 04:46:14 2014 +0200 fix windows build Change-Id: I0de216a8c6259ba6ec825f85f52e2f48b97510d7 diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 1045ec2..60a276c 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1235,7 +1235,7 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor( // XEmbeddedClient // implementation see: ChartController_EditData.cxx -void SAL_CALL ChartController::executeDispatch_ChartType() +void ChartController::executeDispatch_ChartType() { // using assignment for broken gcc 3.3 UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( @@ -1251,7 +1251,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType() } } -void SAL_CALL ChartController::executeDispatch_SourceData() +void ChartController::executeDispatch_SourceData() { //convert properties to ItemSet uno::Reference XChartDocumentxChartDoc( getModel(), uno::UNO_QUERY ); @@ -1273,7 +1273,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData() } } -void SAL_CALL ChartController::executeDispatch_MoveSeries( bool bForward ) +void ChartController::executeDispatch_MoveSeries( bool bForward ) { ControllerLockGuardUNO aCLGuard( getModel() ); diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 230637b..c28c697 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -108,7 +108,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet rItemSet, awt::Rectang rPosAndSize = awt::Rectangle(nPosX,nPosY,nSizX,nSizY); } -void SAL_CALL ChartController::executeDispatch_PositionAndSize() +void ChartController::executeDispatch_PositionAndSize() { const OUString aCID( m_aSelection.getSelectedCID() ); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index dd2e0fa3..3c1bb9e 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -636,7 +636,7 @@ OUString lcl_getObjectCIDForCommand( const OString rDispatchCommand, const uno: } // anonymous namespace -void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString rDispatchCommand) +void ChartController::executeDispatch_FormatObject(const OUString rDispatchCommand) { uno::Reference XChartDocument xChartDocument( getModel(), uno::UNO_QUERY ); OString aCommand( OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) ); @@ -644,7 +644,7 @@ void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString rDis executeDlg_ObjectProperties( rObjectCID ); } -void SAL_CALL ChartController::executeDispatch_ObjectProperties() +void ChartController::executeDispatch_ObjectProperties() { executeDlg_ObjectProperties( m_aSelection.getSelectedCID() ); } @@ -675,7 +675,7 @@ OUString lcl_getFormatCIDforSelectedCID( const OUString rSelectedCID ) }//end anonymous namespace -void SAL_CALL ChartController::executeDlg_ObjectProperties( const OUString rSelectedObjectCID ) +void ChartController::executeDlg_ObjectProperties( const OUString rSelectedObjectCID ) { OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID ); @@ -788,7 +788,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri return bRet; } -void SAL_CALL ChartController::executeDispatch_View3D() +void ChartController::executeDispatch_View3D() { try { diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index c9ae457..5ec36e3 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -46,7 +46,7 @@ namespace chart { using namespace ::com::sun::star; -void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixel ) +void ChartController::executeDispatch_EditText( const Point* pMousePixel ) { this-StartTextEdit( pMousePixel ); } @@ -145,7 +145,7 @@ bool ChartController::EndTextEdit() return true; } -void SAL_CALL
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b6e49ad5ddd68d71c9f872d565881023dae526a9 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sat Jun 21 04:48:48 2014 +0200 avoid truncation double to float warning Change-Id: I7f5c5f025954120c06fcce2c14915a8138843374 diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index d61162a..d4568bd 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -439,7 +439,7 @@ void GL3DBarChart::mouseDragMove(const Point rStartPos, const Point rEndPos, s glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId) { -float pi = 3.1415926; +float pi = 3.1415926f; switch(nId) { case 0: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source
cui/source/options/personalization.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f1e214887adf28e7ae2f5aceb409038684cdbe8 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Sat Jun 21 09:16:16 2014 +0530 Fixed Typo. Change-Id: I8d0b34e0c34c349baaa7c9a56fd1e6cfe3ad6934 diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 8e0520e..1254e82 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -74,7 +74,7 @@ private: PushButton *m_pSearchButton;/// The search button FixedText *m_pProgressLabel;/// The label for showing progress of search PushButton *m_vResultList[9]; /// List of buttons to show search results -PushButton *m_vSearchSuggestions[9];/// List of buttons for the search suggestions +PushButton *m_vSearchSuggestions[5];/// List of buttons for the search suggestions PushButton *m_pOkButton;/// The OK button PushButton *m_pCancelButton;/// The Cancel button ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] [ANN] LibreOffice 4.3.0 rc1 test builds available
Hi, On Wed, Jun 18, 2014 at 07:28:08PM +0200, Christian Lohmaier wrote: for the upcoming new version 4.3.0 the builds for RC1 are now available on pre-releases. For testers of the upcoming Ubuntu Utopic (14.10) version, builds of this are available at: https://launchpad.net/~libreoffice/+archive/libreoffice-prereleases I hope backports to Ubuntu 14.04 LTS and Ubuntu 12.04 LTS might turn up there too at some point. This hopefully helps to get more people involved in the 4.3.0~rc1 BHS: https://wiki.documentfoundation.org/BugHunting_Session_4.3.0_RC1 Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 80260] Conditional formatting in spreadsheets doesn't work
https://bugs.freedesktop.org/show_bug.cgi?id=80260 --- Comment #2 from Lachlan lachlan...@gmail.com --- then i think we have a bug. i was just putting the value y / n /etc into the value section. LO is adding the single quotes when i save the formatting. I can confirm that the double quotes work but LO shouldn't be adding single quotes to my values. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80265] Request: Calc should accept and auto-correct full-width brackets () to half-width ()
https://bugs.freedesktop.org/show_bug.cgi?id=80265 --- Comment #1 from suokunl...@gmail.com --- For the description of fullwidth and halfwidth chars in CJK , see this wiki page: http://en.wikipedia.org/wiki/Fullwidth_form#Full -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80260] Conditional formatting in spreadsheets doesn't work
https://bugs.freedesktop.org/show_bug.cgi?id=80260 --- Comment #3 from ign_christian ign_christ...@yahoo.com --- LO is adding the single quotes when i save the formatting. Yes I also saw single quotes added while we only put Y as conditional entry. ... but LO shouldn't be adding single quotes to my values. I don't know about that, so lets wait for others opinion. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80268] New: Editing formula when more than one page on screen
https://bugs.freedesktop.org/show_bug.cgi?id=80268 Priority: medium Bug ID: 80268 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Editing formula when more than one page on screen Severity: normal Classification: Unclassified OS: Linux (All) Reporter: phoe...@apollonus.net Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.2.3.2 rc Component: Writer Product: LibreOffice Have more than one page displayed on monitor (zoom out / big monitor). Edit a formula in the middle of the document. It will jump somewhere else. When you close the formula, it jumps back. It is annoying because you cannot see what you get. Zoom in to one page per screen- everything works ok. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79574] apply format brush appears weird
https://bugs.freedesktop.org/show_bug.cgi?id=79574 --- Comment #6 from eudlauk eud.l...@laposte.net --- Hi Jay, you are very impressive : job's already done ! You're likely more organized and efficient than me. About xfce, shame for the look'n'feel, compared to gnome, but it gets rid of annoying or critical issues. Hail from France (/where not everything's rotten yet, but hush ! Don't tell I told you/) : have a nice day and see you for an other bug report, who knows... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 --- Comment #3 from ign_christian ign_christ...@yahoo.com --- Just my personal opinion: 3. Click the auto filter icon in B1 or C1 of sheet2. The first value in the filer is a blank box. This is wrong, the filter should never give this result. I think it's ok so we could filter blank cells. 4. Copy cell B5 or C4 of sheet2, and paste only value to another empty cell. the cell you pasted to is showing 0. This is wrong, as you see blank value in B5 and C4. I agree, should be no value. Tested under LO 4.0.6.2 - Win7 x86 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80260] Conditional formatting in spreadsheets doesn't work
https://bugs.freedesktop.org/show_bug.cgi?id=80260 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #4 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #3) LO is adding the single quotes when i save the formatting. Yes I also saw single quotes added while we only put Y as conditional entry. ... but LO shouldn't be adding single quotes to my values. I don't know about that, so lets wait for others opinion. This has been explained once by markus mohard. Not a bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80270] New: Other: Table of contents with Witter
https://bugs.freedesktop.org/show_bug.cgi?id=80270 Priority: medium Bug ID: 80270 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Table of contents with Witter Severity: normal Classification: Unclassified OS: Windows (All) Reporter: philippe.delbo...@educagri.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.6.2 release Component: Writer Product: LibreOffice Problem description: When you create a table of contents with Writer, if the table of contents is more than one page, it is impossible to change the page style of the second page. The style of the second page is always the default style Steps to reproduce: 1. 2. 3. Current behavior: Expected behavior: Operating System: Windows 8 Version: 4.1.6.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com --- Comment #4 from suokunl...@gmail.com --- (In reply to comment #3) Thanks for testing. 3. Click the auto filter icon in B1 or C1 of sheet2. The first value in the filer is a blank box. This is wrong, the filter should never give this result. I think it's ok so we could filter blank cells. I don't think so. If you go to sheet1 and set autofilter on the data, you will see that in normal cases blank value are not shown in the filter results, but you can choose the Empty option located within Top 10, Empty, Not Empty to filter out the empty results. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80245] EDITING: Multiple Issues with the Table of Contents
https://bugs.freedesktop.org/show_bug.cgi?id=80245 --- Comment #7 from actionmystique actionmysti...@gmail.com --- That won't be possible this time. As you pointed out, you have a lot of details to report these issues. If you need more information, I'd be glad to answer your questions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80270] Other: if a Table of contents in Witter is over two pages, it is impossible to change page style of the second page
https://bugs.freedesktop.org/show_bug.cgi?id=80270 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl Summary|Other: Table of contents|Other: if a Table of |with Witter |contents in Witter is over ||two pages, it is impossible ||to change page style of the ||second page -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 78502] FILEOPEN: RTF beginning of file starts with multiple '; ' characters
https://bugs.freedesktop.org/show_bug.cgi?id=78502 --- Comment #4 from Urmas davian...@gmail.com --- Apparently caused by semicolon terminators in the style table encoded as {\uc1 \u59 ?}. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80271] New: FILESAVE: Shape not getting preserved in RT file
https://bugs.freedesktop.org/show_bug.cgi?id=80271 Priority: medium Bug ID: 80271 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Shape not getting preserved in RT file Severity: normal Classification: Unclassified OS: All Reporter: dinesh.pa...@synerzip.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 101417 -- https://bugs.freedesktop.org/attachment.cgi?id=101417action=edit File contains shape Problem description: File containing shape is not getting preserved because of noFill attribute. Steps to reproduce: 1. Open the file in LibreOffice 2. Click File - Save As (Microsoft Word 2007/2010 (.docx)) 3. Open saved file in MS Office Current behavior: Shape in RT file is not getting preserved Expected behavior: Shape in RT file should be preserved Operating System: All Version: 4.4.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80271] FILESAVE: Shape not getting preserved in RT file
https://bugs.freedesktop.org/show_bug.cgi?id=80271 Dinesh dinesh.pa...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |dinesh.pa...@synerzip.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54218] DIN A3 printing in Page Preview correct, Printout wrong
https://bugs.freedesktop.org/show_bug.cgi?id=54218 --- Comment #3 from crass...@aol.de --- Dear Developers printing works perfect since Libreoffice 4.2 Bug is solved. Thank you -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 --- Comment #5 from ign_christian ign_christ...@yahoo.com --- I don't think so. If you go to sheet1 and set autofilter on the data, you will see that in normal cases blank value are not shown in the filter results, but you can choose the Empty option located within Top 10, Empty, Not Empty to filter out the empty results. You're right, if cell have no value so Empty option should be enough. Now I agree with you :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80272] New: Grid lines massed up when formula returns error message in Chinese
https://bugs.freedesktop.org/show_bug.cgi?id=80272 Priority: medium Bug ID: 80272 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Grid lines massed up when formula returns error message in Chinese Severity: major Classification: Unclassified OS: Windows (All) Reporter: suokunl...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.2.4.2 release Component: Spreadsheet Product: LibreOffice Our Simplified Chinese libreoffice community members had been suffering from the grid-line-messed-up issue in Calc, but it was difficult to find the steps to 100% reproduce this bug behaviour. But now, we have finally found the following easy steps to reproduce. Steps to Reproduce: 1. Switch to Simplified Chinese or Tranditional Chinese UI; 2. Input =VLOOKUP() in A1; Note: In formula you input is without any parameter, so the formular returns the error value 错误:511 (Err: 511) in Chinese. 3. Click on a few cells in column A. You can observe that the row label (1,2,3,4,...) spaces have changed a little bit. (This is the bug) 4. Input some other formulas which will return errors, in some other cells. For example, you can input: =VALUE(), =MATCH(), =YEAR()... You can observe that the grid lines are messed up, and even worse if you input more formulas. More info: When is in English UI, Japanese UI and French UI I do not reproduce this bug behaviour. But in both Simplified Chinese and Trandisional Chinese UI, I reproduce this bug behaviour. OS: Windows XP SP3 Version: 4.3.0.1 Build ID: 67f5430184326974072b65403ef1d9d934fc4481 Our commutiy members has said this behaviour first reproduced in 4.2.4.2. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80272] Grid lines messed up when formula returns error message in Chinese
https://bugs.freedesktop.org/show_bug.cgi?id=80272 suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com Summary|Grid lines massed up when |Grid lines messed up when |formula returns error |formula returns error |message in Chinese |message in Chinese -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80272] Grid lines messed up when formula returns error message in Chinese
https://bugs.freedesktop.org/show_bug.cgi?id=80272 suokunl...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=79395 --- Comment #1 from suokunl...@gmail.com --- Added bug 79395 as see also. It may be related. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75937] Galaxy missing in 4.2
https://bugs.freedesktop.org/show_bug.cgi?id=75937 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Keywords||regression --- Comment #19 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hi Bug still occurs on windows 7/64 Version: 4.3.0.1 Build ID: 67f5430184326974072b65403ef1d9d934fc4481 I added the keyword Regression Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79395] Grid lines messed up when open certain xlsx file
https://bugs.freedesktop.org/show_bug.cgi?id=79395 suokunl...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=80272 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 --- Comment #6 from suokunl...@gmail.com --- (In reply to comment #5) @ign_christian: So do you reproduce this bug behaviour following my steps? If you can reproduce, please help to mark the status to NEW. Thanks! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80272] Grid lines messed up when formula returns error message in Chinese
https://bugs.freedesktop.org/show_bug.cgi?id=80272 yanjing...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #2 from yanjing...@gmail.com --- The same in Fedora 20 Build ID: 4.2.4.2-18.fc20. I found the font-size of 错误 is a little bigger than :511. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80272] Grid lines messed up when formula returns error message in Chinese
https://bugs.freedesktop.org/show_bug.cgi?id=80272 --- Comment #3 from suokunl...@gmail.com --- (In reply to comment #2) The same in Fedora 20 Build ID: 4.2.4.2-18.fc20. I found the font-size of 错误 is a little bigger than :511. Font size issue may not be related to this bug, so should not be discussed within this bug (In fact I also noticed the font-size issue in linux. The workaround is to set the default style a 0.5 larger font size for Westen Chars than Chinese) I my testing, those font sizes are the same for me in Windows XP, while I also reproduce the bug. So they are not related. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 --- Comment #7 from ign_christian ign_christ...@yahoo.com --- @suokunlog, I confirm that behavior only in 4.0.6.2. Your report is against 4.3.0.1, so I think someone with 4.3.0.1 that have the right to set NEW ? I also think this report should be splitted. The auto filter icon looks like enhancement request. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80259] VLOOKUP returns wrong value when the source data is blank
https://bugs.freedesktop.org/show_bug.cgi?id=80259 suokunl...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Version|4.3.0.1 rc |4.0.6.2 release Ever confirmed|0 |1 --- Comment #8 from suokunl...@gmail.com --- (In reply to comment #7) Your report is against 4.3.0.1, so I think someone with 4.3.0.1 that have the right to set NEW ? 4.3.0.1 is the version I tested it, if you can reproduce in 4.0.6.2, then of couse the status can be set NEW, and the version should be changed to 4.0.6.2 accordingly to reflect the most early version this bug appears. I also think this report should be splitted. The auto filter icon looks like enhancement request. The filter results issue should be related to the VLOOKUP value issue, so I reported as one report. It's OK for me to file a saparate bug report if the devs think they are different issue. -- Set to NEW; -- Changed version to 4.0.6.2. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69282] MAILMERGE: Format (page style) of the first page changed from other pages in mail merge
https://bugs.freedesktop.org/show_bug.cgi?id=69282 ulk...@hotmail.de changed: What|Removed |Added Whiteboard|BSA |BSA lhm-limux -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79067] MAILMERGE: mailmerge takes ages to create documents
https://bugs.freedesktop.org/show_bug.cgi?id=79067 ulk...@hotmail.de changed: What|Removed |Added Whiteboard|BSA |BSA lhm-limux -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54809] MAILMERGE: Printing address labels: final layout is incorrectly calculated
https://bugs.freedesktop.org/show_bug.cgi?id=54809 ulk...@hotmail.de changed: What|Removed |Added Whiteboard|BSA |BSA lhm-limux -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80275] New: EDITING: suggestion : copy all the line, as it's possible in excel
https://bugs.freedesktop.org/show_bug.cgi?id=80275 Priority: medium Bug ID: 80275 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: suggestion : copy all the line, as it's possible in excel Severity: normal Classification: Unclassified OS: Windows (All) Reporter: ad...@hb50.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.4.2 release Component: Spreadsheet Product: LibreOffice Hi I just want to suggest to add fonctionnality, to copy a line (all the line) as it's possible in excel. In Calc, I can copy one or several cells, but not all a line. Thanks a lot Hubert Operating System: Windows 8 Version: 4.2.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80270] Other: if a Table of contents in Witter is over two pages, it is impossible to change page style of the second page
https://bugs.freedesktop.org/show_bug.cgi?id=80270 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|normal |enhancement Ever confirmed|0 |1 --- Comment #1 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hi I reproduce on windows 7/64 Version: 4.3.0.1 Build ID: 67f5430184326974072b65403ef1d9d934fc4481 I change from bug to enhancement: this is not strictly a bug. The style of second page is not always default (the style of the first page is kept). There is a workaround : - Edit the index, Index/Table tab -Unprotect against manual changes See the IndexTwoPages attached. You can modify the text flow, but beware to no longer update the index Thank's for reporting Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80270] Other: if a Table of contents in Witter is over two pages, it is impossible to change page style of the second page
https://bugs.freedesktop.org/show_bug.cgi?id=80270 --- Comment #2 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Created attachment 101421 -- https://bugs.freedesktop.org/attachment.cgi?id=101421action=edit IndexTwoPages document -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80275] EDITING: suggestion : copy all the line, as it's possible in excel
https://bugs.freedesktop.org/show_bug.cgi?id=80275 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||pierre-yves.samyn@laposte.n ||et Ever confirmed|0 |1 --- Comment #1 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hi Copy a line (all the line) is possible in Calc: - Click the header to select the line, copy - Click the the header of the target line and paste You also can select a cell in Col A before pasting. It is also possible to drag drop : - Click the header to select the line - keep the left button, Move the mouse to the target with the Ctrl-Key What we can not do is select a cell in a column to the right of the first before pasting. The message will be: there is not enough space on the sheet to insert here. Thank you to specify if this answers your question. If this is not the case, thank you give details on the context in which you can not copy. I set status to NEEDINFO. Please set to UNCONFIRMED when you answer. Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80277] New: VIEWING: View is interrupted
https://bugs.freedesktop.org/show_bug.cgi?id=80277 Priority: medium Bug ID: 80277 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: View is interrupted Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: simon.goep...@live.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.4.2 release Component: Spreadsheet Product: LibreOffice Created attachment 101423 -- https://bugs.freedesktop.org/attachment.cgi?id=101423action=edit A sreenshot of the view problem. Usually the cells 1 to 29 are filled with other text. Only the line 30 is empty. When I change the zoom the problem disappears. I'm a German, please forgive my bad english. Problem description: The cells does not show the real content but reproduce the content of another cell (only in view, the real contents are still there, but not shown). Steps to reproduce: 1. Open a document. 2. Wait a while (I don't really know, when the problem starts.). Zoom is on 120-130% (I'm not sure about that.). 3. Then scroll up or down. Current behavior: When you scroll up, the top line is reproduced and now shown in all the upper cells (how you can see in the screenshot). The same error starts sometimes, when you scroll down. Then the bottom line is reproduced and shown in the other lines down to it. Expected behavior: The cells just show the content that is in there. Operating System: Mac OS X Version: 4.2.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80275] EDITING: suggestion : copy all the line, as it's possible in excel
https://bugs.freedesktop.org/show_bug.cgi?id=80275 --- Comment #2 from lus ad...@hb50.fr --- Hi, thanks for reply. No, it's not what I want and need. I want to copy one line in a lot of lines. So, copy and paste each line is not a good idea for me. In excel, I check all the line I click on the + (which appears on first cell) and can copy it on all lines below In calc, I can do it only on Cells (or group of cells). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80278] New: Simplify side-by-side installation of productivity and development/test versions
https://bugs.freedesktop.org/show_bug.cgi?id=80278 Priority: medium Bug ID: 80278 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Simplify side-by-side installation of productivity and development/test versions Severity: enhancement Classification: Unclassified OS: Windows (All) Reporter: libreoff...@earthflight.org Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.3.0.1 rc Component: Installation Product: LibreOffice User story: As a regular bug tester of LibreOffice I want a *quick and simple*, working way to install a second (or third) version of Libreoffice besides my normal (productive) installation in order to easily test the behaviour of several versions without having to fear about corrupting (or erasing) my normal installation. Rationale: I believe that if we make installing/uninstalling a LibO test version as easy and comfortable as installing a production version then this will lower the barrier for users to do bug testing and bug hunting. Background: Once in a while I post bugs and are asked to check if they already existed in older versions (are regressions) or a are maybe fixed in the latest beta versions. So far everytime I installed a version to test this it erased my previous version which I had to re-install after the tests were finished. This is annoying. Today I tested the server installation as described on https://wiki.documentfoundation.org/Installing_in_parallel#Windows. I first tried the Server GUI Setup 4.0.2, but it would show an error and abort when trying to install the files of LibO 4.3.0.1 (RC1). Then I followed the manual installation. This worked until the point when trying to start the application. It complains it cannot find the Visual C++ Runtime DLLs although they are present in C:\Windows\System32 and the documentation claims they should be put exactly there. So this didn't work either. I have now almost 1h wasted for nothing. This is perfect for putting off possible engaged testers. I therefore propose the following: 1. The normal windows installer UI should get an option to perform a side-by-side (or self-contained) installation not touching any already installed instance of LibO or OOo. 2. This option should be offered to the user either - if the installer detects another installed version on the machine or - if the installer was started with a certain command line parameter or - always. I leave this up to you. 3. The installer should then install LibO just as conveniently as with a normal install. It should configure LibO to store the preferences within the installation directory (as the server installation does), It should also create the usual links in the start menu *besides* the existing links. (The user might specify separate path in start menu for the.) 4. During such side-by-side installation the installer might ask the user to change the file type associations to the new installation (so .odf or .doc files open with the new instance), but this should be *disabled by default* because usually the productive installation is supposed to work like it did before, including being responsible for opening documents by default. 5. There should be no need to copy Windows DLLs from one place to another! 6. The installation should create an entry in the list of installed applications under Windows in order to remove the installation just like any other application. Do I ask for too much? Tested on Win7 HP 64 Bit. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79599] FILEOPEN FILESAVE RTF: Libreoffice produces incompatible rtf-code for text-highlighting (uses \chcbpatN instead of \highlightN)
https://bugs.freedesktop.org/show_bug.cgi?id=79599 --- Comment #15 from Norbert X nrb...@gmail.com --- Tested on Windows ( Version: 4.4.0.0.alpha0+ Build ID: 67f64c266cd5a0368eff0be727228bc6a9c67cb2 TinderBox: Win-x86@42, Branch:master, Time: 2014-06-20_01:28:13 ) - the bug is fixed. Is it possible to push this changes to all not-EOL versions of LibO (4.2, 4.3)? Who can perform this push? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 74729] EDITING: Dragging up a cell with a formula delete destination cells(show Delete contents over the cross)
https://bugs.freedesktop.org/show_bug.cgi?id=74729 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added CC||pierre-yves.samyn@laposte.n ||et --- Comment #4 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hi I reproduce on windows 7/64 Version: 4.3.0.1 Build ID: 67f5430184326974072b65403ef1d9d934fc4481 Other steps to reproduce: 1. Type 1, 2, 3, 4, 5 in A1, A2, A3, A4, A5 2. In B3 type =A3 3. Position the mouse on the bottom right of B3, and continue holding down the mouse button until the pointer changes to a cross-hair symbol and drag your mouse down to B5, then release your mouse. Expected actual result : formula copied =A4 in B4 =A5 in B5 4. Select B3, Position the mouse on the bottom right of B3, and continue holding down the mouse button until the pointer changes to a cross-hair symbol and drag your mouse up to B1, then release your mouse. Expected result: =A1 in B1 =A2 in B2 Actual result! B1, B2 are empty This is a regression indeed In addition, the operation is inconsistent: 5. Select B3, Position the mouse on the bottom right of B3, and continue holding down the mouse button until the pointer changes to a cross-hair symbol and drag your mouse up to B2, then release your mouse. Message delete contents appears but the formula is in B2 (=A2) Therefore, copying works cell by cell. Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80279] New: FILESAVE: File is causing LO hang while saving it to docx
https://bugs.freedesktop.org/show_bug.cgi?id=80279 Priority: medium Bug ID: 80279 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: File is causing LO hang while saving it to docx Severity: normal Classification: Unclassified OS: Windows (All) Reporter: umesh.ka...@synerzip.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 101425 -- https://bugs.freedesktop.org/attachment.cgi?id=101425action=edit file has tables spanned across pages. Problem description: Steps to reproduce: 1. Open the file in LO on Windows build 2. Save the file as docx. Current behavior: LO hangs while saving the file Expected behavior: LO should get saved without any issues. Operating System: Windows 7 Version: 4.4.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 74729] EDITING: Dragging up a cell with a formula delete destination cells(show Delete contents over the cross)
https://bugs.freedesktop.org/show_bug.cgi?id=74729 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Keywords||regression -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80280] New: UI: Missing icons in icon chooser for toolbar customization
https://bugs.freedesktop.org/show_bug.cgi?id=80280 Priority: medium Bug ID: 80280 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Missing icons in icon chooser for toolbar customization Severity: normal Classification: Unclassified OS: Windows (All) Reporter: libreoff...@earthflight.org Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.1 rc Component: Writer Product: LibreOffice Created attachment 101426 -- https://bugs.freedesktop.org/attachment.cgi?id=101426action=edit Screenshot showing one missing icon. There are more if you scroll down the dialog. When customizing the toolbar I sometimes add actions to a toolbar which have no own icon. It is possible to assign an icon to them using the Change - Exchange icon action in the Customization dialog. Now the Exchange icon dialog comes up The Exchange icon dialog shows a lot of icons, but it also shows a few texts where obviously the icon is missing. Since I see no point in choosing a text for an icon I deduct this to be a bug. Operating System: Windows 7 Version: 4.3.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80280] UI: Missing icons in icon chooser for toolbar customization
https://bugs.freedesktop.org/show_bug.cgi?id=80280 Matthias Basler libreoff...@earthflight.org changed: What|Removed |Added Severity|normal |minor Priority|medium |low -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 52263] Replace custom hourglass pointer/cursor by the operating system's default wait pointer everywhere
https://bugs.freedesktop.org/show_bug.cgi?id=52263 Sierk Bornemann sie...@gmx.de changed: What|Removed |Added Priority|low |high --- Comment #8 from Sierk Bornemann sie...@gmx.de --- (In reply to comment #6) The issue still is present (LO 4.2.5.2, LO 4.3.0.1). Any progress in it? For instance, it attracts to my attention, when starting LO for the first time, and when then opening a known recent document from the overview panel. If closing LO and doing the same again, the hourglass doesn't show up again, since both, the application as well as the said document, could be loaded faster into memory than the attempt before, so the hourglass then doesn't/needn't appear. The fact, that this issue *still* resists in the year 2014, giving LO a touch of a forgotten relict of the 1980th, and obviously still is *not* fixed although known long enough, really is an embarrassment. If the fix really would be trivial to do, then please fix this issue and use the system's waiting pointer. I am raising the importance of this issue to high, because this issue is one of such seeming-of-no-importance-issues, Mac users complain about (rightly!) and which show tellingly, how unlovingly the Mac platform sometimes is treated concerning some Open Source software in comparison to the Windows platform and Linux platform. Open Source can do better than leaving bad impressions such as this issue. Much better. Let's prove it! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80281] New: FORMATTING: Keep aspect ratio checkbox of images or photos not always honoured
https://bugs.freedesktop.org/show_bug.cgi?id=80281 Priority: medium Bug ID: 80281 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Keep aspect ratio checkbox of images or photos not always honoured Severity: normal Classification: Unclassified OS: Windows (All) Reporter: libreoff...@earthflight.org Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.1 rc Component: Writer Product: LibreOffice As a user I expect that the aspect ratio of an image is kept intact if the corresponding checkbox Keep aspect ratio is set, no matter *when* it was set. To reproduce: 1. Open a new text file. 2. Insert an image or photo into the page 3. Double-click on image to open image properties dialog 4. Ensure the Keep aspect ratio checkbox is off. 4. Choose a width of e.g. 20% (relative to text area) 5. *Then* check the Keep aspect ratio checkbox 6. Click OK Expected result: - Since the checkbox was checked when OK was clicked, the image should be scaled proportionally Actual result: - Since the checkbox was unchecked in the moment when the new size was *entered*, it did not scale the image proportionally when the dialog was closed. I propose that as soon as the Keep aspect ratio checkbox is set, the aspect ratio is forced back to the image ratio the photo had when the dialog was opened, by honouring either the width or height parameter, whatever was changed last. This would be a behaviour consistent with several image processing applications I use. (Side node: It would be nice if there were a possibility to restore the photos original aspect ratio at any time, but this would go as another feature request.) Operating System: Windows 7 Version: 4.3.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80281] FORMATTING: Keep aspect ratio checkbox of images or photos not always honoured
https://bugs.freedesktop.org/show_bug.cgi?id=80281 Matthias Basler libreoff...@earthflight.org changed: What|Removed |Added Severity|normal |minor Priority|medium |low -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76991] Writer destroys aspect ratio when scaling graphics
https://bugs.freedesktop.org/show_bug.cgi?id=76991 Matthias Basler libreoff...@earthflight.org changed: What|Removed |Added CC||libreoff...@earthflight.org --- Comment #5 from Matthias Basler libreoff...@earthflight.org --- I can confirm this with the sample document and LibO 4.3.0.1 (RC1) on Win7 HP. I can also reproduce this with the same .jpg file in a blank new document. I can also reproduce it with a newly created image of the same size (256x194px) with both JPG and PNG version and with own photos. The effect is most obvious for images which are far from quadratic such as this business card. Um ... given that resizing images is a very common task in a word processing application I personally would give this issue a high priority. I am quite sure I stumbled upon this issue already before (in production use), but back then I thought I had done something wrong. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80282] New: FORMATTING: Resizing image relative to page size doesn't work for image anchored to page
https://bugs.freedesktop.org/show_bug.cgi?id=80282 Priority: medium Bug ID: 80282 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Resizing image relative to page size doesn't work for image anchored to page Severity: normal Classification: Unclassified OS: Windows (All) Reporter: libreoff...@earthflight.org Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.1 rc Component: Writer Product: LibreOffice In the release notes to 4.3 (https://wiki.documentfoundation.org/ReleaseNotes/4.3#Relative_text_frame_anchoring_improvements) the new feature of being able to assign sizes for text frames (and images) relative to the full page. This works if the image is anchored to the paragraph, but produces nonsense if the image is anchored to the page at the same time. To reproduce: 1. Open a blank writer document 2. Insert an image from file which is supposed to serve as a full page image. (For this test it need not exactly match the page aspect ratio.) 3. Double-click the image to edit the image properties. 4. Make sure Keep aspect ratio is checked. 5. Check Width Relative to and select Whole page. 6. Check the anchor to be On the page. 7. Klick OK to close the dialog. Expected result: - Image fills the page almost completely Actual result: - Image seems to disappear, actually it shrinks to a dot at the top center of the page. Want some more fun? 8. Right-click this (still selected) dot and bring up the dialog again. 9. Change the width value to 95% (of the page) and close the dialog with OK. New result: Image is completely disappeared. Note: - You get exactly the same result if you do it in two steps. First scale the image to 100% of the page width and close the dialog. This will the so far expected result. If you then reopen the dialog and switch to Anchor to page, the image will shrink to a dot. - Bug (P.S. I am using the German version, so option names might differ for you.) Operating System: Windows 7 Version: 4.3.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80283] New: VIEWING: Problem when scrolling spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=80283 Priority: medium Bug ID: 80283 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Problem when scrolling spreadsheet Severity: normal Classification: Unclassified OS: Windows (All) Reporter: e-p...@tiscali.it Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.3 release Component: Spreadsheet Product: LibreOffice I have a spreadsheet mae of about 30 columns and a few hundred rows. When scrolling (mouse wheel mainly) the rows get messed up, with different rows overlapping or showing / disappearing or changing thei height. Also, selecting an area or a single cell may result in a larger than the cell area being highlighted, making it difficult to assess if selection is correct. It doesn't always happen (but quite often). Operating System: Windows 7 Version: 4.2.3.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80282] FORMATTING: Resizing image relative to page size doesn't work for image anchored to page
https://bugs.freedesktop.org/show_bug.cgi?id=80282 --- Comment #1 from Matthias Basler libreoff...@earthflight.org --- Created attachment 101427 -- https://bugs.freedesktop.org/attachment.cgi?id=101427action=edit Book with image supposed to cover full page Simple test attached -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80284] New: EDITING: Not all cells are recalculated when deleting a column
https://bugs.freedesktop.org/show_bug.cgi?id=80284 Priority: medium Bug ID: 80284 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Not all cells are recalculated when deleting a column Severity: major Classification: Unclassified OS: All Reporter: stanislav.hora...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.2.0.0.beta2 Component: Spreadsheet Product: LibreOffice When deleting a row, some of affected cells are not recalculated and contain incorrect values. Steps to reproduce: 1. Open a new spreadsheet. 2. Type number 1 to A1, formula =A1 to B1 and =B1 to C1. 3. Delete entire column A. Observed: Cell A1 (former B1) gets #REF! value, whereas 1 remains in B1 (former C1). Expected: Both A1 and B1 cells should have #REF! value. The issue does not appear if A1 cell is deleted only (not entire column) or if an entire row is deleted (if we use A1, A2, A3 instead of A1, B1, C1). Tested in 4.2 series (from beta 2 to 4.2.5 RC1), 4.3 beta2 and 4.3 RC1. Previous series are not affected. Severity set to major as this leads to incorrect values in a spreadsheet. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80281] FORMATTING: Keep aspect ratio checkbox of images or photos not always honoured
https://bugs.freedesktop.org/show_bug.cgi?id=80281 Matthias Basler libreoff...@earthflight.org changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=80282 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs