[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/interpr7.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 9bb72868b846a7ba7e8f985a87e944fb760a0f10 Author: Markus Mohrhard Date: Sat Dec 7 06:57:57 2013 +0100 correct UTF8 handling for FILTERXML, fdo#72427 Change-Id: Ie0a5824ddbc3e75a1bb22121e620378ad3e0dfde diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index d714057..bb647c1 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -89,19 +89,19 @@ void ScInterpreter::ScFilterXML() xmlNsPtr ns = (xmlNsPtr)pNodeSet->nodeTab[0]; xmlNodePtr cur = (xmlNodePtr)ns->next; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else if(pNodeSet->nodeTab[0]->type == XML_ELEMENT_NODE) { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr7.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 62174f6a8d4c191d67b7952d851a06b84a2b02be Author: Markus Mohrhard Date: Sat Dec 7 06:57:57 2013 +0100 correct UTF8 handling for FILTERXML, fdo#72427 Change-Id: Ie0a5824ddbc3e75a1bb22121e620378ad3e0dfde diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index d714057..bb647c1 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -89,19 +89,19 @@ void ScInterpreter::ScFilterXML() xmlNsPtr ns = (xmlNsPtr)pNodeSet->nodeTab[0]; xmlNodePtr cur = (xmlNodePtr)ns->next; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else if(pNodeSet->nodeTab[0]->type == XML_ELEMENT_NODE) { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); -aResult = OUString::createFromAscii((char*)pChar2.get()); +aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2013-12-07
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Added OOXML Unit Test framework for Chart module for export. in https://gerrit.libreoffice.org/6957 from Pallavi Jadhav about module chart2 + Do not compress .ui translations in .zip files. in https://gerrit.libreoffice.org/6938 from Matúš Kukan about module solenv + Fix for Column Break if it appears in w:r which is not the first run. in https://gerrit.libreoffice.org/6953 from Vinaya Mandke about module sw, writerfilter + fdo#72158 Add Excel 2010 functions in https://gerrit.libreoffice.org/6883 from Winfried Donkers about module formula, include, sc End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#72125 - Expert config dialog takes too much time to come up in https://gerrit.libreoffice.org/6956 from Noel Grandin + EMF+: Fill line cap object if EmfPlusCustomLineCapDataFillPath is set. in https://gerrit.libreoffice.org/6958 from Matúš Kukan + count notes - GetNotesInRange now include last tab in https://gerrit.libreoffice.org/6954 from Laurent Godard + Zip .ui translations per UIConfig target. in https://gerrit.libreoffice.org/6915 from Matúš Kukan + fdo#71784: Invalid Sections getting added to the document after RT in https://gerrit.libreoffice.org/6813 from Tushar Bende + fdo#71784:Preserve prop "allow row to break across pages" during export in https://gerrit.libreoffice.org/6834 from Tushar Bende * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + fdo#69552 make calc functions CEILING and FLOOR comply with ODF1.2 in https://gerrit.libreoffice.org/6767 from Winfried Donkers + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fdo#69407 in https://gerrit.libreoffice.org/6316 from matthieu gay + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fix sort order of Dockes
There are sorting errors on the D section (see Development/Developers): Jean-François Dockes comes between Christian Dywan: you need to fix the sort order to make his name appear between Maja Djordjevic and Benoit Dolives. Rohit Deshmukh comes between Sameer Deshmukh and Szabolcs Dézsi. And your Launchpad account (seotaewong40) is disabled. It says Page gone! How to get the Launchpad administrators enable your account? -- Tae-Wong Seo Korea, Republic of ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: scalc bug with sum
I am slowly getting back into the mailing list after a long gap, so pardon the repeat post. It seems sum function has been buggy in past (based on following bug report) https://bugs.freedesktop.org/show_bug.cgi?id=42990 Further, it seems, that feature in question above was retained. It is possible that my bug report below falls in same category. then pls ignore. However, if it seems fixable, I am willing to contribute code. I am not familiar with lo code base but willing to take a shot . Will need helpful pointers. I have built 4.2 from code. thanks Neeraj On Fri, Dec 6, 2013 at 9:19 PM, Neeraj Rai wrote: > Additionally, if I type in the cells E10:E20, E22, the non- contiguous one > is ignored. > > > > On Fri, Nov 29, 2013 at 3:21 PM, Neeraj Rai wrote: > >> Hi Eike, >> >> I tried various combinations and it seems that if I drag to select cols, >> it shows the right sum. >> But if I hold ctrl- key down to select, it only shows the last col >> selected. >> If I need to select non-contiguous cols, I need to hold the ctrl-key down >> ? Or is there another way to get the same functionality? >> It used to work in 4.0.0.3 >> >> thanks >> Neeraj >> >> >> >> On Thu, Nov 28, 2013 at 4:53 PM, Eike Rathke wrote: >> >>> Hi Neeraj, >>> >>> On Thursday, 2013-11-28 00:03:00 -0500, Neeraj Rai wrote: >>> >>> > I build libreoffice 4.2 on centos 6.1 last week. >>> > When I select multiple cols and look for sum at the bottom of the >>> sheet, >>> > the last selected col is shown. >>> > Please advise if this is fixed in later versions. >>> >>> I can't reproduce that, works fine here, all values are summed. >>> >>> Eike >>> >>> -- >>> LibreOffice Calc developer. Number formatter stricken i18n >>> transpositionizer. >>> GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 >>> 2D3A >>> Support the FSFE, care about Free Software! >>> https://fsfe.org/support/?erack >>> >> >> >> >> -- >> = >> Intuition - is the inability to figure out the facts on which we based >> the decision. >> > > > > -- > = > Intuition - is the inability to figure out the facts on which we based the > decision. > -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [scalc 4.2]- headless option for multiple sheet
Hi, I should have mentioned that I can contribute code to this. my main language is C++, although I am not familiar with lo code base and will need pointers of what to read and where to start. if attempting this in C++ is overwhelming for someone starting out, perhaps I can attempt Basic macro. I have written one Basic macro before based on Burger example. thanks Neeraj On Thu, Dec 5, 2013 at 9:51 PM, Neeraj Rai wrote: > Hi, > > I am unable to convert xls file with multiple sheets to csv format using > the --headless option. > gnumeric utility ssconvert allows this option but I would like to be able > to do it using scalc. > > Q. Is this feature going to be added in near future? > Q. Is there another way to (macros or otherwise) to do the same? > > thanks > Neeraj > > -- > = > Intuition - is the inability to figure out the facts on which we based the > decision. > -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [scalc 4.2]- headless option for multiple sheet
Hi Robinson, Thanks for pointing out the python utility. I tried all possible combinations of python (lo 4.0, 4.2, rpm), but couldn't get it to work. my lo 4.0 and 4.2 come with python 3.3.0 , which required code change to the attached code - and even after that, it refused to connect to lo. Again, I tried lo running, and not running scenarios. I would prefer to not build dependency on 3rd party (python and boost are well known for breaking with each upgrade). I was hoping for a native implementation solution (C++ etension or Basic macro) The question is posted to dev in the hope that they'll pick up the feature request. Neeraj On Thu, Dec 5, 2013 at 10:11 PM, Robinson Tryon wrote: > On Thu, Dec 5, 2013 at 9:51 PM, Neeraj Rai wrote: > > Hi, > > > > I am unable to convert xls file with multiple sheets to csv format using > the > > --headless option. > > gnumeric utility ssconvert allows this option but I would like to be > able to > > do it using scalc. > > > > Q. Is this feature going to be added in near future? > > Q. Is there another way to (macros or otherwise) to do the same? > > Hi Neeraj, > > Looks like you might want to post your question on the users' list > (you posted to the developers' list): > https://www.libreoffice.org/get-help/mailing-lists/ > > This article might give you a solution: > > http://www.linuxjournal.com/content/convert-spreadsheets-csv-files-python-and-pyuno-part-1v2 > > What version of LibreOffice are you using? (I haven't tested > command-line export of xls for a while) > > Thanks, > --R > -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: scalc bug with sum
Additionally, if I type in the cells E10:E20, E22, the non- contiguous one is ignored. On Fri, Nov 29, 2013 at 3:21 PM, Neeraj Rai wrote: > Hi Eike, > > I tried various combinations and it seems that if I drag to select cols, > it shows the right sum. > But if I hold ctrl- key down to select, it only shows the last col > selected. > If I need to select non-contiguous cols, I need to hold the ctrl-key down > ? Or is there another way to get the same functionality? > It used to work in 4.0.0.3 > > thanks > Neeraj > > > > On Thu, Nov 28, 2013 at 4:53 PM, Eike Rathke wrote: > >> Hi Neeraj, >> >> On Thursday, 2013-11-28 00:03:00 -0500, Neeraj Rai wrote: >> >> > I build libreoffice 4.2 on centos 6.1 last week. >> > When I select multiple cols and look for sum at the bottom of the sheet, >> > the last selected col is shown. >> > Please advise if this is fixed in later versions. >> >> I can't reproduce that, works fine here, all values are summed. >> >> Eike >> >> -- >> LibreOffice Calc developer. Number formatter stricken i18n >> transpositionizer. >> GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 >> 2D3A >> Support the FSFE, care about Free Software! >> https://fsfe.org/support/?erack >> > > > > -- > = > Intuition - is the inability to figure out the facts on which we based the > decision. > -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/inc sc/source
sc/inc/dpobject.hxx |3 ++ sc/source/core/data/dpobject.cxx | 49 ++- 2 files changed, 46 insertions(+), 6 deletions(-) New commits: commit f58941760aa88eb155a2eb7fe39f0ee68265fdb2 Author: Kohei Yoshida Date: Fri Dec 6 19:44:21 2013 -0500 fdo#66984: Define an assignment operator to prevent double deletion. The code path was assigning one ScDPObject to another via assignment, but we didn't define one. So we were using the compiler generated assignment which only shallow-copies data members, which ultimately caused double-deletion of one of its data members. Change-Id: Ie98d0789e51aebff683dbcc0e533a9a0a87943d5 (cherry picked from commit bd976e5b070ec68a4f842190db4d0c1ea0e93428) diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 8505a53..06d4957 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -118,11 +118,14 @@ public: ScDPObject(const ScDPObject& r); ~ScDPObject(); +ScDPObject& operator= (const ScDPObject& r); + void EnableGetPivotData(bool b); voidSetAllowMove(bool bSet); voidInvalidateData(); +void Clear(); void ClearTableData(); void ReloadGroupTableData(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 677ccd5..169231a 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -354,12 +354,34 @@ ScDPObject::ScDPObject(const ScDPObject& r) : ScDPObject::~ScDPObject() { -delete pOutput; -delete pSaveData; -delete pSheetDesc; -delete pImpDesc; -delete pServDesc; -ClearTableData(); +Clear(); +} + +ScDPObject& ScDPObject::operator= (const ScDPObject& r) +{ +Clear(); + +pDoc = r.pDoc; +aTableName = r.aTableName; +aTableTag = r.aTableTag; +aOutRange = r.aOutRange; +mnAutoFormatIndex = r.mnAutoFormatIndex; +nHeaderRows = r.nHeaderRows; +mbHeaderLayout = r.mbHeaderLayout; +bAllowMove = false; +bSettingsChanged = false; +mbEnableGetPivotData = r.mbEnableGetPivotData; + +if (r.pSaveData) +pSaveData = new ScDPSaveData(*r.pSaveData); +if (r.pSheetDesc) +pSheetDesc = new ScSheetSourceDesc(*r.pSheetDesc); +if (r.pImpDesc) +pImpDesc = new ScImportSourceDesc(*r.pImpDesc); +if (r.pServDesc) +pServDesc = new ScDPServiceDesc(*r.pServDesc); + +return *this; } void ScDPObject::EnableGetPivotData(bool b) @@ -780,6 +802,21 @@ void ScDPObject::InvalidateData() bSettingsChanged = true; } +void ScDPObject::Clear() +{ +delete pOutput; +delete pSaveData; +delete pSheetDesc; +delete pImpDesc; +delete pServDesc; +pOutput = NULL; +pSaveData = NULL; +pSheetDesc = NULL; +pImpDesc = NULL; +pServDesc = NULL; +ClearTableData(); +} + void ScDPObject::ClearTableData() { ClearSource(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/core/data/dpobject.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 81cf658ed61493e2c783d9d57cd1af144518f1a5 Author: Eike Rathke Date: Sat Dec 7 00:28:01 2013 +0100 check string bounds Change-Id: I92f2dbbe12956ee9432d592851f10bceaa5ce25d (cherry picked from commit 4e75f724cc59d457cdd905c6833e3b2612f4) diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 773644c..677ccd5 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1541,7 +1541,7 @@ bool isAtStart( while (nStartPos < nListLen && rList[nStartPos] == ' ') ++nStartPos; -if (rList[nStartPos] == '\'') // quoted within the brackets? +if (nStartPos < nListLen && rList[nStartPos] == '\'') // quoted within the brackets? { if ( dequote( rList, nStartPos, nQuoteEnd, aDequoted ) ) { @@ -1760,7 +1760,7 @@ bool ScDPObject::ParseFilters( aRemaining = comphelper::string::stripStart(aRemaining, ' '); // field name has to be followed by item name in brackets -if (aRemaining[0] == '[') +if (!aRemaining.isEmpty() && aRemaining[0] == '[') { bHasFieldName = true; // bUsed remains false - still need the item ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/dpobject.hxx |3 ++ sc/source/core/data/dpobject.cxx | 49 ++- 2 files changed, 46 insertions(+), 6 deletions(-) New commits: commit 4e57eaaaccb114b03849521d5a1a88da4b110236 Author: Kohei Yoshida Date: Fri Dec 6 19:44:21 2013 -0500 fdo#66984: Define an assignment operator to prevent double deletion. The code path was assigning one ScDPObject to another via assignment, but we didn't define one. So we were using the compiler generated assignment which only shallow-copies data members, which ultimately caused double-deletion of one of its data members. Change-Id: Ie98d0789e51aebff683dbcc0e533a9a0a87943d5 (cherry picked from commit bd976e5b070ec68a4f842190db4d0c1ea0e93428) diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 1683480..9bdb123 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -118,11 +118,14 @@ public: ScDPObject(const ScDPObject& r); ~ScDPObject(); +ScDPObject& operator= (const ScDPObject& r); + void EnableGetPivotData(bool b); voidSetAllowMove(bool bSet); voidInvalidateData(); +void Clear(); void ClearTableData(); void ReloadGroupTableData(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index cb107ba..e8b384c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -354,12 +354,34 @@ ScDPObject::ScDPObject(const ScDPObject& r) : ScDPObject::~ScDPObject() { -delete pOutput; -delete pSaveData; -delete pSheetDesc; -delete pImpDesc; -delete pServDesc; -ClearTableData(); +Clear(); +} + +ScDPObject& ScDPObject::operator= (const ScDPObject& r) +{ +Clear(); + +pDoc = r.pDoc; +aTableName = r.aTableName; +aTableTag = r.aTableTag; +aOutRange = r.aOutRange; +mnAutoFormatIndex = r.mnAutoFormatIndex; +nHeaderRows = r.nHeaderRows; +mbHeaderLayout = r.mbHeaderLayout; +bAllowMove = false; +bSettingsChanged = false; +mbEnableGetPivotData = r.mbEnableGetPivotData; + +if (r.pSaveData) +pSaveData = new ScDPSaveData(*r.pSaveData); +if (r.pSheetDesc) +pSheetDesc = new ScSheetSourceDesc(*r.pSheetDesc); +if (r.pImpDesc) +pImpDesc = new ScImportSourceDesc(*r.pImpDesc); +if (r.pServDesc) +pServDesc = new ScDPServiceDesc(*r.pServDesc); + +return *this; } void ScDPObject::EnableGetPivotData(bool b) @@ -780,6 +802,21 @@ void ScDPObject::InvalidateData() bSettingsChanged = true; } +void ScDPObject::Clear() +{ +delete pOutput; +delete pSaveData; +delete pSheetDesc; +delete pImpDesc; +delete pServDesc; +pOutput = NULL; +pSaveData = NULL; +pSheetDesc = NULL; +pImpDesc = NULL; +pServDesc = NULL; +ClearTableData(); +} + void ScDPObject::ClearTableData() { ClearSource(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dpobject.hxx |3 ++ sc/source/core/data/dpobject.cxx | 49 ++- 2 files changed, 46 insertions(+), 6 deletions(-) New commits: commit bd976e5b070ec68a4f842190db4d0c1ea0e93428 Author: Kohei Yoshida Date: Fri Dec 6 19:44:21 2013 -0500 fdo#66984: Define an assignment operator to prevent double deletion. The code path was assigning one ScDPObject to another via assignment, but we didn't define one. So we were using the compiler generated assignment which only shallow-copies data members, which ultimately caused double-deletion of one of its data members. Change-Id: Ie98d0789e51aebff683dbcc0e533a9a0a87943d5 diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 1683480..9bdb123 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -118,11 +118,14 @@ public: ScDPObject(const ScDPObject& r); ~ScDPObject(); +ScDPObject& operator= (const ScDPObject& r); + void EnableGetPivotData(bool b); voidSetAllowMove(bool bSet); voidInvalidateData(); +void Clear(); void ClearTableData(); void ReloadGroupTableData(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index cb107ba..e8b384c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -354,12 +354,34 @@ ScDPObject::ScDPObject(const ScDPObject& r) : ScDPObject::~ScDPObject() { -delete pOutput; -delete pSaveData; -delete pSheetDesc; -delete pImpDesc; -delete pServDesc; -ClearTableData(); +Clear(); +} + +ScDPObject& ScDPObject::operator= (const ScDPObject& r) +{ +Clear(); + +pDoc = r.pDoc; +aTableName = r.aTableName; +aTableTag = r.aTableTag; +aOutRange = r.aOutRange; +mnAutoFormatIndex = r.mnAutoFormatIndex; +nHeaderRows = r.nHeaderRows; +mbHeaderLayout = r.mbHeaderLayout; +bAllowMove = false; +bSettingsChanged = false; +mbEnableGetPivotData = r.mbEnableGetPivotData; + +if (r.pSaveData) +pSaveData = new ScDPSaveData(*r.pSaveData); +if (r.pSheetDesc) +pSheetDesc = new ScSheetSourceDesc(*r.pSheetDesc); +if (r.pImpDesc) +pImpDesc = new ScImportSourceDesc(*r.pImpDesc); +if (r.pServDesc) +pServDesc = new ScDPServiceDesc(*r.pServDesc); + +return *this; } void ScDPObject::EnableGetPivotData(bool b) @@ -780,6 +802,21 @@ void ScDPObject::InvalidateData() bSettingsChanged = true; } +void ScDPObject::Clear() +{ +delete pOutput; +delete pSaveData; +delete pSheetDesc; +delete pImpDesc; +delete pServDesc; +pOutput = NULL; +pSaveData = NULL; +pSheetDesc = NULL; +pImpDesc = NULL; +pServDesc = NULL; +ClearTableData(); +} + void ScDPObject::ClearTableData() { ClearSource(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] voting.git: vote/2013-board vote/include
vote/2013-board/voting-instructions.txt |5 ++--- vote/include/step2-choose.php |6 +++--- vote/include/step3-confirm.php |2 +- vote/include/step4-commit.php |6 +- 4 files changed, 11 insertions(+), 8 deletions(-) New commits: commit 5197a78305a8cf64fa0cdbd396bd3dbd2bc79b78 Author: Thorsten Behrens Date: Sat Dec 7 01:20:35 2013 +0100 Improved wording in various places. diff --git a/vote/2013-board/voting-instructions.txt b/vote/2013-board/voting-instructions.txt index d49d0d6..c434bfa 100644 --- a/vote/2013-board/voting-instructions.txt +++ b/vote/2013-board/voting-instructions.txt @@ -35,6 +35,5 @@ to vote again. Thank you for your vote! Regards, - Simon Phipps - election secretary, on behalf of The Document Foundation Membership - and Elections Commitee + Cor Nouws + Chair, The Document Foundation Membership Committee diff --git a/vote/include/step2-choose.php b/vote/include/step2-choose.php index 27af8fb..d8ab84c 100644 --- a/vote/include/step2-choose.php +++ b/vote/include/step2-choose.php @@ -10,9 +10,9 @@ function step2_do () { $result .= "Choose your candidates in the order of your preference by "; $result .= "clicking on them. Don't worry, if you click on someone by mistake "; - $result .= "you can correct it later. Once you are happy with the order, "; - $result .= "submit your vote. You will have the chance to review and confirm"; - $result .= " your ballot on the next page."; + $result .= "you can correct it later (by clicking on the name again). "; + $result .= "Once you are happy with the order, submit your vote. You will have "; + $result .= "the chance to review and confirm your ballot on the next page."; $result .= "You can vote for as few or as many candidates as you choose. "; $result .= "Your vote will be counted for your first choice candidate as "; diff --git a/vote/include/step3-confirm.php b/vote/include/step3-confirm.php index 5e39fc0..560d424 100644 --- a/vote/include/step3-confirm.php +++ b/vote/include/step3-confirm.php @@ -11,7 +11,7 @@ function step3_do () { $result .= "".htmlspecialchars($election["question"])."\n"; // TODO: should probably check for duplicates in $votes_array here already too if (count ($votes_array) >= 1) { -$result .= "You choose to vote for:\n"; +$result .= "You choose to vote for (in order of preference):\n"; $result .= "\n"; $result .= "\n"; diff --git a/vote/include/step4-commit.php b/vote/include/step4-commit.php index 030c1fb..384b2b6 100644 --- a/vote/include/step4-commit.php +++ b/vote/include/step4-commit.php @@ -115,7 +115,11 @@ function step4_do () { $result .= "Your vote has been received.\n"; $result .= "Please write this anonymous token somewhere:\n"; $result .= "".htmlspecialchars($anon_token)."\n"; - $result .= "This anonymous token will enable you to verify your vote when the preliminary results will be published. Nobody, even the Membership and Elections Committee, except you knows that this token is associated with you and only you will be able to verify your vote. It is not possible to request this anonymous token later.Click here to return to the elections start page.\n"; + $result .= "This anonymous token will enable you to verify your vote, when the preliminary "; + $result .= "results are published. Nobody, not even the Membership Committee, except you knows "; + $result .= "that this token is associated with you, and only you will be able to verify your "; + $result .= "vote. It is therefore not possible to request this anonymous token later."; + $result .= "Click here to return to the elections start page.\n"; return $result; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/docshell/docfunc.cxx | 18 ++ 1 file changed, 18 insertions(+) New commits: commit b0a18ae31de70fbd44bf9677ff0f9d01aad5588f Author: Eike Rathke Date: Fri Dec 6 22:58:25 2013 +0100 resolved fdo#66564 calculate formula cell once if AutoCalc disabled Was lost with 2ce72093cdc68e60fb06ddd4358e0bc7fc8c63a9 and previous restructuring. (cherry picked from commit 2212051e792cb5f51f4191afe83c85fc3730a087) Backported. Change-Id: Ie4c8bdb287b56448406c873840c26ec4759de375 Reviewed-on: https://gerrit.libreoffice.org/6964 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 61786e2..b922508 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -948,6 +948,24 @@ bool ScDocFunc::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, boo pDoc->SetFormulaCell(rPos, xCell.release()); +// For performance reasons API calls may disable calculation while +// operating and recalculate once when done. If through user interaction +// and AutoCalc is disabled, calculate the formula (without its +// dependencies) once so the result matches the current document's content. +if (bInteraction && !pDoc->GetAutoCalc() && pCell) +{ +// ScDocument/ScTable::SetFormulaCell() may have deleted pCell if +// position address was invalid, so check here again. This is +// backported code, new code handles that smarter.. +if (rPos.Tab() < pDoc->GetTableCount() && ValidColRow( rPos.Col(), rPos.Row())) +{ +// calculate just the cell once and set Dirty again +pCell->Interpret(); +pCell->SetDirtyVar(); +pDoc->PutInFormulaTree( pCell); +} +} + if (bUndo) { svl::IUndoManager* pUndoMgr = rDocShell.GetUndoManager(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/dpobject.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit af00fce7c50afabf778580e842d3487650f00e96 Author: Eike Rathke Date: Sat Dec 7 00:28:01 2013 +0100 check string bounds Change-Id: I92f2dbbe12956ee9432d592851f10bceaa5ce25d (cherry picked from commit 4e75f724cc59d457cdd905c6833e3b2612f4) diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 83532e2..cb107ba 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1541,7 +1541,7 @@ bool isAtStart( while (nStartPos < nListLen && rList[nStartPos] == ' ') ++nStartPos; -if (rList[nStartPos] == '\'') // quoted within the brackets? +if (nStartPos < nListLen && rList[nStartPos] == '\'') // quoted within the brackets? { if ( dequote( rList, nStartPos, nQuoteEnd, aDequoted ) ) { @@ -1760,7 +1760,7 @@ bool ScDPObject::ParseFilters( aRemaining = comphelper::string::stripStart(aRemaining, ' '); // field name has to be followed by item name in brackets -if (aRemaining[0] == '[') +if (!aRemaining.isEmpty() && aRemaining[0] == '[') { bHasFieldName = true; // bUsed remains false - still need the item ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dpobject.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4e75f724cc59d457cdd905c6833e3b2612f4 Author: Eike Rathke Date: Sat Dec 7 00:28:01 2013 +0100 check string bounds Change-Id: I92f2dbbe12956ee9432d592851f10bceaa5ce25d diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 83532e2..cb107ba 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1541,7 +1541,7 @@ bool isAtStart( while (nStartPos < nListLen && rList[nStartPos] == ' ') ++nStartPos; -if (rList[nStartPos] == '\'') // quoted within the brackets? +if (nStartPos < nListLen && rList[nStartPos] == '\'') // quoted within the brackets? { if ( dequote( rList, nStartPos, nQuoteEnd, aDequoted ) ) { @@ -1760,7 +1760,7 @@ bool ScDPObject::ParseFilters( aRemaining = comphelper::string::stripStart(aRemaining, ' '); // field name has to be followed by item name in brackets -if (aRemaining[0] == '[') +if (!aRemaining.isEmpty() && aRemaining[0] == '[') { bHasFieldName = true; // bUsed remains false - still need the item ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configmgr/source
configmgr/source/access.cxx |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 2e01c8727ac2652563dd4f0c45be4aa957136be8 Author: Stephan Bergmann Date: Fri Dec 6 16:52:27 2013 +0100 Do not create paths starting "//" when root is just "/" (cherry picked from commit bd8b3be0c7535e74ca8b63969be5c2bece0d3a3b) Conflicts: configmgr/source/access.cxx Change-Id: If0b413a4fdd93465074548c7ea5451288c1d12aa Reviewed-on: https://gerrit.libreoffice.org/6961 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 9f18e8f..aa04a94 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -565,14 +565,15 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) { checkLocalizedPropertyAccess(); // For backwards compatibility, return an absolute path representation where // available: -OUStringBuffer path; +OUString rootPath; rtl::Reference< RootAccess > root(getRootAccess()); if (root.is()) { -path.append(root->getAbsolutePathRepresentation()); +rootPath = root->getAbsolutePathRepresentation(); } OUString rel(getRelativePathRepresentation()); -if (path.getLength() != 0 && !rel.isEmpty()) { -path.append(sal_Unicode('/')); +OUStringBuffer path(rootPath); +if (!rootPath.isEmpty() && rootPath != "/" && !rel.isEmpty()) { +path.append('/'); } path.append(rel); return path.makeStringAndClear(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source
sc/inc/dpobject.hxx |8 + sc/inc/dpoutput.hxx | 21 - sc/source/core/data/dpobject.cxx | 163 +++ sc/source/core/tool/interpr2.cxx | 15 +++ 4 files changed, 103 insertions(+), 104 deletions(-) New commits: commit cfc9cef1e26e98153eb93229a9c18a674a3ebf11 Author: Kohei Yoshida Date: Fri Dec 6 10:43:38 2013 -0500 fdo#69518: Correctly handle the old constraint syntax. We apparently support this syntax for ODF-backward compatibility. To fix this, I resurrected ScDPObject::ParseFilters() which was removed as unused, adjusted it for the String->OUString change, and changed the filter data structure to the UNO one rather than using the old one we no longer use elsewhere. (cherry picked from commit 1d85c8df2fb9cb25fc524485339ae9f11e8da676) Conflicts: sc/inc/dpobject.hxx sc/source/core/data/dpobject.cxx sc/source/core/tool/interpr2.cxx Change-Id: If52b38aaa1e8b208fb0ef9d92a6e853decdf43e3 Reviewed-on: https://gerrit.libreoffice.org/6962 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 735b033..8505a53 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -183,9 +183,11 @@ public: const OUString& rDataFieldName, std::vector& rFilters); -boolParseFilters( ScDPGetPivotDataField& rTarget, - std::vector< ScDPGetPivotDataField >& rFilters, - const OUString& rFilterList ); +bool ParseFilters( +OUString& rDataFieldName, +std::vector& rFilters, +std::vector& rFilterFuncs, +const OUString& rFilterList ); void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 293d937..7b38c7e 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -41,29 +41,8 @@ namespace com { namespace sun { namespace star { namespace sheet { class Rectangle; class ScDocument; - struct ScDPOutLevelData; - -struct ScDPGetPivotDataField -{ -OUString maFieldName; -com::sun::star::sheet::GeneralFunction meFunction; - -bool mbValIsStr; -OUString maValStr; -double mnValNum; - -ScDPGetPivotDataField() : -meFunction( com::sun::star::sheet::GeneralFunction_NONE ), -mbValIsStr( false ), -mnValNum( 0.0 ) -{ -} -}; - - - class ScDPOutput { private: diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 3a45a34..677ccd5 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1400,25 +1400,27 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi pOutput->GetMemberResultNames(rNames, nDimension);// used only with table data -> level not needed } -static bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult ) +namespace { + +bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos, OUString& rResult ) { // nStartPos has to point to opening quote bool bRet = false; const sal_Unicode cQuote = '\''; -if ( rSource.GetChar(nStartPos) == cQuote ) +if (rSource[nStartPos] == cQuote) { OUStringBuffer aBuffer; -xub_StrLen nPos = nStartPos + 1; -const xub_StrLen nLen = rSource.Len(); +sal_Int32 nPos = nStartPos + 1; +const sal_Int32 nLen = rSource.getLength(); while ( nPos < nLen ) { -const sal_Unicode cNext = rSource.GetChar(nPos); +const sal_Unicode cNext = rSource[nPos]; if ( cNext == cQuote ) { -if ( nPos+1 < nLen && rSource.GetChar(nPos+1) == cQuote ) +if (nPos+1 < nLen && rSource[nPos+1] == cQuote) { // double quote is used for an embedded quote aBuffer.append( cNext );// append one quote @@ -1449,7 +1451,7 @@ struct ScGetPivotDataFunctionEntry sheet::GeneralFunction eFunc; }; -static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc ) +bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sheet::GeneralFunction& rFunc ) { static const ScGetPivotDataFunctionEntry aFunctions[] = { @@ -1471,22 +1473,22 @@ static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_St { "StdDevp",sheet::GeneralFunction_STDEVP} }; -const xub_StrLen nListLen = rList.Len(); -while ( nStartPos < nListLen && rList.GetChar(nStartPos) == ' ' ) +const sal_Int32 nListLen = rList.getLength(); +while (nStartPos < nListLen && rList[nStartPos] == '
[Libreoffice-commits] voting.git: vote/2013-board vote/overview.wml
vote/2013-board/candidates.wml | 18 ++ vote/2013-board/rules.wml |8 vote/overview.wml |8 +--- 3 files changed, 19 insertions(+), 15 deletions(-) New commits: commit 8d690b0059bb1379c00a35bfe031e8a51e7c1112 Author: Thorsten Behrens Date: Fri Dec 6 20:04:51 2013 +0100 Fix typos, update overview to reality. diff --git a/vote/2013-board/candidates.wml b/vote/2013-board/candidates.wml index f8650f0..29cd324 100644 --- a/vote/2013-board/candidates.wml +++ b/vote/2013-board/candidates.wml @@ -11,12 +11,12 @@ Candidates for The Document Foundation 2013 Board of Directors Election - Below you will find a list of candidates who are running for the + Below you will find a list of candidates who are running for The Document Foundation Board of Directors. A short summary statement from each candidate and a link to their full candidacy announcement is provided to help you learn more about them. We encourage all voters to read the full candidacy statements and related discussions on - http://listarchives.documentfoundation.org/www/discuss/";>discuss@documentfoundation.org. + http://listarchives.documentfoundation.org/www/board-discuss/";>board-discuss@documentfoundation.org. When deciding who you should vote for, please carefully @@ -32,13 +32,14 @@ Additional elections details can be found in the - http://wiki.documentfoundation.org/CommunityBylaws";>Document Foundation Bylaws. + http://www.documentfoundation.org/satzung.pdf";>Document Foundation statutes (and the non-binding + http://www.documentfoundation.org/statutes.pdf";>English version). If you have any questions, please send them to either - http://listarchives.documentfoundation.org/www/discuss/";>discuss@documentfoundation.org - or to us at http://listarchives.documentfoundation.org/www/board-discuss/";>board-discuss@documentfoundation.org (public list) + or in private to the Membership Committee at mailto:elections@documentfoundation.org";>elections@documentfoundation.org. @@ -47,7 +48,7 @@ Joe Random Candidate Affiliation: ACME - Full statement at http://www.mail-archive.com/discuss@documentfoundation.org/";>http://www.mail-archive.com/discuss@documentfoundation.org/ + Full statement at http://www.mail-archive.com/board-discuss@documentfoundation.org/";>http://www.mail-archive.com/board-discuss@documentfoundation.org/ Some 75 words of wisdom. @@ -58,8 +59,9 @@ Additional Elections-related Information - Note, that according to the http://wiki.documentfoundation.org/CommunityBylaws#Provisions_Concerning_Possible_Conflicts_of_Interest";>Bylaws, + Note, that according to the + http://www.documentfoundation.org/satzung.pdf";>Document Foundation statutes (and the non-binding + http://www.documentfoundation.org/statutes.pdf";>English version), there is a 3-person maximum on the number of people affiliated with any one company that can be on the board and the deputies: if more than 3 persons from one company get elected, only the diff --git a/vote/2013-board/rules.wml b/vote/2013-board/rules.wml index 5c7e35c..e435dca 100644 --- a/vote/2013-board/rules.wml +++ b/vote/2013-board/rules.wml @@ -19,12 +19,12 @@ Foundation Statutes §12, II for general rules. - There are 7 board slots and 3 deputy roles that are to be filled during these elections. + There are 7 board positions and 3 deputy roles that are to be filled during these elections. As per § 7 II of our statues, the Board's term lasts two years. The -Document Foundation has been formally incorporated on February 17, 2012, +Document Foundation was formally incorporated on February 17, 2012, at which day the current Board of Directors officially was set in place. Therefore, the old board remains in charge until the end of February 17, 2014, so the new board will be in charge the day after that, which is @@ -35,7 +35,7 @@ February 18, 2014. As per § 6 III, only members of the Board of Trustees of The Document Foundation, as well as current members of any of its bodies, are eligible to be elected into the Board of Directors, and the election is -overseen by the Membership Comittee (§ 7 II). +overseen by the Membership Committee (§ 7 II). @@ -47,7 +47,7 @@ the Board of Trustees before this announcement (§ 7 II). § 6 III also states that members of the Board of Directors or their deputies may not be members of the Membership Committee and vice versa. This means that current members of the Membership Committee are eligible -to the elected, but would have to step down from the Membership +to be elected, but would have to step down from the Membership Committee the minu
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/docshell/docfunc.cxx | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit 039dadf3b48484ba5d1fc71de5561288e6b7c5cb Author: Eike Rathke Date: Fri Dec 6 22:58:25 2013 +0100 resolved fdo#66564 calculate formula cell once if AutoCalc disabled Was lost with 2ce72093cdc68e60fb06ddd4358e0bc7fc8c63a9 and previous restructuring. Change-Id: Ie4c8bdb287b56448406c873840c26ec4759de375 (cherry picked from commit 2212051e792cb5f51f4191afe83c85fc3730a087) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c0295e4..72e7e46 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -946,7 +946,19 @@ bool ScDocFunc::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, boo if (bUndo) aOldVal.assign(*pDoc, rPos); -pDoc->SetFormulaCell(rPos, xCell.release()); +pCell = pDoc->SetFormulaCell(rPos, xCell.release()); + +// For performance reasons API calls may disable calculation while +// operating and recalculate once when done. If through user interaction +// and AutoCalc is disabled, calculate the formula (without its +// dependencies) once so the result matches the current document's content. +if (bInteraction && !pDoc->GetAutoCalc() && pCell) +{ +// calculate just the cell once and set Dirty again +pCell->Interpret(); +pCell->SetDirtyVar(); +pDoc->PutInFormulaTree( pCell); +} if (bUndo) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docfunc.cxx | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit 2212051e792cb5f51f4191afe83c85fc3730a087 Author: Eike Rathke Date: Fri Dec 6 22:58:25 2013 +0100 resolved fdo#66564 calculate formula cell once if AutoCalc disabled Was lost with 2ce72093cdc68e60fb06ddd4358e0bc7fc8c63a9 and previous restructuring. Change-Id: Ie4c8bdb287b56448406c873840c26ec4759de375 diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c0295e4..72e7e46 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -946,7 +946,19 @@ bool ScDocFunc::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, boo if (bUndo) aOldVal.assign(*pDoc, rPos); -pDoc->SetFormulaCell(rPos, xCell.release()); +pCell = pDoc->SetFormulaCell(rPos, xCell.release()); + +// For performance reasons API calls may disable calculation while +// operating and recalculate once when done. If through user interaction +// and AutoCalc is disabled, calculate the formula (without its +// dependencies) once so the result matches the current document's content. +if (bInteraction && !pDoc->GetAutoCalc() && pCell) +{ +// calculate just the cell once and set Dirty again +pCell->Interpret(); +pCell->SetDirtyVar(); +pDoc->PutInFormulaTree( pCell); +} if (bUndo) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345
On Fri, Dec 6, 2013 at 3:19 PM, Mat M wrote: > You should have cross-posted the vote announcement on all concerned lists, > then you'd been more votes. What are the 'concerned lists'? i10n? projects? website? Lots of people interact with the bugtracker, chief among them, the QA team. For me, the abbreviation is just one small part of the bigger Bugzilla migration plan: https://wiki.documentfoundation.org/QA/Bugzilla/LibreOffice_Bugzilla_Proposal The reason we're having a vote now is because Nov 8 - I mentioned abbreviation in the proposal Nov 10/11 - Discussed abbrevs on the QA list Nov 18 - QA Meeting decided to ask ESC for input Nov 21 - ESC offered suggestions; said "the guys doing the work should choose." Nov 21 - Looked for consensus on QA list Dec 1 - Saw no consensus; Moving to vote on the QA list I felt like I was working hard to go through appropriate channels. Perhaps if I'd spent more time I could've gotten more input from other groups, but at this point I feel like I've already spent a ton of time on just this one little piece. > Well, if you want to mimic fdo, abbrev should be loo (libreoffice.org > instead of freedesktop.org) > loo is a good trade-off : more than 2, but less than 4; different of the > standard lo we use to shortcut LibreOffice IIRC, in en-GB 'loo' == toilet (not that there aren't any piss-poor bug reports in FDO right now...) > if loo# has no access to the vote list ;) Given that I already outlined the parameters for voting, I'm not sure it'd be appropriate for me to change them now. > > BTW, I vote also for lo# ok -- vote recorded. If the devs really want lo#, just send in enough people to vote and the outcome will be certain. --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Example in Java
I'm watching the example http://api.libreoffice.org/examples/java/Text/SWriter.java , and insertString method does not work. This happens only with libreoffice 4. Works on libreoffice 3.6, anyone knows passes, took almost a month with this. III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 2014. Ver www.uci.cu___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85b6167276e6dc1298e9343af06cafb0ea1fde98 Author: Andrzej Hunt Date: Fri Dec 6 20:43:24 2013 + fdo#60705 Don't discard valid printing options. PPDValue::m_aValue is simply an optional parameter description, whereas m_aOption is the actual option being passed to cups. For example, for the key "PageSize" (which was previously passed without problem), a typical PPDValue could be: m_aOption = "A4" m_aValue = "<>setpagedevice" However for the key "InputSlot" (which was previously not passed to the printer), a typical PPDValue could be: m_aOption = "RearPaperFeedSlot" m_aValue = "" Change-Id: I7959317c9f9d67bfafd911e710927a70edfa8792 (cherry picked from commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb) diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 15e1ca6..52b6bfb 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -618,7 +618,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner { const PPDKey* pKey = aKeys[i]; const PPDValue* pValue = rJob.m_aContext.getValue( pKey ); -if(pValue && pValue->m_eType == eInvocation && !pValue->m_aValue.isEmpty() ) +if(pValue && pValue->m_eType == eInvocation && !pValue->m_aOption.isEmpty() ) { OString aKey = OUStringToOString( pKey->getKey(), RTL_TEXTENCODING_ASCII_US ); OString aValue = OUStringToOString( pValue->m_aOption, RTL_TEXTENCODING_ASCII_US ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/unx
include/vcl/jobdata.hxx |2 +- vcl/unx/generic/printer/cupsmgr.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb Author: Andrzej Hunt Date: Fri Dec 6 20:43:24 2013 + fdo#60705 Don't discard valid printing options. PPDValue::m_aValue is simply an optional parameter description, whereas m_aOption is the actual option being passed to cups. For example, for the key "PageSize" (which was previously passed without problem), a typical PPDValue could be: m_aOption = "A4" m_aValue = "<>setpagedevice" However for the key "InputSlot" (which was previously not passed to the printer), a typical PPDValue could be: m_aOption = "RearPaperFeedSlot" m_aValue = "" Change-Id: I7959317c9f9d67bfafd911e710927a70edfa8792 diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 15e1ca6..52b6bfb 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -618,7 +618,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner { const PPDKey* pKey = aKeys[i]; const PPDValue* pValue = rJob.m_aContext.getValue( pKey ); -if(pValue && pValue->m_eType == eInvocation && !pValue->m_aValue.isEmpty() ) +if(pValue && pValue->m_eType == eInvocation && !pValue->m_aOption.isEmpty() ) { OString aKey = OUStringToOString( pKey->getKey(), RTL_TEXTENCODING_ASCII_US ); OString aValue = OUStringToOString( pValue->m_aOption, RTL_TEXTENCODING_ASCII_US ); commit 9fac96a50270b22061316e0a8ad1969ddf322507 Author: Andrzej Hunt Date: Fri Dec 6 19:51:39 2013 + Remove irrelevant comment. Change-Id: I4858667f781f4e8142dcd096222e98316cf1b9b6 diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx index 974c049..22ef0ee 100644 --- a/include/vcl/jobdata.hxx +++ b/include/vcl/jobdata.hxx @@ -67,7 +67,7 @@ struct VCL_DLLPUBLIC JobData void setCollate( bool bCollate ); bool setPaper( int nWidth, int nHeight ); // dimensions in pt -bool setPaperBin( int nPaperBin ); // dimensions in pt +bool setPaperBin( int nPaperBin ); void resolveDefaultBackend(); void setDefaultBackend(bool bUsePDF); ___ 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 42709, which changed state. Bug 42709 Summary: Animated GIFs not displaying correctly. https://bugs.freedesktop.org/show_bug.cgi?id=42709 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sw/source
sw/source/core/txtnode/fntcap.cxx | 29 ++ sw/source/core/txtnode/swfont.cxx | 42 +++--- 2 files changed, 37 insertions(+), 34 deletions(-) New commits: commit 669b9c993dc771ada788d23296252f141462398d Author: Michael Stahl Date: Fri Dec 6 21:18:37 2013 +0100 sw: fix more cases of SwDrawTextInfo::GetText()/SetText() not restoring Change-Id: I9625958e4139dd595f269ebac72b9a037118a9f5 (cherry picked from commit cc3341847f857b1d340d0b9dd09c7bccfb146ab6) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index d569db9..2269f24 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1092,15 +1092,15 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { SV_STAT( nGetTextSize ); long nOldKern = rInf.GetKern(); -const OUString &rOldTxt = rInf.GetText(); +const OUString oldTxt = rInf.GetText(); rInf.SetKern( CheckKerning() ); if ( !IsCaseMap() ) aTxtSize = pLastFont->GetTextSize( rInf ); else { OUString aTmp = CalcCaseMap( rInf.GetText() ); -const OUString &rOldStr = rInf.GetText(); -bool bCaseMapLengthDiffers(aTmp.getLength() != rOldStr.getLength()); +const OUString oldStr = rInf.GetText(); +bool bCaseMapLengthDiffers(aTmp.getLength() != oldStr.getLength()); if(bCaseMapLengthDiffers && rInf.GetLen()) { @@ -1110,7 +1110,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) // a single snippet since its size may differ, too. xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); -const OUString aSnippet(rOldStr.copy(nOldIdx, nOldLen)); +const OUString aSnippet(oldStr.copy(nOldIdx, nOldLen)); OUString aNewText(CalcCaseMap(aSnippet)); rInf.SetText( aNewText ); @@ -1128,10 +1128,10 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) aTxtSize = pLastFont->GetTextSize( rInf ); } -rInf.SetText( rOldStr ); +rInf.SetText(oldStr); } rInf.SetKern( nOldKern ); -rInf.SetText( rOldTxt ); +rInf.SetText(oldTxt); // 15142: Ein Wort laenger als eine Zeile, beim Zeilenumbruch //hochgestellt, muss seine effektive Hoehe melden. if( GetEscapement() ) @@ -1213,9 +1213,9 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) pLastFont->DrawText( rInf ); else { -const OUString &rOldStr = rInf.GetText(); -OUString aString( CalcCaseMap( rOldStr ) ); -bool bCaseMapLengthDiffers(aString.getLength() != rOldStr.getLength()); +const OUString oldStr = rInf.GetText(); +OUString aString( CalcCaseMap(oldStr) ); +bool bCaseMapLengthDiffers(aString.getLength() != oldStr.getLength()); if(bCaseMapLengthDiffers && rInf.GetLen()) { @@ -1225,7 +1225,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) // a single snippet since its size may differ, too. xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); -const OUString aSnippet(rOldStr.copy(nOldIdx, nOldLen)); +const OUString aSnippet(oldStr.copy(nOldIdx, nOldLen)); OUString aNewText = CalcCaseMap(aSnippet); rInf.SetText( aNewText ); @@ -1243,14 +1243,14 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) pLastFont->DrawText( rInf ); } -rInf.SetText( rOldStr ); +rInf.SetText(oldStr); } } if( pUnderFnt && nOldUnder != UNDERLINE_NONE ) { Size aFontSize = _GetTxtSize( rInf ); -const OUString &rOldStr = rInf.GetText(); +const OUString oldStr = rInf.GetText(); OUString aStr(" "); xub_StrLen nOldIdx = rInf.GetIdx(); @@ -1259,8 +1259,8 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) if( rInf.GetSpace() ) { xub_StrLen nTmpEnd = nOldIdx + nOldLen; -if( nTmpEnd > rOldStr.getLength() ) -nTmpEnd = rOldStr.getLength(); +if (nTmpEnd > oldStr.getLength()) +nTmpEnd = oldStr.getLength(); const SwScriptInfo* pSI = rInf.GetScriptInfo(); @@ -1268,8 +1268,8 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) ( rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() ); for( sal_Int32 nTmp = nOldIdx; nTmp < nTmpEnd; ++nTmp ) { -if( CH_BLANK == rOldStr[nTmp] || bAsianFont ||
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 71714, which changed state. Bug 71714 Summary: EDITING: Small capitals rendered as full-sized capitals https://bugs.freedesktop.org/show_bug.cgi?id=71714 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/txtnode/fntcap.cxx | 29 ++ sw/source/core/txtnode/swfont.cxx | 42 +++--- 2 files changed, 37 insertions(+), 34 deletions(-) New commits: commit cc3341847f857b1d340d0b9dd09c7bccfb146ab6 Author: Michael Stahl Date: Fri Dec 6 21:18:37 2013 +0100 sw: fix more cases of SwDrawTextInfo::GetText()/SetText() not restoring Change-Id: I9625958e4139dd595f269ebac72b9a037118a9f5 diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index d569db9..2269f24 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1092,15 +1092,15 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { SV_STAT( nGetTextSize ); long nOldKern = rInf.GetKern(); -const OUString &rOldTxt = rInf.GetText(); +const OUString oldTxt = rInf.GetText(); rInf.SetKern( CheckKerning() ); if ( !IsCaseMap() ) aTxtSize = pLastFont->GetTextSize( rInf ); else { OUString aTmp = CalcCaseMap( rInf.GetText() ); -const OUString &rOldStr = rInf.GetText(); -bool bCaseMapLengthDiffers(aTmp.getLength() != rOldStr.getLength()); +const OUString oldStr = rInf.GetText(); +bool bCaseMapLengthDiffers(aTmp.getLength() != oldStr.getLength()); if(bCaseMapLengthDiffers && rInf.GetLen()) { @@ -1110,7 +1110,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) // a single snippet since its size may differ, too. xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); -const OUString aSnippet(rOldStr.copy(nOldIdx, nOldLen)); +const OUString aSnippet(oldStr.copy(nOldIdx, nOldLen)); OUString aNewText(CalcCaseMap(aSnippet)); rInf.SetText( aNewText ); @@ -1128,10 +1128,10 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) aTxtSize = pLastFont->GetTextSize( rInf ); } -rInf.SetText( rOldStr ); +rInf.SetText(oldStr); } rInf.SetKern( nOldKern ); -rInf.SetText( rOldTxt ); +rInf.SetText(oldTxt); // 15142: Ein Wort laenger als eine Zeile, beim Zeilenumbruch //hochgestellt, muss seine effektive Hoehe melden. if( GetEscapement() ) @@ -1213,9 +1213,9 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) pLastFont->DrawText( rInf ); else { -const OUString &rOldStr = rInf.GetText(); -OUString aString( CalcCaseMap( rOldStr ) ); -bool bCaseMapLengthDiffers(aString.getLength() != rOldStr.getLength()); +const OUString oldStr = rInf.GetText(); +OUString aString( CalcCaseMap(oldStr) ); +bool bCaseMapLengthDiffers(aString.getLength() != oldStr.getLength()); if(bCaseMapLengthDiffers && rInf.GetLen()) { @@ -1225,7 +1225,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) // a single snippet since its size may differ, too. xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); -const OUString aSnippet(rOldStr.copy(nOldIdx, nOldLen)); +const OUString aSnippet(oldStr.copy(nOldIdx, nOldLen)); OUString aNewText = CalcCaseMap(aSnippet); rInf.SetText( aNewText ); @@ -1243,14 +1243,14 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) pLastFont->DrawText( rInf ); } -rInf.SetText( rOldStr ); +rInf.SetText(oldStr); } } if( pUnderFnt && nOldUnder != UNDERLINE_NONE ) { Size aFontSize = _GetTxtSize( rInf ); -const OUString &rOldStr = rInf.GetText(); +const OUString oldStr = rInf.GetText(); OUString aStr(" "); xub_StrLen nOldIdx = rInf.GetIdx(); @@ -1259,8 +1259,8 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) if( rInf.GetSpace() ) { xub_StrLen nTmpEnd = nOldIdx + nOldLen; -if( nTmpEnd > rOldStr.getLength() ) -nTmpEnd = rOldStr.getLength(); +if (nTmpEnd > oldStr.getLength()) +nTmpEnd = oldStr.getLength(); const SwScriptInfo* pSI = rInf.GetScriptInfo(); @@ -1268,8 +1268,8 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey ) ( rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() ); for( sal_Int32 nTmp = nOldIdx; nTmp < nTmpEnd; ++nTmp ) { -if( CH_BLANK == rOldStr[nTmp] || bAsianFont || -( nTmp + 1 < rOldStr.getLength() && pSI && +
Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345
Hello Robinson, * Le Fri, 06 Dec 2013 07:54:07 +0100, Robinson Tryon a écrit: On Fri, Dec 6, 2013 at 12:05 AM, Norbert Thiebaud wrote: but by a wide margin the only 4-char abbreviation in the list has taken an early lead. Sure, but if you were to ask that question on the dev-ml rather than here.. I'd bet you you'd get many more vote for lo# true. I'd always like to have more devs listening-in on what we talk about on the QA list... ;-) You should have cross-posted the vote announcement on all concerned lists, then you'd been more votes. PS: btw I don't see the appeal to want to stick characters in there to re-inforce the idea that it is a bugzilla number... the # in it is sufficient enough to make that clear so the b/bz stuff is not only a waste of space.. but also completely redundant. it is like climbing up or descending down... Fair, fair. One other thing: The abbreviation has a secondary purpose: to be used as shorthand for the bugtracker. Using our two highest-profile options: "Joel, go take a look at regressions on FDO" => "Joel, go take a look at regressions on LO" "Joel, go take a look at regressions on FDO" => "Joel, go take a look at regressions on LOBZ" Well, if you want to mimic fdo, abbrev should be loo (libreoffice.org instead of freedesktop.org) loo is a good trade-off : more than 2, but less than 4; different of the standard lo we use to shortcut LibreOffice BTW, I vote also for lo# if loo# has no access to the vote list ;) Mat ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26 ++ external/libetonyek/UnpackedTarball_libetonyek.mk |4 + 2 files changed, 30 insertions(+) New commits: commit 477e26b9ab681460823f7af042713e28f043cacb Author: David Tardon Date: Fri Dec 6 20:38:03 2013 +0100 fix build Change-Id: I65476b98a58b749619003965c41cfe0f32ae2e13 diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 new file mode 100644 index 000..816039b --- /dev/null +++ b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 @@ -0,0 +1,26 @@ +From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Fri, 6 Dec 2013 18:35:28 +0100 +Subject: [PATCH] Comma at the end of emum list + +Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493 +--- + src/lib/KEYEnum.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h +index f0e027f..9e5e61f 100644 +--- a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h +@@ -33,7 +33,7 @@ enum KEYCapitalization + KEY_CAPITALIZATION_NONE, + KEY_CAPITALIZATION_ALL_CAPS, + KEY_CAPITALIZATION_SMALL_CAPS, +- KEY_CAPITALIZATION_TITLE, ++ KEY_CAPITALIZATION_TITLE + }; + + } +-- +1.8.4.2 + diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 52e6a95..d452574 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \ +)) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/inc sc/source
sc/inc/dpobject.hxx |8 + sc/inc/dpoutput.hxx | 21 - sc/source/core/data/dpobject.cxx | 163 +++ sc/source/core/tool/interpr2.cxx | 15 +++ 4 files changed, 103 insertions(+), 104 deletions(-) New commits: commit ea0be83b9a6453d5e40a4e9356950e70b4784d2e Author: Kohei Yoshida Date: Fri Dec 6 10:43:38 2013 -0500 fdo#69518: Correctly handle the old constraint syntax. We apparently support this syntax for ODF-backward compatibility. To fix this, I resurrected ScDPObject::ParseFilters() which was removed as unused, adjusted it for the String->OUString change, and changed the filter data structure to the UNO one rather than using the old one we no longer use elsewhere. (cherry picked from commit 1d85c8df2fb9cb25fc524485339ae9f11e8da676) Conflicts: sc/inc/dpobject.hxx sc/source/core/data/dpobject.cxx sc/source/core/tool/interpr2.cxx Change-Id: If52b38aaa1e8b208fb0ef9d92a6e853decdf43e3 diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 735b033..8505a53 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -183,9 +183,11 @@ public: const OUString& rDataFieldName, std::vector& rFilters); -boolParseFilters( ScDPGetPivotDataField& rTarget, - std::vector< ScDPGetPivotDataField >& rFilters, - const OUString& rFilterList ); +bool ParseFilters( +OUString& rDataFieldName, +std::vector& rFilters, +std::vector& rFilterFuncs, +const OUString& rFilterList ); void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 293d937..7b38c7e 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -41,29 +41,8 @@ namespace com { namespace sun { namespace star { namespace sheet { class Rectangle; class ScDocument; - struct ScDPOutLevelData; - -struct ScDPGetPivotDataField -{ -OUString maFieldName; -com::sun::star::sheet::GeneralFunction meFunction; - -bool mbValIsStr; -OUString maValStr; -double mnValNum; - -ScDPGetPivotDataField() : -meFunction( com::sun::star::sheet::GeneralFunction_NONE ), -mbValIsStr( false ), -mnValNum( 0.0 ) -{ -} -}; - - - class ScDPOutput { private: diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 3a45a34..773644c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1400,25 +1400,27 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi pOutput->GetMemberResultNames(rNames, nDimension);// used only with table data -> level not needed } -static bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult ) +namespace { + +bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos, OUString& rResult ) { // nStartPos has to point to opening quote bool bRet = false; const sal_Unicode cQuote = '\''; -if ( rSource.GetChar(nStartPos) == cQuote ) +if (rSource[nStartPos] == cQuote) { OUStringBuffer aBuffer; -xub_StrLen nPos = nStartPos + 1; -const xub_StrLen nLen = rSource.Len(); +sal_Int32 nPos = nStartPos + 1; +const sal_Int32 nLen = rSource.getLength(); while ( nPos < nLen ) { -const sal_Unicode cNext = rSource.GetChar(nPos); +const sal_Unicode cNext = rSource[nPos]; if ( cNext == cQuote ) { -if ( nPos+1 < nLen && rSource.GetChar(nPos+1) == cQuote ) +if (nPos+1 < nLen && rSource[nPos+1] == cQuote) { // double quote is used for an embedded quote aBuffer.append( cNext );// append one quote @@ -1449,7 +1451,7 @@ struct ScGetPivotDataFunctionEntry sheet::GeneralFunction eFunc; }; -static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc ) +bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sheet::GeneralFunction& rFunc ) { static const ScGetPivotDataFunctionEntry aFunctions[] = { @@ -1471,22 +1473,22 @@ static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_St { "StdDevp",sheet::GeneralFunction_STDEVP} }; -const xub_StrLen nListLen = rList.Len(); -while ( nStartPos < nListLen && rList.GetChar(nStartPos) == ' ' ) +const sal_Int32 nListLen = rList.getLength(); +while (nStartPos < nListLen && rList[nStartPos] == ' ') ++nStartPos; bool bParsed = false; bool bFound = false; -String aFuncStr; -xub_
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 69518, which changed state. Bug 69518 Summary: GETPIVOTDATA gives #REF! with Constraints syntax https://bugs.freedesktop.org/show_bug.cgi?id=69518 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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/dpobject.hxx |6 sc/inc/dpoutput.hxx | 21 - sc/source/core/data/dpobject.cxx | 441 +++ sc/source/core/tool/interpr2.cxx | 23 +- 4 files changed, 466 insertions(+), 25 deletions(-) New commits: commit a125b9da3035a584ffd2203f2b3c71c972b8bd4c Author: Kohei Yoshida Date: Fri Dec 6 10:43:38 2013 -0500 fdo#69518: Correctly handle the old constraint syntax. We apparently support this syntax for ODF-backward compatibility. To fix this, I resurrected ScDPObject::ParseFilters() which was removed as unused, adjusted it for the String->OUString change, and changed the filter data structure to the UNO one rather than using the old one we no longer use elsewhere. Change-Id: If52b38aaa1e8b208fb0ef9d92a6e853decdf43e3 (cherry picked from commit 1d85c8df2fb9cb25fc524485339ae9f11e8da676) diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index b2f6e38..1683480 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -183,6 +183,12 @@ public: const OUString& rDataFieldName, std::vector& rFilters); +bool ParseFilters( +OUString& rDataFieldName, +std::vector& rFilters, +std::vector& rFilterFuncs, +const OUString& rFilterList ); + void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); voidToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 293d937..7b38c7e 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -41,29 +41,8 @@ namespace com { namespace sun { namespace star { namespace sheet { class Rectangle; class ScDocument; - struct ScDPOutLevelData; - -struct ScDPGetPivotDataField -{ -OUString maFieldName; -com::sun::star::sheet::GeneralFunction meFunction; - -bool mbValIsStr; -OUString maValStr; -double mnValNum; - -ScDPGetPivotDataField() : -meFunction( com::sun::star::sheet::GeneralFunction_NONE ), -mbValIsStr( false ), -mnValNum( 0.0 ) -{ -} -}; - - - class ScDPOutput { private: diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 4dca258..83532e2 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1400,6 +1400,447 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi pOutput->GetMemberResultNames(rNames, nDimension);// used only with table data -> level not needed } +namespace { + +bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos, OUString& rResult ) +{ +// nStartPos has to point to opening quote + +bool bRet = false; +const sal_Unicode cQuote = '\''; + +if (rSource[nStartPos] == cQuote) +{ +OUStringBuffer aBuffer; +sal_Int32 nPos = nStartPos + 1; +const sal_Int32 nLen = rSource.getLength(); + +while ( nPos < nLen ) +{ +const sal_Unicode cNext = rSource[nPos]; +if ( cNext == cQuote ) +{ +if (nPos+1 < nLen && rSource[nPos+1] == cQuote) +{ +// double quote is used for an embedded quote +aBuffer.append( cNext );// append one quote +++nPos; // skip the next one +} +else +{ +// end of quoted string +rResult = aBuffer.makeStringAndClear(); +rEndPos = nPos + 1; // behind closing quote +return true; +} +} +else +aBuffer.append( cNext ); + +++nPos; +} +// no closing quote before the end of the string -> error (bRet still false) +} + +return bRet; +} + +struct ScGetPivotDataFunctionEntry +{ +const sal_Char* pName; +sheet::GeneralFunction eFunc; +}; + +bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sheet::GeneralFunction& rFunc ) +{ +static const ScGetPivotDataFunctionEntry aFunctions[] = +{ +// our names +{ "Sum",sheet::GeneralFunction_SUM }, +{ "Count", sheet::GeneralFunction_COUNT }, +{ "Average",sheet::GeneralFunction_AVERAGE }, +{ "Max",sheet::GeneralFunction_MAX }, +{ "Min",sheet::GeneralFunction_MIN }, +{ "Product",sheet::GeneralFunction_PRODUCT }, +{ "CountNums", sheet::GeneralFunction_COUNTNUMS }, +{ "StDev", sheet::GeneralFunction_STDEV }, +{ "StDevp", sheet::GeneralFunction_STDEVP}, +{ "Var",sheet::GeneralFunction_VAR }, +{ "VarP", she
[Libreoffice-commits] core.git: comphelper/source connectivity/source cui/source dbaccess/source extensions/source forms/source include/comphelper include/connectivity include/svtools include/svx incl
comphelper/source/compare/AnyCompareFactory.cxx |1 - comphelper/source/container/namecontainer.cxx|1 - connectivity/source/commontools/dbconversion.cxx |2 -- connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx |1 - connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx |1 - connectivity/source/drivers/mork/MQueryHelper.hxx|1 - connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx|1 - connectivity/source/inc/hsqldb/HDriver.hxx |1 - connectivity/source/parse/sqlnode.cxx|1 - cui/source/inc/cuifmsearch.hxx |1 - cui/source/inc/dbregister.hxx|1 - cui/source/options/sdbcdriverenum.cxx|1 - dbaccess/source/core/api/OptimisticSet.hxx |1 - dbaccess/source/core/dataaccess/ContentHelper.cxx|1 + dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx |1 + dbaccess/source/core/inc/querycontainer.hxx |1 - dbaccess/source/core/inc/tablecontainer.hxx |1 - dbaccess/source/core/inc/viewcontainer.hxx |1 - dbaccess/source/filter/xml/dbloader2.cxx |1 - dbaccess/source/ui/app/AppController.hxx |1 - dbaccess/source/ui/dlg/tablespage.hxx|1 - dbaccess/source/ui/inc/TableRow.hxx |1 - dbaccess/source/ui/inc/directsql.hxx |1 - dbaccess/source/ui/inc/formadapter.hxx |1 - dbaccess/source/ui/inc/unodatbr.hxx |1 - dbaccess/source/ui/querydesign/TableConnectionData.cxx |3 +-- extensions/source/propctrlr/pcrunodialogs.cxx|4 extensions/source/propctrlr/propertyeditor.hxx |1 - forms/source/component/DatabaseForm.cxx |1 - include/comphelper/IdPropArrayHelper.hxx |1 - include/comphelper/proparrhlp.hxx|1 - include/connectivity/FValue.hxx |1 - include/connectivity/dbcharset.hxx |1 - include/connectivity/sdbcx/VCollection.hxx |1 - include/svtools/wizardmachine.hxx|1 - include/svx/dbaexchange.hxx |1 - include/svx/dbaobjectex.hxx |1 - include/svx/fmsearch.hxx |1 - include/toolkit/controls/geometrycontrolmodel.hxx|1 - reportdesign/inc/RptObject.hxx |1 - reportdesign/source/core/inc/Section.hxx |1 - reportdesign/source/filter/xml/dbloader2.hxx |1 - reportdesign/source/filter/xml/xmlExport.hxx |1 - reportdesign/source/ui/dlg/AddField.cxx |1 - reportdesign/source/ui/inc/DesignView.hxx|1 - sd/inc/CustomAnimationEffect.hxx |1 - sd/source/ui/animations/STLPropertySet.hxx |2 -- sd/source/ui/framework/configuration/Configuration.cxx |3 --- sd/source/ui/framework/configuration/ConfigurationController.cxx |1 - sd/source/ui/unoidl/DrawController.cxx |1 - sfx2/source/sidebar/SidebarController.hxx|1 - svx/source/form/dataaccessdescriptor.cxx |1 - svx/source/form/fmobjfac.cxx |1 - svx/source/form/tabwin.cxx |1 - svx/source/inc/fmexch.hxx|1 - toolkit/source/controls/unocontrol.cxx |1 - unotools/source/config/optionsdlg.cxx|1 - xmloff/source/forms/formlayerexport.cxx |1 - xmloff/source/forms/propertyexport.hxx |1 - xmloff/source/forms/propertyimport.hxx |1 - xmloff/source/style/xmlexppr.cxx |1 - 61 files changed, 7 insertions(+), 63 deletions(-) New commits: commit b0926378ac46f50b16fa6a6c2e3b42937fc34976 Author: Stephan Bergmann Date: Fri Dec 6 17:55:56 2013 +0100 Clean up includes of comphelper/stl_types.hxx Change-Id: I00a8e794189d17ad91a90beb9ce6cb89b7bab2aa diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 31d7d
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dpobject.hxx |6 sc/inc/dpoutput.hxx | 21 - sc/source/core/data/dpobject.cxx | 441 +++ sc/source/core/tool/interpr2.cxx | 23 +- 4 files changed, 466 insertions(+), 25 deletions(-) New commits: commit 1d85c8df2fb9cb25fc524485339ae9f11e8da676 Author: Kohei Yoshida Date: Fri Dec 6 10:43:38 2013 -0500 fdo#69518: Correctly handle the old constraint syntax. We apparently support this syntax for ODF-backward compatibility. To fix this, I resurrected ScDPObject::ParseFilters() which was removed as unused, adjusted it for the String->OUString change, and changed the filter data structure to the UNO one rather than using the old one we no longer use elsewhere. Change-Id: If52b38aaa1e8b208fb0ef9d92a6e853decdf43e3 diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index b2f6e38..1683480 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -183,6 +183,12 @@ public: const OUString& rDataFieldName, std::vector& rFilters); +bool ParseFilters( +OUString& rDataFieldName, +std::vector& rFilters, +std::vector& rFilterFuncs, +const OUString& rFilterList ); + void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); voidToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 293d937..7b38c7e 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -41,29 +41,8 @@ namespace com { namespace sun { namespace star { namespace sheet { class Rectangle; class ScDocument; - struct ScDPOutLevelData; - -struct ScDPGetPivotDataField -{ -OUString maFieldName; -com::sun::star::sheet::GeneralFunction meFunction; - -bool mbValIsStr; -OUString maValStr; -double mnValNum; - -ScDPGetPivotDataField() : -meFunction( com::sun::star::sheet::GeneralFunction_NONE ), -mbValIsStr( false ), -mnValNum( 0.0 ) -{ -} -}; - - - class ScDPOutput { private: diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 4dca258..83532e2 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1400,6 +1400,447 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi pOutput->GetMemberResultNames(rNames, nDimension);// used only with table data -> level not needed } +namespace { + +bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos, OUString& rResult ) +{ +// nStartPos has to point to opening quote + +bool bRet = false; +const sal_Unicode cQuote = '\''; + +if (rSource[nStartPos] == cQuote) +{ +OUStringBuffer aBuffer; +sal_Int32 nPos = nStartPos + 1; +const sal_Int32 nLen = rSource.getLength(); + +while ( nPos < nLen ) +{ +const sal_Unicode cNext = rSource[nPos]; +if ( cNext == cQuote ) +{ +if (nPos+1 < nLen && rSource[nPos+1] == cQuote) +{ +// double quote is used for an embedded quote +aBuffer.append( cNext );// append one quote +++nPos; // skip the next one +} +else +{ +// end of quoted string +rResult = aBuffer.makeStringAndClear(); +rEndPos = nPos + 1; // behind closing quote +return true; +} +} +else +aBuffer.append( cNext ); + +++nPos; +} +// no closing quote before the end of the string -> error (bRet still false) +} + +return bRet; +} + +struct ScGetPivotDataFunctionEntry +{ +const sal_Char* pName; +sheet::GeneralFunction eFunc; +}; + +bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sheet::GeneralFunction& rFunc ) +{ +static const ScGetPivotDataFunctionEntry aFunctions[] = +{ +// our names +{ "Sum",sheet::GeneralFunction_SUM }, +{ "Count", sheet::GeneralFunction_COUNT }, +{ "Average",sheet::GeneralFunction_AVERAGE }, +{ "Max",sheet::GeneralFunction_MAX }, +{ "Min",sheet::GeneralFunction_MIN }, +{ "Product",sheet::GeneralFunction_PRODUCT }, +{ "CountNums", sheet::GeneralFunction_COUNTNUMS }, +{ "StDev", sheet::GeneralFunction_STDEV }, +{ "StDevp", sheet::GeneralFunction_STDEVP}, +{ "Var",sheet::GeneralFunction_VAR }, +{ "VarP", sheet::GeneralFunction_VARP }, +// compatibility names +
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |4 1 file changed, 4 insertions(+) New commits: commit 60b5de35edcc0b1b3f4a85608e9da9846f5e98c0 Author: Caolán McNamara Date: Fri Dec 6 16:35:15 2013 + map homogeneous to opposite of non-homogeneous which should silence that annoying "unknown packing: homogeneous" warning Change-Id: I826908024063909ddd5f975829b7a5727944d399 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 577eb86..2301d21 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2733,6 +2733,10 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, { pCurrent->set_non_homogeneous(toBool(sValue)); } +else if (sKey == "homogeneous") +{ +pCurrent->set_non_homogeneous(!toBool(sValue)); +} else { SAL_WARN("vcl.layout", "unknown packing: " << sKey.getStr()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo65295.docx |binary sw/qa/extras/ooxmlimport/data/mce-nested.docx |binary sw/qa/extras/ooxmlimport/data/wps-only.docx |binary writerfilter/source/dmapper/GraphicImport.cxx | 50 -- 4 files changed, 31 insertions(+), 19 deletions(-) New commits: commit 41acd107e78bb45ac8a6bb632ed5432d6d9deb9f Author: Miklos Vajna Date: Fri Dec 6 16:21:42 2013 +0100 DOCX drawingml shape import: handle name and z-order Change-Id: Ib4e17723ba9e2bb4dae0eb86cf55513a4b68de6f diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index fab8788..e293b0c 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -378,6 +378,33 @@ public: xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_VERT_ORIENT_RELATION ), uno::makeAny(nVertRelation)); } + +void applyZOrder(uno::Reference& xGraphicObjectProperties) const +{ +PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); +if (zOrder >= 0) +{ +GraphicZOrderHelper* pZOrderHelper = rDomainMapper.graphicZOrderHelper(); + xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_Z_ORDER), uno::makeAny(pZOrderHelper->findZOrder(zOrder))); +pZOrderHelper->addItem(xGraphicObjectProperties, zOrder); +} +} + +void applyName(uno::Reference& xGraphicObjectProperties) const +{ +try +{ +if( !sName.isEmpty() ) +{ +uno::Reference< container::XNamed > xNamed( xGraphicObjectProperties, uno::UNO_QUERY_THROW ); +xNamed->setName( sName ); +} +} +catch( const uno::Exception& e ) +{ +SAL_WARN("writerfilter", "failed. Message :" << e.Message); +} +} }; @@ -1045,6 +1072,8 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) bool bOpaque = m_pImpl->bOpaque && !m_pImpl->rDomainMapper.IsInHeaderFooter(); xShapeProps->setPropertyValue("Opaque", uno::makeAny(bOpaque)); xShapeProps->setPropertyValue("Surround", uno::makeAny(m_pImpl->nWrap)); +m_pImpl->applyZOrder(xShapeProps); +m_pImpl->applyName(xShapeProps); } } } @@ -1581,13 +1610,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_BACK_COLOR ), uno::makeAny( m_pImpl->nFillColor )); -if( m_pImpl->zOrder >= 0 ) -{ -GraphicZOrderHelper* zOrderHelper = m_pImpl->rDomainMapper.graphicZOrderHelper(); - xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_Z_ORDER ), -uno::makeAny( zOrderHelper->findZOrder( m_pImpl->zOrder ))); -zOrderHelper->addItem( xGraphicObjectProperties, m_pImpl->zOrder ); -} +m_pImpl->applyZOrder(xGraphicObjectProperties); //there seems to be no way to detect the original size via _real_ API uno::Reference< beans::XPropertySet > xGraphicProperties( xGraphic, uno::UNO_QUERY_THROW ); @@ -1635,18 +1658,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_SIZE), uno::makeAny( awt::Size( m_pImpl->getXSize(), m_pImpl->getYSize() ))); m_pImpl->applyMargins(xGraphicObjectProperties); -try -{ -if( !m_pImpl->sName.isEmpty() ) -{ -uno::Reference< container::XNamed > xNamed( xGraphicObjectProperties, uno::UNO_QUERY_THROW ); -xNamed->setName( m_pImpl->sName ); -} -} -catch( const uno::Exception& e ) -{ -SAL_WARN("writerfilter", "failed. Message :" << e.Message); -} +m_pImpl->applyName(xGraphicObjectProperties); } } } commit 627bfee26354fe59926607138d162a3dd1c8e3f6 Author: Miklos Vajna Date: Fri Dec 6 16:28:53 2013 +0100 sw: remove unused zorder data from bugdocs Expecting that the shapes are on the drawpage in the same order as they are in the file and providing zorder info at the same time doesn't work. Either using names is required or the simpler way is not providing zorder info. Fixed earlier bugdocs not to provide zorder info, so when
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 4 commits - configmgr/source cui/source
configmgr/source/access.cxx |7 cui/source/options/optaboutconfig.cxx | 249 +++--- cui/source/options/optaboutconfig.hxx |4 3 files changed, 146 insertions(+), 114 deletions(-) New commits: commit 6ac384a1ccd4f52e16b9c2393441096f6d9e7bc1 Author: Stephan Bergmann Date: Fri Dec 6 16:53:36 2013 +0100 More Expert Config Page fixes Change-Id: Iaa2b7df4246ab3fa31737126f27e4a9da3814048 (cherry picked from commit 434465cee3c5e21881d3466f115d968e8fbf731c) diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index ad145de..56b945a 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -175,27 +176,25 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& r void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) { -OUString sRootNodePath = ""; m_pPrefBox->Clear(); m_vectorOfModified.clear(); m_pPrefBox->GetModel()->SetSortMode( SortNone ); m_pPrefBox->SetUpdateMode(sal_False); -Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath, sal_False ); -FillItems( xConfigAccess, sRootNodePath ); +Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", sal_False ); +FillItems( xConfigAccess ); m_pPrefBox->SetUpdateMode(sal_True); } sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) { sal_Bool bModified = sal_False; -Reference< XNameAccess > xUpdateAccess = getConfigAccess( "/", sal_True ); std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) { -xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); +Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW ); xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value ); @@ -208,10 +207,12 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) return bModified; } -void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAccess, const OUString& sPath) +void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAccess) { +OUString sPath = Reference< XHierarchicalName >( +xNameAccess, uno::UNO_QUERY_THROW )->getHierarchicalName(); uno::Sequence< OUString > seqItems = xNameAccess->getElementNames(); -for( sal_Int16 i = 0; i < seqItems.getLength(); ++i ) +for( sal_Int32 i = 0; i < seqItems.getLength(); ++i ) { Any aNode = xNameAccess->getByName( seqItems[i] ); @@ -219,7 +220,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces if( xNextNameAccess.is() ) { // not leaf node -FillItems( xNextNameAccess, sPath + "/" + seqItems[i] ); +FillItems( xNextNameAccess ); } else { @@ -227,100 +228,152 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces OUString sType = aNode.getValueTypeName(); OUString sValue; -if( aNode.hasValue() ) +switch( aNode.getValueType().getTypeClass() ) { -switch( aNode.getValueType().getTypeClass() ) +case ::com::sun::star::uno::TypeClass_VOID: +break; + +case ::com::sun::star::uno::TypeClass_BOOLEAN: +sValue = OUString::boolean( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_SHORT: +case ::com::sun::star::uno::TypeClass_LONG: +case ::com::sun::star::uno::TypeClass_HYPER: +sValue = OUString::number( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_DOUBLE: +sValue = OUString::number( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_STRING: +sValue = aNode.get(); +break; + +case ::com::sun::star::uno::TypeClass_SEQUENCE: +if( sType == "[]boolean" ) { -case ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT : -case ::com::sun::star::uno::TypeClass_SHORT : -case ::com::sun::star::uno::TypeClass_UNSIGNED_LONG : -case ::com::sun::star::uno::TypeClass_LONG : -//case ::com::sun::star::uno::TypeClass_INT : +uno::Sequence seq = aNode.get< uno::Sequence >(); +for( sal_Int32 j = 0; j != seq.getLength(); ++j ) { -sal_Int32 nVal = 0
Re: [GSOC] about:config utility a.k.a Expert Config - Weekly Report #13
On 09/16/2013 07:45 AM, Efe Gürkan YALAMAN wrote: This weeks work was implementing list datatypes to the page. It is done right know. So currently page works with all datatypes.(all integers, float, double, boolean, string, list types.) For the record, the attached test.xcd contains properties of all the 14 different data types supported by the configuration. Copy it into your LO installation's share/registry/ directory and find corresponding /TEST.test... entries in the Expert Configuration Page. Stephan http://www.w3.org/2001/XMLSchema"; xmlns:oor="http://openoffice.org/2001/registry";> true -10 -100 -10 1.23 ABC 0041FF truefalse -1010 -100100 -1010 1.23-456.789 ABC 0041FF ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - configmgr/source cui/source
configmgr/source/access.cxx |7 cui/source/options/optaboutconfig.cxx | 246 +++--- cui/source/options/optaboutconfig.hxx |2 3 files changed, 144 insertions(+), 111 deletions(-) New commits: commit 434465cee3c5e21881d3466f115d968e8fbf731c Author: Stephan Bergmann Date: Fri Dec 6 16:53:36 2013 +0100 More Expert Config Page fixes Change-Id: Iaa2b7df4246ab3fa31737126f27e4a9da3814048 diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index ad145de..56b945a 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -175,27 +176,25 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& r void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) { -OUString sRootNodePath = ""; m_pPrefBox->Clear(); m_vectorOfModified.clear(); m_pPrefBox->GetModel()->SetSortMode( SortNone ); m_pPrefBox->SetUpdateMode(sal_False); -Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath, sal_False ); -FillItems( xConfigAccess, sRootNodePath ); +Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", sal_False ); +FillItems( xConfigAccess ); m_pPrefBox->SetUpdateMode(sal_True); } sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) { sal_Bool bModified = sal_False; -Reference< XNameAccess > xUpdateAccess = getConfigAccess( "/", sal_True ); std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) { -xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); +Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW ); xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value ); @@ -208,10 +207,12 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) return bModified; } -void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAccess, const OUString& sPath) +void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAccess) { +OUString sPath = Reference< XHierarchicalName >( +xNameAccess, uno::UNO_QUERY_THROW )->getHierarchicalName(); uno::Sequence< OUString > seqItems = xNameAccess->getElementNames(); -for( sal_Int16 i = 0; i < seqItems.getLength(); ++i ) +for( sal_Int32 i = 0; i < seqItems.getLength(); ++i ) { Any aNode = xNameAccess->getByName( seqItems[i] ); @@ -219,7 +220,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces if( xNextNameAccess.is() ) { // not leaf node -FillItems( xNextNameAccess, sPath + "/" + seqItems[i] ); +FillItems( xNextNameAccess ); } else { @@ -227,100 +228,152 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces OUString sType = aNode.getValueTypeName(); OUString sValue; -if( aNode.hasValue() ) +switch( aNode.getValueType().getTypeClass() ) { -switch( aNode.getValueType().getTypeClass() ) +case ::com::sun::star::uno::TypeClass_VOID: +break; + +case ::com::sun::star::uno::TypeClass_BOOLEAN: +sValue = OUString::boolean( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_SHORT: +case ::com::sun::star::uno::TypeClass_LONG: +case ::com::sun::star::uno::TypeClass_HYPER: +sValue = OUString::number( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_DOUBLE: +sValue = OUString::number( aNode.get() ); +break; + +case ::com::sun::star::uno::TypeClass_STRING: +sValue = aNode.get(); +break; + +case ::com::sun::star::uno::TypeClass_SEQUENCE: +if( sType == "[]boolean" ) { -case ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT : -case ::com::sun::star::uno::TypeClass_SHORT : -case ::com::sun::star::uno::TypeClass_UNSIGNED_LONG : -case ::com::sun::star::uno::TypeClass_LONG : -//case ::com::sun::star::uno::TypeClass_INT : +uno::Sequence seq = aNode.get< uno::Sequence >(); +for( sal_Int32 j = 0; j != seq.getLength(); ++j ) { -sal_Int32 nVal = 0; -if(aNode >>= nVal) +if
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 23 --- 2 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 7c82f63af7a519a192d9dd0ba5ca463de9e508e8 Author: Matúš Kukan Date: Fri Dec 6 14:40:50 2013 +0100 EMF+: Fill line cap object if EmfPlusCustomLineCapDataFillPath is set. Change-Id: I7b53a8f18e1fb24b1ae0322bdf0980e431a0725f (cherry picked from commit 131f3230d98f24faf57d9404e333cb1fb183345b) diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index cd9cda0..cebbbab 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -280,7 +280,7 @@ static float GetSwapFloat( SvStream& rSt ) /// Render LineCap, like the start or end arrow of a polygon. /// @return how much we should shorten the original polygon. double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, +const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart, const com::sun::star::rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState); diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index aeb52af..be0588d 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -621,6 +621,7 @@ namespace cppcanvas sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin; float miterLimit; basegfx::B2DPolyPolygon polygon; +bool mbIsFilled; public: EMFPCustomLineCap() : EMFPObject() @@ -647,7 +648,7 @@ namespace cppcanvas aAttributes.MiterLimit = miterLimit; } -void ReadPath(SvStream& s, ImplRenderer& rR, bool bClosed) +void ReadPath(SvStream& s, ImplRenderer& rR, bool bFill) { sal_Int32 pathLength; s >> pathLength; @@ -664,7 +665,7 @@ namespace cppcanvas path.Read(s, pathFlags, rR); polygon = path.GetPolygon(rR, false); -polygon.setClosed(bClosed); +mbIsFilled = bFill; // transformation to convert the path to what LibreOffice // expects @@ -1317,7 +1318,7 @@ namespace cppcanvas } double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, const rendering::StrokeAttributes& rAttributes, +const ::basegfx::B2DPolyPolygon& rLineCap, bool bIsFilled, bool bStart, const rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState) { if (!rLineCap.count()) @@ -1346,6 +1347,20 @@ namespace cppcanvas rParms.mrCurrActionIndex += pAction->getActionCount()-1; } +if (bIsFilled) +{ +bool bWasFillColorSet = rState.isFillColorSet; +rState.isFillColorSet = true; +rState.fillColor = rState.lineColor; +ActionSharedPtr pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState)); +if (pAction2) +{ +maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex)); +rParms.mrCurrActionIndex += pAction2->getActionCount()-1; +} +rState.isFillColorSet = bWasFillColorSet; +} + return rAttributes.StrokeWidth; } @@ -1400,6 +1415,7 @@ namespace cppcanvas pen->customStartCap->SetAttributes(aAttributes); fStart = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customStartCap->polygon, +pen->customStartCap->mbIsFilled, true, aAttributes, rParms, rState); } @@ -1410,6 +1426,7 @@ namespace cppcanvas pen->customEndCap->SetAttributes(aAttributes); fEnd = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customEndCap->polygon, +pen->customEndCap->mbIsFilled, false, aAttributes, rParms, rState); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 23 --- 2 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 1f294a9ed2ced2e750befb8e98c4f1e9f7c1235e Author: Matúš Kukan Date: Fri Dec 6 14:40:50 2013 +0100 EMF+: Fill line cap object if EmfPlusCustomLineCapDataFillPath is set. Change-Id: I7b53a8f18e1fb24b1ae0322bdf0980e431a0725f (cherry picked from commit 131f3230d98f24faf57d9404e333cb1fb183345b) diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 3d0c48d..d09ed1c 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -284,7 +284,7 @@ static float GetSwapFloat( SvStream& rSt ) /// Render LineCap, like the start or end arrow of a polygon. /// @return how much we should shorten the original polygon. double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, +const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart, const com::sun::star::rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState); diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index bbf4174..4a9d938 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -626,6 +626,7 @@ namespace cppcanvas sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin; float miterLimit; basegfx::B2DPolyPolygon polygon; +bool mbIsFilled; public: EMFPCustomLineCap() : EMFPObject() @@ -652,7 +653,7 @@ namespace cppcanvas aAttributes.MiterLimit = miterLimit; } -void ReadPath(SvStream& s, ImplRenderer& rR, bool bClosed) +void ReadPath(SvStream& s, ImplRenderer& rR, bool bFill) { sal_Int32 pathLength; s >> pathLength; @@ -669,7 +670,7 @@ namespace cppcanvas path.Read(s, pathFlags, rR); polygon = path.GetPolygon(rR, false); -polygon.setClosed(bClosed); +mbIsFilled = bFill; // transformation to convert the path to what LibreOffice // expects @@ -1320,7 +1321,7 @@ namespace cppcanvas } double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, const rendering::StrokeAttributes& rAttributes, +const ::basegfx::B2DPolyPolygon& rLineCap, bool bIsFilled, bool bStart, const rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState) { if (!rLineCap.count()) @@ -1349,6 +1350,20 @@ namespace cppcanvas rParms.mrCurrActionIndex += pAction->getActionCount()-1; } +if (bIsFilled) +{ +bool bWasFillColorSet = rState.isFillColorSet; +rState.isFillColorSet = true; +rState.fillColor = rState.lineColor; +ActionSharedPtr pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState)); +if (pAction2) +{ +maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex)); +rParms.mrCurrActionIndex += pAction2->getActionCount()-1; +} +rState.isFillColorSet = bWasFillColorSet; +} + return rAttributes.StrokeWidth; } @@ -1403,6 +1418,7 @@ namespace cppcanvas pen->customStartCap->SetAttributes(aAttributes); fStart = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customStartCap->polygon, +pen->customStartCap->mbIsFilled, true, aAttributes, rParms, rState); } @@ -1413,6 +1429,7 @@ namespace cppcanvas pen->customEndCap->SetAttributes(aAttributes); fEnd = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customEndCap->polygon, +pen->customEndCap->mbIsFilled, false, aAttributes, rParms, rState); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/shape/ShapeContextHandler.cxx |8 sw/qa/extras/ooxmlimport/data/mce-nested.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 3 files changed, 12 insertions(+) New commits: commit c8e9a953636524ff3ac79859f3698491f775e10a Author: Miklos Vajna Date: Fri Dec 6 15:54:12 2013 +0100 DOCX import: fix import of wpg shapes after a wps textframe Change-Id: I30844062bf4d4f15ca70d9f441f0505fa4f26bb7 diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 5ac772c..6cd8e82 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -322,6 +322,14 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element) if (xContextHandler.is()) xContextHandler->endFastElement(Element); +// In case a textbox is sent, and later we get additional properties for +// the textbox, then the wps context is not cleared, so do that here. +if (Element == (NMSP_wps | XML_wsp)) +{ +uno::Reference xServiceInfo(mxSavedShape, uno::UNO_QUERY); +if (xServiceInfo.is() && xServiceInfo->supportsService("com.sun.star.text.TextFrame")) +mxWpsContext.clear(); +} } void SAL_CALL ShapeContextHandler::endUnknownElement diff --git a/sw/qa/extras/ooxmlimport/data/mce-nested.docx b/sw/qa/extras/ooxmlimport/data/mce-nested.docx index c110f63..6804fc2 100644 Binary files a/sw/qa/extras/ooxmlimport/data/mce-nested.docx and b/sw/qa/extras/ooxmlimport/data/mce-nested.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a1a0d43..9c6510d 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1603,6 +1603,10 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), getProperty(xFrame, "VertOrientPosition")); // This was -1 (default), make sure the background color is set. CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty(xFrame, "BackColor")); + +uno::Reference xShapeDescriptor(getShape(2), uno::UNO_QUERY); +// This was a com.sun.star.drawing.CustomShape, due to incorrect handling of wpg elements after a wps textbox. +CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType()); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") ___ 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 72022, which changed state. Bug 72022 Summary: Integrated help ignored if installed https://bugs.freedesktop.org/show_bug.cgi?id=72022 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/urlparameter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 71771f7cf42619b3f8977b31f5ec33ed05bad6ed Author: Caolán McNamara Date: Fri Dec 6 14:59:06 2013 + Related: fdo#72022 internal links busted regression since 58fa3d50aa43102cea8690fd6bf51fb80c007955 Change-Id: I499704d18872da6f2f01cf955a6496104c53dd3f (cherry picked from commit 6b713bafe4d8f7fc4f5dfe2b794c07fb713a3462) diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 99447df..0acae63 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -627,7 +627,7 @@ bool URLParameter::query() else if( parameter.equalsAscii( "Eid" ) ) m_aEid = value; else if( parameter.equalsAscii( "UseDB" ) ) -m_bUseDB = ( value.equalsAscii("no") != 0 ); +m_bUseDB = !value.equalsAscii("no"); else if( parameter.equalsAscii( "DbPAR" ) ) m_aDbPar = value; else if( parameter.equalsAscii( "Query" ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/urlparameter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b713bafe4d8f7fc4f5dfe2b794c07fb713a3462 Author: Caolán McNamara Date: Fri Dec 6 14:59:06 2013 + Related: fdo#72022 internal links busted regression since 58fa3d50aa43102cea8690fd6bf51fb80c007955 Change-Id: I499704d18872da6f2f01cf955a6496104c53dd3f diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 99447df..0acae63 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -627,7 +627,7 @@ bool URLParameter::query() else if( parameter.equalsAscii( "Eid" ) ) m_aEid = value; else if( parameter.equalsAscii( "UseDB" ) ) -m_bUseDB = ( value.equalsAscii("no") != 0 ); +m_bUseDB = !value.equalsAscii("no"); else if( parameter.equalsAscii( "DbPAR" ) ) m_aDbPar = value; else if( parameter.equalsAscii( "Query" ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/ure.scp|2 +- scp2/source/python/file_python.scp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit dd02446dff4066170a5947065379316111886eaa Author: Matúš Kukan Date: Fri Dec 6 15:30:36 2013 +0100 scp2: hopefully fix Windows build Change-Id: Ib4ead1d64dc6b8e76bf2c7bf0f007e8962acb1e2 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 3e9983b..3cf19c2 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -404,7 +404,7 @@ End File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY); -Name = "assembly/cli_cppuhelper.dll"; +Name = "cli_cppuhelper.dll"; Dir = SCP2_URE_DL_DIR; Assemblyname = "cli_cppuhelper"; PublicKeyToken = "ce2cb7e279207b9e"; diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index e4d5336..66e590d 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -60,7 +60,7 @@ End File gid_File_Py_Bin_Python BIN_FILE_BODY; #ifdef WNT -Name = EXENAME(pyuno/python); +Name = EXENAME(python); Dir = gid_Brand_Dir_Program; Styles = (PACKED); #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 ++ writerfilter/source/dmapper/GraphicImport.cxx |9 + 2 files changed, 11 insertions(+) New commits: commit 51a61bd4aca15c860d301b687d582a39193089e2 Author: Miklos Vajna Date: Fri Dec 6 12:00:29 2013 +0100 DOCX import: fix relativeFrom=page, align=right handling Change-Id: I9c1df594457a8ccbbebf4ede61cc3a637ecc7023 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 24ffb76..a1a0d43 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1561,6 +1561,8 @@ DECLARE_OOXMLIMPORT_TEST(testWpgNested, "wpg-nested.docx") uno::Reference xShapeDescriptor(xGroup->getByIndex(0), uno::UNO_QUERY); // This was a com.sun.star.drawing.CustomShape, due to lack of handling of groupshapes inside groupshapes. CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType()); +// This was text::RelOrientation::PAGE_FRAME, effectively placing the group shape on the left side of the page instead of the right one. +CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_RIGHT, getProperty(xGroup, "HoriOrientRelation")); } DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx") diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 3f7e0cb..fab8788 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1303,6 +1303,15 @@ void GraphicImport::lcl_sprm(Sprm & rSprm) m_pImpl->nHoriRelation = pHandler->relation(); m_pImpl->nHoriOrient = pHandler->orientation(); m_pImpl->nLeftPosition = pHandler->position(); +if (m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME && m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT) +{ +// If the shape is relative from page and aligned to +// right, then set the relation to right and clear the +// orientation, that provides the same visual result as +// Word. +m_pImpl->nHoriRelation = text::RelOrientation::PAGE_RIGHT; +m_pImpl->nHoriOrient = text::HoriOrientation::NONE; +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/shared/05/0110.xhp | 28 ++-- 2 files changed, 14 insertions(+), 21 deletions(-) New commits: commit ee5d5c120418303a51af8ae9f0cf6a73a8447f38 Author: Caolán McNamara Date: Fri Dec 6 14:21:28 2013 + update help ids for search dialog .ui conversion Change-Id: I37a2ddfd5d2004417489f64fb2482095b4ad4360 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 30f6f28..7be6ac7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3283,7 +3283,6 @@ HID_SD_WIN_DOCUMENT,59787, HID_SD_WIN_PRESENTATION,59836, HID_SEARCHATTR,33820, HID_SEARCHATTR_CTL_ATTR,33883, -HID_SEARCHDIALOG,33379, HID_SEARCH_ALLFIELDS,38179, HID_SEARCH_BACKWARD,38185, HID_SEARCH_BTN_CLOSE,38192, @@ -6369,14 +6368,9 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237, sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236, sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235, sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233, -sfx2_CheckBox_RID_DLG_SEARCH_CB_BACKWARDS,2187084816, -sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814, -sfx2_CheckBox_RID_DLG_SEARCH_CB_WHOLEWORDS,2187084813, -sfx2_CheckBox_RID_DLG_SEARCH_CB_WRAPAROUND,2187084815, sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129, sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262, sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263, -sfx2_ComboBox_RID_DLG_SEARCH_ED_SEARCH,2187087883, sfx2_ComboBox_TP_HELP_INDEX_CB_INDEX,546983947, sfx2_ComboBox_TP_HELP_SEARCH_ED_SEARCH,547000331, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021, @@ -6404,7 +6398,6 @@ sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040, sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008, sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807, sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822, -sfx2_PushButton_RID_DLG_SEARCH_PB_FIND,2187088401, sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711, sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830, sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228, diff --git a/source/text/shared/05/0110.xhp b/source/text/shared/05/0110.xhp index 729bfaa..d2e304d 100644 --- a/source/text/shared/05/0110.xhp +++ b/source/text/shared/05/0110.xhp @@ -28,7 +28,7 @@ - + The %PRODUCTNAME Help Window The Help system for all versions of the software is based on the same source files. Some of the functions described in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help. @@ -146,18 +146,18 @@ To find the next occurrence of the search term on the page, click Find again. - -Enter the text that you want to search for or select a text entry in the list. - -Finds complete words only. - -Distinguishes between uppercase text and lowercase text. - -Searches the entire Help page, starting at the current position of the cursor. - -Searches backwards from the current position of the cursor. - -Finds the next occurrence of the search term. + +Enter the text that you want to search for or select a text entry in the list. + +Finds complete words only. + +Distinguishes between uppercase text and lowercase text. + +Searches the entire Help page, starting at the current position of the cursor. + +Searches backwards from the current position of the cursor. + +Finds the next occurrence of the search term. Navigation Pane The navigation pane of the Help window contains the tab pages Contents, Index, Find and Bookmarks. @@ -206,4 +206,4 @@ - \ No newline at end of file + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c8101190a7c9cbc3326253fef38810fc265ac19 Author: Caolán McNamara Date: Fri Dec 6 14:21:28 2013 + Updated core Project: help ee5d5c120418303a51af8ae9f0cf6a73a8447f38 diff --git a/helpcontent2 b/helpcontent2 index d6d16d2..ee5d5c1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d6d16d266f3511f5713f38087ec38484c59f2ae6 +Subproject commit ee5d5c120418303a51af8ae9f0cf6a73a8447f38 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/AllLangResTarget_sfx2.mk sfx2/inc sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
sfx2/AllLangResTarget_sfx2.mk|1 sfx2/UIConfig_sfx.mk |1 sfx2/inc/srchdlg.hxx | 33 ++--- sfx2/source/dialog/srchdlg.cxx | 83 +- sfx2/source/dialog/srchdlg.hrc | 36 -- sfx2/source/dialog/srchdlg.src | 103 -- sfx2/source/inc/helpid.hrc |2 sfx2/uiconfig/ui/searchdialog.ui | 217 +++ 8 files changed, 265 insertions(+), 211 deletions(-) New commits: commit d6407c8804841dbb94d6a4398e4300e9f188049f Author: Caolán McNamara Date: Fri Dec 6 13:35:26 2013 + convert search dialog to .ui Change-Id: I737da11ed6978edf824f00dfb3dfc29c2c5416ed diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index b845e20..8b3e6a2 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/dialog/inputdlg.src \ sfx2/source/dialog/newstyle.src \ sfx2/source/dialog/recfloat.src \ -sfx2/source/dialog/srchdlg.src \ sfx2/source/dialog/taskpane.src \ sfx2/source/dialog/templateinfodlg.src \ sfx2/source/dialog/templdlg.src \ diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index a62f479..a693f2d 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/password \ sfx2/uiconfig/ui/printeroptionsdialog \ sfx2/uiconfig/ui/querysavedialog \ + sfx2/uiconfig/ui/searchdialog \ sfx2/uiconfig/ui/securityinfopage \ sfx2/uiconfig/ui/singletabdialog \ sfx2/uiconfig/ui/versionsofdialog \ diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 66ec03d..1e6bd3b 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -36,14 +36,12 @@ namespace sfx2 { class SearchDialog : public ModelessDialog { private: -FixedText m_aSearchLabel; -ComboBoxm_aSearchEdit; -CheckBoxm_aWholeWordsBox; -CheckBoxm_aMatchCaseBox; -CheckBoxm_aWrapAroundBox; -CheckBoxm_aBackwardsBox; -PushButton m_aFindBtn; -CancelButtonm_aCancelBtn; +ComboBox* m_pSearchEdit; +CheckBox* m_pWholeWordsBox; +CheckBox* m_pMatchCaseBox; +CheckBox* m_pWrapAroundBox; +CheckBox* m_pBackwardsBox; +PushButton* m_pFindBtn; Linkm_aFindHdl; Linkm_aCloseHdl; @@ -58,25 +56,24 @@ private: voidSaveConfig(); DECL_LINK(FindHdl, void *); -DECL_LINK(ToggleHdl, void *); public: SearchDialog( Window* pWindow, const OUString& rConfigName ); ~SearchDialog(); -inline void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } -inline void SetCloseHdl( const Link& rLink ) { m_aCloseHdl = rLink; } +void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } +void SetCloseHdl( const Link& rLink ) { m_aCloseHdl = rLink; } -inline OUString GetSearchText() const { return m_aSearchEdit.GetText(); } -inline void SetSearchText( const OUString& _rText ) { m_aSearchEdit.SetText( _rText ); } -inline bool IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != sal_False ); } -inline bool IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != sal_False ); } -inline bool IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != sal_False ); } -inline bool IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != sal_False ); } +OUString GetSearchText() const { return m_pSearchEdit->GetText(); } +void SetSearchText( const OUString& _rText ) { m_pSearchEdit->SetText( _rText ); } +bool IsOnlyWholeWords() const { return ( m_pWholeWordsBox->IsChecked() ); } +bool IsMarchCase() const { return ( m_pMatchCaseBox->IsChecked() ); } +bool IsWrapAround() const { return ( m_pWrapAroundBox->IsChecked() ); } +bool IsSearchBackwards() const { return ( m_pBackwardsBox->IsChecked() ); } voidSetFocusOnEdit(); -virtual sal_BoolClose(); +virtual sal_BoolClose(); virtual voidMove(); virtual voidStateChanged( StateChangedType nStateChange ); }; diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 6d3c585..3c14275 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -23,7 +23,6 @@ #include #include -#include "srchdlg.hrc" #include "dialog.hrc" #include #include @@ -40,35 +39,25 @@ namespace sfx2 { // SearchDialog // -SearchDialog::SearchDialog( Window* pWindow,
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/shapegroupcontext.cxx|8 oox/source/shape/WpgContext.cxx |6 ++ sw/qa/extras/ooxmlimport/data/wpg-nested.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8 4 files changed, 22 insertions(+) New commits: commit c2c7e4d8d99483f74a7aa357de89240eb83c99d3 Author: Miklos Vajna Date: Fri Dec 6 11:23:17 2013 +0100 DOCX import: handle groupshapes inside wpg elements (groupshapes) Change-Id: Icb44f91219f75103f469f38f96d843b8e8251e92 diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index bae6d4c..10e419f 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -88,11 +88,19 @@ ContextHandlerRef ShapeGroupContext::onCreateContext( sal_Int32 aElementToken, c case XML_grpSp: // group shape return new ShapeGroupContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GroupShape" ) ) ); case XML_sp:// shape +case XML_wsp: return new ShapeContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.CustomShape" ) ) ); case XML_pic: // CT_Picture return new GraphicShapeContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GraphicObjectShape" ) ) ); case XML_graphicFrame: // CT_GraphicalObjectFrame return new GraphicalObjectFrameContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GraphicObjectShape" ) ), true ); +case XML_cNvGrpSpPr: +break; +case XML_grpSpLocks: +break; +default: +SAL_WARN("oox", "ShapeGroupContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); +break; } return this; diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index f83fe75..c8ca505 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -47,6 +47,12 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken return new oox::drawingml::ShapeContext(*this, mpShape, pShape); } break; +case XML_grpSp: +{ +oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape")); +return new oox::drawingml::ShapeGroupContext(*this, mpShape, pShape); +} +break; default: SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken)); break; diff --git a/sw/qa/extras/ooxmlimport/data/wpg-nested.docx b/sw/qa/extras/ooxmlimport/data/wpg-nested.docx new file mode 100755 index 000..eba2aad Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/wpg-nested.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2b271a3..24ffb76 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1555,6 +1555,14 @@ DECLARE_OOXMLIMPORT_TEST(testWpgOnly, "wpg-only.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(548005)), xShape->getPosition().X); } +DECLARE_OOXMLIMPORT_TEST(testWpgNested, "wpg-nested.docx") +{ +uno::Reference xGroup(getShape(1), uno::UNO_QUERY); +uno::Reference xShapeDescriptor(xGroup->getByIndex(0), uno::UNO_QUERY); +// This was a com.sun.star.drawing.CustomShape, due to lack of handling of groupshapes inside groupshapes. +CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType()); +} + DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx") { uno::Reference xShape = getShape(1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 23 --- 2 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 131f3230d98f24faf57d9404e333cb1fb183345b Author: Matúš Kukan Date: Fri Dec 6 14:40:50 2013 +0100 EMF+: Fill line cap object if EmfPlusCustomLineCapDataFillPath is set. Change-Id: I7b53a8f18e1fb24b1ae0322bdf0980e431a0725f diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 3d0c48d..d09ed1c 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -284,7 +284,7 @@ static float GetSwapFloat( SvStream& rSt ) /// Render LineCap, like the start or end arrow of a polygon. /// @return how much we should shorten the original polygon. double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, +const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart, const com::sun::star::rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState); diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 722d23f..b5b6285 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -624,6 +624,7 @@ namespace cppcanvas sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin; float miterLimit; basegfx::B2DPolyPolygon polygon; +bool mbIsFilled; public: EMFPCustomLineCap() : EMFPObject() @@ -650,7 +651,7 @@ namespace cppcanvas aAttributes.MiterLimit = miterLimit; } -void ReadPath(SvStream& s, ImplRenderer& rR, bool bClosed) +void ReadPath(SvStream& s, ImplRenderer& rR, bool bFill) { sal_Int32 pathLength; s >> pathLength; @@ -667,7 +668,7 @@ namespace cppcanvas path.Read(s, pathFlags, rR); polygon = path.GetPolygon(rR, false); -polygon.setClosed(bClosed); +mbIsFilled = bFill; // transformation to convert the path to what LibreOffice // expects @@ -1318,7 +1319,7 @@ namespace cppcanvas } double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, -const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart, const rendering::StrokeAttributes& rAttributes, +const ::basegfx::B2DPolyPolygon& rLineCap, bool bIsFilled, bool bStart, const rendering::StrokeAttributes& rAttributes, const ActionFactoryParameters& rParms, OutDevState& rState) { if (!rLineCap.count()) @@ -1347,6 +1348,20 @@ namespace cppcanvas rParms.mrCurrActionIndex += pAction->getActionCount()-1; } +if (bIsFilled) +{ +bool bWasFillColorSet = rState.isFillColorSet; +rState.isFillColorSet = true; +rState.fillColor = rState.lineColor; +ActionSharedPtr pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState)); +if (pAction2) +{ +maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex)); +rParms.mrCurrActionIndex += pAction2->getActionCount()-1; +} +rState.isFillColorSet = bWasFillColorSet; +} + return rAttributes.StrokeWidth; } @@ -1401,6 +1416,7 @@ namespace cppcanvas pen->customStartCap->SetAttributes(aAttributes); fStart = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customStartCap->polygon, +pen->customStartCap->mbIsFilled, true, aAttributes, rParms, rState); } @@ -1411,6 +1427,7 @@ namespace cppcanvas pen->customEndCap->SetAttributes(aAttributes); fEnd = EMFPPlusDrawLineCap(aPolygon, fPolyLength, pen->customEndCap->polygon, +pen->customEndCap->mbIsFilled, false, aAttributes, rParms, rState); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is the 'libreoffice' list name confusing?
Robinson Tryon wrote: > (*light goes on* -- I could just ask all of the people who post > questions/bug reports, etc.. to the dev list why they chose to use > this particular list. Perhaps there's some oddball reason like "I > found it listed on website XYZ") > That would be my #1 suspect. There's no obvious way from the libreoffice.org sites to get to this list on fdo, but for following one of our links. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a53dafbc9628bb243cee1714bfea59272ae57663 Author: David Tardon Date: Fri Dec 6 14:50:15 2013 +0100 upload libetonyek-0.0.3 Change-Id: I626345b34332d7797f1df412545d8d718e9c634c diff --git a/download.lst b/download.lst index 74ff6f1..42a75db 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 export CDR_TARBALL := libcdr-0.0.14.tar.bz2 EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095 export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2 -ETONYEK_MD5SUM := 111f549514ba84845d426d80f2807244 -export ETONYEK_TARBALL := libetonyek-0.0.2.tar.bz2 +ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4 +export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 268653618ac01796785622e246f6d230db27ca62 Author: Caolán McNamara Date: Fri Dec 6 13:27:17 2013 + Resolves: fdo#72022 Integrated help ignored if installed regression since 58fa3d50aa43102cea8690fd6bf51fb80c007955 Change-Id: Ia20f28daace30181652ec3f9845045db03b4 (cherry picked from commit 57b15f2dcd2963808b8af3f0665450ef81bb3eb8) diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index fb16e66..ed30a7d 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -1233,7 +1233,7 @@ void Databases::setInstallPath( const OUString& aInstDir ) osl::FileBase::getFileURLFromSystemPath( aInstDir,m_aInstallDirectory ); //TODO: check returned error code -if( m_aInstallDirectory.endsWith( "/" ) ) +if( !m_aInstallDirectory.endsWith( "/" ) ) m_aInstallDirectory += "/"; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/sheet/xsheetannotations.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 665989cfc81b0ad4ba8e2dfa9b54348f01710c21 Author: Stephan Bergmann Date: Fri Dec 6 14:32:26 2013 +0100 Fix integer ambiguity Change-Id: I1247af709baf250b82a4156ea2cbf29c758f0c78 diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index a56fc6b..cf4b82a 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -52,7 +52,7 @@ void XSheetAnnotations::testInsertNew() sal_Int32 nBefore = xAnnotationsIndex->getCount(); CPPUNIT_ASSERT_EQUAL_MESSAGE( -"There should already be one note", 1, nBefore ); +"There should already be one note", sal_Int32(1), nBefore ); // insert the annotation table::CellAddress xTargetCellAddress (0,3,4); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57b15f2dcd2963808b8af3f0665450ef81bb3eb8 Author: Caolán McNamara Date: Fri Dec 6 13:27:17 2013 + Resolves: fdo#72022 Integrated help ignored if installed regression since 58fa3d50aa43102cea8690fd6bf51fb80c007955 Change-Id: Ia20f28daace30181652ec3f9845045db03b4 diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index fb16e66..ed30a7d 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -1233,7 +1233,7 @@ void Databases::setInstallPath( const OUString& aInstDir ) osl::FileBase::getFileURLFromSystemPath( aInstDir,m_aInstallDirectory ); //TODO: check returned error code -if( m_aInstallDirectory.endsWith( "/" ) ) +if( !m_aInstallDirectory.endsWith( "/" ) ) m_aInstallDirectory += "/"; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - connectivity/source dbaccess/source forms/source include/comphelper include/svx oox/source sd/inc sd/source xmloff/source
connectivity/source/drivers/ado/AColumn.cxx | 2 connectivity/source/drivers/ado/AColumns.cxx| 2 connectivity/source/drivers/ado/AConnection.cxx | 2 dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 5 - dbaccess/source/ui/control/tabletree.cxx| 2 dbaccess/source/ui/dlg/adtabdlg.cxx | 2 dbaccess/source/ui/inc/WColumnSelect.hxx| 6 +- dbaccess/source/ui/inc/WCopyTable.hxx | 4 - dbaccess/source/ui/misc/UITools.cxx | 2 dbaccess/source/ui/misc/WColumnSelect.cxx | 10 +-- forms/source/inc/InterfaceContainer.hxx | 3 - include/comphelper/stl_types.hxx| 30 -- include/svx/ShapeTypeHandler.hxx| 4 - oox/source/drawingml/customshapegeometry.cxx| 3 - sd/inc/CustomAnimationPreset.hxx| 7 +- sd/inc/TransitionPreset.hxx | 4 - sd/source/filter/eppt/epptooxml.hxx | 3 - sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx | 4 - sd/source/ui/framework/configuration/ResourceFactoryManager.hxx | 4 - sd/source/ui/framework/module/ModuleController.cxx | 7 -- sd/source/ui/framework/tools/FrameworkHelper.cxx| 4 - sd/source/ui/unoidl/facreg.cxx | 3 - xmloff/source/transform/EventOOoTContext.cxx| 4 - xmloff/source/transform/TransformerTokenMap.hxx | 3 - 24 files changed, 36 insertions(+), 84 deletions(-) New commits: commit f51877b147c456ecd8533b6958bfa798842e5c6b Author: Stephan Bergmann Date: Fri Dec 6 14:27:53 2013 +0100 Combine comphelper::UStringMixEqual, comphelper::TStringMixEqualFunctor Change-Id: I3ab3777a65fd68f8cbaf17a8e2a989dc4ad7b1cc diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 2706f08..1e6ab61 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -214,7 +214,7 @@ void OAdoColumn::fillPropertyValues() m_TypeName = pTypeInfo->aSimpleType.aTypeName; else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) ) { -::comphelper::TStringMixEqualFunctor aCase(sal_False); +::comphelper::UStringMixEqual aCase(sal_False); OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), ::o3tl::compose1( diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 1dad74a..c7db779 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -86,7 +86,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); -::comphelper::TStringMixEqualFunctor aCase(sal_False); +::comphelper::UStringMixEqual aCase(sal_False); // search for typeinfo where the typename is equal sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 3c39006..a32ad71 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -596,7 +596,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r } else if ( _sTypeName.getLength() ) { -::comphelper::TStringMixEqualFunctor aCase(sal_False); +::comphelper::UStringMixEqual aCase(sal_False); // search for typeinfo where the typename is equal _sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(), diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cx
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/aqua/saldata.hxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 693eced961a3d3014d15e0a406f4e001ee817522 Author: Tor Lillqvist Date: Fri Dec 6 15:03:24 2013 +0200 Bin unused VER_TIGER and VER_LEOPARD Change-Id: Ie5427d776c726c3725465e06bf4d14e93a2bbb32 diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx index b9da7db..74e10f5 100644 --- a/vcl/inc/aqua/saldata.hxx +++ b/vcl/inc/aqua/saldata.hxx @@ -52,9 +52,6 @@ class SystemFontList; #define SAL_CLIPRECT_COUNT 16 -#define VER_TIGER 0x1040 -#define VER_LEOPARD 0x1050 - class AquaSalFrame; struct FrameHash : public boost::hash { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: Issue: FileSave: LibreOffice crashing while saving the .DOCX files
Hello We found one issue on latest master build ( *libo-master~2013-12-05_01.20.03),* and issue is libreOffice is crashing while trying to save the .DOCX file. This issue is reproducible on Windows and NOT on the Linux. I've raised the bug in Bugzilla and URL is https://bugs.freedesktop.org/show_bug.cgi?id=72347 -- Thanks & Regards, Dushyant Bhalgami -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 251 +- 1 file changed, 156 insertions(+), 95 deletions(-) New commits: commit 3f8e239f15590cf8b7dccaa57e24d1a7dae7b3da Author: Jesús Corrius Date: Fri Dec 6 12:20:21 2013 +0100 Source more PEP8 friendly Change-Id: I033f2a365454c9f98ce2c34f7d1d5ad3c1516202 diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 00a22cf..6a7e7f0 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -9,13 +9,13 @@ # import argparse -import inspect import os import os.path import shutil import re import sys + class GbuildParserState: def __init__(self): self.include = [] @@ -23,26 +23,36 @@ class GbuildParserState: self.cxxobjects = [] self.linked_libs = [] + class GbuildLinkTarget: def __init__(self, name, location, include, defs, cxxobjects, linked_libs): -(self.name, self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) = (name, location, include, defs, cxxobjects, linked_libs) +(self.name, self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) = ( +name, location, include, defs, cxxobjects, linked_libs) + def short_name(self): return self.name + def __str__(self): -return '%s at %s with include path: %s, defines %s, objects: %s and linked libs: %s' % (self.short_name(), self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) +return '%s at %s with include path: %s, defines %s, objects: %s and linked libs: %s' % ( +self.short_name(), self.location, self.include, self.defs, self.cxxobjects, self.linked_libs) + class GbuildLib(GbuildLinkTarget): def __init__(self, name, location, include, defs, cxxobjects, linked_libs): GbuildLinkTarget.__init__(self, name, location, include, defs, cxxobjects, linked_libs) + def short_name(self): return 'Library %s' % self.name + class GbuildExe(GbuildLinkTarget): def __init__(self, name, location, include, defs, cxxobjects, linked_libs): GbuildLinkTarget.__init__(self, name, location, include, defs, cxxobjects, linked_libs) + def short_name(self): return 'Executable %s' % self.name + class GbuildParser: makecmdpattern = re.compile('^MAKE_COMMAND := (.*)') srcdirpattern = re.compile('^SRCDIR = (.*)') @@ -54,8 +64,10 @@ class GbuildParser: defspattern = re.compile('# DEFS := (.*)') cxxpattern = re.compile('# CXXOBJECTS := (.*)') linkedlibspattern = re.compile('# LINKED_LIBS := (.*)') + def __init__(self): (self.makecmd, self.srcdir, self.builddir, self.instdir, self.libs, self.exes) = ('', '', '', '', [], []) + def parse(self, gbuildstate): state = GbuildParserState() for line in gbuildstate: @@ -83,21 +95,26 @@ class GbuildParser: continue libmatch = GbuildParser.libpattern.match(line) if libmatch: -self.libs.append(GbuildLib(libmatch.group(2), libmatch.group(1), state.include, state.defs, state.cxxobjects, state.linked_libs)) +self.libs.append( +GbuildLib(libmatch.group(2), libmatch.group(1), state.include, state.defs, state.cxxobjects, + state.linked_libs)) state = GbuildParserState() continue exematch = GbuildParser.exepattern.match(line) if exematch: -self.exes.append(GbuildExe(exematch.group(2), exematch.group(1), state.include, state.defs, state.cxxobjects, state.linked_libs)) +self.exes.append( +GbuildExe(exematch.group(2), exematch.group(1), state.include, state.defs, state.cxxobjects, + state.linked_libs)) state = GbuildParserState() continue includematch = GbuildParser.includepattern.match(line) if includematch: -state.include = [includeswitch.strip()[2:] for includeswitch in includematch.group(1).split(' ') if len(includeswitch) > 2] +state.include = [includeswitch.strip()[2:] for includeswitch in includematch.group(1).split(' ') if + len(includeswitch) > 2] continue defsmatch = GbuildParser.defspattern.match(line) if defsmatch: -alldefs = [defswitch.strip()[2:] for defswitch in defsmatch.group(1).split(' ') if len(defswitch) >2] +alldefs = [defswitch.strip()[2:] for defswitch in defsmatch.group(1).split(' ') if len(defswitch) > 2] for d in alldefs: defparts = d.split('=') if len(defparts) == 1: @@ -115,15 +132,19 @@ class GbuildParser: #we could match a lot of other stuff here if needed for integration rpaths etc. return self
Re: minutes of ESC call ...
On 2013-12-05 19:23, Michael Meeks wrote: + attach a callgrind profile for 'expert config' to bug (Kendy) [ could make it experimental later if necessary ] https://bugs.freedesktop.org/show_bug.cgi?id=72125 I've pushed a small cleanup related to this code to gerrit: https://gerrit.libreoffice.org/6956 and I've done a basic first pass analysis of the callgrind profile, posted to the bug report. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: callgrind metrics was: Re: minutes of ESC call ...
Good question, Matúš I have been thinking about that also, and was thinking of asking the qa people for a list of file load/save complaints from fdo. The test ods should definitely have a graph in it. That is always a speed bottleneck in Calc. Unfortunately some of the interpretation of the graph data is deferred now until the user clicks the graph. That means that some of the biggest loading bottleneck will not be measured by loperf. The idea was once to have loperf produce a single perfomance indicator, and present that as a graph somewhere of the performance over time. Only retain the underlying data for a short time for dev's interested in the causes of performance regressions. Greetings, Stephan 2013/12/6 Matúš Kukan : > On Thu, 2013-12-05 at 17:23 +, Michael Meeks wrote: >> * Pending Action Items: >> + actually produce callgrind performance metrics from VM (Matus) > > So - it's running and producing callgrind profiles - Is it possible > somebody would be interested in them ? They are deleted after 10 days, > so that should be enough in that case I hope. > > And the result (attached) is something like: > .. > > What files should it test ? > Currently it's empty.ods, empty.odt, and sample.xlsx - just some numbers > in there. > There can't be too many files nor big ones, otherwise it takes too much > time. > > Any ideas how to make this useful for you ? > Btw. it's in buildbot.git/loperf > > Where should I upload this history.csv ? > Post to the list once in a week, or..? > > Thanks, > Matus > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
callgrind metrics was: Re: minutes of ESC call ...
On Thu, 2013-12-05 at 17:23 +, Michael Meeks wrote: > * Pending Action Items: > + actually produce callgrind performance metrics from VM (Matus) So - it's running and producing callgrind profiles - Is it possible somebody would be interested in them ? They are deleted after 10 days, so that should be enough in that case I hope. And the result (attached) is something like: .. What files should it test ? Currently it's empty.ods, empty.odt, and sample.xlsx - just some numbers in there. There can't be too many files nor big ones, otherwise it takes too much time. Any ideas how to make this useful for you ? Btw. it's in buildbot.git/loperf Where should I upload this history.csv ? Post to the list once in a week, or..? Thanks, Matus date time git-commit offload empty.ods empty.odt sample.xlsx 2013-12-03 16:44:09+01:00 86268546a09c3bdd0d5cb6bc047408db779e057c 3054566195 2039663691 2371898423 6836419695 2013-12-03 19:01:41+01:00 d83328b233f51d4a70bfeaae90129a68dccf825b 2955548755 2023025385 2359846135 6860023737 2013-12-03 19:13:20+01:00 c3760e9099db9cf1be696347e2a0743a3cae1b20 2955782274 2023300742 2359931669 6840258596 2013-12-03 20:45:37+01:00 af43ae6f85f9ca840889d568f15b6123c98037a4 2955731942 2023142394 2358388597 6843090795 2013-12-03 21:25:41+01:00 c4d79527ce3a0d9b466ea291a1932bcd66474827 2956440946 2023869893 2359756512 6860276096 2013-12-03 21:35:39+01:00 37d9edc4a7da90da502e62e2adde67396d049bae 2956922327 2023310541 2360547300 6846361226 2013-12-03 21:53:59+01:00 7eb3e0b3892c90a5a2fbaaeaf7693bffeb80a360 2956542166 2023207897 2360088501 6861016596 2013-12-03 22:15:16+01:00 bfd1909c87d0d645f1bbb74a142172ecc15100e8 2957476907 2023555981 2359559775 6855215977 2013-12-04 01:11:53+01:00 882665d821a2fc705b7ae03372c2ae7593028210 2956721914 2023837055 2360925339 6851398137 2013-12-04 08:55:02+01:00 d6de313b043154e70a84c0fc29cbae94fe7541b1 2957353416 2023426462 2359526504 6846275353 2013-12-04 10:32:20+01:00 79eab004dca8413cf99ea688291083df2d146230 2957444016 2023977593 2359756193 6832959376 2013-12-04 12:53:30+01:00 a073e81c3acb0c4aa3bc4fde146b6eb9869738e1 2959508563 2023896575 2360345563 6847003507 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/test sc/qa sc/source test/source
include/test/sheet/xsheetannotations.hxx |3 ++- sc/qa/extras/scannotationsobj.cxx| 12 ++-- sc/source/core/data/document.cxx |2 +- sc/source/ui/unoobj/docuno.cxx |2 +- test/source/sheet/xsheetannotations.cxx | 24 5 files changed, 34 insertions(+), 9 deletions(-) New commits: commit f992400f6fec9c0178bddb83dbc859848221b659 Author: Laurent Godard Date: Fri Dec 6 12:36:41 2013 +0100 count notes - GetNotesInRange now include last tab - refactor tests - add unit test on counting notes on a sheet Change-Id: I6762a0e791a745b828800645effdfc044ac33710 Reviewed-on: https://gerrit.libreoffice.org/6954 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/include/test/sheet/xsheetannotations.hxx b/include/test/sheet/xsheetannotations.hxx index 24e1dd5..403af94 100644 --- a/include/test/sheet/xsheetannotations.hxx +++ b/include/test/sheet/xsheetannotations.hxx @@ -20,11 +20,12 @@ public: // XSheetAnnotations void testInsertNew(); void testRemoveByIndex(); +void testCount(); protected: ~XSheetAnnotations() {} -virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations() = 0; +virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations(long nIndex) = 0; }; } diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 485173c..190efe5 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -20,7 +20,7 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 2 +#define NUMBER_OF_TESTS 3 class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations { @@ -31,11 +31,12 @@ public: virtual void tearDown(); virtual uno::Reference< uno::XInterface > init(); -virtual uno::Reference< sheet::XSheetAnnotations> getAnnotations(); +virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex); CPPUNIT_TEST_SUITE(ScAnnontationsObj); CPPUNIT_TEST(testInsertNew); CPPUNIT_TEST(testRemoveByIndex); +CPPUNIT_TEST(testCount); CPPUNIT_TEST_SUITE_END(); private: @@ -51,12 +52,12 @@ ScAnnontationsObj::ScAnnontationsObj() { } -uno::Reference< sheet::XSheetAnnotations> ScAnnontationsObj::getAnnotations() +uno::Reference< sheet::XSheetAnnotations> ScAnnontationsObj::getAnnotations(long nIndex) { // get the sheet uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), UNO_QUERY_THROW); -uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), UNO_QUERY_THROW); +uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(nIndex), UNO_QUERY_THROW); // get the annotations collection uno::Reference< sheet::XSheetAnnotationsSupplier > xAnnotationSupplier(xSheet, UNO_QUERY_THROW); @@ -76,9 +77,8 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init() mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); -return getAnnotations(); +return getAnnotations(0); } - void ScAnnontationsObj::setUp() { nTest++; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index a24889b..9f36896 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6239,7 +6239,7 @@ void ScDocument::GetNotesInRange( const ScRangeList& rRange, std::vectoraStart.Tab(); nTab < pRange->aEnd.Tab(); ++nTab ) +for( SCTAB nTab = pRange->aStart.Tab(); nTab <= pRange->aEnd.Tab(); ++nTab ) { maTabs[nTab]->GetNotesInRange( *pRange, rNotes ); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 54f40d0..af9ede8 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3601,7 +3601,7 @@ uno::Reference SAL_CALL ScAnnotationsObj::createEnumera sal_Int32 SAL_CALL ScAnnotationsObj::getCount() throw(uno::RuntimeException) { SolarMutexGuard aGuard; -sal_uLong nCount = 0; +sal_Int32 nCount = 0; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index 6671593..a56fc6b 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -22,6 +22,27 @@ using namespace css::uno; namespace apitest { +void XSheetAnnotations::testCount() +{ +uno::Reference< sheet::XSheetAnnotations > aSheetAnnotations (init(), UNO_QUERY_THROW); + +// count on sheet 1 before inserting +uno::Reference< container::XIndexAccess > xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW); +sal_Int32 nBefore = xAnnotationsIndex->getCount(); + +// get Sheet 2
[Libreoffice-commits] core.git: include/xmlreader scp2/inc scp2/macros scp2/source solenv/bin solenv/gbuild vcl/source xmlreader/source
include/xmlreader/xmlreader.hxx |2 + scp2/inc/macros.inc |8 ++--- scp2/macros/macro.pl| 16 +++ scp2/source/ooo/file_library_ooo.scp|2 - scp2/source/ooo/file_ooo.scp| 40 ++-- scp2/source/ooo/ure.scp |2 - solenv/bin/modules/installer/scriptitems.pm |2 - solenv/gbuild/UIConfig.mk | 30 +++-- solenv/gbuild/Zip.mk| 29 vcl/source/window/builder.cxx | 35 xmlreader/source/xmlreader.cxx | 14 + 11 files changed, 128 insertions(+), 52 deletions(-) New commits: commit c2f5e09900561d417d53a74fd6bc189cb7d898e1 Author: Matúš Kukan Date: Tue Dec 3 08:19:36 2013 +0100 Zip .ui translations per UIConfig target. Fix installer / scp2 to not ignore directory prefix in 'Name'. Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29 Reviewed-on: https://gerrit.libreoffice.org/6915 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index e895d8d..4ffc84e 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -39,6 +39,8 @@ namespace xmlreader { class OOO_DLLPUBLIC_XMLREADER XmlReader: private boost::noncopyable { public: +XmlReader(char const *sStr, size_t nLength); + explicit XmlReader(OUString const & fileUrl) SAL_THROW(( com::sun::star::container::NoSuchElementException, diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 2f605a9..d95c364 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -481,12 +481,12 @@ End #include -#define UI_FILELIST_ALL_LANG(name, file, ext) \ +#define UI_FILELIST_ALL_LANG(name, file) \ File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \ TXT_FILE_BODY; \ -Styles = (FILELIST); \ -Dir = FILELIST_DIR; \ -EXTRA_ALL_LANG_BUT_EN_US(file, ext); \ +Styles = (PACKED); \ +Dir = gid_Dir_Share_Config_Sofficecfg; \ +UI_ALL_LANG_BUT_EN_US(file); \ End #define URE_PRIVATE_LIB(id,name) \ diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 3ebeabe..3e7e415 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -50,6 +50,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG(); write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ(); write_EXTRA_ALL_LANG(); write_EXTRA_ALL_LANG_BUT_EN_US(); +write_UI_ALL_LANG_BUT_EN_US(); write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(); write_RESFILE_ALL_LANG(); write_README_ALL_LANG(); @@ -166,6 +167,21 @@ sub write_EXTRA_ALL_LANG_BUT_EN_US print OUTFILE "\n\n"; } +sub write_UI_ALL_LANG_BUT_EN_US +{ +print OUTFILE "#define UI_ALL_LANG_BUT_EN_US(name) "; +my $first = 1; +foreach $lang (@completelangiso) { +if ($lang ne "en-US") { +print OUTFILE "; " unless $first; +$first = 0; +print OUTFILE +"\\\n\tName ($lang) = STRING(CONCAT2(name,/ui/res/$lang.zip))"; +} +} +print OUTFILE "\n\n"; +} + sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 40b4e75..9c50501 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -275,7 +275,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) #else #if !defined(MACOSX) File gid_File_Lib_Sqlite3 -Name = "sqlite/" SPECIAL_NAME(sqlite3); +Name = SPECIAL_NAME(sqlite3); PACKED_LIB_FILE_BODY; End #endif //!defined(MACOSX) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 965c89f..ab2cfe4 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -607,31 +607,31 @@ UI_FILELIST(uui, "UIConfig/uui.filelist") UI_FILELIST(vcl, "UIConfig/vcl.filelist") UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist") -UI_FILELIST_ALL_LANG(basicide, UIConfig/modules/BasicIDE, filelist) -UI_FILELIST_ALL_LANG(cui, UIConfig/cui, filelist) +UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE) +UI_FILELIST_ALL_LANG(cui, cui) #ifdef DBCONNECTIVITY -UI_FILELIST_ALL_LANG(dbaccess, UIConfig/dbaccess, filelist) -#endif -UI_FILELIST_ALL_LANG(desktop, UIConfig/desktop, filelist) -UI_FILELIST_ALL_LANG(filter, UIConfig/filter, filelist) -UI_FILELIST_ALL_LANG(scalc, UIConfig/modules/scalc, filelist) -UI_FILELIST_ALL_LANG(schart, UIConfig/modules/schart, filelist) -UI_FILELIST_ALL_LANG(sdraw, UIConfig/modules/sdraw, filelist) -UI_FILELIST_ALL_LANG(sfx, UIConfig/sfx, filelist) -UI_FILELIST_ALL_LANG(simpress, UIConfig/modules/simpress, filelist) -UI_FILELIST_ALL_LANG(smath, UIConfig/modules/smath, filelist) +UI_FILELIST_ALL_LANG(dbaccess, dbaccess) +#endif +UI_FILELIST_ALL_LANG(desktop, deskt
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/1_page.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 sw/source/filter/ww8/wrtww8.cxx |2 +- 3 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 9a37ce189881f12d678fdb054219b13c3e4c7e40 Author: Tushar Bende Date: Tue Nov 26 16:38:31 2013 +0530 fdo#71784: Invalid Sections getting added to the document after RT Description: There was a problem for some documents, during export Invalid sectPr were getting added. The root cause was faulty calculation of PageDesc value. This was the reason for increasing number of pages in RT doc. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I0700c735545614730d26be187d9047fd20ebf134 Reviewed-on: https://gerrit.libreoffice.org/6813 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/qa/extras/ooxmlexport/data/1_page.docx b/sw/qa/extras/ooxmlexport/data/1_page.docx new file mode 100644 index 000..9b8638d Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/1_page.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index c4d6e44..aea310f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2072,6 +2072,18 @@ DECLARE_OOXMLEXPORT_TEST(testcantSplit, "2_table_doc.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[2]/w:tr/w:trPr/w:cantSplit","val","true"); } +DECLARE_OOXMLEXPORT_TEST(testExtraSectionBreak, "1_page.docx") +{ +// There was a problem for some documents during export.Invalid sectPr getting added +// because of faulty calculation of PageDesc value +// This was the reason for increasing number of pages after RT +uno::Reference xModel(mxComponent, uno::UNO_QUERY); +uno::Reference xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); +uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); +xCursor->jumpToLastPage(); +CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage()); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 1a4e658..6fca2d93 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2510,7 +2510,7 @@ void MSWordExportBase::WriteText() { SwCntntNode* pCNd = (SwCntntNode*)pNd; -const SwPageDesc* pTemp = pCNd->GetSwAttrSet().GetPageDesc().GetPageDesc(); +const SwPageDesc* pTemp = pNd->FindPageDesc(sal_False); if ( pTemp ) pAktPageDesc = pTemp; ___ 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 72279, which changed state. Bug 72279 Summary: When you update the Index the words A) 1) and I) dissapear in LoDEV, in 4.1 works perfectly https://bugs.freedesktop.org/show_bug.cgi?id=72279 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 8 commits - cppcanvas/source pyuno/zipcore scaddins/source sc/inc sc/source sd/source sd/uiconfig sw/source vcl/source
cppcanvas/source/mtfrenderer/emfplus.cxx|2 + pyuno/zipcore/python.cxx| 32 ++-- sc/inc/scmod.hxx|1 sc/source/ui/app/inputhdl.cxx | 14 sc/source/ui/app/scmod.cxx |7 ++ sc/source/ui/formdlg/formula.cxx|2 - sc/source/ui/inc/inputhdl.hxx |1 scaddins/source/analysis/analysishelper.cxx |2 - sd/source/ui/view/drvwshrg.cxx |1 sd/uiconfig/simpress/menubar/menubar.xml|1 sw/source/core/access/accmap.cxx| 14 sw/source/core/frmedt/fecopy.cxx| 23 vcl/source/gdi/gdimtf.cxx |7 ++ 13 files changed, 73 insertions(+), 34 deletions(-) New commits: commit 9e5b39c7a48f52cd86376b1f39297fcaa660f24b Author: Michael Stahl Date: Thu Dec 5 21:58:11 2013 +0100 fdo#71892: sw: fix crash when pasting table in footnote The code that updates RSIDs assumes that the number of nodes copied is the same as the number of nodes inserted, which is not true when pasting a table into a footnote because Writer can't do that, hence all table nodes are missing. Count inserted nodes instead. (regression from 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c) (cherry picked from commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b) Conflicts: sw/source/core/frmedt/fecopy.cxx (cherry picked from commit 2171fff4c1a57ede8f9693d7c0d95c1171a49a70) Change-Id: I77b5b7751d1036a6401f708532537d874969502e Reviewed-on: https://gerrit.libreoffice.org/6951 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 3fa4a73..6c503dc 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1039,25 +1039,22 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames ) aIndexBefore--; pClpDoc->CopyRange( aCpyPam, rInsPos, false ); +// Note: aCpyPam is invalid now -{ -++aIndexBefore; -SwPaM aPaM(SwPosition(aIndexBefore), - SwPosition(rInsPos.nNode)); +++aIndexBefore; +SwPaM aPaM(SwPosition(aIndexBefore), + SwPosition(rInsPos.nNode)); -aPaM.GetDoc()->MakeUniqueNumRules(aPaM); -} -} +aPaM.GetDoc()->MakeUniqueNumRules(aPaM); -// Update the rsid of each pasted text node. -{ -xub_StrLen nNodesCnt = aCpyPam.End()->nNode.GetIndex() - aCpyPam.Start()->nNode.GetIndex(); +// Update the rsid of each pasted text node. SwNodes &rDestNodes = GetDoc()->GetNodes(); -xub_StrLen nDestStart = PCURCRSR->GetPoint()->nNode.GetIndex() - nNodesCnt; +sal_uLong const nEndIdx = aPaM.End()->nNode.GetIndex(); -for ( sal_uInt64 nIdx = 0; nIdx <= nNodesCnt; nIdx++ ) +for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex(); +nIdx <= nEndIdx; ++nIdx) { -SwTxtNode *pTxtNode = rDestNodes[ nDestStart + nIdx ]->GetTxtNode(); +SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode(); if ( pTxtNode ) { GetDoc()->UpdateParRsid( pTxtNode ); commit a0bf832660765305a27985b1cd7517a0579a751e Author: Rob Snelders Date: Thu Dec 5 23:56:52 2013 +0100 Partly revert "Resolves: #ii122335# Disabling the old task pane" This partly reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872. SideBar is experimental, Impress still needs the TaskPane slot, otherwise once disabled / clicked away the user won't get the TaskPane back. Change-Id: I65b9e4a52ef2f3f1e7240fc01b828d2ff5d1589c Reviewed-on: https://gerrit.libreoffice.org/6943 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index bb20370..c71959c 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -94,6 +94,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); +SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); diff --git a/sd/uiconfig/simpress/menub
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/connection.cxx |4 1 file changed, 4 insertions(+) New commits: commit 0336363993c6355598c7c4d0e1d7ac05e25f2de9 Author: Stephan Bergmann Date: Fri Dec 6 12:21:24 2013 +0100 Missing include Change-Id: I3b68c2a01eb1e9678d419fdb246508f2d3e60df8 diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index e5c170f..e5fedf1 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include + #include "connection.hxx" #include "dbastrings.hrc" #include "datasource.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/fixincludeguards.sh
bin/fixincludeguards.sh |9 + 1 file changed, 9 insertions(+) New commits: commit 5b710a4ef36cde0d680add3e7fcf437cf4d1c557 Author: Tor Lillqvist Date: Fri Dec 6 13:13:48 2013 +0200 Add comment about portability Change-Id: I289d3233f99b61115ed8efdea93cfabfbc53bcd7 diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh index 907e4aa..ceed3a3 100755 --- a/bin/fixincludeguards.sh +++ b/bin/fixincludeguards.sh @@ -17,6 +17,9 @@ # ... # #endif // OTHER_BAR_HXX +# TODO: Make this portable. As it is now, it likely only works on Linux, or +# other platforms with a purely GNU toolset. + guard_prefix="INCLUDED_" for fn in "$@"; do commit 1637bcc408600df9a81d439d0d764f1447d3996a Author: Tor Lillqvist Date: Fri Dec 6 13:12:04 2013 +0200 Revert "The TODO seems to be DONE" Actually I am not sure at all. This reverts commit 3b56738d88d881d023bdefdad99663f12b9f. diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh index 5a6347f..907e4aa 100755 --- a/bin/fixincludeguards.sh +++ b/bin/fixincludeguards.sh @@ -11,6 +11,12 @@ # a) fixincludeguards.sh header.hxx # b) find . -name *.hxx -or -name *.h | xargs sh fixincludeguards.sh +# TODO: This doesn't fix wrong #endif comments, like: +# #ifndef FOO_BAR_HXX +# #define FOO_BAR_HXX +# ... +# #endif // OTHER_BAR_HXX + guard_prefix="INCLUDED_" for fn in "$@"; do ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - comphelper/source connectivity/source dbaccess/source embeddedobj/source embedserv/source framework/inc include/comphelper include/cppuhelper include/sfx2 l
comphelper/source/property/genericpropertyset.cxx |3 - connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx |4 + connectivity/source/inc/calc/CTable.hxx |4 - connectivity/source/inc/dbase/DTable.hxx |3 - dbaccess/source/core/inc/ContentHelper.hxx|8 +- dbaccess/source/core/inc/column.hxx |9 --- dbaccess/source/ui/inc/sbamultiplex.hxx |3 - embeddedobj/source/general/intercept.cxx | 25 embedserv/source/embed/intercept.cxx | 28 -- framework/inc/dispatch/menudispatcher.hxx |3 - framework/inc/dispatch/popupmenudispatcher.hxx|3 - framework/inc/stdtypes.h |3 - include/comphelper/stl_types.hxx | 13 include/cppuhelper/interfacecontainer.h |5 + include/sfx2/unoctitm.hxx |3 - linguistic/source/lngopt.hxx |5 - svx/source/unodraw/shapepropertynotifier.cxx |2 sw/source/ui/inc/unomailmerge.hxx |4 - ucb/source/cacher/contentresultsetwrapper.hxx | 18 -- ucb/source/core/ucbstore.cxx | 24 ucb/source/ucp/file/bc.cxx|2 ucb/source/ucp/file/filglob.hxx | 18 -- ucb/source/ucp/file/filnot.hxx|3 - ucb/source/ucp/file/shell.hxx |6 -- ucbhelper/source/provider/contenthelper.cxx | 19 -- ucbhelper/source/provider/resultset.cxx | 19 -- 26 files changed, 33 insertions(+), 204 deletions(-) New commits: commit e7911236e3a3012ce2589080da1f3bcc10b5f2fa Author: Stephan Bergmann Date: Fri Dec 6 12:03:06 2013 +0100 Missing include Change-Id: Ie5036134f03a0e9bfdfcb28190444b5d2ddcc323 diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 17bb847..675f79a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -20,6 +20,10 @@ #ifndef _CONNECTIVITY_MAB_QUERYHELPER_HXX_ #define _CONNECTIVITY_MAB_QUERYHELPER_HXX_ +#include + +#include + #include #include "MErrorResource.hxx" #include commit 0fa31bed9a7a0666df26a1016d74df3ec15b40f9 Author: Stephan Bergmann Date: Fri Dec 6 11:57:54 2013 +0100 Default OMultiTypeInferfaceContainerHelperVar equalImpl parameter ...and assorted OUStringHash clean up Change-Id: I779904e1275e8df88f567beb388d1d11af9e9671 diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 1261db3..feb803e 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -62,7 +61,7 @@ namespace comphelper { private: GenericAnyMapImpl maAnyMap; -::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, OUStringHash,UStringEqual> m_aListener; +::cppu::OMultiTypeInterfaceContainerHelperVar m_aListener; protected: virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ); diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 26cdd3d..9f44367 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -34,13 +34,16 @@ #include #include #include -#include #include #include #include #include #include +namespace com { namespace sun { namespace star { namespace beans { +struct PropertyValue; +} } } } + namespace dbaccess { class ODatabaseModelImpl; @@ -76,8 +79,7 @@ namespace dbaccess typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, -OUStringHash, - ::comphelper::UStringEqual +OUStringHash > PropertyChangeListenerContainer; typedef ::comphelper::OBaseMutexOContentHelper_MBASE; typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::ucb::XContent diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/01/packagemanager.xhp |3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit d6d16d266f3511f5713f38087ec38484c59f2ae6 Author: Caolán McNamara Date: Fri Dec 6 11:03:11 2013 + update help ids for accept license dialog Change-Id: I9ecd313b41abc0105816d15f20048686d1635bf8 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 13a5167..30f6f28 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5821,14 +5821,11 @@ desktop_Edit_TP_USER_ED_USER_INITIALS,586123283, desktop_Edit_TP_USER_ED_USER_LAST,586123281, desktop_ListBox_RID_DLG_DEPENDENCIES_RID_DLG_DEPENDENCIES_LIST,1106529794, desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208, -desktop_ModalDialog_RID_DLG_LICENSE,1180237824, -desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE,1180240435, desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076, desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231, desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166, desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180256268, desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180256269, -desktop_PushButton_RID_DLG_LICENSE_PB_LICENSE_DOWN,1180242482, desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CHECK_UPDATES,1106694669, desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CLOSE,1106694666, desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282, diff --git a/source/text/shared/01/packagemanager.xhp b/source/text/shared/01/packagemanager.xhp index 6d1811f..587406c 100644 --- a/source/text/shared/01/packagemanager.xhp +++ b/source/text/shared/01/packagemanager.xhp @@ -100,8 +100,7 @@ Add Click Add to add an extension. A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open. - - + An extension can show a license dialog. Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.insert hidden text for Show License Remove ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8fbff2997ae9424ce3b0d67bf55186b6e858e35b Author: Caolán McNamara Date: Fri Dec 6 11:03:11 2013 + Updated core Project: help d6d16d266f3511f5713f38087ec38484c59f2ae6 diff --git a/helpcontent2 b/helpcontent2 index a564ffa..d6d16d2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a564ffa850dfcc2020cd84cef44832d70222e96c +Subproject commit d6d16d266f3511f5713f38087ec38484c59f2ae6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source desktop/uiconfig desktop/UIConfig_deployment.mk extras/source
desktop/UIConfig_deployment.mk |1 desktop/source/deployment/gui/dp_gui.hrc | 16 - desktop/source/deployment/gui/dp_gui_dialog.src | 173 - desktop/source/deployment/gui/license_dialog.cxx | 140 +++-- desktop/source/inc/helpid.hrc|1 desktop/uiconfig/ui/licensedialog.ui | 231 +++ desktop/uiconfig/ui/showlicensedialog.ui |2 extras/source/glade/libreoffice-catalog.xml.in |3 8 files changed, 311 insertions(+), 256 deletions(-) New commits: commit de6be3dcdf44900b6ad5bcd9deed531dc8d3f240 Author: Caolán McNamara Date: Fri Dec 6 10:13:04 2013 + convert accept license dialog to .ui Change-Id: Ib36f42d65ef73446320823775accc94016afb13a diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk index cced131..6c00412 100644 --- a/desktop/UIConfig_deployment.mk +++ b/desktop/UIConfig_deployment.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,desktop)) $(eval $(call gb_UIConfig_add_uifiles,desktop,\ desktop/uiconfig/ui/cmdlinehelp \ desktop/uiconfig/ui/extensionmanager \ +desktop/uiconfig/ui/licensedialog \ desktop/uiconfig/ui/showlicensedialog \ )) diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 0238b24..08d4b78 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -33,20 +33,6 @@ #define RID_EM_FT_PROGRESS 14 #define RID_EM_FT_MSG 15 -// local RIDs: -#define PB_LICENSE_DOWN 50 -#define ML_LICENSE 51 -#define BTN_LICENSE_DECLINE 53 -#define FT_LICENSE_HEADER 54 -#define FT_LICENSE_BODY_1 55 -#define FT_LICENSE_BODY_1_TXT 56 -#define FT_LICENSE_BODY_2 57 -#define FT_LICENSE_BODY_2_TXT 58 -#define FL_LICENSE 69 -#define FI_LICENSE_ARROW1 60 -#define FI_LICENSE_ARROW2 61 -#define BTN_LICENSE_ACCEPT 63 - // local RIDs for "Download and Install" dialog #define RID_DLG_UPDATE_INSTALL_ABORT 2 @@ -154,8 +140,6 @@ #define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) #define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) -#define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index 7669d8b..ccddf40 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -122,179 +122,6 @@ String RID_STR_SHOW_LICENSE_CMD Text [ en-US ] = "Show license"; }; -// Dialog layout -// --- -// row 1 | multi line edit -// --- -// row 2 | fixed text -// --- -// row 3 | img | fixed text | fixed text | button -// -// row 4 | img | fixed text | fixed text -// --- -// row 5 |fixed line -// --- -// row 6 | | |button | button -// --- -//| col 1 | col 2 | col3 | col4 | col5 - -//To change the overall size of the multi line edit change -//ROW1_HEIGHT and COL3_WIDTH - -#define ROW1_Y RSC_SP_DLG_INNERBORDER_TOP -#define ROW1_HEIGHT 16*RSC_CD_FIXEDTEXT_HEIGHT -#define ROW2_Y ROW1_Y+ROW1_HEIGHT+RSC_SP_CTRL_GROUP_Y -#define ROW2_HEIGHT 3*RSC_CD_FIXEDTEXT_HEIGHT -#define ROW3_Y ROW2_Y+ROW2_HEIGHT+RSC_SP_CTRL_GROUP_Y -#define ROW3_HEIGHT 3*RSC_CD_FIXEDTEXT_HEIGHT -#define ROW4_Y ROW3_Y+ROW3_HEIGHT+RSC_SP_CTRL_GROUP_Y -#define ROW4_HEIGHT 3*RSC_CD_FIXEDTEXT_HEIGHT -#define ROW5_Y ROW4_Y+ROW4_HEIGHT+RSC_SP_CTRL_GROUP_Y -#define ROW5_HEIGHT RSC_CD_FIXEDTEXT_HEIGHT -#define ROW6_Y ROW5_Y+ROW5_HEIGHT+RSC_SP_CTRL_GROUP_Y -#define ROW6_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT - -#define LIC_DLG_HEIGHT ROW6_Y+ROW6_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM - -#define COL1_X RSC_SP_DLG_INNERBORDER_LEFT -#define IMG_ARROW_WIDTH 16 -#define COL1_WIDTH IMG_ARROW_WIDTH -#define COL2_X COL1_X+COL1_WIDTH -#define COL2_WIDTH 10 -#define COL3_X COL2_X+COL2_WIDTH+RSC_SP_CTRL_GROUP_X -#define COL3_WIDTH 150 -#define COL4_X COL3_X+COL3_WIDTH -#define COL4_WIDTH RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_GROUP_X -#define COL5_X COL4_X+COL4_WIDTH - -#define LIC_DLG_WIDTH COL5_X+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_DLG_INNERBORDER_RIGHT -#define BODYWIDTH LIC_DLG_WIDTH-RSC_SP_DLG_INNERBORDER
[Libreoffice-commits] core.git: desktop/uiconfig
desktop/uiconfig/ui/showlicensedialog.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3535fa12ddd2a0845ab13f31ab7177dc02860205 Author: Caolán McNamara Date: Fri Dec 6 09:40:12 2013 + set close as default Change-Id: Idb93d99ba68b7f605036071e4c499c0640f42cef diff --git a/desktop/uiconfig/ui/showlicensedialog.ui b/desktop/uiconfig/ui/showlicensedialog.ui index 120a1e9..76d207f 100644 --- a/desktop/uiconfig/ui/showlicensedialog.ui +++ b/desktop/uiconfig/ui/showlicensedialog.ui @@ -20,6 +20,8 @@ gtk-close True True +True +True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/shape.cxx |6 ++ sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 ++ 2 files changed, 8 insertions(+) New commits: commit a5c475c25bd432fc80be8c2b437935cd54c4b611 Author: Miklos Vajna Date: Fri Dec 6 10:14:45 2013 +0100 Santa Claus brings fixed background color of textframes in drawingml import Change-Id: Ie2b6885aae5e26c3d29d372da730837cb7dc97ce diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 78a7581..72c7547 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -613,6 +613,12 @@ Reference< XShape > Shape::createAndInsert( { if (aServiceName == "com.sun.star.text.TextFrame") { +// TextFrames have BackColor, not FillColor +if (aShapeProps.hasProperty(PROP_FillColor)) +{ +aShapeProps.setProperty(PROP_BackColor, aShapeProps[PROP_FillColor]); +aShapeProps.erase(PROP_FillColor); +} // TextFrames have BackColorTransparency, not FillTransparence if (aShapeProps.hasProperty(PROP_FillTransparence)) { diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d7ce137..2b271a3 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1591,6 +1591,8 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx") uno::Reference xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); // positionV's posOffset from the bugdoc, was 0. CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), getProperty(xFrame, "VertOrientPosition")); +// This was -1 (default), make sure the background color is set. +CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty(xFrame, "BackColor")); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/source desktop/uiconfig desktop/UIConfig_deployment.mk sw/qa sw/source
desktop/UIConfig_deployment.mk |1 desktop/source/deployment/gui/dp_gui.hrc |1 desktop/source/deployment/gui/dp_gui_dialog.src | 31 -- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 40 ++--- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 10 --- desktop/uiconfig/ui/showlicensedialog.ui | 70 +++ sw/qa/extras/ooxmlexport/data/2_table_doc.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 +++ sw/source/filter/ww8/docxattributeoutput.cxx |4 - 9 files changed, 97 insertions(+), 72 deletions(-) New commits: commit e661d295c2643d6706a9b2040051445591880c46 Author: Caolán McNamara Date: Fri Dec 6 09:22:35 2013 + convert show extension licence dialog to .ui Change-Id: I0e34a0ddaee1485184b55788d618288f4e3f69cb diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk index f23136b..cced131 100644 --- a/desktop/UIConfig_deployment.mk +++ b/desktop/UIConfig_deployment.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,desktop)) $(eval $(call gb_UIConfig_add_uifiles,desktop,\ desktop/uiconfig/ui/cmdlinehelp \ desktop/uiconfig/ui/extensionmanager \ +desktop/uiconfig/ui/showlicensedialog \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 9916c69..0238b24 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -153,7 +153,6 @@ #define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104) #define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) #define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) -#define RID_DLG_SHOW_LICENSE(RID_DEPLOYMENT_GUI_START+107) #define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index 4d523f7..7669d8b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -295,37 +295,6 @@ ModalDialog RID_DLG_LICENSE }; -ModalDialog RID_DLG_SHOW_LICENSE -{ -Text [ en-US ] = "Extension Software License Agreement"; -Size = MAP_APPFONT( 300, 200 ); -OutputSize = TRUE; -SVLook = TRUE; -Moveable = TRUE; -Closeable = TRUE; -Sizeable = TRUE; - -MultiLineEdit ML_LICENSE -{ -Pos = MAP_APPFONT( 5, 5 ); -Size = MAP_APPFONT( 300 - 10, 200 - 15 - RSC_CD_PUSHBUTTON_HEIGHT ); -Border = TRUE; -VScroll = TRUE; -ReadOnly = TRUE; -}; - -OKButton RID_EM_BTN_CLOSE -{ -TabStop = TRUE; -DefButton = TRUE; -Text [ en-US ] = "Close"; -Pos = MAP_APPFONT( (300-RSC_CD_PUSHBUTTON_WIDTH)/2, 200 - 5 - RSC_CD_PUSHBUTTON_HEIGHT ); -Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); -}; -}; - - - WarningBox RID_WARNINGBOX_INSTALL_EXTENSION { Buttons = WB_OK_CANCEL; DefButton = WB_DEF_OK; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 6a90a98..16250ca 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -167,7 +167,7 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent) Size ExtBoxWithBtns_Impl::GetOptimalSize() const { -return LogicToPixel(Size(250, 150), MapMode(MAP_APPFONT)); +return LogicToPixel(Size(250, 150), MAP_APPFONT); } //-- @@ -1704,36 +1704,14 @@ void UpdateRequiredDialog::disableAllEntries() // ShowLicenseDialog //-- ShowLicenseDialog::ShowLicenseDialog( Window * pParent, - const uno::Reference< deployment::XPackage > &xPackage ) : -ModalDialog( pParent, DialogHelper::getResId( RID_DLG_SHOW_LICENSE ) ), -m_aLicenseText( this, DialogHelper::getResId( ML_LICENSE ) ), -m_aCloseBtn( this,DialogHelper::getResId( RID_EM_BTN_CLOSE ) ) -{ -FreeResource(); - -OUString aText = xPackage->getLicenseText(); -m_aLicenseText.SetText( aText ); -} - -//-- -ShowLicenseDialog::~ShowLicenseDialog() -{} - -//-- -void ShowLicenseDialog::Resize() -{ -Size aTotalSize( GetOutputSizePixel() ); -Size aTextSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT, -aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 2*RSC_SP_DLG_INNERBORDER_BOTTOM -
[Libreoffice-commits] core.git: 4 commits - connectivity/source dbaccess/source extensions/source include/comphelper include/connectivity include/dbaccess include/unotools reportdesign/source sd/sourc
connectivity/source/cpool/ZPoolCollection.cxx |6 +-- connectivity/source/cpool/ZPoolCollection.hxx |6 +-- connectivity/source/parse/sqliterator.cxx | 12 +++ dbaccess/source/core/api/RowSetCacheIterator.hxx |7 ++-- dbaccess/source/core/dataaccess/connection.cxx |8 ++-- dbaccess/source/core/dataaccess/connection.hxx |5 +- dbaccess/source/inc/apitools.hxx |7 dbaccess/source/ui/browser/genericcontroller.cxx |2 - dbaccess/source/ui/browser/sbagrid.cxx |2 - dbaccess/source/ui/dlg/DbAdminImpl.cxx | 14 dbaccess/source/ui/dlg/DbAdminImpl.hxx |4 +- dbaccess/source/ui/dlg/dbadmin.cxx |2 - dbaccess/source/ui/dlg/dbfindex.cxx| 22 ++--- dbaccess/source/ui/dlg/dbfindex.hxx|5 -- dbaccess/source/ui/dlg/dbwizsetup.cxx |2 - dbaccess/source/ui/inc/DExport.hxx |3 + dbaccess/source/ui/inc/WCopyTable.hxx |3 + dbaccess/source/ui/inc/sbagrid.hxx |6 +-- dbaccess/source/ui/relationdesign/RelationController.cxx |6 ++- extensions/source/dbpilots/dbptypes.hxx|5 +- include/comphelper/IdPropArrayHelper.hxx |4 ++ include/comphelper/accessiblewrapper.hxx |4 ++ include/comphelper/stl_types.hxx | 17 -- include/connectivity/CommonTools.hxx |5 ++ include/dbaccess/genericcontroller.hxx |5 +- include/unotools/idhelper.hxx | 13 +++ reportdesign/source/core/inc/ReportEngineJFree.hxx |4 ++ reportdesign/source/ui/inspection/GeometryHandler.cxx |5 ++ reportdesign/source/ui/report/ReportControllerObserver.cxx |2 - sd/source/ui/unoidl/unoobj.cxx |8 ++-- sfx2/source/sidebar/SidebarController.hxx |4 ++ svx/source/fmcomp/gridctrl.cxx | 10 ++--- svx/source/form/fmundo.cxx |7 +--- svx/source/inc/fmvwimp.hxx |4 ++ toolkit/source/controls/unocontrol.cxx |1 xmloff/source/forms/eventimport.cxx|2 - xmloff/source/forms/eventimport.hxx| 14 +--- xmloff/source/forms/layerexport.cxx|2 - xmloff/source/forms/layerexport.hxx|3 + xmloff/source/forms/layerimport.cxx|2 - xmloff/source/forms/layerimport.hxx|4 +- 41 files changed, 132 insertions(+), 115 deletions(-) New commits: commit e413521e0bd402530ff0308d9e05331e6bdc0c25 Author: Stephan Bergmann Date: Fri Dec 6 10:37:32 2013 +0100 Avoid ambiguities among different OWeakRefArray declarations Change-Id: I61e3e9cdda17b6b23b33159d89904cce8f2e2ba0 diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 8863b10..e5c170f 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -487,8 +487,8 @@ void OConnection::disposing() OSubComponent::disposing(); OConnectionWrapper::disposing(); -OWeakRefArray::iterator aEnd = m_aStatements.end(); -for (OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i) +connectivity::OWeakRefArray::iterator aEnd = m_aStatements.end(); +for (connectivity::OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i) { Reference xComp(i->get(),UNO_QUERY); ::comphelper::disposeComponent(xComp); @@ -503,8 +503,8 @@ void OConnection::disposing() ::comphelper::disposeComponent(m_xQueries); -OWeakRefArray::iterator aComposerEnd = m_aComposers.end(); -for (OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j) +connectivity::OWeakRefArray::iterator aComposerEnd = m_aComposers.end(); +for (connectivity::OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j) { Reference xComp(j->get(),UNO_QUERY); ::comphelper::disposeComponent(xComp); diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 7995269..4ae7e7e 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -48,6 +48,7 @@ #include #endif #include +#include #include namespace dbaccess @@ -80,10 +81,10 @@ class OConnection :public ::comphelper::OBaseMutex protected: ::com::sun::star::uno::Reference< ::com::
Re: Is the 'libreoffice' list name confusing?
On Fri, Dec 6, 2013 at 3:52 AM, Miklos Vajna wrote: > There is a mix of using just the project name or the -devel suffix for > the developer list (without suffix: libreoffice, PackageKit, etc; with > suffix: gstreamer, systemd, etc). Sure -- it would be helpful to see what other projects use before we actually decide to rename :-) > Before proposing a renaming I would first check if it's possible to do > so without having to re-subscribe everybody, loosing archives and other > drawbacks. And even then, there will be still this mix for freedesktop > projects. :-) What I think we want: - To have only devel traffic on the devel list - (With minimal effort on our part) To get our users/volunteers to the right list to answer their questions If a small linguistic change in our list name can head-off a large percentage of the messages that are posted to the wrong list, then it might be worth it. Anyone have anecdotal evidence one way or the other here? Best, --R (*light goes on* -- I could just ask all of the people who post questions/bug reports, etc.. to the dev list why they chose to use this particular list. Perhaps there's some oddball reason like "I found it listed on website XYZ") ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/frmedt/fecopy.cxx | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) New commits: commit 640e8abbff03f7f242c0c0b9d73ffd2eda3c4e35 Author: Michael Stahl Date: Thu Dec 5 21:58:11 2013 +0100 fdo#71892: sw: fix crash when pasting table in footnote The code that updates RSIDs assumes that the number of nodes copied is the same as the number of nodes inserted, which is not true when pasting a table into a footnote because Writer can't do that, hence all table nodes are missing. Count inserted nodes instead. (regression from 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c) (cherry picked from commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b) Conflicts: sw/source/core/frmedt/fecopy.cxx (cherry picked from commit 2171fff4c1a57ede8f9693d7c0d95c1171a49a70) Change-Id: I77b5b7751d1036a6401f708532537d874969502e Reviewed-on: https://gerrit.libreoffice.org/6951 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 3fa4a73..6c503dc 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1039,25 +1039,22 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames ) aIndexBefore--; pClpDoc->CopyRange( aCpyPam, rInsPos, false ); +// Note: aCpyPam is invalid now -{ -++aIndexBefore; -SwPaM aPaM(SwPosition(aIndexBefore), - SwPosition(rInsPos.nNode)); +++aIndexBefore; +SwPaM aPaM(SwPosition(aIndexBefore), + SwPosition(rInsPos.nNode)); -aPaM.GetDoc()->MakeUniqueNumRules(aPaM); -} -} +aPaM.GetDoc()->MakeUniqueNumRules(aPaM); -// Update the rsid of each pasted text node. -{ -xub_StrLen nNodesCnt = aCpyPam.End()->nNode.GetIndex() - aCpyPam.Start()->nNode.GetIndex(); +// Update the rsid of each pasted text node. SwNodes &rDestNodes = GetDoc()->GetNodes(); -xub_StrLen nDestStart = PCURCRSR->GetPoint()->nNode.GetIndex() - nNodesCnt; +sal_uLong const nEndIdx = aPaM.End()->nNode.GetIndex(); -for ( sal_uInt64 nIdx = 0; nIdx <= nNodesCnt; nIdx++ ) +for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex(); +nIdx <= nEndIdx; ++nIdx) { -SwTxtNode *pTxtNode = rDestNodes[ nDestStart + nIdx ]->GetTxtNode(); +SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode(); if ( pTxtNode ) { GetDoc()->UpdateParRsid( pTxtNode ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - sd/source sd/uiconfig
sd/source/ui/view/drvwshrg.cxx |1 + sd/uiconfig/simpress/menubar/menubar.xml |1 + 2 files changed, 2 insertions(+) New commits: commit 7a92317c40a5aa5dcd78bc52d8c426b446626b0b Author: Rob Snelders Date: Thu Dec 5 23:56:52 2013 +0100 Partly revert "Resolves: #ii122335# Disabling the old task pane" This partly reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872. SideBar is experimental, Impress still needs the TaskPane slot, otherwise once disabled / clicked away the user won't get the TaskPane back. Change-Id: I65b9e4a52ef2f3f1e7240fc01b828d2ff5d1589c Reviewed-on: https://gerrit.libreoffice.org/6943 Reviewed-by: Eike Rathke Tested-by: Eike Rathke (cherry picked from commit cb4225144f1fff44f9bb972fe06f51524da11b8b) Reviewed-on: https://gerrit.libreoffice.org/6952 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index bb20370..c71959c 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -94,6 +94,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); +SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 9ad2019..9a5b874 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -113,6 +113,7 @@ + ___ 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' - d1/2312e8de0f0af1b3f7be5ced034972e32948bf
d1/2312e8de0f0af1b3f7be5ced034972e32948bf |1 + 1 file changed, 1 insertion(+) New commits: commit a30563487fdbb6ab6dbd01eeec578f85c7458a12 Author: Caolán McNamara Date: Fri Dec 6 09:02:28 2013 + Notes added by 'git notes add' diff --git a/d1/2312e8de0f0af1b3f7be5ced034972e32948bf b/d1/2312e8de0f0af1b3f7be5ced034972e32948bf new file mode 100644 index 000..e83ed72 --- /dev/null +++ b/d1/2312e8de0f0af1b3f7be5ced034972e32948bf @@ -0,0 +1 @@ +ignore: obsolete - use clucene ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 030edbcbde812f50c2531789a3730ca1f5736395 Author: Andras Timar Date: Fri Dec 6 09:58:22 2013 +0100 Updated core Project: help 50010f489daf12b663dba5b7d2a789b1c65e diff --git a/helpcontent2 b/helpcontent2 index c39ebf2..50010f4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c39ebf24983ffc3c2bfc52a61ddebf7512b68e10 +Subproject commit 50010f489daf12b663dba5b7d2a789b1c65e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-2' - source/text
source/text/scalc/01/solver_options.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50010f489daf12b663dba5b7d2a789b1c65e Author: Andras Timar Date: Fri Dec 6 09:58:22 2013 +0100 typo: onle -> only Change-Id: I68180be6e5d71c175838772f816dcbfb6e8f81bb diff --git a/source/text/scalc/01/solver_options.xhp b/source/text/scalc/01/solver_options.xhp index 8fade24..3840b3f 100644 --- a/source/text/scalc/01/solver_options.xhp +++ b/source/text/scalc/01/solver_options.xhp @@ -41,7 +41,7 @@ Enter or change the value. Use the Options dialog to configure the current solver engine. You can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions. -Select the solver engine to use and to configure from the listbox. The listbox is disabled if onle one solver engine is installed. +Select the solver engine to use and to configure from the listbox. The listbox is disabled if only one solver engine is installed. In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click Edit to open a dialog where you can change the value. Click OK to accept the changes and to go back to the Solver dialog. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e68610de1c6b51527317112e0222a8a6d228fe26 Author: Andras Timar Date: Fri Dec 6 09:58:22 2013 +0100 Updated core Project: help a564ffa850dfcc2020cd84cef44832d70222e96c diff --git a/helpcontent2 b/helpcontent2 index f8c4192..a564ffa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f8c4192ba2f4e80a59899cd6e48e05317eaec71b +Subproject commit a564ffa850dfcc2020cd84cef44832d70222e96c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/solver_options.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a564ffa850dfcc2020cd84cef44832d70222e96c Author: Andras Timar Date: Fri Dec 6 09:58:22 2013 +0100 typo: onle -> only Change-Id: I68180be6e5d71c175838772f816dcbfb6e8f81bb diff --git a/source/text/scalc/01/solver_options.xhp b/source/text/scalc/01/solver_options.xhp index 8fade24..3840b3f 100644 --- a/source/text/scalc/01/solver_options.xhp +++ b/source/text/scalc/01/solver_options.xhp @@ -41,7 +41,7 @@ Enter or change the value. Use the Options dialog to configure the current solver engine. You can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions. -Select the solver engine to use and to configure from the listbox. The listbox is disabled if onle one solver engine is installed. +Select the solver engine to use and to configure from the listbox. The listbox is disabled if only one solver engine is installed. In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click Edit to open a dialog where you can change the value. Click OK to accept the changes and to go back to the Solver dialog. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/qa
extensions/qa/unoapi/extensions.sce |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f5e99e24ee12a9873f029e53bfef465f9d194363 Author: Andras Timar Date: Fri Dec 6 09:57:21 2013 +0100 typo: onle -> only Change-Id: Ibacf8da00e06a725557e4de1ea3f9c6833b59d74 diff --git a/extensions/qa/unoapi/extensions.sce b/extensions/qa/unoapi/extensions.sce index cb338fe..448484f 100644 --- a/extensions/qa/unoapi/extensions.sce +++ b/extensions/qa/unoapi/extensions.sce @@ -1,5 +1,5 @@ -o pcr.ObjectInspector -# this object must be tests twice since it is the onle one in this module +# this object must be tested twice, because it is the only one in this module # The runner only prints "[0-9]+? of [0-9]+? tests failed" # if more then one tests is executed. This is needed by cwscheckapi. -o pcr.ObjectInspector ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is the 'libreoffice' list name confusing?
Hi Robinson, On Thu, Dec 05, 2013 at 11:32:58PM -0500, Robinson Tryon wrote: > I wonder if the name of this list is confusing to newcomers to the > libreoffice project. Have a look here: http://lists.freedesktop.org/mailman/listinfo/ There is a mix of using just the project name or the -devel suffix for the developer list (without suffix: libreoffice, PackageKit, etc; with suffix: gstreamer, systemd, etc). Before proposing a renaming I would first check if it's possible to do so without having to re-subscribe everybody, loosing archives and other drawbacks. And even then, there will be still this mix for freedesktop projects. :-) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jan Holesovsky changed: What|Removed |Added Depends on||71884 -- 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: Navigation buttons in Writer Search bar
I figured it out myself... Am 06.12.2013 08:49, schrieb Samuel Mehrbrodt: Hi Rodolfo, thanks, that worked (using links). I should have read the README in icon-themes... Now I've got another problem: I need to change the text of the uno command during run-time. The Next/Previous buttons need to display "Next Page", "Next Heading", etc. depending on which navigation element was chosen. Can you (or someone else) help me there? Samuel Am 05.12.2013 21:15, schrieb Rodolfo: If the button fires an UNO command, you should A) create an icon in an icon theme pack/folder. It should be named lc_unocommandname.png for large icons and sc_unocommandname.png for small ones. B) or, if you want to reuse an existant icon, you can make a link to it: add its name to a text file called links.txt in theme directory. Example line: cmd/lc_newunocommandname.png cmd/lc_existanticon.png Sorry if I was not clear. Answering by mobile. Regards, Rodolfo. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice