GSOC weekly report
Hi all, this week I've managed to dislpay the ListBox (CodeCompleteListBox), and list the methods in it. The code completition is still triggered by the ., but sometimes the source/parser are not in sync(meaning that it does not parse the most asctual version of the source, I'm still working out why). The ListBox is displayed under the current line, ant it's size is set to 150x150. This week I'm going to disable some thing in parser when doing code completition (like gode generation), and I'll make the parser to accept any string to parse. Regards Gergő ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 suokunl...@gmail.com changed: What|Removed |Added Depends on||58577 -- 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: Weekly report about character border
On Sun, Jun 30, 2013 at 06:35:07PM +0200, Zolnai Tamás zolnaitamas2...@gmail.com wrote: - How can we implement character border? (two distinct solution: font or layout frame) This is an interesting question, yes. My opinion is that it would be good to do this in VCL (font), so not only Writer can benefit from this, but later also other applications. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #232 from suokunl...@gmail.com --- I'm adding Bug 58577 because it caused my text frame lost when I save as OOXML (*.docx). It is a BLOCKER! -- 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: Weekly report about character border
On Mon, Jul 01, 2013 at 09:17:02AM +0200, Cedric Bosdonnat cedric.bosdon...@free.fr wrote: This is an interesting question, yes. My opinion is that it would be good to do this in VCL (font), so not only Writer can benefit from this, but later also other applications. Well, I was originally more thinking on something around the writer layout... borders aren't the same things than underlines and friends. However the idea to be able to reuse it from VCL is appealing. Problem coming from that: the code for borders painting is using cod from svx and drawinglayer... would we be able to use that from VCL fonts code? I'm not sure at all ;) Sadly that's indeed not true, you can't even use svtools::GetDashing() from VCL. So might be easier to go with a Writer-only layout for now. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 suokunl...@gmail.com changed: What|Removed |Added Depends on||56960 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #233 from suokunl...@gmail.com --- For Bug 56960, patch is out for LibreOffice 4.1, but not in LibreOffice 3.6 list. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jorendc joren.libreoff...@telenet.be changed: What|Removed |Added Depends on|58577 | -- 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: Building LO 4.0.4.2 on illumos based OS
On Sat, Jun 29, 2013 at 16:24:42 CEST, Norbert Thiebaud wrote take a look at Library_cpp_uno.mk and in particular how bridges_SELECTED_BRIDGE is set... from what I read the else ifeq($(CPU),I) line 56 pre-empt the section you want which is lower.. line 143 some re-order of the different if/else section seems in order (to works we need to test from the most particular to the most generic) Norbert Great! I moved the SOLARISI code from line 143 up just before line 56 and it worked ;) Thanx! Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Guidance on 'Paragraph Tab' bug
Hi Adam, On Thu, Jun 27, 2013 at 06:18:09PM +0300, Adam Fyne adam.f...@cloudon.com wrote: I didn't post this on the IRC because it is too long and too specific, and I feel it will be lost there… Sure, for some kind of discussions the mailing list is a better place. I want to fix a bug with import \ export of a 'Paragraph Tab'. I've attached a really simple DOCX with such a paragraph tab. The XML node is 'w:ptab' inside a 'run' node. I see. Indeed, looks like this is not imported (correctly). When it goes through Writer – it is transformed to a simple tab. I would like to fix this so that the 'ptab' is: 1. Import 'ptab' from DOCX 2. Store the 'ptab' attributes in the Writer's core 3. Render correctly on the screen (2nd run will be aligned to the right) 4. Export 'ptab' back to DOCX Hmm, this sounds like a new feature -- doing that would be great, but I would suggest to finish your previous feature first (the character shading one), where the ODF filters are not yet updated. After doing some digging, I found this in 'model.xml': 22530 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22530 resource *name=*CT_PTab *resource=*Stream *tag=*paragraph 22531 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22531 attribute *name=*alignment *tokenid=*ooxml:CT_PTab_alignment/ 22532 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22532 attribute *name=*relativeTo *tokenid=*ooxml:CT_PTab_relativeTo/ 22533 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22533 attribute *name=*leader *tokenid=*ooxml:CT_PTab_leader/ 22534 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22534 action *name=*end *action=*tab/ 22535 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22535 /resource And also found this: 22574 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22574 resource *name=*CT_Tab *resource=*Stream *tag=*content 22575 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22575 action *name=*end *action=*tab/ 22576 http://opengrok.libreoffice.org/xref/core/writerfilter/source/ooxml/model.xml#22576 /resource I have a few questions: 1. Shouldn't CT_PTab call ptab instead of tab? That's right, except that writerfilter::ooxml::OOXMLFastContextHandler has a tab() method, but no ptab() method, that will be one thing you need to implement first. 2. What is the meaning of the 'tag' attribute of the 'resource' node? As far as I know, the action .. action=name/ is always a method call. 3. The way information is stored in 'model.xml' is so confusing. You're not alone, writerfilter/documentation/ooxml/model.xml is what we found out so far, feel free to extend that if you manage to decode some more detail. In short, whenever you add support for new XML tags, you typically need to extend the file at two places: - the new tag is a child of some existing tag, so extend the parent's definition - you also need to add a matching resource tag in model.xml Once those two definitions match, you get new tokens in dmapper. 363dafefad14411a16f6ea9d2ee0d55b67bc9c8d is hopefully a good example. (Though your case is easier, as you add a new token in an existing namespace.) Some of the info is stored like this (resource + attributes + action), some are stored as 'define' + 'attribute' + 'ref', some are stored as 'resource' + 'value's. This is more of a general question, but – what is the difference between these nodes? First probably it makes sense to see how RELAX NG works, e.g. have a look at the RELAX NG definition of the ODF format. ref/define is just a way to avoid copypaste, you define something first, then you can refer to it (by name, using ref) multiple times. If I'm not mistaken, the only non-RELAX NG tag you need in model.xml is the resource one, as explained above. From the code – I understood that 'action' calls a function in OOXMLFastContextHandler. When do we need such actions? Why is this done on some nodes and on other nodes (like 'run', 'paragraph', 'brush' etc) not done? So – say I need to add a new function called 'ptab' to 'OOXMLFastContextHandler' – Do I simply copy the logic of 'tab()' ? I think it's all about where do you want to handle the input. Normally, the tokenizer just generates these tokens, and dmapper does the mapping. However, in case of tabs, other (RTF, WW8) formats handle the tab as a normal character, so in case of DOCX, an action is used, that converts the OOXML tokens to a simple character, so in dmapper you always get a tab character. So actions are used to generate these fake tokens. Other example: w:hyperlink is also handled in the
Re: Regarding previous mail
Hi Adam, On Thu, Jun 27, 2013 at 06:23:57PM +0300, Adam Fyne adam.f...@cloudon.com wrote: Regarding the previous mail – I just wanted to check something – I used MSO to convert the DOCX to DOC, and MSO Word said : if you save as DOC you will turn alignment tabs to normal tabs. I saved it and it looks the same. LO opens the DOC correctly, and when saved back to DOC or DOCX – it looks fine. I just did this check because I wanted to know if maybe the 'DOC' importer has a 'ptab' implementation, but obviously it doesn't – because Word itself converts it from a 'ptab' to a 'normal tab' when saving as DOC. Right -- so that's also a way to handle the situation, you can do similar mapping of these paragraph tabs to normal tabs in dmapper, and then you won't have to deal with paragraph tabs anywhere else in LO. Given that such a mapping probably loses information, you need to choose between correctness and ease of implementation. :-) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC] Improve Toolbars: Weekly Report #2
Hello everyone, Continuing to my last week's work of panels conversion to .ui, here's an update of last week's progress. The further panels upon which I was working were much more difficult than the previous ones and needed much more attention, which was unfortunately not expected by me. I got stuck while their conversion and finally the got acquainted that the problem was some issue with Resource Id's. Nevertheless, one more patch for ParaPropertyPanel has been pushed successfully and the further work is currently in progress. This week, I'd be making my patches of AreaPropertyPanel and LinePropertyPanel as perfect as possible + time permitting working on some more panels! Thanks and Regards, Prashant On Fri, Jun 21, 2013 at 10:45 PM, Prashant Pandey prashant3.yi...@gmail.com wrote: Hello everyone, I am working on LibreOffice's UI part to improve toolbars. The work commenced by the Conversion of sidebar panels to .ui definition, with the help of glade. Since I never dealt with 'Glade', my first on-hand experience started with learning glade. In the mean time I could learn and prepare the designs for some sidebars, Kendy ke...@suse.cz provided me a wonderful tutorial to get started with the coding part too, which could empower me to opportunely complete the sidebar conversions for the following panels: NumberFormatPropertyPanel [1], CellAppearancePropertyPanel [2] and PagePropertyPanel [3]. I am glad to announce that these changes have been prosperously pushed to master in the first week. On the present scale, we are finished with 'Calc' (on the part of .ui panel conversions) and I am currently working on 'Writer'. Around 3 further changes (for writer) are pushed to gerrit and the work is still in progress. Hopefully I'll be done with all the required leftover sidebar conversions, by the end of next week/weekend. [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=782adaed6342ceb798c52cff9c47a6dd8c1c2d72 [2] http://cgit.freedesktop.org/libreoffice/core/commit/?id=637334cb6fdce9d5ee08f8c9fd9f964ccbb56403 [3] http://cgit.freedesktop.org/libreoffice/core/commit/?id=0813006e76880e78200cad47baefb5b70d9b21e8 Thanks and Regards, Prashant Pandey IRC- elixir ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
take a look at Library_cpp_uno.mk and in particular how bridges_SELECTED_BRIDGE is set... from what I read the else ifeq($(CPU),I) line 56 pre-empt the section you want which is lower.. line 143 some re-order of the different if/else section seems in order (to works we need to test from the most particular to the most generic) Norbert Build goes through for some time, then I got this (I didn't have this on 4.0): [build C ] sal/osl/unx/tempfile.c [build C ] sal/osl/unx/thread.c [build C ] sal/osl/unx/time.c [build C ] sal/osl/unx/util.c [build C ] sal/osl/unx/signal.c [build C ] sal/osl/unx/backtrace.c [build ASM] sal/osl/unx/asm/interlck_x86 [build LNK] Library/libuno_sal.so ERROR: aux-target missing, library deleted, please try running make again make[2]: *** [/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Library//libuno_sal.so.3] Error 1 Running make again as suggested, repeats the error. Any idea? Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/README |2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 7857d772f7f82a33de506cd10e4298aa092bfe8f Author: Miklos Vajna vmik...@suse.cz Date: Mon Jul 1 11:13:40 2013 +0200 SmOoxmlImport: update doc on how to extract handled token list Change-Id: I7cea50e99a4ffd9eac357251ffe630921ec64795 diff --git a/writerfilter/source/rtftok/README b/writerfilter/source/rtftok/README index e77c05f..4adbb75 100644 --- a/writerfilter/source/rtftok/README +++ b/writerfilter/source/rtftok/README @@ -6,7 +6,7 @@ At the time of writing, all control words understood by SmOoxmlImport are imported. To view the current status: -grep M_TOKEN starmath/source/ooxmlimport.cxx |sed 's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u ~/math-import-list +grep M_TOKEN starmath/source/ooxmlimport.cxx |sed 's/.*\(M_TOKEN(\) /\1/;s/ ).*/)/'|sort -u ~/math-import-list grep '[^_]M_TOKEN' writerfilter/source/rtftok/rtfdocumentimpl.cxx |sed 's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u ~/wf-export-list diff -u ~/math-import-list ~/wf-export-list |grep ^-M_TOKEN diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f408346..31cc365 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -200,6 +200,7 @@ static void lcl_DestinationToMath(OUStringBuffer rDestinationText, oox::formula if (rMathNor) { rMathBuffer.appendOpeningTag(M_TOKEN(rPr)); +// Same as M_TOKEN(lit) rMathBuffer.appendOpeningTag(M_TOKEN(nor)); rMathBuffer.appendClosingTag(M_TOKEN(nor)); rMathBuffer.appendClosingTag(M_TOKEN(rPr)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Guidance on 'Paragraph Tab' bug
Hi Miklos, Thanks for the help. it helps a lot ! See my comments below in blue ... I have a few questions: 1. Shouldn't CT_PTab call ptab instead of tab? That's right, except that writerfilter::ooxml::OOXMLFastContextHandler has a tab() method, but no ptab() method, that will be one thing you need to implement first. Why would I implement a 'ptab' function? From what you wrote below - it seems that I do not need to do any action for 'ptab'. So does your recommendation still stand that I need 'ptab'? (you said that 'tab()' inserts a '\t' instead of the tab element). 2. What is the meaning of the 'tag' attribute of the 'resource' node? As far as I know, the action .. action=name/ is always a method call. The question was actually about the 'tag' element of a resource, not the 'action' element. 3. The way information is stored in 'model.xml' is so confusing. You're not alone, writerfilter/documentation/ooxml/model.xml is what we found out so far, feel free to extend that if you manage to decode some more detail. In short, whenever you add support for new XML tags, you typically need to extend the file at two places: - the new tag is a child of some existing tag, so extend the parent's definition - you also need to add a matching resource tag in model.xml Once those two definitions match, you get new tokens in dmapper. 363dafefad14411a16f6ea9d2ee0d55b67bc9c8d is hopefully a good example. (Though your case is easier, as you add a new token in an existing namespace.) What do you mean when you say that my case is easy because I add a new token to an existing namespace? what namespace would that be? (I looked at the commit you mentioned and it doesn't make any sense to me...) From the code – I understood that 'action' calls a function in OOXMLFastContextHandler. When do we need such actions? Why is this done on some nodes and on other nodes (like 'run', 'paragraph', 'brush' etc) not done? So – say I need to add a new function called 'ptab' to 'OOXMLFastContextHandler' – Do I simply copy the logic of 'tab()' ? I think it's all about where do you want to handle the input. Normally, the tokenizer just generates these tokens, and dmapper does the mapping. However, in case of tabs, other (RTF, WW8) formats handle the tab as a normal character, so in case of DOCX, an action is used, that converts the OOXML tokens to a simple character, so in dmapper you always get a tab character. So actions are used to generate these fake tokens. Other example: w:hyperlink is also handled in the tokenizer, and it generates a HYPERLINK field from it, and dmapper handles only that. So, should I handle 'ptab' in OOXMLFastContextHandler' or not? Sounds like I shouldn't. If not - should I remove the action from the xml node? Where do I parse the attributes themselves of the 'ptab'? If you handle ptab as a normal element in model.xml, you'll have the usual way to get all its attributes. I would recommend going that way, as ptab is not a character (tab is), but an element with attributes. From what I saw - 'ptab' attributes *are* handled in the dmapper. So the *current* way it works, where 'ptab' is both parsed in 'OOXMLFastContextHandler' and it's attributes are parsed in the dmapper is very confusing. I add it as properties to some existing object of the core? I would check how existing similar features are implement, and do something similar. Normal tabs are not a good example, as those are stored as a \t character inside SwTxtNode, but page break may be a good example. How is 'Page Break' stored in the core? Is there some tutorial on how to add an entirely new object to the core? (you told me once that adding a property to an existing core object is relatively easy, but adding a new object is a much more complex task). Sure, so -- as usual, the first step would be to design how the document model should store these paragraph tabs, then either do the UNO API or some UI, so you can test it. Then you can continue with filters and layout, etc. You say either do the UNO API or some UI. What UI do you mean? How would one control the 'paragraph tabs' through the UI? Thanks, it helps a great deal ! Adam ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weekly report about character border
Yes, layout already has the way using borders. Let's see how does it work, maybe all aspect of border (shadow and spacing too) can added at one go. 2013/7/1 Miklos Vajna vmik...@suse.cz On Mon, Jul 01, 2013 at 09:17:02AM +0200, Cedric Bosdonnat cedric.bosdon...@free.fr wrote: This is an interesting question, yes. My opinion is that it would be good to do this in VCL (font), so not only Writer can benefit from this, but later also other applications. Well, I was originally more thinking on something around the writer layout... borders aren't the same things than underlines and friends. However the idea to be able to reuse it from VCL is appealing. Problem coming from that: the code for borders painting is using cod from svx and drawinglayer... would we be able to use that from VCL fonts code? I'm not sure at all ;) Sadly that's indeed not true, you can't even use svtools::GetDashing() from VCL. So might be easier to go with a Writer-only layout for now. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weekly report about character border
Hi, Cedric, - How does the system store attributes? (SwFmt, SwAttrSet, SwAttrStack) You got the proper classes. If you need some help to debug the SfxItemSet, you can have a look at my old gdbinit here (function dump_psfxitemset): http://cgit.freedesktop.org/libreoffice/build/plain/scratch/writer/gdbinit-cbosdo?h=libreoffice-3-4 Thanks, It will helpful. - How does layout frame work? How does frame hierarchy look like? How to calculate the border properties of the current frame? (SwBorderAttr) Do you know this wiki page explaining quite a lot of things? http://wiki.openoffice.org/wiki/Writer/Core_And_Layout Yes, I got it. But at first I follow the trace of the existent character attributes like background and overlining and that's how I got to fonts. But the time comes to learn more about layout. Characters are at a lower level as these are SwLinePortions. You can also debug that by exporting SW_DEBUG=t, open a sample document, and press F12: that will dump a layout.xml in $PWD. This layout.xml will show you quite a lot of informations on the layout structure. (Shift+F12 will do the same with a nodes.xml showing the model structure). Oh, it is nice. I will try it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65653, which changed state. Bug 65653 Summary: EDITING: Base crashes with queries with keyword LIKE in GUI-Mode https://bugs.freedesktop.org/show_bug.cgi?id=65653 What|Removed |Added Status|VERIFIED|REOPENED 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: 3 commits - cui/source sw/inc sw/source
cui/source/tabpages/autocdlg.cxx |2 +- sw/inc/comcore.hrc |2 +- sw/source/ui/app/app.src |7 --- sw/source/ui/uiview/view2.cxx| 20 ++-- 4 files changed, 12 insertions(+), 19 deletions(-) New commits: commit e21544132a6732334a14194e02232b28e559303b Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 10:38:51 2013 +0100 Resolves: fdo#66403 infinite loop, typo i should be it Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936 diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 5a97a91..9efb438 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1434,7 +1434,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet ) } } -for(std::vectorOUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i) +for(std::vectorOUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++it) { String* s = new String(*it); if(!pWrdList-insert(s).second) commit 6d866fec7117b5264136371bd8c04d5b882548e9 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 08:55:36 2013 +0100 fix indent Change-Id: I079e88700f3353b906f0d8fc85083695cfe569bb diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index f490aab..7f3ab45 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2293,16 +2293,16 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) else { //take an existing data source or create a new one? -SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); -OSL_ENSURE(pFact, Dialogdiet fail!); -AbstractMailMergeFieldConnectionsDlg* pConnectionsDlg = pFact-CreateMailMergeFieldConnectionsDlg( - DLG_MERGE_FIELD_CONNECTIONS, - GetViewFrame()-GetWindow()); -OSL_ENSURE(pConnectionsDlg, Dialogdiet fail!); -if(RET_OK == pConnectionsDlg-Execute()) -bCallAddressPilot = !pConnectionsDlg-IsUseExistingConnections(); -else -return; +SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); +OSL_ENSURE(pFact, Dialogdiet fail!); +AbstractMailMergeFieldConnectionsDlg* pConnectionsDlg = pFact-CreateMailMergeFieldConnectionsDlg( + DLG_MERGE_FIELD_CONNECTIONS, + GetViewFrame()-GetWindow()); +OSL_ENSURE(pConnectionsDlg, Dialogdiet fail!); +if(RET_OK == pConnectionsDlg-Execute()) +bCallAddressPilot = !pConnectionsDlg-IsUseExistingConnections(); +else +return; } if(bCallAddressPilot) commit f9acc916bf6a047e92692e91623113806d2c1a29 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 08:54:38 2013 +0100 MSG_DISABLE_UNDO_QUESTION unused Change-Id: I1e06ccae6c820715d2cea70d679bf7681bae711a diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc index 21e1d7e..eb1b3e2 100644 --- a/sw/inc/comcore.hrc +++ b/sw/inc/comcore.hrc @@ -42,7 +42,7 @@ #define STR_MULT_INTERACT_SPELL_WARN(RC_COMCORE_BEGIN + 14) #define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15) #define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16) -#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17) + #define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19) #define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20) diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index d18ee58..34a6bc5 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -502,13 +502,6 @@ String STR_REDLINE_UNKNOWN_AUTHOR Text [ en-US ] = Unknown Author; }; -WarningBox MSG_DISABLE_UNDO_QUESTION -{ -BUTTONS = WB_YES_NO_CANCEL; -DEFBUTTON = WB_DEF_YES ; -Message [ en-US ] = This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?; -}; - QueryBox MSG_PRINT_AS_MERGE { HelpId = HID_PRINT_AS_MERGE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo47802.rtf | 46 + sw/qa/extras/rtfimport/rtfimport.cxx | 10 + writerfilter/source/rtftok/rtfdocumentimpl.cxx | 25 + writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +- writerfilter/source/rtftok/rtfvalue.cxx| 32 - writerfilter/source/rtftok/rtfvalue.hxx|7 +++ 6 files changed, 113 insertions(+), 11 deletions(-) New commits: commit d892671c118158490b08d24eea7398330a23599b Author: Miklos Vajna vmik...@suse.cz Date: Mon Jul 1 11:37:30 2013 +0200 fdo#47802 testcase Change-Id: Ib3e399efb0d1116473bc5ff0e1b858b2cfa4aec8 diff --git a/sw/qa/extras/rtfimport/data/fdo47802.rtf b/sw/qa/extras/rtfimport/data/fdo47802.rtf new file mode 100644 index 000..cbbf94f --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo47802.rtf @@ -0,0 +1,46 @@ +{\rtf1 +\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440 +\ltrrow\trowd \cellx4680\cellx9468\pard\plain \ltrpar\ql \li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\yts15 \rtlch\fcs1 +\af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid5924912 +{\shp +{\*\shpinst\shpleft705\shptop-130\shpright1920\shpbottom335\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1026 +{\sp +{\sn shapeType} +{\sv 1} +} +{\sp +{\sn fFlipH} +{\sv 0} +} +{\sp +{\sn fFlipV} +{\sv 0} +} +{\sp +{\sn lTxid} +{\sv 65536} +} +{\sp +{\sn dhgt} +{\sv 251658240} +} +{\sp +{\sn fLayoutInCell} +{\sv 1} +} +{\shptxt \ltrpar \pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1038\langfe1033\langnp1038\insrsid5924912 C} +{\par } +} +} +} +} +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5924912 A\cell B\cell +} +\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +{\row } +\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 61de96e..6b628c3 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -149,6 +149,7 @@ public: void testN823655(); void testFdo66040(); void testN823675(); +void testFdo47802(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -283,6 +284,7 @@ void Test::run() {n823655.rtf, Test::testN823655}, {fdo66040.rtf, Test::testFdo66040}, {n823675.rtf, Test::testN823675}, +{fdo47802.rtf, Test::testFdo47802}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1377,6 +1379,14 @@ void Test::testN823675() CPPUNIT_ASSERT_EQUAL(OUString(Symbol), aFont.Name); } +void Test::testFdo47802() +{ +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +// Shape inside table was ignored. +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); commit 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e Author: Miklos Vajna vmik...@suse.cz Date: Fri Jun 28 16:47:49 2013 +0200 RTF import: support shapes inside tables This is a better fix for fdo#47802, now that shape import is no longer buffered. Change-Id: Idce6d11e6774d1fe7fc04b6a52d5b77a3879381e diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 31cc365..96bfce6 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1197,6 +1197,10 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t rBuffer) Mapper().endCharacterGroup(); else if (aPair.first == BUFFER_PAR) parBreak(); +else if (aPair.first == BUFFER_STARTSHAPE) +m_pSdrImport-resolve(aPair.second-getShape(), false); +else if (aPair.first == BUFFER_ENDSHAPE) +m_pSdrImport-close(); else SAL_WARN(writerfilter, should not happen); } @@ -1313,11 +1317,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_SHAPE; break; case RTF_SHPINST: -//
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65653, which changed state. Bug 65653 Summary: EDITING: Base crashes with queries with keyword LIKE in GUI-Mode https://bugs.freedesktop.org/show_bug.cgi?id=65653 What|Removed |Added Status|REOPENED|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-0' - cui/source
cui/source/tabpages/autocdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3367c767fec1b02f4493490e1ef5b2929dfbbd46 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 10:38:51 2013 +0100 Resolves: fdo#66403 infinite loop, typo i should be it Conflicts: cui/source/tabpages/autocdlg.cxx Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936 Reviewed-on: https://gerrit.libreoffice.org/4649 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a99ec37..f8a5fe5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1445,7 +1445,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet ) } } -for(std::vectorrtl::OUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i) +for(std::vectorrtl::OUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++it) { String* s = new String(*it); if(!pWrdList-insert(s).second) ___ 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' - cui/source
cui/source/tabpages/autocdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ce8756b9e9b76f3f4eac1d5e9209aef51f46c44 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 10:38:51 2013 +0100 Resolves: fdo#66403 infinite loop, typo i should be it Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936 (cherry picked from commit e21544132a6732334a14194e02232b28e559303b) Reviewed-on: https://gerrit.libreoffice.org/4648 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 2e11890..bfde63b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1434,7 +1434,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet ) } } -for(std::vectorOUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i) +for(std::vectorOUString::iterator it = rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++it) { String* s = new String(*it); if(!pWrdList-insert(s).second) ___ 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/filter/xml/xmlexprt.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8be462fde98a8f22f182b5b3e63657f7007ed165 Author: Laurent Godard lgodard.li...@laposte.net Date: Mon Jul 1 11:32:47 2013 +0200 the calculation of the progressbar leads to very slow saving Change-Id: Ibba31126161b77b499561c5a74c057a56c07a4a8 Reviewed-on: https://gerrit.libreoffice.org/4647 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 0062479..1943238 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2432,10 +2432,10 @@ void ScXMLExport::_ExportAutoStyles() if (xCellRangesQuery.is()) { Referencesheet::XSheetCellRanges xSheetCellRanges(xCellRangesQuery-queryContentCells(sheet::CellFlags::FORMATTED)); -Referencesheet::XSheetOperation xSheetOperation(xSheetCellRanges, uno::UNO_QUERY); -if (xSheetCellRanges.is() xSheetOperation.is()) +if (xSheetCellRanges.is()) { -sal_uInt32 nCount(sal_uInt32(xSheetOperation-computeFunction(sheet::GeneralFunction_COUNT))); +uno::Sequence table::CellRangeAddress aCellRangeAddresses (xSheetCellRanges-getRangeAddresses()); +sal_uInt32 nCount(aCellRangeAddresses.getLength()); Referencecontainer::XEnumerationAccess xCellsAccess(xSheetCellRanges-getCells()); if (xCellsAccess.is()) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - connectivity/source officecfg/registry sfx2/source
connectivity/source/resource/conn_shared_res.src |2 officecfg/registry/data/org/openoffice/Office/makefile.mk |4 + sfx2/source/doc/docfile.cxx | 35 +- 3 files changed, 37 insertions(+), 4 deletions(-) New commits: commit 335891f630924e6080ac887efd9aa8811404a307 Author: Oliver-Rainer Wittmann o...@apache.org Date: Mon Jul 1 09:54:24 2013 + 121143: SfxMedium - assure that name of internal used temporary file does not clash with SfxMedium's name diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 2bca9f9..02a17a2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -585,7 +585,9 @@ Reference XContent SfxMedium::GetContent() const SvStream* SfxMedium::GetInStream() { if ( pInStream ) +{ return pInStream; +} if ( pImp-pTempFile ) { @@ -601,13 +603,17 @@ SvStream* SfxMedium::GetInStream() pInStream = NULL; } else +{ return pInStream; +} } GetMedium_Impl(); if ( GetError() ) +{ return NULL; +} return pInStream; } @@ -2330,14 +2336,20 @@ void SfxMedium::GetMedium_Impl() //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor if ( !GetError() !pImp-xStream.is() !pImp-xInputStream.is() ) +{ SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); +} if ( !GetError() ) { if ( pImp-xStream.is() ) +{ pInStream = utl::UcbStreamHelper::CreateStream( pImp-xStream ); +} else if ( pImp-xInputStream.is() ) +{ pInStream = utl::UcbStreamHelper::CreateStream( pImp-xInputStream ); +} } pImp-bDownloadDone = sal_True; @@ -3455,7 +3467,15 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) aName = String(); } -pImp-pTempFile = new ::utl::TempFile(); +do +{ +pImp-pTempFile = new ::utl::TempFile(); +if ( GetName().Equals( pImp-pTempFile-GetURL() ) ) +{ +delete pImp-pTempFile; +pImp-pTempFile = NULL; +} +} while ( pImp-pTempFile == NULL ); pImp-pTempFile-EnableKillingFile( sal_True ); aName = pImp-pTempFile-GetFileName(); ::rtl::OUString aTmpURL = pImp-pTempFile-GetURL(); @@ -3551,9 +3571,20 @@ void SfxMedium::CreateTempFileNoCopy() { // this call always replaces the existing temporary file if ( pImp-pTempFile ) +{ delete pImp-pTempFile; +pImp-pTempFile = NULL; +} -pImp-pTempFile = new ::utl::TempFile(); +do +{ +pImp-pTempFile = new ::utl::TempFile(); +if ( GetName().Equals( pImp-pTempFile-GetURL() ) ) +{ +delete pImp-pTempFile; +pImp-pTempFile = NULL; +} +} while ( pImp-pTempFile == NULL ); pImp-pTempFile-EnableKillingFile( sal_True ); aName = pImp-pTempFile-GetFileName(); if ( !aName.Len() ) commit 8f23dda62c32085f8665483e38345ee13389860e Author: Andre Fischer a...@apache.org Date: Mon Jul 1 09:18:36 2013 + 122658: Fixed typo in localized string. Found by: jteera Reported by: Andrea Pescetti diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 442328c..dd2b0ec 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -396,7 +396,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME }; String STR_COULD_NOT_CREATE_INDEX_KEYSIZE { -Text [ en-US ] = The index could not be created. The size of the chosen column is to big.; +Text [ en-US ] = The index could not be created. The size of the chosen column is too big.; }; String STR_SQL_NAME_ERROR commit 4b22bc8d225baf9abab3e6c1d7153e7a851fb6ee Author: Jürgen Schmidt j...@apache.org Date: Mon Jul 1 09:15:37 2013 + #122619# mark Impress.xcu anmd PresenterScreen.xcu as localized diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk index aa97150..dac316d 100644 --- a/officecfg/registry/data/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk @@ -109,7 +109,9 @@ LOCALIZEDFILES= \ Embedding.xcu \ WebWizard.xcu \ FormWizard.xcu \ -Writer.xcu +Writer.xcu \ +Impress.xcu \ +PresenterScreen.xcu .INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit 49a454225e35699d7351faaba3d296e1858c6107 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 12:14:37 2013 +0200 fdo#66324 fix locking in webdav_ucp::Content::getResourceType() Crash in there while accessing an evidently deleted DAVResourceAccess instance with about 4 other threads also in various webdav_ucp::Content methods. The problem is apparently that the outer getResourceType() passes the m_xResAccess to the inner getResourceType(), which accesses it without locking the mutex, while another thread resets m_xResAccess and thereby deletes the current instance. (regression from 0c3500115c4fd86284a027fc32be704afcf77061) Change-Id: I1c67021c536e303d766c7ff93fb71e40f991f3af diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 4ad76c4..49e8655 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -3164,7 +3164,19 @@ Content::ResourceType Content::getResourceType( const uno::Reference ucb::XCommandEnvironment xEnv ) throw ( uno::Exception ) { -return getResourceType( xEnv, m_xResAccess ); +SAL_WNODEPRECATED_DECLARATIONS_PUSH +std::auto_ptr DAVResourceAccess xResAccess; +SAL_WNODEPRECATED_DECLARATIONS_POP +{ +osl::MutexGuard aGuard( m_aMutex ); +xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); +} +Content::ResourceType const ret = getResourceType( xEnv, xResAccess ); +{ +osl::Guard osl::Mutex aGuard( m_aMutex ); +m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); +} +return ret; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/crsr/swcrsr.cxx | 65 +--- sw/source/core/docnode/nodedump.cxx | 43 ++- 2 files changed, 45 insertions(+), 63 deletions(-) New commits: commit dc7498e4f0632c10a0019564d2e71b5403e40812 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Jun 28 17:04:49 2013 +0200 don't show section/table nodes as plain start nodes in debug dump Change-Id: I8b4901d98c210f5a3228981a2b180f2fcc06c768 diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 96e787a..01ba1d2 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -220,25 +220,36 @@ void SwStartNode::dumpAsXml( xmlTextWriterPtr w ) { WriterHelper writer( w ); const char* name = ???; -switch( GetStartNodeType()) +switch( GetNodeType() ) { -case SwNormalStartNode: -name = start; -break; -case SwTableBoxStartNode: -name = tablebox; -break; -case SwFlyStartNode: -name = fly; -break; -case SwFootnoteStartNode: -name = footnote; +case ND_TABLENODE: +name = table; break; -case SwHeaderStartNode: -name = header; +case ND_SECTIONNODE: +name = section; break; -case SwFooterStartNode: -name = footer; +default: +switch( GetStartNodeType()) +{ +case SwNormalStartNode: +name = start; +break; +case SwTableBoxStartNode: +name = tablebox; +break; +case SwFlyStartNode: +name = fly; +break; +case SwFootnoteStartNode: +name = footnote; +break; +case SwHeaderStartNode: +name = header; +break; +case SwFooterStartNode: +name = footer; +break; +} break; } writer.startElement( name ); commit ed1d006e1ab594ff0b64a41eadd1b8fe48ab0414 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jun 24 20:15:06 2013 +0200 remove strange #ifdefs, presumably a workaround for ancient compiler bug Change-Id: I77287909b88be01615e2aae302c48904c1adf933 diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 6b4a772..9dadc67 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -482,13 +482,6 @@ sal_Bool SwCursor::IsSelOvr( int eFlags ) return sal_False; } -#if defined( UNX ) -#define IDX (*pCellStt) -#else -#define IDX aCellStt -#endif - - sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr ) { SwCntntNode* pCNd = GetCntntNode(); @@ -540,32 +533,24 @@ sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr ) // search next valid box // if there is another StartNode after the EndNode of a cell then // there is another cell -#if defined( UNX ) -SwNodeIndex* pCellStt = new SwNodeIndex( *GetNode()- -FindTableBoxStartNode()-EndOfSectionNode(), 1 ); -#else SwNodeIndex aCellStt( *GetNode()-FindTableBoxStartNode()-EndOfSectionNode(), 1 ); -#endif sal_Bool bProt = sal_True; GoNextCell: do { -if( !IDX.GetNode().IsStartNode() ) +if( !aCellStt.GetNode().IsStartNode() ) break; -++IDX; -if( 0 == ( pCNd = IDX.GetNode().GetCntntNode() )) -pCNd = IDX.GetNodes().GoNext( IDX ); +++aCellStt; +if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() )) +pCNd = aCellStt.GetNodes().GoNext( aCellStt ); if( 0 == ( bProt = pCNd-IsProtect() )) break; -IDX.Assign( *pCNd-FindTableBoxStartNode()-EndOfSectionNode(), 1 ); +aCellStt.Assign( *pCNd-FindTableBoxStartNode()-EndOfSectionNode(), 1 ); } while( bProt ); SetNextCrsr: if( !bProt ) // found free cell { -GetPoint()-nNode = IDX; -#if defined( UNX ) -delete pCellStt; -#endif +GetPoint()-nNode = aCellStt; SwCntntNode* pTmpCNd = GetCntntNode(); if( pTmpCNd ) { @@ -576,19 +561,16 @@ SetNextCrsr: nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ); } // end of table, so go to next node -++IDX; +++aCellStt; SwNode* pNd; -if( ( pNd = IDX.GetNode())-IsEndNode() || HasMark()) +if( ( pNd = aCellStt.GetNode())-IsEndNode() || HasMark()) { // if only table in FlyFrame or SSelection then stay on old position
Hide and show slides from custom dialog
Hi, I am trying add a functionality for hide or show the slides included in a custom user presentation (menu Slide show - Custom slide show...). Objective: to print a custom in PDF, hiding the rest of slides and presenting only those chosen. Can anyone help? I think it's something important for teachers with different students, the same base but different levels slide. I have added the buttons Show and Hide to /libreoffice/sd/uiconfig/ui/customslideshows.ui with Glade: terminal: $ export GLADE_CATALOG_SEARCH_PATH=~/.../libreoffice/install/share/glade $ glade I add size for put two buttons: Show and Hide, code buttons: --code buttons in .../libreoffice/sd/uiconfig/ui/customslideshows.ui child object class=GtkButton id=show property name=label translatable=yesSho_w/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=use_action_appearanceFalse/property property name=use_underlineTrue/property /object packing property name=expandFalse/property property name=fillTrue/property property name=position7/property /packing /child child object class=GtkButton id=hide property name=label translatable=yes_Hide/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=use_action_appearanceFalse/property property name=use_underlineTrue/property /object packing property name=expandFalse/property property name=fillTrue/property property name=position8/property /packing /child --END code buttons in .../libreoffice/sd/uiconfig/ui/customslideshows.ui In /home/deb/Descargas/libreoffice/libreoffice/sd/source/ui/inc/custdlg.hxx I add: -- Change custdlg.hxx - class SdCustomShowDlg : public ModalDialog { private: ListBox* m_pLbCustomShows; CheckBox*m_pCbxUseCustomShow; PushButton* m_pBtnNew; PushButton* m_pBtnEdit; PushButton* m_pBtnRemove; PushButton* m_pBtnCopy; HelpButton* m_pBtnHelp; PushButton* m_pBtnStartShow; OKButton*m_pBtnOK; +PushButton* m_pBtnShow; +PushButton* m_pBtnHide; --END Change custdlg.hxx - In .../libreoffice/sd/source/ui/dlg/custdlg.cxx I add in constructor: get( m_pBtnStartShow, startshow ); get( m_pBtnOK, ok ); +get( m_pBtnShow, show ); +get( m_pBtnHide, hide ); get( m_pLbCustomShows, customshowlist); ... m_pCbxUseCustomShow-SetClickHdl( aLink ); m_pLbCustomShows-SetSelectHdl( aLink ); +m_pBtnShow-SetClickHdl( aLink ); +m_pBtnHide-SetClickHdl( aLink ); m_pBtnStartShow-SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test In function CheckState I add: void SdCustomShowDlg::CheckState() { sal_uInt16 nPos = m_pLbCustomShows-GetSelectEntryPos(); sal_Bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; m_pBtnEdit-Enable( bEnable ); m_pBtnRemove-Enable( bEnable ); m_pBtnCopy-Enable( bEnable ); m_pCbxUseCustomShow-Enable( bEnable ); m_pBtnStartShow-Enable( true ); +m_pBtnShow-Enable( bEnable ); +m_pBtnHide-Enable( bEnable ); if( bEnable ) pCustomShowList-Seek( nPos ); } Now the hard part: /** * ButtonHdl() */ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) { ... the buttons source implementation ... // show CustomShow else if( p == m_pBtnShow ) // or else if( p == m_pBtnShow || p == m_pBtnHide ) { sal_uInt16 nPos = m_pLbCustomShows-GetSelectEntryPos(); sal_Bool bDifferent = sal_False; if( nPos != LISTBOX_ENTRY_NOTFOUND ) { DBG_ASSERT( pCustomShowList, pCustomShowList does not exist ); pCustomShow = (*pCustomShowList)[ nPos ]; bDifferent = sal_True; for( pCustomShow = (SdCustomShow*) pCustomShowList-First(); pCustomShow != NULL bDifferent; pCustomShow = (SdCustomShow*) pCustomShowList-Next() ) { // What code will I put here? if (p == m_pBtnShow ) { HERE } else { HERE } //if( aStr == OUString( pCustomShow-GetName() ) ) //bDifferent = sal_False; } } } Is right the actual code? (loop, ...) I have seen code for hide or show the slides in /core/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx HIDE: case SID_HIDE_SLIDE: ChangeSlideExclusionState(model::SharedPageDescriptor(), true); SHOW: case SID_SHOW_SLIDE ChangeSlideExclusionState(model::SharedPageDescriptor(), false); Or for selections in /core/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx 234 void SelectionManager::SelectionHasChanged
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/inc sw/source sw/UIConfig_swriter.mk
include/sfx2/sfxsids.hrc |1 + sc/inc/sc.hrc |3 ++- sw/UIConfig_swriter.mk |1 + sw/source/ui/envelp/labfmt.cxx |3 ++- sw/source/ui/envelp/labfmt.hrc |3 +-- sw/source/ui/envelp/labfmt.src |6 -- 6 files changed, 7 insertions(+), 10 deletions(-) New commits: commit 257ba103fb9ffae87189eb5d435969961fe4e98c Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 11:46:05 2013 +0100 Resolves: fdo#66263 calc's protect records doesn't do anything, sid collision Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index d1227e3..f17124a 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -750,6 +750,7 @@ #define SC_VIEW_START (SID_SC_START) #endif #define FID_CHG_RECORD (EDIT_MENU_START + 18) +//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries #define SID_CHG_PROTECT (SC_VIEW_START + 84) // eof diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e0bbdca..5bfe313 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -123,6 +123,7 @@ #define SID_NUMBER_DECDEC (SC_VIEW_START + 58) // misc: +#define SID_COLLABORATION (SC_VIEW_START + 59) #define SID_LINKS (SC_VIEW_START + 60) #define SID_INSERT_SIMAGE (SC_VIEW_START + 61) #define SID_INSERT_SMATH(SC_VIEW_START + 63) @@ -153,7 +154,7 @@ #define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) #define SID_EURO_CONVERTER (SC_VIEW_START + 83) -#define SID_COLLABORATION (SC_VIEW_START + 84) +//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84) #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85) #define SID_SC_INPUT_TEXTWYSIWYG(SC_VIEW_START + 86) commit 14c619f10f88dd42c4f8af05aa6a1daabe11475e Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 10:38:00 2013 +0100 convert predefined label warning dialog to .ui Change-Id: I6f7cbc6aea1acbd7c803cd418ba2e9ed71fb2c50 diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index b0a2966..f85c018 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/autotext \ sw/uiconfig/swriter/ui/bibliographyentry \ sw/uiconfig/swriter/ui/bulletsandnumbering \ + sw/uiconfig/swriter/ui/cannotsavelabeldialog \ sw/uiconfig/swriter/ui/captionoptions \ sw/uiconfig/swriter/ui/characterproperties \ sw/uiconfig/swriter/ui/charurlpage \ diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 770ae65..89d12f4 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -18,6 +18,7 @@ */ #include tools/poly.hxx +#include vcl/layout.hxx #include viewopt.hxx #include swtypes.hxx @@ -631,7 +632,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) if ( rCfg.IsPredefinedLabel(sMake, sType) ) { SAL_WARN( sw.envelp, label is predefined and cannot be overwritten ); -WarningBox( this, SW_RES( WB_PREDEFINED_LABEL ) ).Execute(); +MessageDialog(this, CannotSaveLabelDialog, modules/swriter/ui/cannotsavelabeldialog.ui).Execute(); return 0; } String sTmp(aQueryMB.GetMessText()); diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc index 7469b93..00c5eca 100644 --- a/sw/source/ui/envelp/labfmt.hrc +++ b/sw/source/ui/envelp/labfmt.hrc @@ -72,11 +72,10 @@ #define STR_ROWS (RC_LABFMT_BEGIN + 8) #define STR_PWIDTH (RC_LABFMT_BEGIN + 9) #define STR_PHEIGHT (RC_LABFMT_BEGIN + 10) -#define WB_PREDEFINED_LABEL (RC_LABFMT_BEGIN + 11) // overflow check -#define LABFMT_ACT_END WB_PREDEFINED_LABEL +#define LABFMT_ACT_END STR_PHEIGHT #if LABFMT_ACT_END RC_LABFMT_END #error Resource overflow in #file, #line diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 96efd28..2be92d7 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.src @@ -303,12 +303,6 @@ String STR_PHEIGHT { Text [ en-US ] = Page Height ; }; -WarningBox WB_PREDEFINED_LABEL -{ -BUTTONS = WB_OK; -DEFBUTTON = WB_DEF_OK; -Message [ en-US ] = Predefined labels cannot be overwritten, use another name. ; -}; ModalDialog DLG_SAVE_LABEL { HelpID = HID_SAVE_LABEL_DLG ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/resource/conn_shared_res.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53a08b03a88e7f6c387988c01f7c6e2183967176 Author: Andre Fischer a...@apache.org Date: Mon Jul 1 09:18:36 2013 + 122658: Fixed typo in localized string. Found by: jteera Reported by: Andrea Pescetti (cherry picked from commit 8f23dda62c32085f8665483e38345ee13389860e) diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index a5133d0..b98a560 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -395,7 +395,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME }; String STR_COULD_NOT_CREATE_INDEX_KEYSIZE { -Text [ en-US ] = The index could not be created. The size of the chosen column is to big.; +Text [ en-US ] = The index could not be created. The size of the chosen column is too big.; }; String STR_SQL_NAME_ERROR ___ 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' - 8f/23dda62c32085f8665483e38345ee13389860e
8f/23dda62c32085f8665483e38345ee13389860e |1 + 1 file changed, 1 insertion(+) New commits: commit 3582e4b0451b9b4ce8ca01edd3ec5a2fa0c15be2 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 11:59:34 2013 +0100 Notes added by 'git notes add' diff --git a/8f/23dda62c32085f8665483e38345ee13389860e b/8f/23dda62c32085f8665483e38345ee13389860e new file mode 100644 index 000..e715aca --- /dev/null +++ b/8f/23dda62c32085f8665483e38345ee13389860e @@ -0,0 +1 @@ +merged as: 53a08b03a88e7f6c387988c01f7c6e2183967176 ___ 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' - 4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee
4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee |1 + 1 file changed, 1 insertion(+) New commits: commit 5700b06de74af1b6f813da5d230ac46ae60112c0 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:04:26 2013 +0100 Notes added by 'git notes add' diff --git a/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee b/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/4b/22bc8d225baf9abab3e6c1d7153e7a851fb6ee @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 33/5891f630924e6080ac887efd9aa8811404a307
33/5891f630924e6080ac887efd9aa8811404a307 |1 + 1 file changed, 1 insertion(+) New commits: commit 18804332a7f6207fefc586ec795556c11c6a2896 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:06:57 2013 +0100 Notes added by 'git notes add' diff --git a/33/5891f630924e6080ac887efd9aa8811404a307 b/33/5891f630924e6080ac887efd9aa8811404a307 new file mode 100644 index 000..7f418a2 --- /dev/null +++ b/33/5891f630924e6080ac887efd9aa8811404a307 @@ -0,0 +1 @@ +prefer: c6560c6f07f7f71842d7314157feaca2fa4a03c9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/solaris.mk | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) New commits: commit 99a4baf89c470d1e73b4e87fe9adf37a09230a2c Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 13:27:54 2013 +0200 gbuild: sync solaris.mk linker invocation with unxgcc.mk Change-Id: Ib7ef6fe87673c601ad3c24f3ed3f382c039551f4 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 20fc2a9..240204c 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -171,7 +171,9 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ + $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \ + $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ + $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -181,13 +183,16 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ + -Wl$(COMMA)--no-as-needed \ $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib) \ - -o $(1)) + -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) + $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) $(if $(filter Library,$(TARGETTYPE)),\ - $(NM) --extern-only --dynamic --format=posix $(1) \ - | cut -d' ' -f1-2 | grep -v U$$ \ -$(1).exports.tmp \ + readelf -d $(1) | grep SONAME $(1).exports.tmp ; \ + $(NM) --dynamic --extern-only --defined-only --format=posix $(1) \ + | cut -d' ' -f1-2 \ +$(1).exports.tmp \ if cmp -s $(1).exports.tmp $(1).exports; \ then rm $(1).exports.tmp; \ else mv $(1).exports.tmp $(1).exports; touch -r $(1) $(1).exports; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) New commits: commit ba8bcc2681d8e9788ae2d6fef11308d5f0fcae05 Author: Yong Lin Ma mayo...@apache.org Date: Tue Jul 10 02:29:03 2012 + Resolves: #i119994# Range picker dialog is changed to modal mode wrongly Patch by: Peng YunQuan Review by: mayongl Reported by: Yan Ji (cherry picked from commit 94c8978a16536738bbad7a52cdfb9f37a4d19ed0) Change-Id: I66bb91bf07a5c52b2a5e2b2a91187ac9580fbb0a diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index aca80f1b..0a63d25 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1083,8 +1083,21 @@ void Dialog::SetModalInputMode( sal_Bool bModal ) mpPrevExecuteDlg-EnableInput( sal_True, sal_True, sal_True, this ); // ensure continued modality of prev dialog // do not change modality counter -mpPrevExecuteDlg-SetModalInputMode( sal_False ); -mpPrevExecuteDlg-SetModalInputMode( sal_True ); + + +// #i119994# need find the last modal dialog before reactive it +Dialog * pPrevModalDlg = mpPrevExecuteDlg; + +while( pPrevModalDlg !pPrevModalDlg-IsModalInputMode() ) +pPrevModalDlg = pPrevModalDlg-mpPrevExecuteDlg; + +if( pPrevModalDlg +( pPrevModalDlg == mpPrevExecuteDlg +|| !pPrevModalDlg-IsWindowOrChild( this, sal_True ) ) ) +{ +mpPrevExecuteDlg-SetModalInputMode( sal_False ); +mpPrevExecuteDlg-SetModalInputMode( sal_True ); +} } } } ___ 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' - 94/c8978a16536738bbad7a52cdfb9f37a4d19ed0
94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 |1 + 1 file changed, 1 insertion(+) New commits: commit 568acb50246dac4dcbc82c323724bdbfaac97a2b Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:35:12 2013 +0100 Notes added by 'git notes add' diff --git a/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 b/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 new file mode 100644 index 000..28c60f0 --- /dev/null +++ b/94/c8978a16536738bbad7a52cdfb9f37a4d19ed0 @@ -0,0 +1 @@ +merged as: ba8bcc2681d8e9788ae2d6fef11308d5f0fcae05 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source unotest/source unusedcode.easy
sd/source/ui/remotecontrol/BluetoothServer.cxx |5 - sd/source/ui/view/ViewShellBase.cxx|7 --- unotest/source/cpp/bootstrapfixturebase.cxx| 12 unusedcode.easy|3 --- 4 files changed, 27 deletions(-) New commits: commit 6a59659541e45198b8cda162f87f6abcd68c6101 Author: Petr Vorel petr.vo...@gmail.com Date: Thu Jun 27 21:36:48 2013 +0200 Remove unused code Change-Id: Id789250d6aeae642ef5c712e33c5583628638218 Reviewed-on: https://gerrit.libreoffice.org/4604 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index ce8bc3c..37836ee 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -274,11 +274,6 @@ bluezDetachCloseSocket( GMainContext *pContext, GPollFD *pSocketFD ) #endif // LINUX_BLUETOOTH -void BluetoothServer::addCommunicator( Communicator* pCommunicator ) -{ -mpCommunicators-push_back( pCommunicator ); -} - #if defined(MACOSX) OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) : diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 66707c3..b1e671fa 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -223,13 +223,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell); // new ViewShellBase object has been constructed. SfxViewFactory* ViewShellBase::pFactory; -SfxViewShell* ViewShellBase::CreateInstance ( -SfxViewFrame *pFrame, SfxViewShell *pOldView) -{ -ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView); -pBase-LateInit(); -return pBase; -} SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) { diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 2192b79..1ffab1e 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -76,18 +76,6 @@ OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) return m_aSrcRootPath + OUString::createFromAscii( pPath ); } - -OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) -{ -return m_aWorkdirRootURL + OUString::createFromAscii( pPath ); -} - -OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) -{ -return m_aWorkdirRootPath + OUString::createFromAscii( pPath ); - -} - void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template diff --git a/unusedcode.easy b/unusedcode.easy index 8a9bec0..50ec494 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -43,6 +43,3 @@ sd::BluetoothServer::addCommunicator(sd::Communicator*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) -sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*) -test::BootstrapFixtureBase::getPathFromWorkdir(char const*) -test::BootstrapFixtureBase::getURLFromWorkdir(char const*) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
Hi, because I need to work on a consolidated tar.gz source version, I'm not using master, so I cannot pull changes at the moment. Can you suggest me what modifications I need? Gabriele. -- Da: Michael Stahl A: Gabriele Bulfon Cc: libreoffice@lists.freedesktop.org Raffaele Fullone Jonathan Adams Data: 1 luglio 2013 13.34.58 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On 01/07/13 11:03, Gabriele Bulfon wrote: [build LNK] Library/libuno_sal.so ERROR: aux-target missing, library deleted, please try running make again make[2]: *** [/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Library//libuno_sal.so.3] Error 1 Running make again as suggested, repeats the error. Any idea? apparently the solaris.mk is out of sync with the unxgcc.mk from which it was copied; i've pushed 99a4baf89c470d1e73b4e87fe9adf37a09230a2c to fix the dynamic link command. this duplication needs to be reverted in the long run, solaris.mk should include unxgcc.mk. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui | 34 1 file changed, 34 insertions(+) New commits: commit 20661599f402cda97915e77667368422a2382b78 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:41:44 2013 +0100 add missing .ui Change-Id: I3cf3d730fee95a54d8b51779835eda8d24d50ff3 diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui new file mode 100644 index 000..20e19961 --- /dev/null +++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=CannotSaveLabelDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesCannot add label/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typeerror/property +property name=buttonsok/property +property name=text translatable=yesCannot add label/property +property name=secondary_text translatable=yesPredefined labels cannot be overwritten, use another name./property +child internal-child=vbox + object class=GtkBox id=messagedialog-vbox +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing24/property +child internal-child=action_area + object class=GtkButtonBox id=messagedialog-action_area +property name=can_focusFalse/property +property name=layout_styleend/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child + /object +/child + /object +/interface ___ 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' - a1/817251fd384d58a3942d28849723ac84bd315d
a1/817251fd384d58a3942d28849723ac84bd315d |1 + 1 file changed, 1 insertion(+) New commits: commit f8ebd9c1dc59afcec3d882ee92d09dd733e3ec98 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:45:33 2013 +0100 Notes added by 'git notes add' diff --git a/a1/817251fd384d58a3942d28849723ac84bd315d b/a1/817251fd384d58a3942d28849723ac84bd315d new file mode 100644 index 000..c46ad7e --- /dev/null +++ b/a1/817251fd384d58a3942d28849723ac84bd315d @@ -0,0 +1 @@ +ignore: We have a totally different pivot cache code now ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/vector/b2ivector.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee5ea3b629c55f628ee23078f4c1800d83b8514b Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:51:22 2013 +0100 fOne should be 1.0 not 10.0 Change-Id: I1e51ea9f06be698641287e8d85a5288220879d3f diff --git a/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx index ff3cade..b2cfb7b 100644 --- a/basegfx/source/vector/b2ivector.cxx +++ b/basegfx/source/vector/b2ivector.cxx @@ -51,7 +51,7 @@ namespace basegfx if(!::basegfx::fTools::equalZero(fLenNow)) { -const double fOne(10.0); +const double fOne(1.0); if(!::basegfx::fTools::equal(fOne, fLenNow)) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unocrsrhelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3090cfc972287da3fbdc567387527b65b3bfd128 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 12:56:17 2013 +0100 Resolves: rhbz#979758 crash on 'Diagrammen in LibreOffice' help page Change-Id: I269846840b8e2f67838da525c020a305901cf903 diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index deeb5ba..66202c0 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -176,7 +176,7 @@ void GetSelectableFromAny(uno::Referenceuno::XInterface const xIfc, if (pRanges) { SwUnoCrsr const* pUnoCrsr = pRanges-GetCursor(); -if (pUnoCrsr-GetDoc() == rTargetDoc) +if (pUnoCrsr pUnoCrsr-GetDoc() == rTargetDoc) { o_rpPaM = lcl_createPamCopy(*pUnoCrsr); } ___ 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' - vcl/source
vcl/source/gdi/outdev3.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c150dd7fdc593dd320f6bd67828d769312517e81 Author: Sean Young s...@mess.org Date: Sat May 25 20:06:15 2013 +0100 fix OUString conversion This used to be equalsAscii( hg, 0, 2 ) before conversion. Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 Change-Id: I2cf61d88c79b3ab33c0ee7d077ee65b16053c05c Reviewed-on: https://gerrit.libreoffice.org/4035 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d5d019a..3b8e3c5 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2392,7 +2392,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern rFSD, // #114999# special emboldening for Ricoh fonts // TODO: smarter check for special cases by using PreMatch infrastructure? if( (rFSD.GetWeight() WEIGHT_MEDIUM) - aSearchName.equalsIgnoreAsciiCase( hg ) ) + aSearchName.startsWithIgnoreAsciiCase( hg ) ) { OUString aBoldName; if( aSearchName.equalsIgnoreAsciiCase( hggothicb ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source
chart2/source/inc/InternalDataProvider.hxx |9 +-- chart2/source/tools/ChartModelHelper.cxx | 33 ++- chart2/source/tools/InternalDataProvider.cxx | 17 +++-- 3 files changed, 53 insertions(+), 6 deletions(-) New commits: commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c Author: Armin Le Grand a...@apache.org Date: Mon Jul 1 10:43:33 2013 + i120559 Corrected load for charts without RangeString bu twith local row-oriented data diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 4272c58..2596467 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -75,8 +75,13 @@ class InternalDataProvider : { public: explicit InternalDataProvider(const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext _xContext); -explicit InternalDataProvider( const ::com::sun::star::uno::Reference - ::com::sun::star::chart2::XChartDocument xChartDoc, bool bConnectToModel ); + +// #120559# allow handing over a default for data orientation (DataInColumns) that will +// be used when no data is available +explicit InternalDataProvider( +const ::com::sun::star::uno::Reference ::com::sun::star::chart2::XChartDocument xChartDoc, +bool bConnectToModel, +bool bDefaultDataInColumns ); explicit InternalDataProvider( const InternalDataProvider rOther ); virtual ~InternalDataProvider(); diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index a743c9f..563c15a 100755 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -43,6 +43,9 @@ // header for define DBG_ASSERT #include tools/debug.hxx +#include com/sun/star/chart/XChartDocument.hpp +#include com/sun/star/chart/ChartDataRowSource.hpp + //. namespace chart { @@ -59,7 +62,35 @@ uno::Reference chart2::data::XRangeHighlighter ChartModelHelper::createRangeH uno::Reference chart2::data::XDataProvider ChartModelHelper::createInternalDataProvider( const uno::Reference ::com::sun::star::chart2::XChartDocument xChartDoc, bool bConnectToModel ) { -return new InternalDataProvider( xChartDoc, bConnectToModel ); +bool bDefaultDataInColumns(true); + +// #120559# Try to access the current state of DataRowSource fo rthe chart data and +// use it as default for creating a new InternalDataProvider +if(xChartDoc.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::chart::XChartDocument xDoc(xChartDoc, uno::UNO_QUERY); + +if(xDoc.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::chart::XDiagram aDiagram = xDoc-getDiagram(); + +if(aDiagram.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet xProp(aDiagram, uno::UNO_QUERY); + +if(xProp.is()) +{ +::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS); + +xProp-getPropertyValue( ::rtl::OUString::createFromAscii(DataRowSource)) = aDataRowSource; + +bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource); +} +} +} +} + +return new InternalDataProvider( xChartDoc, bConnectToModel, bDefaultDataInColumns ); } uno::Reference XDiagram ChartModelHelper::findDiagram( const uno::Reference frame::XModel xModel ) diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index d904adf..7c1fc27 100755 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -337,8 +337,11 @@ InternalDataProvider::InternalDataProvider( const Reference uno::XComponentCont : m_bDataInColumns( true ) {} -InternalDataProvider::InternalDataProvider( const Reference chart2::XChartDocument xChartDoc, bool bConnectToModel ) -: m_bDataInColumns( true ) +InternalDataProvider::InternalDataProvider( +const Reference chart2::XChartDocument xChartDoc, +bool bConnectToModel, +bool bDefaultDataInColumns) +: m_bDataInColumns( bDefaultDataInColumns ) { try { @@ -353,7 +356,15 @@ InternalDataProvider::InternalDataProvider( const Reference chart2::XChartDocum bool bFirstCellAsLabel = true; bool bHasCategories = true; uno::Sequence sal_Int32 aSequenceMapping; -DataSourceHelper::detectRangeSegmentation( xChartModel, aRangeString, aSequenceMapping, m_bDataInColumns, bFirstCellAsLabel, bHasCategories ); +const bool
[Libreoffice-commits] core.git: sal/textenc svtools/source
sal/textenc/tencinfo.cxx | 12 ++-- svtools/source/misc/sampletext.cxx |4 ++-- svtools/source/table/defaultinputhandler.cxx |2 +- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6c912701dc9fd82dc1fec0481119f3c9d753e161 Author: Takeshi Abe t...@fixedpoint.jp Date: Mon Jul 1 21:00:55 2013 +0900 Mark as const Change-Id: Ic71f39aaebf07d3b0435882986be71cf2b0390c2 diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index ded6bc5..ccbfe40 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -294,32 +294,32 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { NULL, RTL_TEXTENCODING_DONTKNOW } }; -static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0208Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0208 } }; -static ImplStrCharsetDef aUnixCharsetJISX0201Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0201Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0201 } }; -static ImplStrCharsetDef aUnixCharsetJISX0212Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0212Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0212 } }; -static ImplStrCharsetDef aUnixCharsetGBTab[] = +static ImplStrCharsetDef const aUnixCharsetGBTab[] = { { NULL, RTL_TEXTENCODING_GB_2312 } }; -static ImplStrCharsetDef aUnixCharsetGBKTab[] = +static ImplStrCharsetDef const aUnixCharsetGBKTab[] = { { NULL, RTL_TEXTENCODING_GBK } }; -static ImplStrCharsetDef aUnixCharsetBIG5Tab[] = +static ImplStrCharsetDef const aUnixCharsetBIG5Tab[] = { { NULL, RTL_TEXTENCODING_BIG5 } }; diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index bacde29..f3279c9 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -92,9 +92,9 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice) } } -static sal_Unicode aImplSymbolFontText[] = { +static const sal_Unicode aImplSymbolFontText[] = { 0xF021,0xF032,0xF043,0xF054,0xF065,0xF076,0xF0B7,0xF0C8,0}; -static sal_Unicode aImplStarSymbolText[] = { +static const sal_Unicode aImplStarSymbolText[] = { 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0}; const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText; OUString sSampleText(pText); diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx index ed47403..ff098f2 100644 --- a/svtools/source/table/defaultinputhandler.cxx +++ b/svtools/source/table/defaultinputhandler.cxx @@ -147,7 +147,7 @@ namespace svt { namespace table sal_uInt16 nKeyModifier; TableControlAction eAction; } -static aKnownActions[] = { +static const aKnownActions[] = { { KEY_DOWN, 0, cursorDown }, { KEY_UP, 0, cursorUp }, { KEY_LEFT, 0, cursorLeft }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 1b5763c40686c8ca3f6e26f9b495bca57271872c Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 14:10:59 2013 +0200 BluetoothServer::addCommunicator not unused after all was erroneously removed in 6a59659541e45198b8cda162f87f6abcd68c6101 Change-Id: Ib95fccaaccb8baf269f7d393af00d9b95b25161a diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 37836ee..f8843ea 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -420,6 +420,11 @@ void incomingCallback( void *userRefCon, pCommunicator-launch(); } +void BluetoothServer::addCommunicator( Communicator* pCommunicator ) +{ +mpCommunicators-push_back( pCommunicator ); +} + #endif // MACOSX #ifdef LINUX_BLUETOOTH ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
On Mon, Jul 1, 2013 at 6:39 AM, Gabriele Bulfon gabriele.bul...@sonicle.com wrote: Hi, because I need to work on a consolidated tar.gz source version, I'm not using master, so I cannot pull changes at the moment. Can you suggest me what modifications I need? http://cgit.freedesktop.org/libreoffice/core/commit/? id=99a4baf89c470d1e73b4e87fe9adf37a09230a2c Thanks Norbert :) it worked great ;) Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx
include/svx/svdoashp.hxx |2 - include/svx/svdoattr.hxx | 10 include/svx/svdomeas.hxx | 56 +++ 3 files changed, 34 insertions(+), 34 deletions(-) New commits: commit 3c26d63b22f9ae2b4c2cb90f4b1218985f1d6131 Author: Chris Hoppe hop...@gmail.com Date: Mon Jul 1 13:10:56 2013 +0100 Translate German comments. Change-Id: Ibdd5bb021973624c1bb2a0e7bbbebd15fca5c731 diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ee7e11b..91890dc 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -30,7 +30,7 @@ #include svx/svxdllapi.h // -// Vorausdeklarationen +// Initial Declarations // class SdrObjList; diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 46f1da0..c6c62d4 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -29,7 +29,7 @@ #include svx/svxdllapi.h // -// Vorausdeklarationen +// Initial Declarations // class SfxPoolItem; @@ -53,10 +53,10 @@ protected: Rectangle maSnapRect; protected: -// Strichstaerke ermitteln. Keine Linie - 0. +/// Detects the width of the line. No line -0. sal_Int32 ImpGetLineWdt() const; -// Zuhoeren, ob sich ein StyleSheet aendert +/// Detects when a stylesheet is changed virtual void Notify(SfxBroadcaster rBC, const SfxHint rHint); SdrAttrObj(); @@ -65,10 +65,10 @@ protected: public: TYPEINFO(); -// Feststellen, ob bFilledObj Fuellung!=FillNone +// Detects if bFilledObj Fill != FillNone sal_Bool HasFill() const; -// Feststellen, ob Linie!=LineNone +// Detects if Line != LineNone sal_Bool HasLine() const; virtual const Rectangle GetSnapRect() const; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 39018d1..8076635 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -25,7 +25,7 @@ #include editeng/measfld.hxx // -// Vorausdeklarationen +// Initial Declarations // class SdrOutliner; @@ -37,7 +37,7 @@ namespace sdr { namespace properties { }} // -// Hilfsklasse SdrMeasureObjGeoData +// Auxiliary Class SdrMeasureObjGeoData // class SdrMeasureObjGeoData : public SdrTextObjGeoData @@ -156,52 +156,52 @@ public: // // Creating: // ~ -// Dragging von Bezugspunkt 1 zu Bezugspunkt 2 - Bezugskante +// dragging reference point 1 to reference point 2 - reference edge // -// Die Defaults: +// Defaults: // ~ -// Masslinie und Masshilfslinien: Haarlinien solid schwarz -// Pfeile: 2mm x 4mm -// Textgroesse +// dimension line and auxiliary dimension lines: solid black hairlines +// arrows : 2mm x 4mm +// text size // ___ -// |Masszahl | 2mm +// |dimension | 2mm // |-|--- // | | 8mm // | | -//Pt1#Pt2-- Bezugskante (von Pt1 nach Pt2) -// # # |___ - Ueberstand der Masshilfslinie(n) +//Pt1#Pt2-- reference edge (from Pt1 to Pt2) +// # # |___ -excess length of the auxiliary dimention line(s) // # #=# -// # Zu bemassendes Objekt # +// # objected to be dimensioned # // #===# // -// Attribute: +// Attributes: // ~~ -// 1. Wo steht der Text: mitte, rechts oder links (def=automatik) -// 2. Text oberhalb der Linie oder unterhalb oder Linie unterbrochen durch Text (def=automatik) -// 3. Den Abstand der Masslinie zur Bezugskante (=zum bemassten Objekt). +// 1. Where is the text: middle, right or left (default=automatic) +// 2. Text above or below the line or line broken by text (default=automatic) //Default=8mm -// 4. Masslinie unterhalb der Bezugskante (default=nein) -// 5. Die Ueberlaenge(n) der Masshilfslinien ueber die Bezugskante (2x, default=0) -// 6. Den Ueberhang der Masshilfslinien ueber die Masslinie (default=2mm) -// 7. Den Abstand der Masshilfslinien zur Bezugskante +// 3. The distance from the dimension line to the reference edge (= to the dimesnioned object) +// 4. dimension line below the reference edge (default=no)) +// 5. excess lenth of the auxiliary dimension lines beyond the reference edge (2x, default=0) +// 6. excess lenth of the auxiliary dimension lines past the dimesion line (default=2mm) +// 7. distance between the
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |4 +- vcl/source/gdi/outdev3.cxx | 72 ++--- 2 files changed, 6 insertions(+), 70 deletions(-) New commits: commit 92ffe57f6bf40ec0f19e2abed24721137c569063 Author: Khaled Hosny khaledho...@eglug.org Date: Sat Jun 15 14:24:21 2013 +0200 Donât shrink text from fallback fonts This code is bogus in multiple ways: * It scales text based on ascent or descent, but this makes no sense as those control line height and nothing else, if one is to scale two different fonts to âfitâ together, cap or x height would be more appropriate. This results in some text being ridiculously shrunk. * Not only that, but it is comparing apples to oranges; original font ascent/descent with the bounding box of the fallback glyphs, which results in different scale ratios depending on the shape of the glyphs at hand, which leads to all sorts of funny and irregular text. * Even worse, the PDF export is completely broken in this case; it uses the scaled down glyph widths but the unscaled font size, resulting in cramped unreadable text. Change-Id: Iaa6117ecfdad837d9a03b538e7327544ad5e Reviewed-on: https://gerrit.libreoffice.org/4293 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index b97f416..688d75d 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -541,9 +541,9 @@ public: // Helper for line geometry paint with support for graphic expansion (pattern and fat_to_area) void impPaintLineGeometryWithEvtlExpand(const LineInfo rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon); -SAL_DLLPRIVATE SalLayout* getFallbackFontThatFits(ImplFontEntry rFallbackFont, +SAL_DLLPRIVATE SalLayout* getFallbackFont(ImplFontEntry rFallbackFont, FontSelectPattern rFontSelData, int nFallbackLevel, -ImplLayoutArgs rLayoutArgs, const ImplFontMetricData rOrigMetric) const; +ImplLayoutArgs rLayoutArgs) const; protected: OutputDevice(); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 38f1f25..999f703 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -5877,9 +5877,9 @@ SalLayout* OutputDevice::ImplLayout( const OUString rOrigStr, sal_Int32 nMinInd return pSalLayout; } -SalLayout* OutputDevice::getFallbackFontThatFits(ImplFontEntry rFallbackFont, +SalLayout* OutputDevice::getFallbackFont(ImplFontEntry rFallbackFont, FontSelectPattern rFontSelData, int nFallbackLevel, -ImplLayoutArgs rLayoutArgs, const ImplFontMetricData rOrigMetric) const +ImplLayoutArgs rLayoutArgs) const { rFallbackFont.mnSetFontFlags = mpGraphics-SetFont( rFontSelData, nFallbackLevel ); @@ -5896,68 +5896,8 @@ SalLayout* OutputDevice::getFallbackFontThatFits(ImplFontEntry rFallbackFont, return NULL; } -Rectangle aBoundRect; -bool bHaveBounding = false; -Rectangle aRectangle; - pFallback-AdjustLayout( rLayoutArgs ); -// All we care about here is getting the vertical bounds of this text and -// make sure it will fit inside the available space -Point aPos; -for( int nStart = 0;;) -{ -sal_GlyphId nLGlyph; -if( !pFallback-GetNextGlyphs( 1, nLGlyph, aPos, nStart ) ) -break; - -sal_GlyphId nFontTag = nFallbackLevel GF_FONTSHIFT; -nLGlyph |= nFontTag; - -// get bounding rectangle of individual glyph -if( mpGraphics-GetGlyphBoundRect( nLGlyph, aRectangle ) ) -{ -// merge rectangle -aRectangle += aPos; -aBoundRect.Union( aRectangle ); -bHaveBounding = true; -} -} - -// Shrink it down if it won't fit -if (bHaveBounding) -{ -long nGlyphsAscent = -aBoundRect.Top(); -float fScaleTop = nGlyphsAscent rOrigMetric.mnAscent ? -rOrigMetric.mnAscent/(float)nGlyphsAscent : 1; -long nGlyphsDescent = aBoundRect.Bottom(); -float fScaleBottom = nGlyphsDescent rOrigMetric.mnDescent ? -rOrigMetric.mnDescent/(float)nGlyphsDescent : 1; -float fScale = fScaleBottom fScaleTop ? fScaleBottom : fScaleTop; -if (fScale 1) -{ -long nOrigHeight = rFontSelData.mnHeight; -long nNewHeight = static_castint(static_castfloat(rFontSelData.mnHeight) * fScale); - -if (nNewHeight == nOrigHeight) ---nNewHeight; - -pFallback-Release(); - -rFontSelData.mnHeight = nNewHeight; -rFallbackFont.mnSetFontFlags = mpGraphics-SetFont( rFontSelData, nFallbackLevel ); -rFontSelData.mnHeight = nOrigHeight; - -
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par3.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 5c3f673c1ff25c835da6b905a63b36087aaa405e Author: Mark Wielaard m...@klomp.org Date: Sun Jun 30 17:07:05 2013 +0200 Robustify WW8FormulaControl::FormulaRead reading SvStream. The operator of SvStream doesn't initialize a variable if the stream is faulty. So initialize the variables before usage to prevent reading wrong/random bits. Change-Id: Ia66dd6d8574c36e7229a58347f2e2c1e0fe2e248 Reviewed-on: https://gerrit.libreoffice.org/4636 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 6f2375f..e00b6d2 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2176,7 +2176,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { sal_uInt8 nField; // nHeaderBype == version -sal_uInt32 nHeaderByte; +sal_uInt32 nHeaderByte = 0; // The following is a FFData structure as described in // Microsoft's DOC specification (chapter 2.9.78) @@ -2185,9 +2185,9 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, // might be better to read the bits as a 16 bit word // ( like it is in the spec. ) -sal_uInt8 bits1; +sal_uInt8 bits1 = 0; *pDataStream bits1; -sal_uInt8 bits2; +sal_uInt8 bits2 = 0; *pDataStream bits2; sal_uInt8 iType = ( bits1 0x3 ); @@ -2199,10 +2199,10 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, sal_uInt8 iRes = (bits1 0x7C) 2; -sal_uInt16 cch; +sal_uInt16 cch = 0; *pDataStream cch; -sal_uInt16 hps; +sal_uInt16 hps = 0; *pDataStream hps; // xstzName @@ -2241,9 +2241,9 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { bool bAllOk = true; // SSTB (see Spec. 2.2.4) -sal_uInt16 fExtend; +sal_uInt16 fExtend = 0; *pDataStream fExtend; -sal_uInt16 nNoStrings; +sal_uInt16 nNoStrings = 0; // Isn't it that if fExtend isn't 0x then fExtend actually // doesn't exist and we really have just read nNoStrings ( or cData )? @@ -2252,7 +2252,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, *pDataStream nNoStrings; // I guess this should be zero ( and we should ensure that ) -sal_uInt16 cbExtra; +sal_uInt16 cbExtra = 0; *pDataStream cbExtra; OSL_ENSURE(bAllOk, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: io/source
io/source/TextInputStream/TextInputStream.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2fc0fa62b26ce34675fcb94de59194592421eeb5 Author: Mark Wielaard m...@klomp.org Date: Sun Jun 30 17:03:37 2013 +0200 Fix memory leak in OTextInputStream. Delete mpBuffer when done in destructor or replaced in implResizeBuffer. Change-Id: Ide1b44f10a482ce9bb6135fb879e62e0a8ccea29 Reviewed-on: https://gerrit.libreoffice.org/4637 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index ff734fa..0d6645d 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -128,6 +128,8 @@ OTextInputStream::~OTextInputStream() rtl_destroyUnicodeToTextContext( mConvText2Unicode, mContextText2Unicode ); rtl_destroyUnicodeToTextConverter( mConvText2Unicode ); } + +delete[] mpBuffer; } void OTextInputStream::implResizeBuffer( void ) @@ -135,6 +137,7 @@ void OTextInputStream::implResizeBuffer( void ) sal_Int32 mnNewBufferSize = mnBufferSize * 2; sal_Unicode* pNewBuffer = new sal_Unicode[ mnNewBufferSize ]; memcpy( pNewBuffer, mpBuffer, mnCharsInBuffer * sizeof( sal_Unicode ) ); +delete[] mpBuffer; mpBuffer = pNewBuffer; mnBufferSize = mnNewBufferSize; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotest/source
unotest/source/cpp/bootstrapfixturebase.cxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 247b182fc55a05e9cd54b94dbf3de7ba9a13094f Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 14:40:45 2013 +0200 unotest: re-add test::BootstrapFixtureBase::getPathFromWorkdir also erroneously removed in 6a59659541e45198b8cda162f87f6abcd68c6101 Change-Id: Id9e942cf012d901546b5b403d0d04e749fd20695 diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 1ffab1e..31a5d44 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -76,6 +76,21 @@ OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) return m_aSrcRootPath + OUString::createFromAscii( pPath ); } +// just temporarily ifdef this out as it's currently unused (callcatcher) +// if you start using it on linux just remove the ifdef +#ifndef LINUX +OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) +{ +return m_aWorkdirRootURL + OUString::createFromAscii( pPath ); +} + +OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) +{ +return m_aWorkdirRootPath + OUString::createFromAscii( pPath ); + +} +#endif + void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/eppt.hxx |2 sd/source/filter/eppt/epptso.cxx | 213 +-- 2 files changed, 121 insertions(+), 94 deletions(-) New commits: commit a70d429b96be02f0aa407216ab91edbe7883c7c7 Author: Sun Ying suny...@apache.org Date: Wed Sep 12 01:09:22 2012 + Resolves: #i120730# fix table with merged cell becoming group shape... when exporting ppt file Reported by: Liu Ping Tan Patch by: Ying Sun Review by: Jian Yuan Li (cherry picked from commit 1619e67c0c225ca6cc14a1fbebd4a97fb1b26311) Conflicts: sd/source/filter/eppt/epptso.cxx Change-Id: I96ff7d3e2b3f822a5ba84e918f20b2dff81e5a70 diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 982ddee..42f7226 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -266,7 +266,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider PageType ePageType, sal_Bool bMaster, int nPageNumber = 0 ); -voidImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); +sal_BoolImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); voidImplCreateTable( com::sun::star::uno::Reference com::sun::star::drawing::XShape rXShape, EscherSolverContainer aSolverContainer, EscherPropertyContainer aPropOpt ); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 16552a8..7a0ebb7 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3580,11 +3580,12 @@ struct CellBorder CellBorder() : mnPos ( 0 ), mnLength( 0 ){}; }; -void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) +sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2) { sal_Int32 nLineWidth = pCellBorder-maCellBorder.OuterLineWidth + pCellBorder-maCellBorder.InnerLineWidth; if ( nLineWidth ) { +nLineWidth *= 2; mnAngle = 0; mpPptEscherEx-OpenContainer( ESCHER_SpContainer ); EscherPropertyContainer aPropOptSp; @@ -3609,7 +3610,44 @@ void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n nX2 nY2; mpPptEscherEx-CloseContainer(); +return sal_True; } +return sal_False; +} + +//get merged cell's width +sal_Int32 GetCellRight( sal_Int32 nColumn, +Rectangle rect, +std::vector std::pair sal_Int32, sal_Int32 aColumns, +uno::Reference table::XMergeableCell xCell ) +{ +sal_Int32 nRight = aColumns[ nColumn ].first + aColumns[ nColumn ].second; +for ( sal_Int32 nColumnSpan = 1; nColumnSpan xCell-getColumnSpan(); nColumnSpan++ ) +{ +sal_uInt32 nC = nColumnSpan + nColumn; +if ( nC aColumns.size() ) +nRight += aColumns[ nC ].second; +else +nRight = rect.Right(); +} +return nRight; +} +//get merged cell's height +sal_Int32 GetCellBottom( sal_Int32 nRow, +Rectangle rect, +std::vector std::pair sal_Int32, sal_Int32 aRows, +uno::Reference table::XMergeableCell xCell ) +{ +sal_Int32 nBottom = aRows[nRow].first + aRows[nRow].second; +for ( sal_Int32 nRowSpan = 1; nRowSpan xCell-getRowSpan(); nRowSpan++ ) +{ +sal_uInt32 nR = nRowSpan + nRow; +if ( nR aRows.size() ) +nBottom += aRows[ nR ].second; +else +nBottom = rect.Bottom(); +} +return nBottom; } void PPTWriter::WriteCString( SvStream rSt, const String rString, sal_uInt32 nInstance ) @@ -3718,25 +3756,8 @@ void PPTWriter::ImplCreateTable( uno::Reference drawing::XShape rXShape, Esc { sal_Int32 nLeft = aColumns[ nColumn ].first; sal_Int32 nTop= aRows[ nRow ].first; -sal_Int32 nRight = nLeft + aColumns[ nColumn ].second; -sal_Int32 nBottom = nTop + aRows[ nRow ].second; - -for ( sal_Int32 nColumnSpan = 1; nColumnSpan xCell-getColumnSpan(); nColumnSpan++ ) -{ -sal_uInt32 nC = nColumnSpan + nColumn; -if ( nC aColumns.size() ) -nRight += aColumns[ nC ].second; -else -nRight = maRect.Right(); -
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311
16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 |1 + 1 file changed, 1 insertion(+) New commits: commit 2271d0218cec9d7677a1c3d29a5b7c2ddf5598c4 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 13:54:17 2013 +0100 Notes added by 'git notes add' diff --git a/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 b/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 new file mode 100644 index 000..82f2fd8 --- /dev/null +++ b/16/19e67c0c225ca6cc14a1fbebd4a97fb1b26311 @@ -0,0 +1 @@ +merged as: a70d429b96be02f0aa407216ab91edbe7883c7c7 ___ 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' - include/sfx2 sc/inc
include/sfx2/sfxsids.hrc |1 + sc/inc/sc.hrc|3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit d4d5c97b4eb0b0d28aac635482bca547d60b7cdc Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 11:46:05 2013 +0100 Resolves: fdo#66263 calc's protect records doesn't do anything, sid collision Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef (cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c) Reviewed-on: https://gerrit.libreoffice.org/4651 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index d1227e3..f17124a 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -750,6 +750,7 @@ #define SC_VIEW_START (SID_SC_START) #endif #define FID_CHG_RECORD (EDIT_MENU_START + 18) +//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries #define SID_CHG_PROTECT (SC_VIEW_START + 84) // eof diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6fbe3f0..b688cdd 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -123,6 +123,7 @@ #define SID_NUMBER_DECDEC (SC_VIEW_START + 58) // misc: +#define SID_COLLABORATION (SC_VIEW_START + 59) #define SID_LINKS (SC_VIEW_START + 60) #define SID_INSERT_SIMAGE (SC_VIEW_START + 61) #define SID_INSERT_SMATH(SC_VIEW_START + 63) @@ -153,7 +154,7 @@ #define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) #define SID_EURO_CONVERTER (SC_VIEW_START + 83) -#define SID_COLLABORATION (SC_VIEW_START + 84) +//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84) #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85) #define SID_SC_INPUT_TEXTWYSIWYG(SC_VIEW_START + 86) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
On Mon, Jul 1, 2013 at 6:39 AM, Gabriele Bulfon gabriele.bul...@sonicle.com wrote: Hi, because I need to work on a consolidated tar.gz source version, I'm not using master, so I cannot pull changes at the moment. Can you suggest me what modifications I need? http://cgit.freedesktop.org/libreoffice/core/commit/?id=99a4baf89c470d1e73b4e87fe9adf37a09230a2c Ok, now I'm stuck again with libreg.so not being resolved: [build LNK] Executable/cppumaker /usr/gnu/bin/ld: warning: libreg.so, needed by /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libunoidl.so, not found (try using -rpath or -rpath-link) I tried using the solaris.mk commented options: @@ -120,6 +120,7 @@ -L$(SYSBASE)/lib \ -L$(SYSBASE)/usr/lib \ -Wl,-z,combreloc \ + -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ $(SOLARLIB) \ ifeq ($(HAVE_LD_HASH_STYLE),TRUE) but no luck, still cannot solve. I also tried using Sun ld, but looks like options for ld are always gnu-ld ones, so compilation stop much earlier. ...any clue? Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 747988e8362faeb3f18271d8b33cf55905e5e860 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 1 09:02:13 2013 -0400 Fix a crasher on copy to clip. The logical row position equals the top block position plus offset within block, not minus. Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index a224b6f..aa82f4d1 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1276,7 +1276,7 @@ public: void operator() (const sc::CellStoreType::value_type aNode, size_t nOffset, size_t nDataSize) { -size_t nTopRow = aNode.position - nOffset; +size_t nTopRow = aNode.position + nOffset; switch (aNode.type) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: _ prefix in Windows stdlib calls (was: [GSOC]Firebird Integration Weekly Update 03)
a lot of 'normal' c/posix function 'foo' are named _foo on windows for some reason... That would be POSIX functions in particular, because (surprise?) Windows is not POSIX. The C library has some nominally POSIX-like API but don't let that fool you into thinking it would attempt any emulation. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dbaccess/source
dbaccess/source/ui/dlg/generalpage.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 40d76398f2be1f6efb11f79865c3b8adc3186f24 Author: Petr Mladek pmla...@suse.cz Date: Tue May 21 10:46:45 2013 +0200 allow to create new database using the wizard again (fdo#62937) To be honest, I do not userstand the code much. Julien pointed out that the setParentTitle and onTypeSelected were newer called. The condition looked like an optimisation and it helped to remove it. It would be great to put it back. It might be enough to hand the intial values. Change-Id: Id06cc9c63a9e578cb3c698c8526851fec71ef9da Reviewed-on: https://gerrit.libreoffice.org/4429 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index f637155..354d3e9 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -357,7 +357,6 @@ namespace dbaui sConnectURL = pUrlItem-GetValue(); } -::rtl::OUString eOldSelection = m_eCurrentSelection; m_eNotSupportedKnownType = ::dbaccess::DST_UNKNOWN; implSetCurrentType( ::rtl::OUString() ); @@ -388,11 +387,9 @@ namespace dbaui m_pDatasourceType-SelectEntry(sDisplayName); // notify our listener that our type selection has changed (if so) -if ( eOldSelection != m_eCurrentSelection ) -{ -setParentTitle(m_eCurrentSelection); -onTypeSelected(m_eCurrentSelection); -} +// FIXME: how to detect that it did not changed? (fdo#62937) +setParentTitle(m_eCurrentSelection); +onTypeSelected(m_eCurrentSelection); // a special message for the current page state switchMessage(m_eCurrentSelection); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a189859341240afedb5293ed50e6da15cc0518b1 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 1 09:02:13 2013 -0400 Fix a crasher on copy to clip. The logical row position equals the top block position plus offset within block, not minus. Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 25a20f6..edd552b 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1276,7 +1276,7 @@ public: void operator() (const sc::CellStoreType::value_type aNode, size_t nOffset, size_t nDataSize) { -size_t nTopRow = aNode.position - nOffset; +size_t nTopRow = aNode.position + nOffset; switch (aNode.type) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dbaccess/source
dbaccess/source/ui/dlg/generalpage.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0a94f9210ca74ea959a59dbb4cb6ea05b6450118 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 5 10:24:25 2013 +0200 fdo#64447 when changing setup mode, trigger changed DatasourceType event Change-Id: I961118331f534de103b83766a2c21a6bec479241 Reviewed-on: https://gerrit.libreoffice.org/4430 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 354d3e9..2c32e94 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -578,6 +578,7 @@ namespace dbaui { if ( m_aCreationModeHandler.IsSet() ) m_aCreationModeHandler.Call(this); +OnDatasourceTypeSelected(m_pDatasourceType.get()); return 1L; } ___ 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/condformat/condformatdlgentry.cxx | 28 +++-- 1 file changed, 17 insertions(+), 11 deletions(-) New commits: commit 9b557cfd01131544639285dace81e11ed3c49aa7 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jun 27 20:44:19 2013 +0200 use the local setting aware method for the UI, fdo#64754 Change-Id: Ie3117c26b347e1a8996ef9cbcb8b0d6ee561b5b3 (cherry picked from commit a539cf2c09bdd62d1c4a0124ed536f88d4fd01d5) Reviewed-on: https://gerrit.libreoffice.org/4612 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index d8acc85..46feaa8 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -596,6 +596,14 @@ void ScFormulaFrmtEntry::SetInactive() namespace { +OUString convertNumberToString(double nVal, ScDocument* pDoc) +{ +SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable(); +OUString aText; +pNumberFormatter-GetInputLineString(nVal, 0, aText); +return aText; +} + void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType, Edit rEdit, ColorListBox rLbCol, ScDocument* pDoc ) { // entry Automatic is not available for color scales @@ -612,10 +620,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType, case COLORSCALE_PERCENT: { double nVal = rEntry.GetValue(); -SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable(); -OUString aText; -pNumberFormatter-GetInputLineString(nVal, 0, aText); -rEdit.SetText(aText); +rEdit.SetText(convertNumberToString(nVal, pDoc)); } break; case COLORSCALE_FORMULA: @@ -1259,14 +1264,15 @@ class ScIconSetFrmtDataEntry : public Control ListBox maLbEntryType; public: -ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); +ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, +sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress rPos) const; void SetFirstEntry(); }; -ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry ): +ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ): Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ), maImgIcon( this, ScResId( IMG_ICON ) ), maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ), @@ -1280,15 +1286,15 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType e { case COLORSCALE_VALUE: maLbEntryType.SelectEntryPos(0); -maEdEntry.SetText(OUString::valueOf(pEntry-GetValue())); +maEdEntry.SetText(convertNumberToString(pEntry-GetValue(), pDoc)); break; case COLORSCALE_PERCENTILE: maLbEntryType.SelectEntryPos(2); -maEdEntry.SetText(OUString::valueOf(pEntry-GetValue())); +maEdEntry.SetText(convertNumberToString(pEntry-GetValue(), pDoc)); break; case COLORSCALE_PERCENT: maLbEntryType.SelectEntryPos(1); -maEdEntry.SetText(OUString::valueOf(pEntry-GetValue())); +maEdEntry.SetText(convertNumberToString(pEntry-GetValue(), pDoc)); break; case COLORSCALE_FORMULA: maLbEntryType.SelectEntryPos(3); @@ -1367,7 +1373,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const for(size_t i = 0, n = pIconSetFormatData-maEntries.size(); i n; ++i) { -maEntries.push_back( new ScIconSetFrmtDataEntry( this, eType, i, pIconSetFormatData-maEntries[i] ) ); +maEntries.push_back( new ScIconSetFrmtDataEntry( this, eType, pDoc, i, pIconSetFormatData-maEntries[i] ) ); Point aPos = maEntries[0].GetPosPixel(); aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2; maEntries[i].SetPosPixel( aPos ); @@ -1397,7 +1403,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl ) for(size_t i = 0; i nElements; ++i) { -maEntries.push_back( new ScIconSetFrmtDataEntry( this, static_castScIconSetType(nPos), i ) ); +maEntries.push_back( new ScIconSetFrmtDataEntry( this, static_castScIconSetType(nPos), mpDoc, i ) ); Point aPos = maEntries[0].GetPosPixel();
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/core/data/table2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 336d684a940165d15b3581a72d8bd45743bf98ee Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Jun 29 01:08:22 2013 +0200 only clean the cond format if we want to write attribs, fdo#62267 Change-Id: I2f4feecb3180b165f6b9b299ecb3dcdbb65f87e3 (cherry picked from commit d4f631e8ceb7f02a18565cf0470c8170215e69f8) Reviewed-on: https://gerrit.libreoffice.org/4613 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5df2ac1..a44c602 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -775,7 +775,7 @@ void ScTable::CopyFromClip( aCol[i].CopyFromClip(rCxt, nRow1, nRow2, nDy, pTable-aCol[i - nDx]); -if (rCxt.getInsertFlag() != IDF_OBJECTS) +if (rCxt.getInsertFlag() == IDF_ATTRIB) { // make sure that there are no old references to the cond formats sal_uInt16 nWhichArray[2]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk|1 sc/inc/stylehelper.hxx | 29 ++ sc/inc/styleuno.hxx |9 -- sc/source/core/tool/stylehelper.cxx | 157 sc/source/ui/unoobj/cellsuno.cxx|1 sc/source/ui/unoobj/fmtuno.cxx |1 sc/source/ui/unoobj/styleuno.cxx| 143 7 files changed, 190 insertions(+), 151 deletions(-) New commits: commit 902f6d61e1e9ffdf39544d8b168996b0093ac57e Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Jun 29 02:06:25 2013 +0200 extract this functionality from the uno code we need this code in our next step for some mappings in the filters code Change-Id: I059d9d05877846215e1a967123dc253de605417e (cherry picked from commit b3aabf223ec7bc2678fd6dfb79ab7f079e5b) Reviewed-on: https://gerrit.libreoffice.org/4614 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 94ad19e..2583937 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -238,6 +238,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/scmatrix \ sc/source/core/tool/simplerangelist \ sc/source/core/tool/stringutil \ + sc/source/core/tool/stylehelper \ sc/source/core/tool/subtotal \ sc/source/core/tool/token \ sc/source/core/tool/typedstrdata \ diff --git a/sc/inc/stylehelper.hxx b/sc/inc/stylehelper.hxx new file mode 100644 index 000..31f79d1 --- /dev/null +++ b/sc/inc/stylehelper.hxx @@ -0,0 +1,29 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include rtl/ustring.hxx + +class ScStyleNameConversion +{ +public: +static OUString DisplayToProgrammaticName( const OUString rDispName, sal_uInt16 nType ); +static OUString ProgrammaticToDisplayName( const OUString rProgName, sal_uInt16 nType ); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index bd7d8a4..29ab960 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -43,15 +43,6 @@ class ScDocShell; class ScStyleFamilyObj; class ScStyleObj; - -class ScStyleNameConversion -{ -public: -static String DisplayToProgrammaticName( const String rDispName, sal_uInt16 nType ); -static String ProgrammaticToDisplayName( const String rProgName, sal_uInt16 nType ); -}; - - class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4 ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XNameAccess, diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx new file mode 100644 index 000..a5e5b5b --- /dev/null +++ b/sc/source/core/tool/stylehelper.cxx @@ -0,0 +1,157 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include rsc/rscsfx.hxx + +#include stylehelper.hxx +#include global.hxx +#include globstr.hrc + +// conversion programmatic - display (visible) name +// currently, the core always has the visible names +// the api is required to use programmatic names for default styles +// these programmatic
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/xml/xmlcondformat.cxx |5 +++-- sc/source/filter/xml/xmlexprt.cxx |6 -- 2 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 297363822d460321c0b3bdd4a8acc9f689f4661b Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Jun 29 02:50:48 2013 +0200 handle localized default style names, fdo#61339 We need to map localized style names during import and export from and to ODF. The default styles are the only localized style names and are not imported with the name written into the file. Change-Id: Ibdc2f750b7a4b7ce6994b22248e237fe95ac638d (cherry picked from commit 5b9bad7482a98f2d0d37c4b75a13292abe653ea3) Reviewed-on: https://gerrit.libreoffice.org/4615 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 41f4f3d..afeec54 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -18,6 +18,7 @@ #include rangeutl.hxx #include docfunc.hxx #include XMLConverter.hxx +#include stylehelper.hxx ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport rImport, sal_uInt16 nPrfx, @@ -566,7 +567,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport rImport, sal_uInt16 nPrfx, sExpression = sValue; break; case XML_TOK_CONDITION_APPLY_STYLE_NAME: -sStyle = sValue; +sStyle = ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA ); break; case XML_TOK_CONDITION_BASE_CELL_ADDRESS: sAddress = sValue; @@ -764,7 +765,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport rImport, sal_uInt16 nPrfx, sDateType = sValue; break; case XML_TOK_COND_DATE_STYLE: -sStyle = sValue; +sStyle = ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA ); break; default: break; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 2b72e89..9089f27 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -59,6 +59,7 @@ #include colorscale.hxx #include conditio.hxx #include cellvalue.hxx +#include stylehelper.hxx #include xmloff/xmltoken.hxx #include xmloff/xmlnmspe.hxx @@ -4011,7 +4012,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) default: SAL_WARN(sc, unimplemented conditional format export); } -OUString sStyle = pEntry-GetStyle(); +OUString sStyle = ScStyleNameConversion::DisplayToProgrammaticName(pEntry-GetStyle(), SFX_STYLE_FAMILY_PARA); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, sStyle); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, aCond.makeStringAndClear()); @@ -4138,7 +4139,8 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { const ScCondDateFormatEntry mrDateFormat = static_castconst ScCondDateFormatEntry(*pFormatEntry); OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); -AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, mrDateFormat.GetStyleName()); +OUString aStyleName = ScStyleNameConversion::DisplayToProgrammaticName(mrDateFormat.GetStyleName(), SFX_STYLE_FAMILY_PARA ); +AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, aStyleName); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE, aDateType); SvXMLElementExport aElementDateFormat(*this, XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true); } ___ 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/condformat/condformatdlgentry.cxx | 57 - sc/source/ui/inc/condformatdlgentry.hxx| 14 +- 2 files changed, 67 insertions(+), 4 deletions(-) New commits: commit 8c69cc28fd6cb9ac22f1c896d6007d92dffe9012 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Jun 29 05:16:14 2013 +0200 update all style lists when a new style is added Change-Id: Ib404958e2bc0e3bfe075d1c94f348e907ee004c8 (cherry picked from commit aa028cab4a72660c773a9eac0cd8a19a0d655c01) Reviewed-on: https://gerrit.libreoffice.org/4616 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 46feaa8..e0f78a5 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -167,7 +167,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c maEdVal2( this, NULL, NULL, ScResId( ED_VAL2 ) ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), -maWdPreview( this, ScResId( WD_PREVIEW ) ) +maWdPreview( this, ScResId( WD_PREVIEW ) ), +mbIsInStyleCreate(false) { FreeResource(); @@ -175,6 +176,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c Init(); +StartListening(*pDoc-GetStyleSheetPool(), true); + if(pFormatEntry) { OUString aStyleName = pFormatEntry-GetStyle(); @@ -436,6 +439,35 @@ void ScConditionFrmtEntry::SetInactive() namespace { +void UpdateStyleList(ListBox rLbStyle, ScDocument* pDoc) +{ +OUString aSelectedStyle = rLbStyle.GetSelectEntry(); +for(sal_Int32 i = rLbStyle.GetEntryCount(); i = 1; --i) +{ +rLbStyle.RemoveEntry(i); +} +FillStyleListBox(pDoc, rLbStyle); +rLbStyle.SelectEntry(aSelectedStyle); +} + +} + +void ScConditionFrmtEntry::Notify(SfxBroadcaster, const SfxHint rHint) +{ +SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, rHint); +if(!pHint) +return; + +sal_uInt16 nHint = pHint-GetHint(); +if(nHint == SFX_STYLESHEET_MODIFIED) +{ +if(!mbIsInStyleCreate) +UpdateStyleList(maLbStyle, mpDoc); +} +} + +namespace { + void StyleSelect( ListBox rLbStyle, ScDocument* pDoc, SvxFontPrevWindow rWdPreview ) { if(rLbStyle.GetSelectEntryPos() == 0) @@ -503,7 +535,9 @@ void StyleSelect( ListBox rLbStyle, ScDocument* pDoc, SvxFontPrevWindow rWdPre IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) { +mbIsInStyleCreate = true; StyleSelect( maLbStyle, mpDoc, maWdPreview ); +mbIsInStyleCreate = false; return 0; } @@ -1189,11 +1223,14 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCon maLbDateEntry( this, ScResId( LB_DATE_TYPE ) ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), -maWdPreview( this, ScResId( WD_PREVIEW ) ) +maWdPreview( this, ScResId( WD_PREVIEW ) ), +mbIsInStyleCreate(false) { Init(); FreeResource(); +StartListening(*pDoc-GetStyleSheetPool(), sal_True); + if(pFormat) { sal_Int32 nPos = static_castsal_Int32(pFormat-GetDateType()); @@ -1234,6 +1271,20 @@ void ScDateFrmtEntry::SetInactive() Deselect(); } +void ScDateFrmtEntry::Notify( SfxBroadcaster, const SfxHint rHint ) +{ +SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, rHint); +if(!pHint) +return; + +sal_uInt16 nHint = pHint-GetHint(); +if(nHint == SFX_STYLESHEET_MODIFIED) +{ +if(!mbIsInStyleCreate) +UpdateStyleList(maLbStyle, mpDoc); +} +} + ScFormatEntry* ScDateFrmtEntry::GetEntry() const { ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc); @@ -1250,7 +1301,9 @@ OUString ScDateFrmtEntry::GetExpressionString() IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl ) { +mbIsInStyleCreate = true; StyleSelect( maLbStyle, mpDoc, maWdPreview ); +mbIsInStyleCreate = false; return 0; } diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 7727d28..77054ab 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -11,6 +11,8 @@ #include conditio.hxx #include formula/funcutl.hxx +#include svl/lstner.hxx + class ScIconSetFrmtDataEntry; namespace condformat { @@ -76,7 +78,7 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() = 0; }; -class ScConditionFrmtEntry : public ScCondFrmtEntry +class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener { //cond format ui elements ListBox maLbCondType; @@ -85,6 +87,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry FixedText maFtStyle; ListBox maLbStyle;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/condformat/condformatdlgentry.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 22f2ad0088d57fc9e3a0bd8b975a5c549810fa7d Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Jun 29 05:38:37 2013 +0200 hide the style boxes to collapse the date entries fully Change-Id: I58f06a57a05ef007afc203c737acfe29df6ea6a3 (cherry picked from commit def32c7e14ad9743e2b55804442be5d596f6c21c) Reviewed-on: https://gerrit.libreoffice.org/4617 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index e0f78a5..2fb93e0 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1258,6 +1258,7 @@ void ScDateFrmtEntry::SetActive() maLbDateEntry.Show(); maFtStyle.Show(); maWdPreview.Show(); +maLbStyle.Show(); Select(); } @@ -1267,6 +1268,7 @@ void ScDateFrmtEntry::SetInactive() maLbDateEntry.Hide(); maFtStyle.Hide(); maWdPreview.Hide(); +maLbStyle.Hide(); Deselect(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source starmath/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 12 +++--- starmath/source/mathmlexport.cxx | 24 ++--- 2 files changed, 24 insertions(+), 12 deletions(-) New commits: commit 1ef63d0842dab4154c5ca2fc42e416950bd7459a Author: Frédéric Wang fred.w...@free.fr Date: Fri Jun 28 17:07:11 2013 +0200 fdo#66278 - MathML export: distinguish inline/display equations. Change-Id: Ia764c2fd64ab772342ce86f67ee290ab38dc4a83 Reviewed-on: https://gerrit.libreoffice.org/4607 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index d9de0e9..e83195c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2949,9 +2949,7 @@ -- !-- MathML -- xsl:template match=draw:object[math:math] - math xmlns=http://www.w3.org/1998/Math/MathML; - xsl:apply-templates select=math:math/math:semantics/* mode=math/ - /math + xsl:apply-templates select=math:math mode=math/ /xsl:template xsl:template match=* mode=math @@ -2966,6 +2964,12 @@ /xsl:attribute /xsl:template - xsl:template match=math:annotation mode=math/ + !-- Ignore semantic annotations -- + xsl:template match=math:semantics mode=math + xsl:apply-templates select=*[1] mode=math/ + /xsl:template + + !-- Ignore the replacement image -- + xsl:template match=draw:frame/draw:image[preceding-sibling::*[1]/math:math]/ /xsl:stylesheet diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index fb1e6c3..fbc1e97 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -599,6 +599,22 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass) void SmXMLExport::_ExportContent() { +uno::Reference frame::XModel xModel = GetModel(); +uno::Reference lang::XUnoTunnel xTunnel; +xTunnel = uno::Reference lang::XUnoTunnel (xModel,uno::UNO_QUERY); +SmModel *pModel = reinterpret_castSmModel * +(xTunnel-getSomething(SmModel::getUnoTunnelId())); +SmDocShell *pDocShell = pModel ? +static_castSmDocShell*(pModel-GetObjectShell()) : 0; +OSL_ENSURE( pDocShell, doc shell missing ); + +if (pDocShell !pDocShell-GetFormat().IsTextmode()) +{ +// If the Math equation is not in text mode, we attach a display=block +// attribute on the math root. We don't do anything if it is in +// text mode, the default display=inline value will be used. +AddAttribute(XML_NAMESPACE_MATH, XML_DISPLAY, XML_BLOCK); +} SvXMLElementExport aEquation(*this, XML_NAMESPACE_MATH, XML_MATH, sal_True, sal_True); SvXMLElementExport *pSemantics=0; @@ -613,14 +629,6 @@ void SmXMLExport::_ExportContent() if (aText.Len()) { // Convert symbol names -uno::Reference frame::XModel xModel = GetModel(); -uno::Reference lang::XUnoTunnel xTunnel; -xTunnel = uno::Reference lang::XUnoTunnel (xModel,uno::UNO_QUERY); -SmModel *pModel = reinterpret_castSmModel * -(xTunnel-getSomething(SmModel::getUnoTunnelId())); -SmDocShell *pDocShell = pModel ? -static_castSmDocShell*(pModel-GetObjectShell()) : 0; -OSL_ENSURE( pDocShell, doc shell missing ); if (pDocShell) { SmParser rParser = pDocShell-GetParser(); ___ 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' - vcl/coretext
vcl/coretext/ctlayout.cxx | 66 +++--- 1 file changed, 51 insertions(+), 15 deletions(-) New commits: commit 6ccc588a522f1068706fe05f5c819e488b6628eb Author: Khaled Hosny khaledho...@eglug.org Date: Sat Jun 29 14:43:23 2013 +0200 Fix jitter when editing RTL text When drawing right aligned text, rounding errors in the position returned by GetDrawPosition() cause the right margin of the text to change whenever text width changes causing jumping letters effect. So here we calculate the drawing position relative to the right margin on our own to avoid the rounding errors. That is basically a hack, and it should go away if one day we managed to get rid of those rounding errors. Continue using GetDrawPosition() for non-right aligned text, to minimize any unforeseen side effects. Change-Id: Ia095a17a41f723f5fb7afc99df4250262e9a0051 Reviewed-on: https://gerrit.libreoffice.org/4618 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index 05f9aa8..632d6f5 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx @@ -50,6 +50,9 @@ public: virtual voidSimplify( bool bIsBase ); private: +CGPoint GetTextDrawPosition(void) const; +double GetWidth(void) const; + const CTTextStyle* constmpTextStyle; // CoreText specific objects @@ -64,7 +67,7 @@ private: // x-offset relative to layout origin // currently only used in RTL-layouts -mutable longmnBaseAdv; +mutable double mfBaseAdv; }; // === @@ -75,7 +78,7 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle ) , mpCTLine( NULL ) , mnCharCount( 0 ) , mfCachedWidth( -1 ) -, mnBaseAdv( 0 ) +, mfBaseAdv( 0 ) { CFRetain( mpTextStyle-GetStyleDict() ); } @@ -143,7 +146,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs ) // in RTL-layouts trailing spaces are leftmost // TODO: use BiDi-algorithm to thoroughly check this assumption if( rArgs.mnFlags SAL_LAYOUT_BIDI_RTL) -mnBaseAdv = rint( fTrailingSpace ); +mfBaseAdv = fTrailingSpace; // return early if there is nothing to do if( nPixelWidth = 0 ) @@ -165,11 +168,42 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs ) } CFRelease( mpCTLine ); mpCTLine = pNewCTLine; -mfCachedWidth = -1; // TODO: can we set it directly to target width we requested? For now we re-measure +mfCachedWidth = nPixelWidth; } // --- +// When drawing right aligned text, rounding errors in the position returned by +// GetDrawPosition() cause the right margin of the text to change whenever text +// width changes causing jumping letters effect. So here we calculate the +// drawing position relative to the right margin on our own to avoid the +// rounding errors. That is basically a hack, and it should go away if one day +// we managed to get rid of those rounding errors. +// +// We continue using GetDrawPosition() for non-right aligned text, to minimize +// any unforeseen side effects. +CGPoint CTLayout::GetTextDrawPosition(void) const +{ +float fPosX, fPosY; + +if (mnLayoutFlags SAL_LAYOUT_RIGHT_ALIGN) +{ +// text is always drawn at its leftmost point +const Point aPos = DrawBase(); +fPosX = aPos.X() + mfBaseAdv - GetWidth(); +fPosY = aPos.Y(); +} +else +{ +const Point aPos = GetDrawPosition(Point(mfBaseAdv, 0)); +fPosX = aPos.X(); +fPosY = aPos.Y(); +} + +CGPoint aTextPos = { +fPosX, -fPosY }; +return aTextPos; +} + void CTLayout::DrawText( SalGraphics rGraphics ) const { AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics); @@ -187,8 +221,7 @@ void CTLayout::DrawText( SalGraphics rGraphics ) const CGContextSetShouldAntialias( rAquaGraphics.mrContext, !rAquaGraphics.mbNonAntialiasedText ); // Draw the text -const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) ); -CGPoint aTextPos = { (CGFloat) +aVclPos.X(), (CGFloat) -aVclPos.Y() }; +CGPoint aTextPos = GetTextDrawPosition(); if( mpTextStyle-mfFontRotation != 0.0 ) { @@ -327,7 +360,7 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point rPos, int // --- -long CTLayout::GetTextWidth() const +double CTLayout::GetWidth() const { if( (mnCharCount = 0) || !mpCTLine ) return 0; @@ -336,10 +369,13 @@ long CTLayout::GetTextWidth() const mfCachedWidth = CTLineGetTypographicBounds( mpCTLine, NULL, NULL, NULL); } -const long nScaledWidth = lrint( mfCachedWidth ); -return
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/InternalDataProvider.hxx |9 +-- chart2/source/tools/ChartModelHelper.cxx | 32 ++- chart2/source/tools/InternalDataProvider.cxx | 17 +++--- 3 files changed, 52 insertions(+), 6 deletions(-) New commits: commit 4dda042c354b4cfaf190bca35092bbd5f6dc2a1f Author: Armin Le Grand a...@apache.org Date: Mon Jul 1 10:43:33 2013 + Resolves: #i120559# Corrected load for charts without RangeString... but with local row-oriented data (cherry picked from commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c) Conflicts: chart2/source/tools/ChartModelHelper.cxx Change-Id: I4979b639f5652a1c27b640b6b469f66c65a888aa diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 3b6cd9a..71a61a5 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -71,8 +71,13 @@ class InternalDataProvider : { public: explicit InternalDataProvider(const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext _xContext); -explicit InternalDataProvider( const ::com::sun::star::uno::Reference - ::com::sun::star::chart2::XChartDocument xChartDoc, bool bConnectToModel ); + +// #i120559# allow handing over a default for data orientation +// (DataInColumns) that will be used when no data is available +explicit InternalDataProvider( +const ::com::sun::star::uno::Reference ::com::sun::star::chart2::XChartDocument xChartDoc, +bool bConnectToModel, +bool bDefaultDataInColumns ); explicit InternalDataProvider( const InternalDataProvider rOther ); virtual ~InternalDataProvider(); diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 7002a47..5c1e78d 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -25,6 +25,8 @@ #include RangeHighlighter.hxx #include InternalDataProvider.hxx +#include com/sun/star/chart/ChartDataRowSource.hpp +#include com/sun/star/chart/XChartDocument.hpp #include com/sun/star/chart2/data/XDataReceiver.hpp #include com/sun/star/chart2/XChartDocument.hpp #include com/sun/star/chart2/XChartTypeContainer.hpp @@ -50,7 +52,35 @@ uno::Reference chart2::data::XRangeHighlighter ChartModelHelper::createRangeH uno::Reference chart2::data::XDataProvider ChartModelHelper::createInternalDataProvider( const uno::Reference ::com::sun::star::chart2::XChartDocument xChartDoc, bool bConnectToModel ) { -return new InternalDataProvider( xChartDoc, bConnectToModel ); +bool bDefaultDataInColumns(true); + +// #i120559# Try to access the current state of DataRowSource for the +// chart data and use it as default for creating a new InternalDataProvider +if(xChartDoc.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::chart::XChartDocument xDoc(xChartDoc, uno::UNO_QUERY); + +if(xDoc.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::chart::XDiagram aDiagram = xDoc-getDiagram(); + +if(aDiagram.is()) +{ +::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet xProp(aDiagram, uno::UNO_QUERY); + +if(xProp.is()) +{ +::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS); + +xProp-getPropertyValue( ::rtl::OUString::createFromAscii(DataRowSource)) = aDataRowSource; + +bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource); +} +} +} +} + +return new InternalDataProvider( xChartDoc, bConnectToModel, bDefaultDataInColumns ); } uno::Reference XDiagram ChartModelHelper::findDiagram( const uno::Reference frame::XModel xModel ) diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 147afc8..2def119 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -315,8 +315,11 @@ InternalDataProvider::InternalDataProvider( const Reference uno::XComponentCont : m_bDataInColumns( true ) {} -InternalDataProvider::InternalDataProvider( const Reference chart2::XChartDocument xChartDoc, bool bConnectToModel ) -: m_bDataInColumns( true ) +InternalDataProvider::InternalDataProvider( +const Reference chart2::XChartDocument xChartDoc, +bool bConnectToModel, +bool bDefaultDataInColumns) +: m_bDataInColumns( bDefaultDataInColumns ) { try { @@ -331,7 +334,15 @@ InternalDataProvider::InternalDataProvider( const Reference chart2::XChartDocum bool bFirstCellAsLabel = true;
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 85/5d5e3bc075e516edf1dc7e844924bbf9ab590c
85/5d5e3bc075e516edf1dc7e844924bbf9ab590c |1 + 1 file changed, 1 insertion(+) New commits: commit de587b0a2c1e0788322f3eab157f88bd10647a97 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 14:46:53 2013 +0100 Notes added by 'git notes add' diff --git a/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c b/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c new file mode 100644 index 000..3c0e422 --- /dev/null +++ b/85/5d5e3bc075e516edf1dc7e844924bbf9ab590c @@ -0,0 +1 @@ +merged as: 4dda042c354b4cfaf190bca35092bbd5f6dc2a1f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/coretext
vcl/coretext/ctfonts.cxx | 34 -- 1 file changed, 24 insertions(+), 10 deletions(-) New commits: commit 8a2719b8fc65ab2f875f4d617c2202e573b7bc77 Author: Khaled Hosny khaledho...@eglug.org Date: Mon Jul 1 15:47:43 2013 +0200 Handle synthetic bold with Core Text And fix the previous commit for synthetic italic a bit. Change-Id: Ia5977d53739b7a6eaaccbf3aeb24adb820ca05c6 diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx index f5e1a98..d46d19d 100644 --- a/vcl/coretext/ctfonts.cxx +++ b/vcl/coretext/ctfonts.cxx @@ -59,6 +59,11 @@ private: // === +inline double toRadian(int nDegree) +{ +return nDegree * (M_PI / 1800.0); +} + CTTextStyle::CTTextStyle( const FontSelectPattern rFSD ) : ImplMacTextStyle( rFSD ) , mpStyleDict( NULL ) @@ -69,24 +74,18 @@ CTTextStyle::CTTextStyle( const FontSelectPattern rFSD ) double fScaledFontHeight = pReqFont-mfExactHeight; // convert font rotation to radian -mfFontRotation = pReqFont-mnOrientation * (M_PI / 1800.0); +mfFontRotation = toRadian(pReqFont-mnOrientation); + +// dummy matrix so we can use CGAffineTransformConcat() below +CGAffineTransform aMatrix = CGAffineTransformMakeTranslation(0, 0); // handle font stretching if any -CGAffineTransform aMatrix = CGAffineTransformMakeScale(1.0, 1.0); if( (pReqFont-mnWidth != 0) (pReqFont-mnWidth != pReqFont-mnHeight) ) { mfFontStretch = (float)pReqFont-mnWidth / pReqFont-mnHeight; aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMakeScale(mfFontStretch, 1.0F)); } -// fake bold -if ((pReqFont-GetWeight() = WEIGHT_BOLD) (mpFontData-GetWeight() WEIGHT_SEMIBOLD)) -/* XXX */; -// fake italic -if (((pReqFont-GetSlant() == ITALIC_NORMAL) || (pReqFont-GetSlant() == ITALIC_OBLIQUE)) - !((mpFontData-GetSlant() == ITALIC_NORMAL) || (mpFontData-GetSlant() == ITALIC_OBLIQUE))) -aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, tanf(14 * acosf(0) / 90), 1, 0, 0)); - // create the style object for CoreText font attributes static const CFIndex nMaxDictSize = 16; // TODO: does this really suffice? mpStyleDict = CFDictionaryCreateMutable( NULL, nMaxDictSize, @@ -95,6 +94,21 @@ CTTextStyle::CTTextStyle( const FontSelectPattern rFSD ) CFBooleanRef pCFVertBool = pReqFont-mbVertical ? kCFBooleanTrue : kCFBooleanFalse; CFDictionarySetValue( mpStyleDict, kCTVerticalFormsAttributeName, pCFVertBool ); +// fake bold +if ((pReqFont-GetWeight() = WEIGHT_BOLD) (mpFontData-GetWeight() WEIGHT_SEMIBOLD)) +{ +int nStroke = -10.0; +CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, nStroke); +CFDictionarySetValue(mpStyleDict, kCTStrokeWidthAttributeName, rStroke); +} + +// fake italic +if (((pReqFont-GetSlant() == ITALIC_NORMAL) || (pReqFont-GetSlant() == ITALIC_OBLIQUE)) + !((mpFontData-GetSlant() == ITALIC_NORMAL) || (mpFontData-GetSlant() == ITALIC_OBLIQUE))) +{ +aMatrix = CGAffineTransformConcat(aMatrix, CGAffineTransformMake(1, 0, toRadian(120), 1, 0, 0)); +} + CTFontDescriptorRef pFontDesc = (CTFontDescriptorRef)mpFontData-GetFontId(); CTFontRef pNewCTFont = CTFontCreateWithFontDescriptor( pFontDesc, fScaledFontHeight, aMatrix ); CFDictionarySetValue( mpStyleDict, kCTFontAttributeName, pNewCTFont ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: _ prefix in Windows stdlib calls (was: [GSOC]Firebird Integration Weekly Update 03)
Actually snprintf is not posix but (surprise?) C99. Which, as far as I, know, MSVC does not claim to conform to. What the stdlib in the Subject refers to I don' t know. Standards are only worth anything if there is a consensus among implementors to follow them. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 11 commits - sc/inc sc/qa sc/source
sc/inc/calcmacros.hxx| 24 ++ sc/inc/column.hxx|6 sc/inc/document.hxx |7 sc/inc/dpcache.hxx |2 sc/inc/dpfilteredcache.hxx |2 sc/inc/dpitemdata.hxx|2 sc/inc/dpmacros.hxx | 23 -- sc/inc/dpnumgroupinfo.hxx|2 sc/inc/dpobject.hxx |2 sc/inc/dptabdat.hxx |2 sc/inc/dptabres.hxx |2 sc/inc/mtvelements.hxx |3 sc/inc/pivot.hxx |2 sc/inc/scmatrix.hxx |3 sc/inc/table.hxx |7 sc/qa/unit/data/xls/shared-formula.xls |binary sc/qa/unit/data/xlsx/shared-formula.xlsx |binary sc/qa/unit/filters-test.cxx | 36 sc/qa/unit/subsequent_filters-test.cxx | 37 sc/qa/unit/ucalc.cxx | 19 ++ sc/source/core/data/column.cxx |2 sc/source/core/data/column2.cxx | 267 +++ sc/source/core/data/documen2.cxx |2 sc/source/core/data/documen9.cxx |7 sc/source/core/data/document.cxx | 13 + sc/source/core/data/dptabsrc.cxx |2 sc/source/core/data/formulacell.cxx | 16 + sc/source/core/data/table1.cxx | 12 + sc/source/core/tool/interpr1.cxx | 65 --- sc/source/core/tool/scmatrix.cxx | 111 sc/source/ui/dbgui/fieldwnd.cxx |2 31 files changed, 494 insertions(+), 186 deletions(-) New commits: commit bd4c6a7d7521abb0e36ebfba6e14685a1e195be8 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 1 09:02:13 2013 -0400 Fix a crasher on copy to clip. The logical row position equals the top block position plus offset within block, not minus. Change-Id: Ia6376d8e971f9d3379977895d14f97f43c5664ba diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index a224b6f..aa82f4d1 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1276,7 +1276,7 @@ public: void operator() (const sc::CellStoreType::value_type aNode, size_t nOffset, size_t nDataSize) { -size_t nTopRow = aNode.position - nOffset; +size_t nTopRow = aNode.position + nOffset; switch (aNode.type) { commit add9e14a4a45d29ac7284f9cecf762e3a075a01d Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Jun 28 19:37:50 2013 -0400 Add tests for matrix's min and max values, and fix one bug. Apparently numeric_limitstype::min() is not to be used for signed types. Change-Id: Ia9730328562905459eb1d3e5cfd1a023c644e219 diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index be470b1..c7eda91 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2562,6 +2562,25 @@ void Test::testMatrix() CPPUNIT_ASSERT_EQUAL(1.5, pMat-GetDouble(0, 1)); CPPUNIT_ASSERT_EQUAL(1.5, pMat-GetDouble(1, 0)); CPPUNIT_ASSERT_MESSAGE(PutEmpty() call failed., pMat-IsEmpty(1, 1)); + +// Max and min values. +pMat = new ScMatrix(2, 2, 0.0); +pMat-PutDouble(-10, 0, 0); +pMat-PutDouble(-12, 0, 1); +pMat-PutDouble(-8, 1, 0); +pMat-PutDouble(-25, 1, 1); +CPPUNIT_ASSERT_EQUAL(-25.0, pMat-GetMinValue(false)); +CPPUNIT_ASSERT_EQUAL(-8.0, pMat-GetMaxValue(false)); +pMat-PutString(Test, 0, 0); +CPPUNIT_ASSERT_EQUAL(0.0, pMat-GetMaxValue(true)); // text as zero. +CPPUNIT_ASSERT_EQUAL(-8.0, pMat-GetMaxValue(false)); // ignore text. +pMat-PutBoolean(true, 0, 0); +CPPUNIT_ASSERT_EQUAL(1.0, pMat-GetMaxValue(false)); +pMat = new ScMatrix(2, 2, 10.0); +pMat-PutBoolean(false, 0, 0); +pMat-PutDouble(12.5, 1, 1); +CPPUNIT_ASSERT_EQUAL(0.0, pMat-GetMinValue(false)); +CPPUNIT_ASSERT_EQUAL(12.5, pMat-GetMaxValue(false)); } void Test::testEnterMixedMatrix() diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index bf3ea63..b0bef2e 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -940,7 +940,7 @@ public: struct MaxOp { -static double init() { return std::numeric_limitsdouble::min(); } +static double init() { return -std::numeric_limitsdouble::max(); } static double compare(double left, double right) { return std::max(left, right); commit 58380c11216cb9f03a98e3d53dcee702576fedb8 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Jun 28 17:54:34 2013 -0400 Better to calculate max and min value of matrix *in* the matrix itself. Change-Id: I410b345ac32550a188aa356e133ef8e0e9b13d9f diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 66b271b..d6ac279 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -349,6 +349,9 @@ public: IterateResult Product(bool
[Libreoffice-commits] core.git: shell/Package_scripts.mk shell/source vcl/inc
shell/Package_scripts.mk |4 +++- shell/source/unix/misc/cde-open-url.sh | 30 -- vcl/inc/unx/desktops.hxx |3 +-- 3 files changed, 4 insertions(+), 33 deletions(-) New commits: commit cea7cca5c8db3f273ed2c14efde45ff0e73dee7a Author: Pader Rezso re...@rezso.net Date: Mon Jul 1 15:38:36 2013 +0100 remove obsolete CDE integration, and make TDE launcher conditional. Change-Id: I5e830cd3f44627d789d789748e1b0f0ff5590d91 diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk index 3bccf28..d300337 100644 --- a/shell/Package_scripts.mk +++ b/shell/Package_scripts.mk @@ -11,8 +11,10 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc) $(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR))) -$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/cde-open-url,cde-open-url.sh)) $(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh)) + +ifeq ($(ENABLE_TDE),TRUE) $(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh)) +endif # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/source/unix/misc/cde-open-url.sh b/shell/source/unix/misc/cde-open-url.sh deleted file mode 100644 index baa74df..000 --- a/shell/source/unix/misc/cde-open-url.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -if [ -x /usr/bin/mktemp ] -then - TMPFILE=`mktemp -t open-url.XX` -else - DTTMPDIR=`xrdb -query | grep DtTmpDir` - TMPFILE=${DTTMPDIR:-$HOME/.dt/tmp}/open-url.$$ -fi - -if [ -z $TMPFILE ]; then exit 1; fi -( echo $1 $TMPFILE; dtaction Open $TMPFILE; rm -f $TMPFILE ) -exit 0 diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx index 623c9f0..c97d708 100644 --- a/vcl/inc/unx/desktops.hxx +++ b/vcl/inc/unx/desktops.hxx @@ -24,10 +24,9 @@ enum DesktopType { DESKTOP_NONE, // headless, i.e. no X connection at all DESKTOP_UNKNOWN, // unknown desktop, simple WM, etc. DESKTOP_GNOME, -DESKTOP_TDE, DESKTOP_KDE, DESKTOP_KDE4, -DESKTOP_CDE +DESKTOP_TDE }; // keep in sync with desktop_strings[] in salplug.cxx #endif // INCLUDED_VCL_DESKTOPS_HXX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC]Slide Layout Extendibility :Weekly Report #2
Hello Everyone, Here is the Linkhttp://vishvbrahmbhatt.wordpress.com/2013/07/01/slide-layout-extendibility-weekly-report-2/ to my blog for the weekly report update. Thanks Regards, Vishv Brahmbhatt On Fri, Jun 21, 2013 at 6:34 PM, Vishv Brahmbhatt vishvbrahmbhat...@gmail.com wrote: Hello Everyone, Before the beginning of this week ,I was debugging on impress slide layouts.Basically,I got to understand the mechanism of creation of slide layouts in the normal page,in the master pages like notes and handout and much more. Currently in the slide layouts, Placeholder object's height,width,position are hard-coded. So,I did following things during this week: +So at first ,I started with creation of XML file which stores following information: (1) Layout Type (2) PresObj Kind (3) Position co-ordinates of PresObj (4) Size of PreObj(Width and Height) + I have started coding XML parser, which will read this information from XML file and set the appropriate parameters in the function CalcAutoLayoutRectangles (This function calculates/sets the Top Position,Height and Width of Rectangle PresObj used.) And this will parser will help in bringing configurability with Slide Layouts. + So XML parser should be fully completed, probably by Monday or Tuesday(mostly it should get completed by this weekend). + Next week,I will work on understanding Slide Mater View and on using Slide Mater View to edit the current built-in layouts. Regards, Vishv Brahmbhatt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source
i18nlangtag/source/isolang/isolang.cxx |2 ++ include/i18nlangtag/lang.h |2 ++ svtools/source/misc/langtab.src|2 ++ 3 files changed, 6 insertions(+) New commits: commit 30213582c73f2dec6d4a980560192720f2f426ab Author: Harri Pitkänen hatap...@iki.fi Date: Wed Jun 19 10:07:32 2013 +0300 Add Cornish and Pite Sami to the list of spelling languages Add Cornish (kw-UK) and Pite Sami (sje-SE) to the list of available spell checking languages to support spell checkers that are being currently developed: https://victorio.uit.no/langtech/trunk/langs/cor https://victorio.uit.no/langtech/trunk/langs/sje Change-Id: I2f95fe5339e7cc31d64fa13cf2f74268b159215e Reviewed-on: https://gerrit.libreoffice.org/4609 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index c830673..a27331f 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -514,6 +514,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_SIDAMA,sid, ET }, { LANGUAGE_USER_NKO, nqo, GN }, { LANGUAGE_USER_UDMURT,udm, RU }, +{ LANGUAGE_USER_CORNISH, kw, UK }, +{ LANGUAGE_USER_SAMI_PITE_SWEDEN, sje, SE }, { LANGUAGE_MULTIPLE, mul,}, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, und,}, // undetermined language, language cannot be identified { LANGUAGE_NONE, zxx,}, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 53724c9..c2281cb 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -557,6 +557,8 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_NKO 0x0686 #define LANGUAGE_USER_UDMURT0x0687 #define LANGUAGE_USER_TIBETAN_INDIA 0x8051 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_TIBETAN)) */ +#define LANGUAGE_USER_CORNISH 0x0688 +#define LANGUAGE_USER_SAMI_PITE_SWEDEN 0x843B /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_SAMI_NORTHERN_NORWAY)) */ #define LANGUAGE_USER_PRIV_JOKER0xFFEB /* privateuse * (sic! bad! nasty!), primary 0x3eb, sub 0x3f */ #define LANGUAGE_USER_PRIV_COMMENT 0xFFEC /* privateuse x-comment, primary 0x3ec, sub 0x3f */ diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index f85ef6a..15abc14 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -363,6 +363,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE N'ko ; LANGUAGE_USER_NKO ; ; Udmurt ; LANGUAGE_USER_UDMURT ; ; Tibetan (India) ; LANGUAGE_USER_TIBETAN_INDIA ; ; + Cornish ; LANGUAGE_USER_CORNISH ; ; + Sami, Pite (Sweden) ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; ; }; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff starmath/source xmloff/source
include/xmloff/xmltoken.hxx |3 ++ starmath/source/mathmlexport.cxx | 42 +-- xmloff/source/core/xmltoken.cxx |3 ++ 3 files changed, 46 insertions(+), 2 deletions(-) New commits: commit bc51be7e7f2fc55456e1ce7dcdc70e6a15c53c0e Author: Frédéric Wang fred.w...@free.fr Date: Sat Jun 29 22:51:58 2013 +0200 #fdo66277 - Add support for alignment in MathML export. Change-Id: I78352ff93da5b4e912040c4019fcea924f7b0c20 Reviewed-on: https://gerrit.libreoffice.org/4625 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 5993b74..690aad0 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -430,6 +430,7 @@ namespace xmloff { namespace token { XML_COLUMN_NAME, XML_COLUMN_SEP, XML_COLUMN_WIDTH, +XML_COLUMNALIGN, XML_COLUMNS, XML_COLUMNSPLIT_AUTO, XML_COLUMNSPLIT_AVOID, @@ -590,6 +591,7 @@ namespace xmloff { namespace token { XML_DELAY, XML_DELETION, XML_DELETIONS, +XML_DENOMALIGN, XML_DENOMINATOR_VALUE, XML_DEPENDENCE, XML_DEPENDENCES, @@ -1276,6 +1278,7 @@ namespace xmloff { namespace token { XML_NUM_LETTER_SYNC, XML_NUM_PREFIX, XML_NUM_SUFFIX, +XML_NUMALIGN, XML_NUMBER, XML_NUMBER_AND_NAME, XML_NUMBER_COLUMNS_REPEATED, diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index fbc1e97..34c6050 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -799,9 +799,25 @@ void SmXMLExport::ExportExpression(const SmNode *pNode, int nLevel) void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel) { OSL_ENSURE(pNode-GetNumSubNodes()==3,Bad Fraction); +const SmNode *pNum = pNode-GetSubNode(0); +const SmNode *pDenom = pNode-GetSubNode(2); +if (pNum-GetType() == NALIGN pNum-GetToken().eType != TALIGNC) +{ +// A left or right alignment is specified on the numerator: +// attach the corresponding numalign attribute. +AddAttribute(XML_NAMESPACE_MATH, XML_NUMALIGN, +pNum-GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT); +} +if (pDenom-GetType() == NALIGN pDenom-GetToken().eType != TALIGNC) +{ +// A left or right alignment is specified on the denominator: +// attach the corresponding denomalign attribute. +AddAttribute(XML_NAMESPACE_MATH, XML_DENOMALIGN, +pDenom-GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT); +} SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, sal_True, sal_True); -ExportNodes(pNode-GetSubNode(0), nLevel); -ExportNodes(pNode-GetSubNode(2), nLevel); +ExportNodes(pNum, nLevel); +ExportNodes(pDenom, nLevel); } void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel) @@ -866,6 +882,19 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel) if (pTable) { pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTR, sal_True, sal_True); +if (pTemp-GetNumSubNodes() 0) +{ + const SmNode *pFirstChild = pTemp-GetSubNode(0); + if (pFirstChild-GetType() == NALIGN + pFirstChild-GetToken().eType != TALIGNC) + { + // If a left or right alignment is specified on this line, + // attach the corresponding columnalign attribute. + AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN, + pFirstChild-GetToken().eType == TALIGNL ? + XML_LEFT : XML_RIGHT); + } +} pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTD, sal_True, sal_True); } ExportNodes(pTemp, nLevel+1); @@ -1481,6 +1510,15 @@ void SmXMLExport::ExportMatrix(const SmNode *pNode, int nLevel) for (sal_uLong x = 0; x pMatrix-GetNumCols(); x++) if (const SmNode *pTemp = pNode-GetSubNode(i++)) { +if (pTemp-GetType() == NALIGN +pTemp-GetToken().eType != TALIGNC) +{ +// A left or right alignment is specified on this cell, +// attach the corresponding columnalign attribute. +AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN, +pTemp-GetToken().eType == TALIGNL ? +XML_LEFT : XML_RIGHT); +} SvXMLElementExport aCell(*this, XML_NAMESPACE_MATH, XML_MTD, sal_True, sal_True); ExportNodes(pTemp, nLevel+1); }
Re: Building LO 4.0.4.2 on illumos based OS
On 01/07/13 16:43, Michael Stahl wrote: On 01/07/13 14:58, Gabriele Bulfon wrote: [build LNK] Executable/cppumaker /usr/gnu/bin/ld: warning: libreg.so, needed by /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libunoidl.so, not found (try using -rpath or -rpath-link) I tried using the solaris.mk commented options: @@ -120,6 +120,7 @@ -L$(SYSBASE)/lib \ -L$(SYSBASE)/usr/lib \ -Wl,-z,combreloc \ + -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ $(SOLARLIB) \ ifeq ($(HAVE_LD_HASH_STYLE),TRUE) but no luck, still cannot solve. did you try adding it to definition of gb_Library__get_rpath like it's done in unxgcc.mk ? (perhaps just copy that) ah sorry the relevant one is gb_Executable__get_rpath I also tried using Sun ld, but looks like options for ld are always gnu-ld ones, so compilation stop much earlier. ...any clue? sure, if you want to use Sun ld you need to change quite a few things in solaris.mk to use different options. Great suggestions! Path to the solution ;) it went through :) Following your suggestion I found solaris.mk had many more lines about rpath, the ones you pointed, and they were almost all changed from unxgcc.mk into something different. I guess the one who tried to do solaris.mk was using Sun ld instead of Gnu. It's going on building now. ;) Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [No patch] Proposed tiny modification to lo-commit-stat
Adolfo Jayme Barrientos wrote: Oh, forgive me, Thorsten has already thought on this... Not at all - thanks for manually cleaning up, I should have noticed earlier! 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: Branch 'refs/notes/commits' - e9/4681fb47e3c5bdba486cd8feca92705d44840d
e9/4681fb47e3c5bdba486cd8feca92705d44840d |1 + 1 file changed, 1 insertion(+) New commits: commit c33c95bc3f8e6c1aa76bc75a12579405dc7835ca Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 16:47:40 2013 +0100 Notes added by 'git notes add' diff --git a/e9/4681fb47e3c5bdba486cd8feca92705d44840d b/e9/4681fb47e3c5bdba486cd8feca92705d44840d new file mode 100644 index 000..4dea33c --- /dev/null +++ b/e9/4681fb47e3c5bdba486cd8feca92705d44840d @@ -0,0 +1 @@ +merged as: b9ebdadf5a6ebf22b4df7589d86dd8fdfb675b1e ___ 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' - 45/4614afbc43924380735b68f0f140584723d93b
45/4614afbc43924380735b68f0f140584723d93b |1 + 1 file changed, 1 insertion(+) New commits: commit 0fedc9dc14ba947087adf068b50e215913d2b6bd Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 1 16:47:55 2013 +0100 Notes added by 'git notes add' diff --git a/45/4614afbc43924380735b68f0f140584723d93b b/45/4614afbc43924380735b68f0f140584723d93b new file mode 100644 index 000..4dea33c --- /dev/null +++ b/45/4614afbc43924380735b68f0f140584723d93b @@ -0,0 +1 @@ +merged as: b9ebdadf5a6ebf22b4df7589d86dd8fdfb675b1e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Statement - rezso
Hi all, here is my license statement (for fdo#62966 and others): All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, rezso signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/shared/autokorr/0700.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a804914de5db3aef91f8c244db6acf59a1da0f78 Author: Andras Timar ati...@suse.com Date: Mon Jul 1 17:55:35 2013 +0200 typo fix: You text - Your text Change-Id: I4543b50bca9bd9b8354ae0896c9d36e94606737b diff --git a/source/text/shared/autokorr/0700.xhp b/source/text/shared/autokorr/0700.xhp index c4c08b5..3a92857 100644 --- a/source/text/shared/autokorr/0700.xhp +++ b/source/text/shared/autokorr/0700.xhp @@ -34,7 +34,7 @@ bookmark xml-lang=en-US branch=hid/EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES id=bm_id3147477 localize=false/ paragraph role=heading id=hd_id3153629 xml-lang=en-US level=1 l10n=U oldref=1AutoCorrect has been activated/paragraph paragraph role=heading id=hd_id3149987 xml-lang=en-US level=3 l10n=U oldref=2Single quotes have been replaced/paragraph -paragraph role=paragraph id=par_id3154688 xml-lang=en-US l10n=U oldref=3You text was corrected by link href=text/shared/01/0604.xhp name=AutocorrectAutocorrect/link so that single quotation marks were replaced by link href=text/shared/01/06040400.xhp name=typographical quotation markstypographical quotation marks/link./paragraph +paragraph role=paragraph id=par_id3154688 xml-lang=en-US l10n=U oldref=3Your text was corrected by link href=text/shared/01/0604.xhp name=AutocorrectAutocorrect/link so that single quotation marks were replaced by link href=text/shared/01/06040400.xhp name=typographical quotation markstypographical quotation marks/link./paragraph section id=howtoget embed href=text/shared/00/0406.xhp#autokotyafz/ /section ___ 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 a1df1de6ec140cfe49160fe08cc9eee7c0a60ba9 Author: Andras Timar ati...@suse.com Date: Mon Jul 1 17:55:35 2013 +0200 Updated core Project: help a804914de5db3aef91f8c244db6acf59a1da0f78 diff --git a/helpcontent2 b/helpcontent2 index e26aa35..a804914 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e26aa35eb646a5f0e1256c72af000595c4845016 +Subproject commit a804914de5db3aef91f8c244db6acf59a1da0f78 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||66071 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|66071 | -- 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 'aoo/trunk' - 2 commits - solenv/bin sw/source sysui/desktop
solenv/bin/modules/installer/epmfile.pm | 12 +--- sw/source/core/docnode/nodes.cxx| 24 sysui/desktop/debian/control|4 ++-- 3 files changed, 27 insertions(+), 13 deletions(-) New commits: commit 7f250ed4ce273c5d54898a142f07ef93f38c3056 Author: Andre Fischer a...@apache.org Date: Mon Jul 1 15:10:21 2013 + 121479: Prevent crash when loading some RTF documents. diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 1150d509..eddef2a 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange aRange, SwNodes rNodes, sal_uInt16 nSectNdCnt = 0; sal_Bool bSaveNewFrms = bNewFrms; +// Check that the range of nodes to move is valid. +// This is a very specific test that only checks that table nodes +// are completely covered by the range. Issue 121479 has a +// document for which this test fails. +SwNodeIndex aNodeIndex (aRg.aEnd); +while (aNodeIndex aRg.aStart) +{ +SwNode* pNode = rNodes[aNodeIndex.GetIndex()]; +if (pNode-GetNodeType() != ND_ENDNODE) +break; +SwStartNode* pStartNode = pNode-pStartOfSection; +if (pStartNode==NULL) +break; +if ( ! pStartNode-IsTableNode()) +break; +aNodeIndex = *pStartNode; +if (aNodeIndex aRg.aStart.GetIndex()) +{ +return sal_False; +} +--aNodeIndex; +} + + // bis alles verschoben ist while( aRg.aStart aRg.aEnd ) switch( (pAktNode = aRg.aEnd.GetNode())-GetNodeType() ) commit e9991e068f17bbe588b97cdfa07fdd0a3f901f33 Author: Oliver-Rainer Wittmann o...@apache.org Date: Mon Jul 1 14:23:10 2013 + 121968: further changes for the creation of debian packages in order to get them installed when a former AOO resp. OOo version is installed. diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index cd7ed76..d0efdc0 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -538,23 +538,13 @@ sub create_epm_header if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; } # Debian allows no underline in package name $line = %replaces . . $onereplaces . \n; push(@epmheader, $line); - -# Force the openofficeorg packages to get removed, -# see http://www.debian.org/doc/debian-policy/ch-relationships.html -# 7.5.2 Replacing whole packages, forcing their removal - -if ( $installer::globals::debian ) -{ -$line = %incompat . . $onereplaces . \n; -push(@epmheader, $line); -} } if ( $installer::globals::debian $variableshashref-{'UNIXPRODUCTNAME'} eq 'openoffice' ) { $line = %provides . openoffice.org-unbundled\n; push(@epmheader, $line); -$line = %incompat . openoffice.org-bundled\n; +$line = %replaces . openoffice.org-bundled\n; push(@epmheader, $line); } } diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control index a1db639..90f0c09 100644 --- a/sysui/desktop/debian/control +++ b/sysui/desktop/debian/control @@ -2,5 +2,5 @@ Description: %productname desktop integration Maintainer: Apache Software Foundation Architecture: all Provides: openoffice-desktop-integration, openoffice.org-unbundled -Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled -Replaces: openoffice-desktop-integration, openoffice.org-debian-menus +Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus +Replaces: openoffice-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled, openoffice.org-common ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/hr_HR.xml | 140 +++--- 1 file changed, 70 insertions(+), 70 deletions(-) New commits: commit cb44db2fe78b43424491d25f0c9e34f16aba5c24 Author: Eike Rathke er...@redhat.com Date: Mon Jul 1 19:02:32 2013 +0200 sorted by formatindex for better comparability Change-Id: I38f238878141b9ce7d479e66340ef3e78dc83843 diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index f484830..f95dd02 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -56,55 +56,84 @@ DateAcceptancePatternD.M.Y./DateAcceptancePattern DateAcceptancePatternD/M/Y/DateAcceptancePattern DateAcceptancePatternD/M/DateAcceptancePattern -FormatElement msgid=DateFormatskey1 default=false type=medium usage=DATE formatindex=34 - FormatCodeMM.YY/FormatCode +FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 + FormatCodeGeneral/FormatCode /FormatElement -FormatElement msgid=DateFormatskey2 default=false type=medium usage=DATE formatindex=35 - FormatCodeMMM.DD/FormatCode +FormatElement msgid=FixedFormatskey2 default=true type=short usage=FIXED_NUMBER formatindex=1 + FormatCode0/FormatCode /FormatElement -FormatElement msgid=DateFormatskey3 default=false type=medium usage=DATE formatindex=36 - FormatCode/FormatCode +FormatElement msgid=FixedFormatskey3 default=false type=medium usage=FIXED_NUMBER formatindex=2 + FormatCode0,00/FormatCode /FormatElement -FormatElement msgid=DateFormatskey4 default=false type=medium usage=DATE formatindex=37 - FormatCodeQQ YY/FormatCode +FormatElement msgid=FixedFormatskey4 default=false type=short usage=FIXED_NUMBER formatindex=3 + FormatCode#.##0/FormatCode /FormatElement -FormatElement msgid=DateFormatskey5 default=false type=medium usage=DATE formatindex=21 - FormatCodeDD.MM./FormatCode +FormatElement msgid=FixedFormatskey5 default=false type=medium usage=FIXED_NUMBER formatindex=4 + FormatCode#.##0,00/FormatCode /FormatElement -FormatElement msgid=DateFormatskey6 default=true type=medium usage=DATE formatindex=20 - FormatCodeDD.MM.YY/FormatCode +FormatElement msgid=FixedFormatskey6 default=false type=medium usage=FIXED_NUMBER formatindex=5 + FormatCode#.###,00/FormatCode /FormatElement -FormatElement msgid=DateFormatskey7 default=false type=medium usage=DATE formatindex=32 - FormatCodeYY-MM-DD/FormatCode +FormatElement msgid=ScientificFormatskey1 default=true type=medium usage=SCIENTIFIC_NUMBER formatindex=6 + FormatCode0,00E+00/FormatCode /FormatElement -FormatElement msgid=DateFormatskey8 default=false type=medium usage=DATE formatindex=33 - FormatCode-MM-DD/FormatCode - DefaultNameISO 8601/DefaultName +FormatElement msgid=ScientificFormatskey2 default=false type=medium usage=SCIENTIFIC_NUMBER formatindex=7 + FormatCode0,00E+000/FormatCode /FormatElement -FormatElement msgid=DateFormatskey9 default=false type=medium usage=DATE formatindex=38 - FormatCodeWW/FormatCode +FormatElement msgid=PercentFormatskey1 default=true type=short usage=PERCENT_NUMBER formatindex=8 + FormatCode0%/FormatCode /FormatElement -FormatElement msgid=DateFormatskey10 default=false type=medium usage=DATE formatindex=27 - FormatCodeNN, DD.MMM.YY/FormatCode +FormatElement msgid=PercentFormatskey2 default=true type=long usage=PERCENT_NUMBER formatindex=9 + FormatCode0,00%/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY formatindex=12 + FormatCode#.##0 [CURRENCY];-#.##0 [CURRENCY]/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey2 default=false type=medium usage=CURRENCY formatindex=13 + FormatCode#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey3 default=false type=medium usage=CURRENCY formatindex=14 + FormatCode#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey4 default=true type=medium usage=CURRENCY formatindex=15 + FormatCode#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey5 default=false type=medium usage=CURRENCY formatindex=16 + FormatCode#.##0,00 CCC/FormatCode +/FormatElement +FormatElement msgid=CurrencyFormatskey6 default=false type=medium usage=CURRENCY formatindex=17 + FormatCode#.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]/FormatCode /FormatElement FormatElement msgid=DateFormatskey11 default=true type=short usage=DATE formatindex=18 FormatCodeD.MM.YY/FormatCode /FormatElement -
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmltabi.cxx | 12 +--- sc/source/ui/unoobj/cellsuno.cxx |7 +-- 2 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 92c7eca78e6ac84ef2b1be5dca102ecfaee9766b Author: Laurent Godard lgodard.li...@laposte.net Date: Mon Jul 1 15:43:46 2013 +0200 simplify AddPrintRanges calls at import time - at import time, use directly core functions - honor IsUndoEnabled in uno calls Change-Id: If1e762df0ca9cfa22fa2c0e75518fe892be602b6 Reviewed-on: https://gerrit.libreoffice.org/4656 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 1069f47..1701529 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -359,14 +359,12 @@ void ScXMLTableContext::EndElement() SCTAB nCurTab = rTables.GetCurrentSheet(); if (!sPrintRanges.isEmpty()) { -Reference sheet::XPrintAreas xPrintAreas( -rTables.GetCurrentXSheet(), UNO_QUERY); - -if( xPrintAreas.is() ) + ScRangeList aRangeList; +ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO ); +size_t nCount = aRangeList.size(); +for (size_t i=0; i nCount; i++ ) { -Sequence table::CellRangeAddress aRangeList; -ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO ); -xPrintAreas-setPrintAreas( aRangeList ); +pDoc-AddPrintRange( nCurTab, *aRangeList[i] ); } } else if (!bPrintEntireSheet) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 763bf67..1d0a8e8 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -7503,13 +7503,15 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( throw(uno::RuntimeException) { SolarMutexGuard aGuard; +ScPrintRangeSaver* pOldRanges; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { ScDocument* pDoc = pDocSh-GetDocument(); SCTAB nTab = GetTab_Impl(); -ScPrintRangeSaver* pOldRanges = pDoc-CreatePrintRangeSaver(); +if ( pDoc-IsUndoEnabled() ) +pOldRanges = pDoc-CreatePrintRangeSaver(); sal_uInt16 nCount = (sal_uInt16) aPrintAreas.getLength(); pDoc-ClearPrintRanges( nTab ); @@ -7524,7 +7526,8 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( } } -PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. +if ( pDoc-IsUndoEnabled() ) +PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc. } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8nds.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit a201ae63ce798438057a1328dc644dc8b64fe4e8 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 19:04:38 2013 +0200 fdo#66165: WW8 export: fix duplicated paragraph breaks MSWordExportBase::OutputTextNode(): in commit 8f2a21eac4a904db3cc4c448179e2d2cf5878ef4 (which is not merged) a WriteCR( pTextNodeInfoInner ); was moved up a few lines, so it shows up as context in the other commit, and the bug is that the cherry-pick 83ba821c10392c08334f7d8d3775fe3e8d08f8fd erroneously adds this context line so now there are 2 WriteCR(). Change-Id: I08434b284f3d8d8426fa997623be352c37d6c7c2 diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 85d6b11..62b43a5 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2023,7 +2023,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode rNode ) aAttrIter.OutFlys( nEnd ); // insert final bookmarks if any before CR and after flys AppendBookmarks( rNode, nEnd, 1 ); -WriteCR( pTextNodeInfoInner ); // #i120928 - position of the bullet's graphic is at end of doc if (bLastCR (!bExported)) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Hide and show slides from custom dialog
Guillermo Molleda Jimena wrote: Objective: to print a custom in PDF, hiding the rest of slides and presenting only those chosen. Can anyone help? Hi Guillermo, so you mean, beyond selecting certain slides, within that custom selection, have some 'don't export this to pdf' meta-customization? I think it's something important for teachers with different students, the same base but different levels slide. Wouldn't that work with the custom slide shows itself, i.e. have several different ones, for the various student levels, and then export just the slides in the selected custom show? Can you elaborate a bit more (preferably on the ux-advise list) how the interaction would look like? But I don't know how do it. Beyond the question of the use case, and how to best do it (for which I Cc the ux-advise list), the dialog and code to stick slide subset selections into is: - impress pdf/export page render code: SdXImpressDocument::render() in sd/source/ui/unoidl/unomodel.cxx - pdf export dialog implementation: filter/source/pdf/impdialog.cxx HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|4 ++ vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 39 ++ 2 files changed, 32 insertions(+), 11 deletions(-) New commits: commit cc06e7b6b8b73ae68a2eea72d94c6f45c9fbf497 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Jul 1 21:29:29 2013 +0400 gtk3: for checkbox map BUTTONVALUE_MIXED to GTK_STATE_FLAG_INCONSISTENT Change-Id: I5f5810a1e2dc56afb0fba7fde20a383980e3ba51 diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 1821cbe..350d1e9 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -853,7 +853,9 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart break; case CTRL_CHECKBOX: flags = (GtkStateFlags)(flags | -( (aValue.getTristateVal() == BUTTONVALUE_ON) ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL)); +( (aValue.getTristateVal() == BUTTONVALUE_ON) ? GTK_STATE_FLAG_ACTIVE : + (aValue.getTristateVal() == BUTTONVALUE_MIXED) ? GTK_STATE_FLAG_INCONSISTENT : + GTK_STATE_FLAG_NORMAL)); context = mpCheckButtonStyle; styleClass = GTK_STYLE_CLASS_CHECK; renderType = RENDER_CHECK; commit 76c9d45ccf8480f8b73815607ff8701a3d41a649 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Jul 1 21:24:25 2013 +0400 gtk3: add indicator-spacing to size of checkbox/radiobutton Change-Id: Ifea43607c8cd5a8047796b7d2efdf14289b029e2 diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 4d5ff7c..912e27e 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -103,6 +103,10 @@ private: ControlType nType, ControlPart nPart, const ImplControlValue aValue ); +void PaintCheckOrRadio(GtkStyleContext *context, + cairo_t *cr, + const Rectangle rControlRectangle, + ControlType nType); static bool style_loaded; }; diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 3448615..1821cbe 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -751,6 +751,24 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext *context, arrowRect.GetWidth() ); } +void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context, + cairo_t *cr, + const Rectangle rControlRectangle, + ControlType nType) +{ +gint x, y, indicator_size; +gtk_style_context_get_style(mpCheckButtonStyle, +indicator-size, indicator_size, +NULL ); + +x = (rControlRectangle.GetWidth() - indicator_size) / 2; +y = (rControlRectangle.GetHeight() - indicator_size) / 2; +if (nType == CTRL_CHECKBOX) +gtk_render_check(context, cr, x, y, indicator_size, indicator_size); +else if (nType == CTRL_RADIOBUTTON) +gtk_render_option(context, cr, x, y, indicator_size, indicator_size); +} + sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle rControlRegion, ControlState nState, const ImplControlValue aValue, const OUString ) @@ -891,14 +909,8 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart rControlRegion.GetWidth(), rControlRegion.GetHeight()); break; case RENDER_CHECK: -gtk_render_check(context, cr, - 0, 0, - rControlRegion.GetWidth(), rControlRegion.GetHeight()); -break; case RENDER_RADIO: -gtk_render_option(context, cr, - 0, 0, - rControlRegion.GetWidth(), rControlRegion.GetHeight()); +PaintCheckOrRadio(context, cr, rControlRegion, nType); break; case RENDER_LINE: gtk_render_line(context, cr, @@ -982,18 +994,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart { /* TODO: all this funcions needs improvements */ Rectangle aEditRect = rControlRegion; -gint indicator_size, point; +gint indicator_size, indicator_spacing, point; if(((nType == CTRL_CHECKBOX) || (nType == CTRL_RADIOBUTTON)) nPart == PART_ENTIRE_CONTROL) { gtk_style_context_get_style( mpCheckButtonStyle, indicator-size, indicator_size, + indicator-spacing,
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c Author: Ivan Timofeev timofeev@gmail.com Date: Mon Jul 1 22:10:45 2013 +0400 WaE: pOldRanges may be used uninitialized Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135 diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 1d0a8e8..3a8f7cd 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -7503,7 +7503,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( throw(uno::RuntimeException) { SolarMutexGuard aGuard; -ScPrintRangeSaver* pOldRanges; +ScPrintRangeSaver* pOldRanges = NULL; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 64989, which changed state. Bug 64989 Summary: FILE SAVE: A newline /paragraph is added after pictures (anchored as character) and fields, when saved as .doc https://bugs.freedesktop.org/show_bug.cgi?id=64989 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 'feature/polynomialregression' - 3 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/Library_chartcontroller.mk chart2/source
chart2/AllLangResTarget_chartcontroller.mk |1 chart2/Library_chartcontroller.mk |1 chart2/source/controller/dialogs/dlg_InsertTrendline.cxx| 106 chart2/source/controller/dialogs/dlg_InsertTrendline.hrc| 25 -- chart2/source/controller/dialogs/dlg_InsertTrendline.src| 40 chart2/source/controller/dialogs/res_Trendline.cxx |1 chart2/source/controller/inc/dlg_InsertTrendline.hxx| 62 --- chart2/source/controller/main/ChartController_Insert.cxx| 48 - chart2/source/controller/main/ControllerCommandDispatch.cxx | 10 - chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 20 +- 10 files changed, 22 insertions(+), 292 deletions(-) New commits: commit afd74d41e7c8c0014a3b67940f855dc469b306c5 Author: Tomaž Vajngerl qui...@gmail.com Date: Mon Jul 1 22:32:35 2013 +0200 Remove InsertTrendlineDialog as it is not used anymore. Change-Id: I58dbdc416254e631f33784bb2a2cf124e69fc69a diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 0da17b2..006266a 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \ chart2/source/controller/dialogs/dlg_InsertLegend.src \ chart2/source/controller/dialogs/dlg_InsertTitle.src \ -chart2/source/controller/dialogs/dlg_InsertTrendline.src \ chart2/source/controller/dialogs/dlg_ObjectProperties.src \ chart2/source/controller/dialogs/dlg_ShapeFont.src \ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 45e4266..e90f716 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -98,7 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/dialogs/dlg_InsertErrorBars \ chart2/source/controller/dialogs/dlg_InsertLegend \ chart2/source/controller/dialogs/dlg_InsertTitle \ -chart2/source/controller/dialogs/dlg_InsertTrendline \ chart2/source/controller/dialogs/dlg_NumberFormat \ chart2/source/controller/dialogs/dlg_ObjectProperties \ chart2/source/controller/dialogs/dlg_ShapeFont \ diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx deleted file mode 100644 index a00e424..000 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include dlg_InsertTrendline.hxx -#include dlg_InsertTrendline.hrc -#include res_Trendline.hxx -#include ResourceIds.hrc -#include ResId.hxx -#include Strings.hrc -#include chartview/ExplicitValueProvider.hxx -#include ChartModelHelper.hxx -#include ObjectIdentifier.hxx -#include DiagramHelper.hxx -#include AxisHelper.hxx -#include ObjectNameProvider.hxx -#include com/sun/star/chart2/XAxis.hpp -#include com/sun/star/chart2/XDiagram.hpp - -#include svtools/controldims.hrc - -using namespace ::com::sun::star; -using namespace ::com::sun::star::chart2; - -namespace -{ -void lcl_SetControlXPos( Control rControl, long nPosPixel ) -{ -Point aPos( rControl.GetPosPixel()); -aPos.setX( nPosPixel ); -rControl.SetPosPixel( aPos ); -} -} // anonymous namespace - -//. -namespace chart -{ -//. - -InsertTrendlineDialog::InsertTrendlineDialog( Window* pParent, const SfxItemSet rMyAttrs ) : -ModalDialog( pParent, SchResId( DLG_DATA_TRENDLINE )), -rInAttrs( rMyAttrs ), -aBtnOK( this, SchResId( BTN_OK )), -aBtnCancel( this, SchResId( BTN_CANCEL )), -aBtnHelp( this, SchResId( BTN_HELP )), -m_apTrendlineResources( new TrendlineResources(
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3afc54efa142c20adbbdc68900b3c429cae6bd6b Author: Michael Meeks michael.me...@suse.com Date: Mon Jul 1 21:54:09 2013 +0100 get quoting right. diff --git a/configure.ac b/configure.ac index 46cb73c..68b578a 100644 --- a/configure.ac +++ b/configure.ac @@ -9686,7 +9686,7 @@ AC_MSG_CHECKING([opencl sdk]) if test z$with_opencl_sdk = z; then AC_MSG_RESULT([no]) else - if test -d $with_opencl_sdk/include; then + if test -d $with_opencl_sdk/include; then ENABLE_OPENCL=TRUE OPENCL_CFLAGS=-I$with_opencl_sdk/include OPENCL_LIBS=-L$with_opencl_sdk/lib/x86 -lOpenCL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f74e6dd07e971d25a610edbe0197b98984dbf353 Author: Michael Meeks michael.me...@suse.com Date: Mon Jul 1 21:55:24 2013 +0100 get quoting right. Change-Id: I3b1508a3309ad4df9e095b1cb6c3091df4adff4a diff --git a/configure.ac b/configure.ac index aa440fb..66733ea 100644 --- a/configure.ac +++ b/configure.ac @@ -9838,7 +9838,7 @@ if test \( -z $with_opencl_sdk -o $with_opencl_sdk = yes \) -a $_os = Darwin elif test z$with_opencl_sdk = z; then AC_MSG_RESULT([no]) else -if test -d $with_opencl_sdk/include; then +if test -d $with_opencl_sdk/include; then ENABLE_OPENCL=TRUE OPENCL_CFLAGS=-I$with_opencl_sdk/include OPENCL_LIBS=-L$with_opencl_sdk/lib/x86 -lOpenCL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unosett.cxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 1 23:48:59 2013 +0200 fdo#65650: fix Writer ODF import of list style with bullets and color For such lists xmloff tries to set a BulletColor property but SwXNumberingRules::SetNumberingRuleByIndex() throws a RuntimeException and does not set any of the list properties on the NumRule. (regression from abf18610998aa8330f8330f1d769508e47ef5b20) Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21 diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 4f8e083..31dfa2dd 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1658,8 +1658,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const sal_uInt16 NotInChapterLast = 23; const sal_uInt16 InChapterFirst = 24; const sal_uInt16 InChapterLast = 24; -const sal_uInt16 IgnoredFirst = 25; -const sal_uInt16 IgnoredLast = 26; const beans::PropertyValue* pPropArray = rProperties.getConstArray(); PropValDataArr aPropertyValues; @@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( bExcept = true; for(sal_uInt16 j = 0; j SAL_N_ELEMENTS( aNumPropertyNames ); j++) { -if( j = IgnoredFirst j = IgnoredLast ) -continue; if( pDocShell j = NotInChapterFirst j = NotInChapterLast ) continue; if( !pDocShell j = InChapterFirst j = InChapterLast ) @@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; case 25: // BulletRelSize - unsupported - only available in Impress break; -case 26: // ignored too +case 26: // BulletColor - ignored too break; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/source
formula/source/core/api/FormulaCompiler.cxx | 14 +++--- formula/source/core/api/token.cxx | 11 +-- include/formula/FormulaCompiler.hxx |4 ++-- sc/inc/compiler.hxx |4 +--- sc/source/core/tool/token.cxx |2 +- 5 files changed, 16 insertions(+), 19 deletions(-) New commits: commit 9c1ca6dca3b553c302a635357e33591605343b99 Author: Eike Rathke er...@redhat.com Date: Mon Jul 1 23:54:28 2013 +0200 resolved fdo#35411 redefined MAXCODE 512 to FORMULA_MAXTOKENS 8192 Also renamed MAXJUMPCOUNT to FORMULA_MAXJUMPCOUNT but without changing the value as the runtime array size of ocChose depends on it, should be changed before. Eliminated the duplicated and error causing redefinition of both in sc/inc/compiler.hxx Change-Id: I0e87d1439c9564a4f475fcb2870ab51c3b586942 diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 514d11c..afd6746 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1195,7 +1195,7 @@ void FormulaCompiler::Factor() pFacToken-GetJump()[ 0 ] = 3; // if, else, behind break; case ocChose: -pFacToken-GetJump()[ 0 ] = MAXJUMPCOUNT+1; +pFacToken-GetJump()[ 0 ] = FORMULA_MAXJUMPCOUNT + 1; break; case ocIfError: case ocIfNA: @@ -1225,7 +1225,7 @@ void FormulaCompiler::Factor() nJumpMax = 3; break; case ocChose: -nJumpMax = MAXJUMPCOUNT; +nJumpMax = FORMULA_MAXJUMPCOUNT; break; case ocIfError: case ocIfNA: @@ -1236,7 +1236,7 @@ void FormulaCompiler::Factor() SAL_WARN( formula.core, FormulaCompiler::Factor: forgot to add a jump max case?); } short nJumpCount = 0; -while ( (nJumpCount (MAXJUMPCOUNT - 1)) (eOp == ocSep) +while ( (nJumpCount (FORMULA_MAXJUMPCOUNT - 1)) (eOp == ocSep) (!pArr-GetCodeError() || bIgnoreErrors) ) { if ( ++nJumpCount = nJumpMax ) @@ -1262,7 +1262,7 @@ void FormulaCompiler::Factor() bLimitOk = (nJumpCount = 3); break; case ocChose: -bLimitOk = (nJumpCount MAXJUMPCOUNT); /* TODO: check, really , not =? */ +bLimitOk = (nJumpCount FORMULA_MAXJUMPCOUNT); /* TODO: check, really , not =? */ break; case ocIfError: case ocIfNA: @@ -1546,7 +1546,7 @@ bool FormulaCompiler::CompileTokenArray() pArr-nRefs = 0;// count from start pArr-DelRPN(); pStack = NULL; -FormulaToken* pData[ MAXCODE ]; +FormulaToken* pData[ FORMULA_MAXTOKENS ]; pCode = pData; bool bWasForced = pArr-IsRecalcModeForced(); if ( bWasForced ) @@ -1951,9 +1951,9 @@ OpCode FormulaCompiler::NextToken() } void FormulaCompiler::PutCode( FormulaTokenRef p ) { -if( pc = MAXCODE-1 ) +if( pc = FORMULA_MAXTOKENS - 1 ) { -if ( pc == MAXCODE-1 ) +if ( pc == FORMULA_MAXTOKENS - 1 ) { p = new FormulaByteToken( ocStop ); p-IncRef(); diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index b341cdc..9ea036c 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -29,7 +29,6 @@ #include formula/tokenarray.hxx #include formula/FormulaCompiler.hxx #include formula/compiler.hrc -#define MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */ namespace formula { @@ -726,8 +725,8 @@ FormulaToken* FormulaTokenArray::MergeArray( ) FormulaToken* FormulaTokenArray::Add( FormulaToken* t ) { if( !pCode ) -pCode = new FormulaToken*[ MAXCODE ]; -if( nLen MAXCODE-1 ) +pCode = new FormulaToken*[ FORMULA_MAXTOKENS ]; +if( nLen FORMULA_MAXTOKENS - 1 ) { CheckToken(*t); pCode[ nLen++ ] = t; @@ -742,7 +741,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t ) else { t-Delete(); -if ( nLen == MAXCODE-1 ) +if ( nLen == FORMULA_MAXTOKENS - 1 ) { t = new FormulaByteToken( ocStop ); pCode[ nLen++ ] = t; @@ -1194,11 +1193,11 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp ) case ocIfNA: case ocChose: { -short nJump[MAXJUMPCOUNT + 1]; +short nJump[FORMULA_MAXJUMPCOUNT + 1]; if ( eOp == ocIf ) nJump[ 0 ] = 3; else if ( eOp == ocChose ) -