Re: make fails when using '--with-system-libs'
Hi, I did some searching, and the issue seems to be with xulrunner. If I run configure with '--with-system-xulrunner=no', the issue goes away. Im running Fedora 21 and the distro provided version of xulrunner there is 33.0. I did some additional googling, and more people seem to be running into a similar issue, which appears to have started with API changes in xulrunner 30.0 and higher. Regards, Maarten Hoes. On Sat, Nov 1, 2014 at 11:10 AM, Maarten Hoes hoes.maar...@gmail.com wrote: Hi, Im running into the following build failure (it looks like it only occurs when when I run configure with the option '--with-system-libs'). Does anyone have an idea what might be going on here ? Thanks, Maarten Hoes. -- [build CXX] vcl/headless/svpprn.cxx [build CXX] vcl/headless/svptext.cxx [build CXX] vcl/headless/svpvd.cxx [build CXX] extensions/source/plugin/unx/mediator.cxx [build CXX] extensions/source/plugin/unx/plugcon.cxx In file included from /usr/local/src/libreoffice/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:71:0, from /usr/local/src/libreoffice/extensions/source/plugin/unx/plugcon.cxx:36: /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:91:27: error: expected ‘)’ before ‘NPP_InitializeUPP’ typedef void (* NP_LOADDS NPP_InitializeUPP)(void); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:118:27: error: expected ‘)’ before ‘NPP_ShutdownUPP’ typedef void (* NP_LOADDS NPP_ShutdownUPP)(void); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:151:30: error: expected ‘)’ before ‘NPP_NewUPP’ typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved); ^ In file included from /usr/local/src/libreoffice/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:71:0, from /usr/local/src/libreoffice/extensions/source/plugin/unx/plugcon.cxx:36: /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:177:30: error: expected ‘)’ before ‘NPP_DestroyUPP’ typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:204:30: error: expected ‘)’ before ‘NPP_SetWindowUPP’ typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:233:30: error: expected ‘)’ before ‘NPP_NewStreamUPP’ typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:260:30: error: expected ‘)’ before ‘NPP_DestroyStreamUPP’ typedef NPError (* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:287:30: error: expected ‘)’ before ‘NPP_WriteReadyUPP’ typedef int32_t (* NP_LOADDS NPP_WriteReadyUPP)(NPP instance, NPStream* stream); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:317:30: error: expected ‘)’ before ‘NPP_WriteUPP’ typedef int32_t (* NP_LOADDS NPP_WriteUPP)(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:345:27: error: expected ‘)’ before ‘NPP_StreamAsFileUPP’ typedef void (* NP_LOADDS NPP_StreamAsFileUPP)(NPP instance, NPStream* stream, const char* fname); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:371:27: error: expected ‘)’ before ‘NPP_PrintUPP’ typedef void (* NP_LOADDS NPP_PrintUPP)(NPP instance, NPPrint* platformPrint); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:398:30: error: expected ‘)’ before ‘NPP_HandleEventUPP’ typedef int16_t (* NP_LOADDS NPP_HandleEventUPP)(NPP instance, void* event); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:427:27: error: expected ‘)’ before ‘NPP_URLNotifyUPP’ typedef void (* NP_LOADDS NPP_URLNotifyUPP)(NPP instance, const char* url, NPReason reason, void* notifyData); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:454:30: error: expected ‘)’ before ‘NPP_GetValueUPP’ typedef NPError (* NP_LOADDS NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:480:30: error: expected ‘)’ before
Re: make fails when using '--with-system-libs'
Hrm. Looks like I spoke (just a little) too soon: there appears to be no '--with-system-xulrunner' option. Using '--with-system-npapi-headers=no' for the desired effect instead. - Maarten. On Mon, Nov 3, 2014 at 9:18 AM, Maarten Hoes hoes.maar...@gmail.com wrote: Hi, I did some searching, and the issue seems to be with xulrunner. If I run configure with '--with-system-xulrunner=no', the issue goes away. Im running Fedora 21 and the distro provided version of xulrunner there is 33.0. I did some additional googling, and more people seem to be running into a similar issue, which appears to have started with API changes in xulrunner 30.0 and higher. Regards, Maarten Hoes. On Sat, Nov 1, 2014 at 11:10 AM, Maarten Hoes hoes.maar...@gmail.com wrote: Hi, Im running into the following build failure (it looks like it only occurs when when I run configure with the option '--with-system-libs'). Does anyone have an idea what might be going on here ? Thanks, Maarten Hoes. -- [build CXX] vcl/headless/svpprn.cxx [build CXX] vcl/headless/svptext.cxx [build CXX] vcl/headless/svpvd.cxx [build CXX] extensions/source/plugin/unx/mediator.cxx [build CXX] extensions/source/plugin/unx/plugcon.cxx In file included from /usr/local/src/libreoffice/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:71:0, from /usr/local/src/libreoffice/extensions/source/plugin/unx/plugcon.cxx:36: /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:91:27: error: expected ‘)’ before ‘NPP_InitializeUPP’ typedef void (* NP_LOADDS NPP_InitializeUPP)(void); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:118:27: error: expected ‘)’ before ‘NPP_ShutdownUPP’ typedef void (* NP_LOADDS NPP_ShutdownUPP)(void); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:151:30: error: expected ‘)’ before ‘NPP_NewUPP’ typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved); ^ In file included from /usr/local/src/libreoffice/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:71:0, from /usr/local/src/libreoffice/extensions/source/plugin/unx/plugcon.cxx:36: /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:177:30: error: expected ‘)’ before ‘NPP_DestroyUPP’ typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:204:30: error: expected ‘)’ before ‘NPP_SetWindowUPP’ typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:233:30: error: expected ‘)’ before ‘NPP_NewStreamUPP’ typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:260:30: error: expected ‘)’ before ‘NPP_DestroyStreamUPP’ typedef NPError (* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:287:30: error: expected ‘)’ before ‘NPP_WriteReadyUPP’ typedef int32_t (* NP_LOADDS NPP_WriteReadyUPP)(NPP instance, NPStream* stream); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:317:30: error: expected ‘)’ before ‘NPP_WriteUPP’ typedef int32_t (* NP_LOADDS NPP_WriteUPP)(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:345:27: error: expected ‘)’ before ‘NPP_StreamAsFileUPP’ typedef void (* NP_LOADDS NPP_StreamAsFileUPP)(NPP instance, NPStream* stream, const char* fname); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:371:27: error: expected ‘)’ before ‘NPP_PrintUPP’ typedef void (* NP_LOADDS NPP_PrintUPP)(NPP instance, NPPrint* platformPrint); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:398:30: error: expected ‘)’ before ‘NPP_HandleEventUPP’ typedef int16_t (* NP_LOADDS NPP_HandleEventUPP)(NPP instance, void* event); ^ /usr/local/src/libreoffice/external/np_sdk/npsdk/npupp.h:427:27: error: expected ‘)’ before ‘NPP_URLNotifyUPP’ typedef void (* NP_LOADDS NPP_URLNotifyUPP)(NPP instance, const char* url, NPReason reason, void* notifyData); ^
Re: Build fail with MacOs (crashrep part)
On 10/31/2014 10:04 PM, julien2412 wrote: On MacOs 10.9.5, I got this error when building master sources updated yesterday: lo/core/crashrep/source/unx/main.cxx:168:26: error: 'tmpnam' is deprecated: This function is provided for compatibility reasons only. Due to security concerns inherent in the design of tmpnam(3), it is highly recommended that you use mkstemp(3) instead. [-Werror,-Wdeprecated-declarations] FILE*fp = fopen( tmpnam( g_szReportFile ), w ); Easiest fix would be to not bother with --enable-crashdump. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d2a989bc2fed03e41ed0493d7ce5b0512c67612 Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 10:51:32 2014 +0400 change 'Entry' to its full form of 'Index Entry' Change-Id: I861374e6a5c867f674fb682c6dc0eb6050a372d1 Reviewed-on: https://gerrit.libreoffice.org/12208 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 2fea2a5..81f9532 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -398,7 +398,7 @@ /node node oor:name=.uno:InsertIndexesEntry oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Entry.../value + value xml:lang=en-US~Index Entry.../value /prop prop oor:name=Properties oor:type=xs:int value1/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig
cui/uiconfig/ui/backgroundpage.ui | 127 + cui/uiconfig/ui/calloutdialog.ui|2 cui/uiconfig/ui/macroassigndialog.ui|2 cui/uiconfig/ui/positionsizedialog.ui |8 cui/uiconfig/ui/posterdialog.ui | 15 - cui/uiconfig/ui/querychangelineenddialog.ui |7 cui/uiconfig/ui/querydeletebitmapdialog.ui |9 cui/uiconfig/ui/querydeletechartcolordialog.ui |5 cui/uiconfig/ui/querydeletedictionarydialog.ui |5 cui/uiconfig/ui/querydeletegradientdialog.ui|7 cui/uiconfig/ui/querydeletehatchdialog.ui |9 cui/uiconfig/ui/querydeletelineenddialog.ui |9 cui/uiconfig/ui/querydeletelinestyledialog.ui |7 cui/uiconfig/ui/queryduplicatedialog.ui |7 cui/uiconfig/ui/querynoloadedfiledialog.ui |7 cui/uiconfig/ui/querynosavefiledialog.ui|7 cui/uiconfig/ui/querysavelistdialog.ui |9 cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui |7 cui/uiconfig/ui/rotationtabpage.ui | 25 - cui/uiconfig/ui/searchattrdialog.ui | 46 --- cui/uiconfig/ui/searchformatdialog.ui |5 cui/uiconfig/ui/securityoptionsdialog.ui| 43 --- cui/uiconfig/ui/selectpathdialog.ui |8 cui/uiconfig/ui/shadowtabpage.ui| 37 -- cui/uiconfig/ui/showcoldialog.ui| 10 cui/uiconfig/ui/similaritysearchdialog.ui | 31 -- cui/uiconfig/ui/slantcornertabpage.ui |7 cui/uiconfig/ui/smoothdialog.ui | 16 - cui/uiconfig/ui/solarizedialog.ui | 18 - cui/uiconfig/ui/spellingdialog.ui | 44 --- cui/uiconfig/ui/spelloptionsdialog.ui |5 cui/uiconfig/ui/splitcellsdialog.ui | 15 - cui/uiconfig/ui/storedwebconnectiondialog.ui| 24 - cui/uiconfig/ui/swpossizepage.ui| 114 +--- cui/uiconfig/ui/textanimtabpage.ui | 76 ++--- cui/uiconfig/ui/textattrtabpage.ui | 46 --- cui/uiconfig/ui/textdialog.ui |7 cui/uiconfig/ui/textflowpage.ui | 73 - cui/uiconfig/ui/transparencytabpage.ui | 162 --- cui/uiconfig/ui/wordcompletionpage.ui | 54 --- cui/uiconfig/ui/zoomdialog.ui |6 sw/uiconfig/swriter/ui/titlepage.ui | 18 - sw/uiconfig/swriter/ui/tocdialog.ui |8 sw/uiconfig/swriter/ui/tocentriespage.ui| 147 +- sw/uiconfig/swriter/ui/tocindexpage.ui | 281 ++-- sw/uiconfig/swriter/ui/warndatasourcedialog.ui |6 sw/uiconfig/swriter/ui/warnemaildialog.ui |6 sw/uiconfig/swriter/ui/wordcount.ui | 39 -- sw/uiconfig/swriter/ui/wrapdialog.ui|5 sw/uiconfig/swriter/ui/wrappage.ui | 65 50 files changed, 468 insertions(+), 1228 deletions(-) New commits: commit 616f24419aba82369cbc005e64bd6b4ea494787c Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sun Nov 2 20:26:38 2014 -0600 HIG fixes for the rest of cui (and a bit of sw) * Standardize spacing and make some dialogs waste less space * Add missing colons to labels that precede controls (fdo#78826) * Disable manual resizing where it doesnât make sense * Standardize Help buttonâs position (fdo#76486) Change-Id: Ib3f7f830e890e67f72aab970571793f495bab956 Reviewed-on: https://gerrit.libreoffice.org/12207 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index be78570..8971eb9 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -1,12 +1,31 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- - !-- interface-requires LibreOffice 1.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkAdjustment id=adjustment1 property name=upper100/property property name=step_increment5/property property name=page_increment10/property /object + object class=GtkListStore id=liststore1 +columns + !-- column-name gchararray1 -- + column type=gchararray/ + !-- column-name gint1 -- + column type=gint/ +/columns +data + row +col id=0 translatable=yesColor/col +col id=11/col + /row + row +col id=0 translatable=yesGraphic/col +col id=14/col + /row +/data + /object object class=GtkGrid id=BackgroundPage property
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/cmd/lc_decrementindent-lc_incrementindent.xcf.bz2 |binary icon-themes/tango/cmd/lc_decrementindent.png|binary icon-themes/tango/cmd/lc_incrementindent.png|binary icon-themes/tango/cmd/lc_insertfootnote.png |binary icon-themes/tango/cmd/lc_insertpagebreak.png|binary icon-themes/tango/cmd/lc_insertpagebreak.xcf.bz2|binary icon-themes/tango/cmd/lc_insertsymbol.png |binary 7 files changed New commits: commit 1e498f756f4ac6be6ffa76bf530ce2cdd302ff64 Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 04:52:56 2014 +0400 TANGO: addition of new symbol icon and minor fixes to others Change-Id: I5e5c39fa8b237fd9a2e970e8f39ff6ff5a511c7d Reviewed-on: https://gerrit.libreoffice.org/12206 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/tango/cmd/lc_decrementindent-lc_incrementindent.xcf.bz2 b/icon-themes/tango/cmd/lc_decrementindent-lc_incrementindent.xcf.bz2 new file mode 100644 index 000..1dc0d53 Binary files /dev/null and b/icon-themes/tango/cmd/lc_decrementindent-lc_incrementindent.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_decrementindent.png b/icon-themes/tango/cmd/lc_decrementindent.png index 8d47bd6..117ac0f 100644 Binary files a/icon-themes/tango/cmd/lc_decrementindent.png and b/icon-themes/tango/cmd/lc_decrementindent.png differ diff --git a/icon-themes/tango/cmd/lc_incrementindent.png b/icon-themes/tango/cmd/lc_incrementindent.png index ca3ba39..1eec0ab 100644 Binary files a/icon-themes/tango/cmd/lc_incrementindent.png and b/icon-themes/tango/cmd/lc_incrementindent.png differ diff --git a/icon-themes/tango/cmd/lc_insertfootnote.png b/icon-themes/tango/cmd/lc_insertfootnote.png index 0320917..d57c59c 100644 Binary files a/icon-themes/tango/cmd/lc_insertfootnote.png and b/icon-themes/tango/cmd/lc_insertfootnote.png differ diff --git a/icon-themes/tango/cmd/lc_insertpagebreak.png b/icon-themes/tango/cmd/lc_insertpagebreak.png index 1efad71..c2f9cf5 100644 Binary files a/icon-themes/tango/cmd/lc_insertpagebreak.png and b/icon-themes/tango/cmd/lc_insertpagebreak.png differ diff --git a/icon-themes/tango/cmd/lc_insertpagebreak.xcf.bz2 b/icon-themes/tango/cmd/lc_insertpagebreak.xcf.bz2 index 83d2e29..ac52acd 100644 Binary files a/icon-themes/tango/cmd/lc_insertpagebreak.xcf.bz2 and b/icon-themes/tango/cmd/lc_insertpagebreak.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_insertsymbol.png b/icon-themes/tango/cmd/lc_insertsymbol.png index 4624975..e539e05 100644 Binary files a/icon-themes/tango/cmd/lc_insertsymbol.png and b/icon-themes/tango/cmd/lc_insertsymbol.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make fails when using '--with-system-libs'
I suspect there are very few systems, at least stable releases, where --with-system-libs would work in a master build without any --without-system-foo options at all. Perhaps we ought to mention that in some wiki or in the configure.ac. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml | 24 +--- sw/uiconfig/swriter/toolbar/textobjectbar.xml | 10 +++--- 2 files changed, 24 insertions(+), 10 deletions(-) New commits: commit 10c979462263c50ca5d19debf61205ff2de12ffa Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 02:15:18 2014 +0400 fdo#81475 - Rearrangement some buttons and add some hidden ones Change-Id: I0d3ee669c396f8948de62407f231693413be4ee3 Reviewed-on: https://gerrit.libreoffice.org/12203 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index 84f262d..6563d25a 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -25,10 +25,10 @@ toolbar:toolbaritem xlink:href=.uno:Save toolbar:helpid=5505/ toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false toolbar:helpid=5502/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false toolbar:helpid=5331/ - toolbar:toolbaritem xlink:href=.uno:ExportDirectToPDF toolbar:helpid=6674/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312 toolbar:visible=false/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:ExportDirectToPDF toolbar:helpid=6674/ toolbar:toolbaritem xlink:href=.uno:PrintDefault toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:Print/ toolbar:toolbaritem xlink:href=.uno:PrintPreview toolbar:helpid=5325/ @@ -44,17 +44,27 @@ toolbar:toolbaritem xlink:href=.uno:SpellingAndGrammarDialog toolbar:helpid=20622/ toolbar:toolbaritem xlink:href=.uno:SpellOnline toolbar:visible=false toolbar:helpid=12021/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ + toolbar:toolbaritem xlink:href=.uno:Navigator toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ControlCodes toolbar:helpid=20224/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:InsertTable toolbar:helpid=20330/ - toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ - toolbar:toolbaritem xlink:href=.uno:InsertObjectChart/ - toolbar:toolbaritem xlink:href=.uno:InsertFootnote/ + toolbar:toolbaritem xlink:href=.uno:InsertGraphic toolbar:helpid=10241/ + toolbar:toolbaritem xlink:href=.uno:Gallery toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertObjectChart toolbar:helpid=10140/ + toolbar:toolbaritem xlink:href=.uno:InsertObjectStarMath toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertFootnote toolbar:helpid=20399/ + toolbar:toolbaritem xlink:href=.uno:InsertEndnote toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertBookmark toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertReferenceField toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertIndexesEntry toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertPagebreak toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678/ - toolbar:toolbaritem xlink:href=.uno:InsertSymbol/ - toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl/ - toolbar:toolbaritem xlink:href=.uno:InsertAnnotation/ + toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/ + toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl toolbar:helpid=52824/ + toolbar:toolbaritem xlink:href=.uno:InsertAnnotation toolbar:helpid=20329/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:DrawText toolbar:visible=false toolbar:helpid=10253/ + toolbar:toolbaritem xlink:href=.uno:BasicShapes toolbar:visible=false toolbar:helpid=11002/ toolbar:toolbaritem xlink:href=.uno:InsertDraw toolbar:helpid=10244/ toolbar:toolbaritem xlink:href=.uno:ViewDataSourceBrowser toolbar:visible=false toolbar:helpid=6660/ toolbar:toolbaritem xlink:href=.uno:Zoom toolbar:visible=false/ diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml index acf3752..3b9c276 100644 --- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml @@ -31,18 +31,22 @@ toolbar:toolbaritem xlink:href=.uno:Bold/ toolbar:toolbaritem xlink:href=.uno:Italic/ toolbar:toolbaritem xlink:href=.uno:Underline/ + toolbar:toolbaritem xlink:href=.uno:UnderlineDouble toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:Strikeout toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:Overline toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:SuperScript toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:SubScript toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:Shadowed toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:OutlineFont toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:FontColor/ toolbar:toolbaritem
[Libreoffice-commits] core.git: icon-themes/oxygen
icon-themes/oxygen/cmd/lc_backcolor.png |binary icon-themes/oxygen/cmd/lc_color.png |binary icon-themes/oxygen/cmd/lc_fontcolor.png |binary 3 files changed New commits: commit c52451758c88aeb9ce3316a3591eaafd01370d37 Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 03:06:57 2014 +0400 OXYGEN: fixes to font color icons Change-Id: I53abb17326196dda4533dec204d8d16ef6ac9748 Reviewed-on: https://gerrit.libreoffice.org/12204 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/oxygen/cmd/lc_backcolor.png b/icon-themes/oxygen/cmd/lc_backcolor.png index b778ff7..13ef831 100644 Binary files a/icon-themes/oxygen/cmd/lc_backcolor.png and b/icon-themes/oxygen/cmd/lc_backcolor.png differ diff --git a/icon-themes/oxygen/cmd/lc_color.png b/icon-themes/oxygen/cmd/lc_color.png index 98f6173..5196cda 100644 Binary files a/icon-themes/oxygen/cmd/lc_color.png and b/icon-themes/oxygen/cmd/lc_color.png differ diff --git a/icon-themes/oxygen/cmd/lc_fontcolor.png b/icon-themes/oxygen/cmd/lc_fontcolor.png index b12a06b..879f8222 100644 Binary files a/icon-themes/oxygen/cmd/lc_fontcolor.png and b/icon-themes/oxygen/cmd/lc_fontcolor.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make fails when using '--with-system-libs'
Hi, I was just trying to follow this LCOV Code Coverage guide: https://wiki.documentfoundation.org/Development/Lcov which recommends to run configure '--with-system-libs' in order to easily filter 'non-core' / non-libreoffice code from the resulting lcov report. Perhaps this needs a different approach, then. - Maarten On Mon, Nov 3, 2014 at 9:54 AM, Tor Lillqvist t...@iki.fi wrote: I suspect there are very few systems, at least stable releases, where --with-system-libs would work in a master build without any --without-system-foo options at all. Perhaps we ought to mention that in some wiki or in the configure.ac. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make fails when using '--with-system-libs'
I was just trying to follow this LCOV Code Coverage guide: https://wiki.documentfoundation.org/Development/Lcov which recommends to run configure '--with-system-libs' The wiki might be a bit optimistic. It's a wiki. Edit it. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make fails when using '--with-system-libs'
Hi Maarten, On Mon, Nov 03, 2014 at 09:58:25AM +0100, Maarten Hoes hoes.maar...@gmail.com wrote: I was just trying to follow this LCOV Code Coverage guide: https://wiki.documentfoundation.org/Development/Lcov which recommends to run configure '--with-system-libs' in order to easily filter 'non-core' / non-libreoffice code from the resulting lcov report. Perhaps this needs a different approach, then. Is there a specific area in which you're interested wrt. code coverage? There is http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/lcov/coverage.sh that is a start of mapping source code locations to unit tests, that can give you much quicker feedback if you plan to do pick an untested area, writer a unit test, re-check if the test indeed increased coverage cycles. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx | 14 +
vcl/source/outdev/polyline.cxx | 96 ++---
2 files changed, 48 insertions(+), 62 deletions(-)
New commits:
commit 886eadd0862963de36f2a4a6901b6752c767ac9c
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Nov 2 13:42:34 2014 +1100
vcl: merge DrawPolyLineDirect() and drawPolyLineDirectNoAACheck()
I've merged these two functions, I just added a new function parameter to
switch on and off
the AA check, this function parameter defaults to false so
DrawPolyLineDirect needs to do the
AA check each time. If bBypassAACheck is set to true, then we automatically
enable AA.
Change-Id: Id2d9b2036a41716590f7b87f658f5bb210964392
Reviewed-on: https://gerrit.libreoffice.org/12191
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f505f04..30da2ea 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -726,12 +726,15 @@ public:
voidDrawPolyLine( const Polygon rPoly,
const LineInfo rLineInfo );
+// #i101491#
+// Helper who tries to use SalGDI's DrawPolyLine direct and returns it's
bool.
boolDrawPolyLineDirect(
const basegfx::B2DPolygon rB2DPolygon,
double fLineWidth = 0.0,
double fTransparency = 0.0,
basegfx::B2DLineJoin eLineJoin =
basegfx::B2DLINEJOIN_NONE,
-css::drawing::LineCap eLineCap =
css::drawing::LineCap_BUTT);
+css::drawing::LineCap eLineCap =
css::drawing::LineCap_BUTT,
+bool bBypassAACheck = false );
private:
// #i101491#
@@ -739,15 +742,6 @@ private:
// switched on. Advantage is that line geometry is only temporarily used
for paint
SAL_DLLPRIVATE void drawPolyLine(const Polygon rPoly, const
LineInfo rLineInfo);
-
-// #i101491#
-// Helper who tries to use SalGDI's DrawPolyLine direct and returns it's
bool. Contains no AA check.
-SAL_DLLPRIVATE bool drawPolyLineDirectNoAACheck(
-const basegfx::B2DPolygon rB2DPolygon,
-double fLineWidth = 0.0,
-double fTransparency = 0.0,
-basegfx::B2DLineJoin eLineJoin =
basegfx::B2DLINEJOIN_NONE,
-css::drawing::LineCap eLineCap =
css::drawing::LineCap_BUTT);
///@}
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index d896bd1..fd71306 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -197,14 +197,11 @@ void OutputDevice::DrawPolyLine( const
basegfx::B2DPolygon rB2DPolygon,
ROP_OVERPAINT == GetRasterOp()
IsLineColor());
-if(bTryAA)
+// when AA it is necessary to also paint the filled polygon's outline
+// to avoid optical gaps
+for(sal_uInt32 a(0); a aAreaPolyPolygon.count(); a++)
{
-// when AA it is necessary to also paint the filled polygon's
outline
-// to avoid optical gaps
-for(sal_uInt32 a(0); a aAreaPolyPolygon.count(); a++)
-{
-drawPolyLineDirectNoAACheck(aAreaPolyPolygon.getB2DPolygon(a));
-}
+DrawPolyLineDirect( aAreaPolyPolygon.getB2DPolygon(a), 0.0, 0.0,
basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, bTryAA );
}
}
else
@@ -267,49 +264,12 @@ void OutputDevice::drawPolyLine(const Polygon rPoly,
const LineInfo rLineInfo)
mpAlphaVDev-DrawPolyLine( rPoly, rLineInfo );
}
-bool OutputDevice::drawPolyLineDirectNoAACheck( const basegfx::B2DPolygon
rB2DPolygon,
- double fLineWidth,
- double fTransparency,
- basegfx::B2DLineJoin eLineJoin,
- css::drawing::LineCap eLineCap)
-{
-const basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
-basegfx::B2DVector aB2DLineWidth(1.0, 1.0);
-
-// transform the line width if used
-if( fLineWidth != 0.0 )
-{
-aB2DLineWidth = aTransform * ::basegfx::B2DVector( fLineWidth, 0.0 );
-}
-
-// transform the polygon
-basegfx::B2DPolygon aB2DPolygon(rB2DPolygon);
-aB2DPolygon.transform(aTransform);
-
-if((mnAntialiasing ANTIALIASING_PIXELSNAPHAIRLINE)
- aB2DPolygon.count() 1000)
-{
-// #i98289#, #i101491#
-// better
Re: Patch for [Bug 79082] FILESAVE: Tab positions not being retained in PPT
Hi Piet, On Sun, Nov 02, 2014 at 06:19:56PM +0100, Piet van Oostrum p...@vanoostrum.org wrote: I have a patch for bug https://bugs.freedesktop.org/show_bug.cgi?id=79082 (tested on LibreOffice 4.3.2.2). There is a test file on bugzilla (https://bugs.freedesktop.org/attachment.cgi?id=106377), and also the patch file (https://bugs.freedesktop.org/attachment.cgi?id=108711). Could you please follow https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch and submit the patch to gerrit? That way it's harder to miss your patch. Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
Hi, On Fri, Oct 31, 2014 at 10:24:26AM +0100, Markus Mohrhard markus.mohrh...@googlemail.com wrote: You can do the same by downloading two directories from the server (or as you have access to the VM on the VM directly where the logs are stored in /srv/crashtestdata/logs/) and running cat */exportCrash.txt | grep *.docx which returns all docx export crashes and diff this for the two directories. Got it, pushed a fix (d72237741ed1d8f976032ff2ee5d2a8702d3380e), let's see if/how that improves the results. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/line.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 656ffdd4bf095152fb95f4d9ddb766964cd18c3b
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Nov 2 15:55:33 2014 +1100
vcl: typo in variable name in PaintLineGeometryWithEvtlExpand
Change-Id: I87084cbc4d6a8b6f5edbf8b90791c2b1e75b4afb
Reviewed-on: https://gerrit.libreoffice.org/12211
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 752bad4..366d992 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -184,12 +184,12 @@ void OutputDevice::PaintLineGeometryWithEvtlExpand(
for(sal_uInt32 c(0); c aLinePolyPolygon.count(); c++)
{
-basegfx::B2DPolyPolygon aLineTraget;
+basegfx::B2DPolyPolygon aLineTarget;
basegfx::tools::applyLineDashing(
aLinePolyPolygon.getB2DPolygon(c),
fDotDashArray,
-aLineTraget);
-aResult.append(aLineTraget);
+aLineTarget);
+aResult.append(aLineTarget);
}
aLinePolyPolygon = aResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen2.cxx | 64 ++-
1 file changed, 31 insertions(+), 33 deletions(-)
New commits:
commit 1cd9c19ba1983984e9d42cc8cb5ddbfcdcebe2a7
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Nov 2 03:05:01 2014 -0500
fdo#39468 Translate German Comments - sc/source/core/data/documen2.cxx
Change-Id: I9a426f40f8cdce1f1ebe207dd9ada8154d8fde46
Reviewed-on: https://gerrit.libreoffice.org/12195
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d9ab457..5a6af4b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -114,7 +114,7 @@ struct ScLookupCacheMapImpl
void clear()
{
freeCaches();
-// Zap map.
+// free mapping
ScLookupCacheMap aTmp;
aCacheMap.swap( aTmp);
}
@@ -330,11 +330,11 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
{
-if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln
+if ( ScDdeLink::IsInUpdate() ) // do not nest
{
-aTrackTimer.Start();// spaeter nochmal versuchen
+aTrackTimer.Start();// try again later
}
-else if (pShell)// ausfuehren
+else if (pShell)// execute
{
TrackFormulas();
pShell-Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
@@ -363,7 +363,7 @@ void ScDocument::SetExpandRefs( bool bVal )
void ScDocument::StartTrackTimer()
{
-if (!aTrackTimer.IsActive())// nicht ewig aufschieben
+if (!aTrackTimer.IsActive())// do not postpone for forever
aTrackTimer.Start();
}
@@ -388,10 +388,9 @@ ScDocument::~ScDocument()
ScAddInAsync::RemoveDocument( this );
ScAddInListener::RemoveDocument( this );
-DELETEZ( pChartListenerCollection); // vor pBASM wg. evtl. Listener!
+DELETEZ( pChartListenerCollection); // before pBASM because of potential
Listener!
DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners
-// BroadcastAreas vor allen Zellen zerstoeren um unnoetige
-// Einzel-EndListenings der Formelzellen zu vermeiden
+// destroy BroadcastAreas first to avoid un-needed Single-EndListenings of
Formula-Cells
delete pBASM; // BroadcastAreaSlotMachine
pBASM = NULL;
@@ -421,11 +420,11 @@ ScDocument::~ScDocument()
ImplDeleteOptions();
delete pConsolidateDlgData;
delete pClipData;
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // also deletes entries
delete pChangeTrack;
delete pEditEngine;
delete pNoteEngine;
-delete pChangeViewSettings; // und weg damit
+delete pChangeViewSettings; // and delete
delete pVirtualDevice_100th_mm;
delete pDPCollection;
@@ -463,13 +462,13 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )
SharePooledResources(pSourceDoc);
-// bedingte Formate / Gueltigkeiten
-//! Vorlagen kopieren?
+// conditional Formats / validations
+// TODO: Copy Templates?
const ScValidationDataList* pSourceValid = pSourceDoc-pValidationList;
if ( pSourceValid )
pValidationList = new ScValidationDataList(this, *pSourceValid);
-// Links in Stream speichern
+// store Links in Stream
delete pClipData;
if (pSourceDoc-GetDocLinkManager().hasDdeLinks())
{
@@ -591,7 +590,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB
nTab )
void ScDocument::EnsureTable( SCTAB nTab )
{
-bool bExtras = !bIsUndo;// Spaltenbreiten, Zeilenhoehen, Flags
+bool bExtras = !bIsUndo;// Column-Widths, Row-Heights, Flags
if (static_castsize_t(nTab) = maTabs.size())
maTabs.resize(nTab+1, NULL);
@@ -728,8 +727,8 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos,
ScProgress* pProgress )
if (nNewPos == SC_TAB_APPEND || nNewPos = nTabCount)
nNewPos = nTabCount-1;
-// Referenz-Updaterei
-//! mit UpdateReference zusammenfassen!
+// Update Reference
+// TODO: combine with UpdateReference!
sc::RefUpdateMoveTabContext aCxt(nOldPos, nNewPos);
@@ -792,8 +791,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos,
const ScMarkData* pOnlyM
OUString aName;
GetName(nOldPos, aName);
-// vorneweg testen, ob der Prefix als gueltig erkannt wird
-// wenn nicht, nur doppelte vermeiden
+// check first if Prefix is valid; if not, then only avoid duplicates
bool bPrefix = ValidTabName( aName );
OSL_ENSURE(bPrefix, invalid table name);
SCTAB nDummy;
@@ -885,7 +883,7 @@ bool
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #143 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=1cd9c19ba1983984e9d42cc8cb5ddbfcdcebe2a7 fdo#39468 Translate German Comments - sc/source/core/data/documen2.cxx It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make fails when using '--with-system-libs'
On Mon, Nov 3, 2014 at 10:08 AM, Miklos Vajna vmik...@collabora.co.uk wrote: Is there a specific area in which you're interested wrt. code coverage? Im just interested in determining what the current (total) state of coverage is, and how much it changed compared to : http://dev-builds.libreoffice.org/lcov_reports/master~2014-04-11_00.55.10/ - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 21 +
1 file changed, 21 insertions(+)
New commits:
commit e04b8afe7aef5db535311630834bc25316433dae
Author: Tomáš Chvátal tomas.chva...@gmail.com
Date: Mon Nov 3 10:01:52 2014 +0100
Detect KDE5 and fallback to KDE4UI there
Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360
Reviewed-on: https://gerrit.libreoffice.org/12209
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 163d48e..e1f253d 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay )
return false;
}
+static bool is_kde5_desktop( Display* pDisplay )
+{
+if ( NULL != getenv( KDE_FULL_SESSION ) )
+{
+OUString aVer( 5 );
+
+const char *pVer = getenv( KDE_SESSION_VERSION );
+if ( pVer aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
+return true;
+}
+
+if ( KDEVersion( pDisplay ) == 5 )
+return true;
+
+return false;
+}
+
extern C
{
@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
if ( aOver.equalsIgnoreAsciiCase( tde ) )
return DESKTOP_TDE;
+if ( aOver.equalsIgnoreAsciiCase( kde5 ) )
+return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( kde4 ) )
return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( gnome ) )
@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
// these guys can be slower, with X property fetches,
// round-trips etc. and so are done later.
+else if ( is_kde5_desktop( pDisplay ) )
+ret = DESKTOP_KDE4;
else if ( is_kde4_desktop( pDisplay ) )
ret = DESKTOP_KDE4;
else if ( is_gnome_desktop( pDisplay ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make fails when using '--with-system-libs'
On Mon, Nov 3, 2014 at 10:07 AM, Tor Lillqvist t...@iki.fi wrote: I was just trying to follow this LCOV Code Coverage guide: https://wiki.documentfoundation.org/Development/Lcov which recommends to run configure '--with-system-libs' The wiki might be a bit optimistic. It's a wiki. Edit it. I have no problem with editing the wiki. But before one can edit, one must determine what to change it into: I havent determined yet what would be a better way to filter out the unwanted non-libreoffice code from the report, other than running run configure '--with-system-libs'. Adding all unwanted code to the removal line: lcov --remove '/usr/local/src/libreoffice/*/UnpackedTarball/*' '/foo/bar/dependency1' '/foo/bar/dependency2' '/foo/bar/dependencyx' seems like a way to do it, but will require manually adding a new 'unwanted' directory to that line whenever new code gets added. I havent figured out a better way yet, though. - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eb8530cc90ff12fa79ac24fd9703422a7e8c8415
Author: Noel Grandin n...@peralex.com
Date: Mon Nov 3 11:59:36 2014 +0200
fix sparc build
after my commit e7bc3cab019fbf040f9fb8b53ae2cf3f977d200b
remove boilerplate in UNO Exception constructor calls
Change-Id: Iccf79e3c41c860e15078b791fed551a9526aa453
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 4cad13e..51ad964 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -257,7 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping *
pUno2Cpp )
{
throw RuntimeException(
OUString(no rtti for type ) +
-*reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName
),
+*reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName )
);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] cppunit.git: src/cppunit
src/cppunit/Asserter.cpp |1 + 1 file changed, 1 insertion(+) New commits: commit 9c5b50060411ec71ac1583ae96e8f4652803b564 Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 3 10:24:26 2014 + extend tell coverity that fail doesn't return diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp index f3b6577..79fcb2e 100644 --- a/src/cppunit/Asserter.cpp +++ b/src/cppunit/Asserter.cpp @@ -6,6 +6,7 @@ CPPUNIT_NS_BEGIN +// coverity[+kill] void Asserter::fail( std::string message, const SourceLine sourceLine ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py
msodumper/docrecord.py |2 ++ 1 file changed, 2 insertions(+) New commits: commit 698009677c0b82fb13733b1f140c47c9ad12aa4d Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Nov 3 11:38:23 2014 +0100 docrecord: handle PChgTabsPapxOperand of 6 bytes diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py index bb13b94..66f5653 100644 --- a/msodumper/docrecord.py +++ b/msodumper/docrecord.py @@ -1329,6 +1329,8 @@ class Sprm(DOCDirStream): self.ct = TableBordersOperand(self) elif self.sprm == 0xd605: self.ct = TableBordersOperand80(self) +elif self.sprm == 0xc60d: +self.ct = PChgTabsPapxOperand(self) else: print 'todo what=Sprm::__init__() unhandled sprm of size %s: %s/' % (self.getOperandSize(), hex(self.sprm)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Buil error under Windows
Hi all, i get the following errors Making all in build /usr/bin/sh: Zeile 20: make: Kommando nicht gefunden. Makefile:476: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 Makefile:386: recipe for target 'all' failed make[2]: *** [all] Error 2 D:/src/lo/lo-core/external/libfreehand/ExternalProject_libfreehand.mk:24: recipe for target 'D:/src/lo/lo-core/workdir/ExternalProject/libfreehand/build' failed make[1]: *** [D:/src/lo/lo-core/workdir/ExternalProject/libfreehand/build] Error 1 make[1]: *** Waiting for unfinished jobs and Making all in build /usr/bin/sh: Zeile 20: make: Kommando nicht gefunden. Makefile:478: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 Makefile:388: recipe for target 'all' failed make[2]: *** [all] Error 2 D:/src/lo/lo-core/external/libwpd/ExternalProject_libwpd.mk:23: recipe for target 'D:/src/lo/lo-core/workdir/ExternalProject/libwpd/build' failed make[1]: *** [D:/src/lo/lo-core/workdir/ExternalProject/libwpd/build] Error 1 and Making all in src /usr/bin/sh: Zeile 20: make: Kommando nicht gefunden. Makefile:475: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 Makefile:385: recipe for target 'all' failed make[2]: *** [all] Error 2 D:/src/lo/lo-core/external/libpagemaker/ExternalProject_libpagemaker.mk:24: recipe for target 'D:/src/lo/lo-core/workdir/ExternalProject/libpagemaker/build' failed make[1]: *** [D:/src/lo/lo-core/workdir/ExternalProject/libpagemaker/build] Error 1 and Making all in src /usr/bin/sh: Zeile 17: make: Kommando nicht gefunden. Makefile:717: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 Makefile:625: recipe for target 'all' failed make[2]: *** [all] Error 2 D:/src/lo/lo-core/external/liborcus/ExternalProject_liborcus.mk:88: recipe for target 'D:/src/lo/lo-core/workdir/ExternalProject/liborcus/build' failed make[1]: *** [D:/src/lo/lo-core/workdir/ExternalProject/liborcus/build] Error 1 and Making all in goo /usr/bin/sh: Zeile 20: make: Kommando nicht gefunden. Makefile:641: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 Makefile:523: recipe for target 'all' failed make[2]: *** [all] Error 2 D:/src/lo/lo-core/external/poppler/ExternalProject_poppler.mk:19: recipe for target 'D:/src/lo/lo-core/workdir/ExternalProject/poppler/build' failed make[1]: *** [D:/src/lo/lo-core/workdir/ExternalProject/poppler/build] Error 1 Makefile:233: recipe for target 'build' failed make: *** [build] Error 2 The solution, copy the make in /usr/bin, but in the past that was not necessary? My autogen.input is --enable-pch --disable-ccache --enable-dbgutil --with-windows-sdk=7.1A --with-external-tar=/cygdrive/d/src/lo/externalsrc --with-ant-home=/cygdrive/d/src/lo/apache-ant-1.9.4 --with-junit=/cygdrive/d/src/lo/junit-4.10.jar --with-visual-studio=2012 --with-lang=de en-GB I think, a new shell-script do not using the calling path to the make Juergen Funk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
master 'make check' failures: 'sccomp_lpsolver.test' and 'sw_tox.test'
Hi, FYI: running 'make check' on master, I have failures (core dumped) for 'sccomp_lpsolver.test' and 'sw_tox.test' (see attachment for logs). Not sure if this needs some attention or not, just thought id mention it. Feel free to ignore. - Maarten make-check.tar.gz Description: GNU Zip compressed data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/tml/opencl-default-1'
New branch 'private/tml/opencl-default-1' available with the following commits: commit 9222675f7929831124aa423a31be84f7d0db Author: Tor Lillqvist t...@collabora.com Date: Mon Nov 3 11:01:30 2014 +0200 Indent the generated OpenCL a bit saner Change-Id: Ie180d47558bdb9496ef55e39652f33ef52d1addb commit 38f817d4f232da72d4714cca4c9427a18e971272 Author: Tor Lillqvist t...@collabora.com Date: Mon Nov 3 11:00:01 2014 +0200 Don't use OpenCL unless the function is in the subset we support Change-Id: I6c6fcc492f338cd8994bbc781bbf71abb6bf5057 commit 1468c0f8a510664fdd1e878f40778521e20636e1 Author: Tor Lillqvist t...@collabora.com Date: Mon Nov 3 10:59:27 2014 +0200 Don't use OpenCL unless the group is long enough Change-Id: I37d54e39186fca2653717bb364072a2b283bcfb9 commit 82f8243b877df57acdd49709f18c65a7f96569cb Author: Tor Lillqvist t...@collabora.com Date: Mon Nov 3 10:57:39 2014 +0200 Add a setting for what subset of functions we use OpenCL for Change-Id: I9ecea99a921a9230fa80f813627db6cdf7ed5875 commit 98c94cf203e2b88985ee7c7fced71bd4d345f14a Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 30 20:28:28 2014 +0200 Avoid crash Sure, this is probably defensive coding and the root cause is my other changes... Change-Id: Ia888921fddc48dc022a3205c7e0abc7e2160cf5c commit d37b9d7b49411b784036b78775057364940629a8 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 30 15:40:54 2014 +0200 Add more detailled configuration for OpenCL use, and make OpenCL default to on Add a boolean whether to use OpenCL for just a subset of functions, and a numberical minimum length of a cell group for OpenCL to be used. No functionality or GUI for this yet implemented, just the setting fields. Make whether to use OpenCL default to on. Sure, this breaks stuff right and left for now. Fixes and workarounds later. Change-Id: I09b7aff9c7d1845df2bf01f09616e646373f030c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - linguistic/source oox/source
linguistic/source/spelldsp.cxx | 44 ++--
oox/source/export/drawingml.cxx |2 -
2 files changed, 43 insertions(+), 3 deletions(-)
New commits:
commit 86f876b45a2737a1f7ccf9581af05277e1650159
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Nov 3 12:03:48 2014 +0100
fdo#61167 suggest titlecase and uppercase words from exception dict
Change-Id: I280ffed996814e246ac3e93de5ff0acaad84018c
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 15ecfef..3a2f025 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -649,7 +649,7 @@ Reference XSpellAlternatives
SpellCheckerDispatcher::spell_Impl(
Reference XDictionaryEntry xTmp( lcl_GetRulingDictionaryEntry(
aChkWord, nLanguage ) );
if (xTmp.is())
{
-if (xTmp-isNegative())// positive entry found
+if (xTmp-isNegative())// negative entry found
{
eFailureType = SpellFailure::IS_NEGATIVE_WORD;
@@ -669,6 +669,46 @@ Reference XSpellAlternatives
SpellCheckerDispatcher::spell_Impl(
eFailureType = -1; // no failure
}
}
+else
+{
+setCharClass(LanguageTag(nLanguage));
+sal_uInt16 ct = capitalType(aChkWord, pCharClass);
+if (ct == CAPTYPE_INITCAP || ct == CAPTYPE_ALLCAP)
+{
+Reference XDictionaryEntry xTmp2(
lcl_GetRulingDictionaryEntry( makeLowerCase(aChkWord, pCharClass), nLanguage )
);
+if (xTmp2.is())
+{
+if (xTmp2-isNegative())// negative entry found
+{
+eFailureType = SpellFailure::IS_NEGATIVE_WORD;
+
+// replacement text to be added to suggestions, if
not empty
+OUString aAddRplcTxt( xTmp2-getReplacementText()
);
+
+// replacement text must not be in negative
dictionary itself
+if (!aAddRplcTxt.isEmpty()
+!SearchDicList( xDList, aAddRplcTxt,
nLanguage, false, true ).is())
+{
+switch ( ct )
+{
+case CAPTYPE_INITCAP:
+aProposalList.Prepend(
pCharClass-titlecase(aAddRplcTxt) );
+break;
+case CAPTYPE_ALLCAP:
+aProposalList.Prepend(
pCharClass-uppercase(aAddRplcTxt) );
+default:
+aProposalList.Prepend( aAddRplcTxt );
+}
+}
+}
+else// positive entry found
+{
+xRes = NULL;
+eFailureType = -1; // no failure
+}
+}
+}
+}
}
if (eFailureType != -1) // word misspelled or found in negative
user-dictionary
@@ -681,7 +721,7 @@ Reference XSpellAlternatives
SpellCheckerDispatcher::spell_Impl(
Sequence OUString aProposals = aProposalList.GetSequence();
// remove entries listed in negative dictionaries
-// (we don't want to display suggestions that will be regarded as
misspelledlater on)
+// (we don't want to display suggestions that will be regarded as
misspelled later on)
if (bCheckDicsxDList.is())
SeqRemoveNegEntries( aProposals, xDList, nLanguage );
commit 4e87e0f2da6bc132edc42056db1d91e63e9497e7
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Oct 29 14:49:36 2014 +0100
typo: geomtery - geometry
Change-Id: I20263c836dd55e663cdad9fc8283fe8fbf02b1f1
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f1ff69b..df4bc23 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2066,7 +2066,7 @@ void DrawingML::WritePresetShape( const char* pShape,
MSO_SPT eShapeType, bool b
EscherPropertyContainer::LookForPolarHandles( eShapeType,
nAdjustmentsWhichNeedsToBeConverted );
sal_Int32 nValue, nLength = aAdjustmentSeq.getLength();
-//aAdjustments will give info about the number of adj values for a
particular geomtery.For example for hexagon aAdjustments.size() will be 2 and
for circular arrow it will be 5 as per lcl_getAdjNames.
+//aAdjustments will give info about the number of adj values for a
particular geometry. For example for hexagon aAdjustments.size()
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit d4ca8958859b96cb3dc067c0cdc048f35d4a24a6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Nov 3 12:04:36 2014 +0100
sw doc model xml dump: handle RES_FRMATR*STYLE_NAME
Change-Id: I7a131c00166a8930042415dbf90e4640ecfea64c
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 1e05423..122bcd4 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -613,11 +613,27 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
pWhich = shadow;
break;
case RES_PAGEDESC:
+{
pWhich = page description;
const SwFmtPageDesc* pFmt = static_castconst
SwFmtPageDesc*(pItem);
if (pFmt-GetPageDesc())
oValue = name: +
OUStringToOString(pFmt-GetPageDesc()-GetName(), RTL_TEXTENCODING_UTF8);
break;
+}
+case RES_FRMATR_STYLE_NAME:
+{
+pWhich = frame style name;
+const SfxStringItem* pStringItem = static_castconst
SfxStringItem*(pItem);
+oValue = name: + OUStringToOString(pStringItem-GetValue(),
RTL_TEXTENCODING_UTF8);
+break;
+}
+case RES_FRMATR_CONDITIONAL_STYLE_NAME:
+{
+pWhich = frame conditional style name;
+const SfxStringItem* pStringItem = static_castconst
SfxStringItem*(pItem);
+oValue = name: + OUStringToOString(pStringItem-GetValue(),
RTL_TEXTENCODING_UTF8);
+break;
+}
}
if (pWhich)
writer.writeFormatAttribute(which, %s, BAD_CAST(pWhich));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/parse.hxx|4 ++--
starmath/source/parse.cxx | 16 ++--
2 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit fe1f258d5b77cd6e6a7483d7cf28195dbfdd62a4
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Nov 3 08:42:02 2014 +0900
fix memory leak of pointers contained in m_aErrDescList
Change-Id: I9fcbdcd54978ccaffa5359c0afb0a1990356c218
Reviewed-on: https://gerrit.libreoffice.org/12205
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 7f59def..376113c 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -27,7 +27,7 @@
#include types.hxx
-#include vector
+#include boost/ptr_container/ptr_vector.hpp
class SmNode;
@@ -157,7 +157,7 @@ struct SmErrorDesc
typedef ::std::stack SmNode* SmNodeStack;
-typedef ::std::vector SmErrorDesc* SmErrDescList;
+typedef boost::ptr_vector SmErrorDesc SmErrDescList;
/**/
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 408612e..c1757bf 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2406,8 +2406,6 @@ SmNode *SmParser::Parse(const OUString rBuffer)
m_nColOff = 0;
m_nCurError = -1;
-for ( size_t i = 0, n = m_aErrDescList.size(); i n; ++i )
-delete m_aErrDescList[ i ];
m_aErrDescList.clear();
while ( !m_aNodeStack.empty() )
@@ -2430,8 +2428,6 @@ SmNode *SmParser::ParseExpression(const OUString rBuffer)
m_nColOff = 0;
m_nCurError = -1;
-for ( size_t i = 0, n = m_aErrDescList.size(); i n; ++i )
-delete m_aErrDescList[ i ];
m_aErrDescList.clear();
while ( !m_aNodeStack.empty() )
@@ -2485,11 +2481,11 @@ size_t SmParser::AddError(SmParseError Type, SmNode
*pNode)
const SmErrorDesc *SmParser::NextError()
{
if ( !m_aErrDescList.empty() )
-if (m_nCurError 0) return m_aErrDescList[ --m_nCurError ];
+if (m_nCurError 0) return m_aErrDescList[ --m_nCurError ];
else
{
m_nCurError = 0;
-return m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ];
}
else return NULL;
}
@@ -2498,11 +2494,11 @@ const SmErrorDesc *SmParser::NextError()
const SmErrorDesc *SmParser::PrevError()
{
if ( !m_aErrDescList.empty() )
-if (m_nCurError (int) (m_aErrDescList.size() - 1)) return
m_aErrDescList[ ++m_nCurError ];
+if (m_nCurError (int) (m_aErrDescList.size() - 1)) return
m_aErrDescList[ ++m_nCurError ];
else
{
m_nCurError = (int) (m_aErrDescList.size() - 1);
-return m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ];
}
else return NULL;
}
@@ -2511,10 +2507,10 @@ const SmErrorDesc *SmParser::PrevError()
const SmErrorDesc *SmParser::GetError(size_t i)
{
if ( i m_aErrDescList.size() )
-return m_aErrDescList[ i ];
+return m_aErrDescList[ i ];
if ( (size_t)m_nCurError m_aErrDescList.size() )
-return m_aErrDescList[ m_nCurError ];
+return m_aErrDescList[ m_nCurError ];
return NULL;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/editsh.hxx | 11 ++
sw/source/core/edit/edattr.cxx | 176 +++-
sw/source/uibase/shells/txtattr.cxx | 65 +
3 files changed, 232 insertions(+), 20 deletions(-)
New commits:
commit 98c95ce3a759a6f691c20cb1e376fa54a9dfdbc0
Author: Daniel Sikeler d.sikele...@gmail.com
Date: Mon Sep 22 08:26:06 2014 +
fdo#35862 De-/Increase font when multi-sized text
Added two new function to the SwEditShell.
The first returns all items of a specific WhichId wich belong to the
current selection. The items from the attribute set and from the hints are used.
The second returns SwPaMs separated at borders of an itemtype identified
by its WhichId. The SwPaMs must be deleted after yous.
Change-Id: I00e6d1b0f75b9f184343711c6d2bdc7e5694c711
Reviewed-on: https://gerrit.libreoffice.org/11857
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b869896..06aed3a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -233,6 +233,17 @@ public:
void SetAttrItem( const SfxPoolItem, sal_uInt16 nFlags = 0 );
void SetAttrSet( const SfxItemSet, sal_uInt16 nFlags = 0, SwPaM* pCrsr =
NULL );
+/** Get all items of one type in the current selection.
+ * @param nWhich WhichId of the collected items.
+ * @return Vector with the items.*/
+std::vectorconst SfxPoolItem* GetCurItem( sal_uInt16 nWhich );
+
+/** Splits the current SwPaM in smaller ones.
+ * The borders of an itemtype are used as separator. The SwPaMs must be
deleted after use.
+ * @param nWhich WhichId of the item to separate at.
+ * @return Vector with the smaller SwPaMs*/
+std::vectorSwPaM* GetSplitPaM( sal_uInt16 nWhich );
+
/**
* Get the paragraph format attribute(s) of the current selection.
*
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 4cf6687..009f837 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -18,10 +18,10 @@
*/
#include hintids.hxx
-
#include editeng/tstpitem.hxx
#include editeng/lrspitem.hxx
#include editeng/scripttypeitem.hxx
+#include editeng/fhgtitem.hxx
#include com/sun/star/i18n/ScriptType.hpp
#include txatbase.hxx
#include txtftn.hxx
@@ -42,10 +42,12 @@
#include txtfrm.hxx
#include scriptinfo.hxx
#include svl/ctloptions.hxx
+#include svl/itemiter.hxx
#include charfmt.hxx
#include numrule.hxx
#include algorithm
+#include charatr.hxx
/*
* hard Formatting (Attributes)
@@ -281,6 +283,178 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM
) const
return NULL;
}
+std::vectorconst SfxPoolItem* SwEditShell::GetCurItem( sal_uInt16 nWhich )
+{
+std::vectorconst SfxPoolItem* vItem;
+SwPaM* pPaM = GetCrsr();
+SwPaM* pStartPaM = pPaM;
+do { // for all the point and mark (selections)
+
+// get the start and the end node of the current selection
+sal_uLong nSttNd = pPaM-GetMark()-nNode.GetIndex(),
+ nEndNd = pPaM-GetPoint()-nNode.GetIndex();
+sal_Int32 nSttCnt = pPaM-GetMark()-nContent.GetIndex();
+sal_Int32 nEndCnt = pPaM-GetPoint()-nContent.GetIndex();
+
+// reverse start and end if there number aren't sorted correctly
+if( nSttNd nEndNd || ( nSttNd == nEndNd nSttCnt nEndCnt ))
+{
+std::swap(nSttNd, nEndNd);
+std::swap(nSttCnt, nEndCnt);
+}
+
+// for all the nodes in the current selection
+for( sal_uLong n = nSttNd; n = nEndNd; ++n )
+{
+SwNode* pNd = GetDoc()-GetNodes()[ n ];
+switch( pNd-GetNodeType() )
+{
+case ND_TEXTNODE:
+{
+SwTxtNode* pTxtNd = (SwTxtNode*) pNd;
+const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
+const sal_Int32 nEnd = (n == nEndNd)
+? nEndCnt : pTxtNd-GetTxt().getLength();
+
+// item from attribute set or default item
+if ( pTxtNd-HasSwAttrSet() )
+{
+const SwAttrSet aSet = pTxtNd-GetSwAttrSet();
+vItem.push_back( (aSet.GetSize()) );
+}
+// items with limited range
+if ( pTxtNd-HasHints() )
+{
+const size_t nSize = pTxtNd-GetpSwpHints()-Count();
+for (size_t m = 0; m nSize; m++)
+{
+const SwTxtAttr* pHt =
(*pTxtNd-GetpSwpHints())[m];
+if ( pHt-Which() == RES_TXTATR_AUTOFMT )
+{
+const sal_Int32 nAttrStart = pHt-GetStart();
+const sal_Int32* pAttrEnd
[Bug 35862] Increase font and decrease font could work even if the selection contains differing font sizes
https://bugs.freedesktop.org/show_bug.cgi?id=35862 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyInteresting |DifficultyInteresting ||target:4.4.0 -- 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 35862] Increase font and decrease font could work even if the selection contains differing font sizes
https://bugs.freedesktop.org/show_bug.cgi?id=35862 --- Comment #26 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Daniel Sikeler committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=98c95ce3a759a6f691c20cb1e376fa54a9dfdbc0 fdo#35862 De-/Increase font when multi-sized text It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 35862] Increase font and decrease font could work even if the selection contains differing font sizes
https://bugs.freedesktop.org/show_bug.cgi?id=35862 Samuel Mehrbrodt s.mehrbr...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED CC||s.mehrbr...@gmail.com 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: vcl/source
vcl/source/control/ilstbox.cxx |5 +++-
vcl/source/window/menu.cxx |5 ++--
vcl/source/window/winproc.cxx | 47 ++---
3 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit fa022a9c4fe74f3f67fb3c35ef49022842d7499b
Author: Juergen Funk juergen.funk...@cib.de
Date: Tue Oct 21 15:28:02 2014 +0200
fdo#84795 Menu, DropDown-List don't disappear with right mouse click
this includes a fix to leave disabled menu entries disabled.
This reverts commit 454f5c3018c6d61d5872f7c23c7590c2157444e4.
Change-Id: Ifb66b0b241378437f040af19ec163da3cb8d815d
Reviewed-on: https://gerrit.libreoffice.org/12061
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 5dea2fd..62db0c7 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3073,7 +3073,10 @@ void ImplListBoxFloatingWindow::StartFloat( bool
bStartTracking )
if( pGrandparent-ImplIsAntiparallel() )
pGrandparentOutDev-ReMirror( aRect );
-StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN );
+// mouse-button right: close the List-Box-Float-win and don't stop the
handling fdo#84795
+const sal_uLong nFlags = FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+
+StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | nFlags );
if( nPos != LISTBOX_ENTRY_NOTFOUND )
mpImplLB-ShowProminentEntry( nPos );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c65930c..546725a 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2816,8 +2816,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const
Rectangle rRect, sal_
WinBits nStyle = WB_BORDER;
if (bRealExecute)
nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL;
-if (!pStartedFrom || !pStartedFrom-IsMenuBar())
-nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+
+// mouse-button right: close the sub-menu (float-win) and don't stop the
handling fdo#84795
+nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index be88ec3e..62974ca 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -60,7 +60,9 @@ bool ImplCallPreNotify( NotifyEvent rEvt )
|| rEvt.GetWindow()-PreNotify( rEvt );
}
-static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point
rMousePos,
+
+enum ENUM_IHMFM {IHMFM_FALSE = 0, IHMFM_TRUE = 1, IHMFM_FLOAT = 2};
+static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point
rMousePos,
sal_uInt16 nCode, sal_uInt16 nSVEvent,
bool bMouseLeave )
{
@@ -80,14 +82,14 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point rMousePo
if ( nSVEvent == EVENT_MOUSEMOVE )
{
if ( bMouseLeave )
-return true;
+return IHMFM_TRUE;
if ( !pFloat || (nHitTest == HITTEST_RECT) )
{
if ( pSVData-maHelpData.mpHelpWin
!pSVData-maHelpData.mbKeyboardHelp )
ImplDestroyHelpWindow( true );
pChild-ImplGetFrame()-SetPointer( POINTER_ARROW );
-return true;
+return IHMFM_TRUE;
}
}
else
@@ -101,13 +103,13 @@ static bool ImplHandleMouseFloatMode( vcl::Window*
pChild, const Point rMousePo
pLastLevelFloat =
pSVData-maWinData.mpFirstFloat-ImplFindLastLevelFloat();
nPopupFlags = pLastLevelFloat-GetPopupModeFlags();
pLastLevelFloat-EndPopupMode(
FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL );
-return true;
+return IHMFM_FLOAT | IHMFM_TRUE; // don't stop the
handling fdo#84795
}
else if ( nHitTest == HITTEST_RECT )
{
if ( !(pFloat-GetPopupModeFlags()
FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE) )
pFloat-ImplSetMouseDown();
-return true;
+return IHMFM_TRUE;
}
}
else
@@ -118,7 +120,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point rMousePo
{
if ( pFloat-ImplIsMouseDown() )
pFloat-EndPopupMode(
FLOATWIN_POPUPMODEEND_CANCEL );
-
'master' 'make check' lcov code coverage report
Hi,
I ran an gcov/lcov report of 'make check' on master ('sccomp_lpsolver.test'
and 'sw_tox.test' failed for some reason with a core dump, and therefore
are excluded from the results), which I could (if interested) upload (if
given access) to dev-builds.libreoffice.org/lcov_reports/ for comparison
with the report generated for master on 11-Apr-2014.
- Maarten
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx |4 ++--
sc/source/filter/excel/excform8.cxx |4 ++--
sc/source/filter/lotus/lotform.cxx | 12 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1071eccd037390774b6d3f1aade9af02fd2cbe54
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Nov 2 02:18:02 2014 -0500
fdo#39468 Translate German Comments - final bits of sc/source/filter/
Change-Id: Ie01e9488c6b8e36c40e6176bc1cac38a93a8087f
Reviewed-on: https://gerrit.libreoffice.org/12194
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 0e5eacc..3a0236a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -932,7 +932,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs rRangeList,
XclImpStream aIn, sal
aSRD.InitFlags();
aCRD.InitFlags();
-switch( nOp ) // book page:
+switch( nOp ) // book page:
{ // SDK4 SDK5
case 0x01: // Array Formula [325]
// Array Formula or Shared Formula [277]
@@ -1539,7 +1539,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz
)
if( nAnz 0 eId == ocExternal )
{
TokenId n = eParam[ nAnz - 1 ];
-//# GRUETZE FUER BASIC-FUNCS RICHTEN!
+//# ADJUST GRUETZE (?) FOR BASIC-FUNCS!
if( const OUString* pExt = aPool.GetExternal( n ) )
{
if( const XclFunctionInfo* pFuncInfo =
maFuncProv.GetFuncInfoFromXclMacroName( *pExt ) )
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index 3686671..19f8cb5 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -177,7 +177,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
aSRD.InitFlags();
aCRD.InitFlags();
-switch( nOp ) // book page:
+switch( nOp ) // book page:
{ // SDK4 SDK5
case 0x01: // Array Formula [325]
// Array Formula or Shared Formula [277]
@@ -208,7 +208,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
aPool aStack ocDiv nMerk0;
aPool aStack;
break;
-case 0x07: // Exponentiation[313 265]
+case 0x07: // Exponentiation[313 265]
// raise SECOND-TOP to power of TOP
aStack nMerk0;
aPool aStack ocPow nMerk0;
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index 450c5fe..3e1fe49 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1265,14 +1265,14 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex
)
FT_FuncFix2,// 108 Cell() - new
FT_FuncFix1,// 109 Trim() - new
FT_FuncFix1,// 110 Clean() - new
-FT_FuncFix1,// 111 S() - change in Bez.
-FT_FuncFix1,// 112 N() - change in Bez.
+FT_FuncFix1,// 111 S() - change in name
+FT_FuncFix1,// 112 N() - change in name
FT_FuncFix2,// 113 Exact() - new
-FT_NotImpl, // 114 App - change in Bez.
+FT_NotImpl, // 114 App - change in name
FT_FuncFix1,// 115 @@() - new
FT_FuncFix3,// 116 Rate() - new
-FT_FuncFix3,// 117 Term() - change in Anz.
-FT_FuncFix3,// 118 Cterm() - change in Anz.
+FT_FuncFix3,// 117 Term() - change in quantity
+FT_FuncFix3,// 118 Cterm() - change in quantity
FT_FuncFix3,// 119 Sln()- new
FT_FuncFix4,// 120 Syd()- new
FT_FuncFix4,// 121 Ddb()- new
@@ -1755,7 +1755,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
NULL, // 69 Is Text?
NULL, // 70 Len()
NULL, // 71 Val()
-NULL, // 72 String()ocFixed ersatzweise +
Spezialfall
+NULL,
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #144 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=1071eccd037390774b6d3f1aade9af02fd2cbe54 fdo#39468 Translate German Comments - final bits of sc/source/filter/ It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Sun, 2014-11-02 at 22:53 +0100, Thorsten Behrens wrote: Michael Meeks wrote: + apparently a fiction that as of today there is idle TDF owned hardware. No idea why this is relevant here, but for the record: there is a number of donated / sponsored boxes with TDF, that for various hysterical reasons are not under infra control. 3-4 of them are mostly idle or powered down. Interesting; so the boxes are not paid for by TDF, but are donated by others ? As such, of course I'd imagine that they're under the control of whomever set them up - but if we can kick them into life that'd be great of course: is there an up-to-date list ? ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/tml/opencl-default-1' - 2 commits - sc/inc sc/qa sc/source
sc/inc/formulagroup.hxx |3 ++-
sc/qa/unit/opencl-test.cxx |2 +-
sc/source/core/tool/formulagroup.cxx |4 +++-
sc/source/core/tool/token.cxx| 10 ++
4 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit eddb22cdd0ec2b12288fbef6b2e76656e4a6feba
Author: Tor Lillqvist t...@collabora.com
Date: Mon Nov 3 14:04:51 2014 +0200
Check also unary and binary operation opcodes for presence in subset
Change-Id: I316ebdb017d512e72d0ad15a847802bca0e15814
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 46fd5a4..93c3463 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1454,6 +1454,16 @@ void ScTokenArray::CheckToken( const FormulaToken r )
default:
;
}
+return;
+}
+
+if (eOp = SC_OPCODE_START_BIN_OP
+eOp = SC_OPCODE_STOP_UN_OP
+ScInterpreter::GetGlobalConfig().mbOpenCLSubsetOnly
+ScInterpreter::GetGlobalConfig().maOpenCLSubsetFunctions.find(eOp) ==
ScInterpreter::GetGlobalConfig().maOpenCLSubsetFunctions.end())
+{
+meVectorState = FormulaVectorDisabled;
+return;
}
}
commit 8f4502c8e7a0795fafa42bbc781c3165812f4432
Author: Tor Lillqvist t...@collabora.com
Date: Mon Nov 3 14:04:12 2014 +0200
Add also parameters for the opcode subset to enableOpenCL()
In CppunitTest_sc_opencl_test we want to explicitly disable subsetting and
use
OpenCL maximally, to match how it used to work.
Change-Id: Ie900adb5fa58b7cd169e44efd70d8cac5256
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 1ee0249..d507cd5 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -15,6 +15,7 @@
#include platforminfo.hxx
#include stlalgorithm.hxx
+#include formula/opcode.hxx
#include svl/sharedstringpool.hxx
#include vector
@@ -122,7 +123,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
static FormulaGroupInterpreter *getStatic();
static void fillOpenCLInfo(std::vectorOpenCLPlatformInfo rPlatforms);
static bool switchOpenCLDevice(const OUString rDeviceId, bool
bAutoSelect, bool bForceEvaluation = false);
-static void enableOpenCL(bool bEnable);
+static void enableOpenCL(bool bEnable, bool bEnableCompletely = false,
const std::setOpCodeEnum rSubsetToEnable = std::setOpCodeEnum());
static void getOpenCLDeviceInfo(sal_Int32 rDeviceId, sal_Int32
rPlatformId);
virtual ScMatrixRef inverseMatrix(const ScMatrix rMat) = 0;
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 9b05518..f5f8324 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -553,7 +553,7 @@ bool ScOpenCLTest::detectOpenCLDevice()
void ScOpenCLTest::enableOpenCL()
{
-sc::FormulaGroupInterpreter::enableOpenCL(true);
+sc::FormulaGroupInterpreter::enableOpenCL(true, true);
}
void ScOpenCLTest::testCompilerHorizontal()
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index b4a8827..a5ad10b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -606,10 +606,12 @@ void
FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32 rDeviceId, sal_Int3
#endif
}
-void FormulaGroupInterpreter::enableOpenCL(bool bEnable)
+void FormulaGroupInterpreter::enableOpenCL(bool bEnable, bool
bEnableCompletely, const std::setOpCodeEnum rSubsetToEnable)
{
ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig();
aConfig.mbOpenCLEnabled = bEnable;
+aConfig.mbOpenCLSubsetOnly = !bEnableCompletely;
+aConfig.maOpenCLSubsetFunctions = rSubsetToEnable;
ScInterpreter::SetGlobalConfig(aConfig);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/table3.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit fa08c98c485e0de34082f3d66c5e1b6609268be1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Oct 27 08:52:38 2014 -0700
fdo#85215: Ensure that formula broadcasting works after sort.
When the reference update on sort is turned off.
Change-Id: I547dd1525a638dd447fe331e22583af4a7947308
(cherry picked from commit 1eb82c78a223d9a0b2bb5c3f5c129c1ee8bdf303)
Reviewed-on: https://gerrit.libreoffice.org/12113
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 05285d8..f7589dd 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -803,6 +803,15 @@ void ScTable::SortReorderByRow(
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
assert(pRows); // In sort-by-row mode we must have data rows already
populated.
+if (!pArray-IsUpdateRefs())
+{
+// When the update ref mode is disabled, we need to detach all formula
+// cells in the sorted range before reordering, and re-start them
+// afterward.
+sc::EndListeningContext aCxt(*pDocument);
+DetachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
+
// Split formula groups at the sort range boundaries (if applicable).
std::vectorSCROW aRowBounds;
aRowBounds.reserve(2);
@@ -1081,6 +1090,12 @@ void ScTable::SortReorderByRow(
// Re-group columns in the sorted range too.
for (SCCOL i = nCol1; i = nCol2; ++i)
aCol[i].RegroupFormulaCells();
+
+if (!pArray-IsUpdateRefs())
+{
+sc::StartListeningContext aCxt(*pDocument);
+AttachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
}
short ScTable::CompareCell(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
open calc / sorting issues ...
On Mon, 2014-10-27 at 19:56 +0100, Jean-Baptiste Faure wrote: Le 23/10/2014 17:20, Michael Meeks a écrit : [...] * Pending Action Items: + get a clear use-case description of what doesn't work vs. master wrt. Calc sorting (JBF) First draft here: https://bugs.freedesktop.org/show_bug.cgi?id=85490 So - I don't grok that bug; I was expecting a tracker bug; are you trying to use 'see also' for that ? rather than 'depends on' ? the see also is a zoo that doesn't solve the problem here I think. I spent a few minutes poking around at this stuff - and I couldn't see a single place where I can see: are these bugs fixed on master ? There is a request for us to do an accelerated 4.3.x release - which make some sense here I guess; but if we are -still- unsure about whether the bugs are fixed - its ~impossible to make a sensible decision there; and not knowing delays our ability to trigger any builds. A clear, tracker bug - perhaps ignoring the default on master / for 4.4 issue that is punted to UX - and/or summary of any of the live issues that remains open that a busy ESC member can read quickly - rather than having to follow a dozen irate comments would be great ! =) Is the problem fixed for 4.3.x ? I spent 10x minutes, and picked a commit, but I see no clear answer there. Thanks, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/table3.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit f4c179ea7f69e87e55a416c1588ee0aad7c146c0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Oct 27 08:52:38 2014 -0700
fdo#85215: Ensure that formula broadcasting works after sort.
When the reference update on sort is turned off.
Change-Id: I547dd1525a638dd447fe331e22583af4a7947308
(cherry picked from commit 1eb82c78a223d9a0b2bb5c3f5c129c1ee8bdf303)
Reviewed-on: https://gerrit.libreoffice.org/12113
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 589a9b1..c36b4cd 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -802,6 +802,15 @@ void ScTable::SortReorderByRow(
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
assert(pRows); // In sort-by-row mode we must have data rows already
populated.
+if (!pArray-IsUpdateRefs())
+{
+// When the update ref mode is disabled, we need to detach all formula
+// cells in the sorted range before reordering, and re-start them
+// afterward.
+sc::EndListeningContext aCxt(*pDocument);
+DetachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
+
// Split formula groups at the sort range boundaries (if applicable).
std::vectorSCROW aRowBounds;
aRowBounds.reserve(2);
@@ -1077,6 +1086,12 @@ void ScTable::SortReorderByRow(
// Re-group columns in the sorted range too.
for (SCCOL i = nCol1; i = nCol2; ++i)
aCol[i].RegroupFormulaCells();
+
+if (!pArray-IsUpdateRefs())
+{
+sc::StartListeningContext aCxt(*pDocument);
+AttachFormulaCells(aCxt, nCol1, nRow1, nCol2, nRow2);
+}
}
short ScTable::CompareCell(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 77308, which changed state. Bug 77308 Summary: FILESAVE: .odt file with over-long text:style-name won't open in LO 4.1 and earlier branches and AOO https://bugs.freedesktop.org/show_bug.cgi?id=77308 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgtoken.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 78b0b292637ebdeb2e4a7f08e0e8128530caaa18 Author: Noel Grandin n...@peralex.com Date: Mon Nov 3 15:00:58 2014 +0200 svgio: two of the token names were not being mapped to tokens Change-Id: I2be280ff8ebbf1046047a5bb4463191462172e24 diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index f0ff803..9d90bbc 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -189,6 +189,8 @@ namespace svgio aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrDx, SVGTokenDx)); aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrDy, SVGTokenDy)); aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrRotate, SVGTokenRotate)); + aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrTextLength, SVGTokenTextLength)); + aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrLengthAdjust, SVGTokenLengthAdjust)); aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrFont, SVGTokenFont)); aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrFontFamily, SVGTokenFontFamily)); aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrFontSize, SVGTokenFontSize)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Victor Sanches Portella - All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 2 commits - basegfx/source canvas/source include/basegfx
basegfx/source/glm_matrix/b2dglmmatrixtools.cxx | 360
canvas/source/opengl/ogl_spritedevicehelper.cxx |8
canvas/source/opengl/ogl_spritedevicehelper.hxx |3
include/basegfx/matrix/b2dglmmatrixtools.hxx| 134
4 files changed, 500 insertions(+), 5 deletions(-)
New commits:
commit 813fe994f5588db9639b0cbe7aa6778e400513b8
Author: Michael Jaumann meta_...@yahoo.com
Date: Mon Nov 3 13:34:01 2014 +
replaced B2IVector with glm::vec2
Change-Id: Id89699358ec0a831184b4180a1e0c34c5ce2d9d0
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 5b712b8..70c9507 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -543,7 +543,7 @@ namespace oglcanvas
class BufferContextImpl : public IBufferContext
{
-::basegfx::B2IVector maSize;
+glm::vec2 maSize;
GLuint mnFrambufferId;
GLuint mnDepthId;
GLuint mnTextureId;
@@ -566,13 +566,13 @@ namespace oglcanvas
}
public:
-BufferContextImpl(const ::basegfx::B2IVector rSize) :
+BufferContextImpl(const glm::vec2 rSize) :
maSize(rSize),
mnFrambufferId(0),
mnDepthId(0),
mnTextureId(0)
{
-OpenGLHelper::createFramebuffer(maSize.getX(), maSize.getY(),
mnFrambufferId,
+OpenGLHelper::createFramebuffer(maSize.x, maSize.y,
mnFrambufferId,
mnDepthId, mnTextureId, false);
}
@@ -585,7 +585,7 @@ namespace oglcanvas
};
}
-IBufferContextSharedPtr SpriteDeviceHelper::createBufferContext(const
::basegfx::B2IVector rSize) const
+IBufferContextSharedPtr SpriteDeviceHelper::createBufferContext(const
glm::vec2 rSize) const
{
return IBufferContextSharedPtr(new BufferContextImpl(rSize));
}
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx
b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 4eb3c4b..e9ecdc2 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -20,6 +20,7 @@
#include ogl_buffercontext.hxx
+#include glm/glm.hpp
#include set
namespace vcl { class Window; }
@@ -110,7 +111,7 @@ namespace oglcanvas
const ::basegfx::B2DHomMatrix
rTexTransform );
/// create a pbuffer context (for rendering into background surface)
-IBufferContextSharedPtr createBufferContext(const
::basegfx::B2IVector rSize) const;
+IBufferContextSharedPtr createBufferContext(const glm::vec2 rSize)
const;
/// Get instance of internal texture cache
TextureCache getTextureCache() const;
commit 6dedd443191f5da89d9b1414274aa1ecaa10c95c
Author: Michael Jaumann meta_...@yahoo.com
Date: Mon Nov 3 13:24:29 2014 +
migrate matrixtools to glm
Change-Id: Ibd558f5d85f78e52fc6a73ba14acf2ea68ce8a37
diff --git a/basegfx/source/glm_matrix/b2dglmmatrixtools.cxx
b/basegfx/source/glm_matrix/b2dglmmatrixtools.cxx
new file mode 100644
index 000..0c81327
--- /dev/null
+++ b/basegfx/source/glm_matrix/b2dglmmatrixtools.cxx
@@ -0,0 +1,360 @@
+/* -*- 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 basegfx/matrix/b2dglmmatrixtools.hxx
+#include basegfx/matrix/b2dhommatrixtools.hxx
+#include rtl/ustring.hxx
+#include rtl/ustrbuf.hxx
+
+namespace basegfx
+{
+namespace tools
+{
+
+glm::mat4 createScaleGlmMatrix(double fScaleX, double fScaleY)
+{
+glm::mat4 aRetval;
+const double fOne(1.0);
+
+if(!fTools::equal(fScaleX, fOne))
+{
+aRetval[0][0] = fScaleX;
+}
+
+if(!fTools::equal(fScaleY, fOne))
+{
+aRetval[1][1] = fScaleY;
+}
+
+return aRetval;
+}
+
+glm::mat4
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/cellsh2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 99cfc0f8a321c3fd3ef1a49d669ebc5744dbf606 Author: Eike Rathke er...@redhat.com Date: Mon Nov 3 14:52:27 2014 +0100 fdo#85403 broadcast changes after TextToColumn Regression introduced with 3d869cda8db03820dea8c4ba463eb155d05e933b for fdo#74014 Change-Id: Ie8ca1e7c15609aaf80b4ecbb6ccffc30a3f79f0a diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a677101..b656771 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -978,6 +978,7 @@ void ScCellShell::ExecuteDB( SfxRequest rReq ) pDlg-SaveParameters(); aImport.SetExtOptions( aOptions ); aImport.SetApi( false ); +aImport.SetImportBroadcast( true ); aStream.Seek( 0 ); aImport.ImportStream( aStream, OUString(), FORMAT_STRING ); ___ 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/docnode/nodedump.cxx | 21 +
1 file changed, 21 insertions(+)
New commits:
commit ec7d261772d55c5328d0ca2c87f1f9399882ecd5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Nov 3 13:15:59 2014 +0100
sw doc model dump: show parameters of fieldmarks
Change-Id: I3596df5736620488948cc3a138d63a0cb9676ee8
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 122bcd4..90e356b 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -55,6 +55,7 @@
#include libxml/xmlwriter.h
#include boost/optional.hpp
#include rtl/strbuf.hxx
+#include comphelper/anytostring.hxx
using namespace com::sun::star;
@@ -244,6 +245,26 @@ void MarkManager::dumpAsXml( xmlTextWriterPtr w ) const
writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
OString txt8 = OUStringToOString(pMark-GetName(),
RTL_TEXTENCODING_UTF8);
writer.writeFormatAttribute(name, %s, BAD_CAST(
txt8.getStr()));
+
+if (sw::mark::IFieldmark* pFieldmark =
dynamic_castsw::mark::IFieldmark*(pMark.get()))
+{
+sw::mark::IFieldmark::parameter_map_t* pParameters =
pFieldmark-GetParameters();
+if (pParameters)
+{
+writer.startElement(parameters);
+for (sw::mark::IFieldmark::parameter_map_t::iterator
parameter = pParameters-begin(); parameter != pParameters-end(); ++parameter)
+{
+writer.startElement(parameter);
+OString aName = OUStringToOString(parameter-first,
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute(name, %s,
BAD_CAST(aName.getStr()));
+OString aValue =
OUStringToOString(comphelper::anyToString(parameter-second),
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute(value, %s,
BAD_CAST(aValue.getStr()));
+writer.endElement();
+}
+writer.endElement();
+}
+}
+
writer.endElement();
}
writer.endElement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: crashrep/source
crashrep/source/unx/main.cxx | 258 +--
1 file changed, 154 insertions(+), 104 deletions(-)
New commits:
commit bbdd3da43d37ea4fdbcc2dc3ad8b4800020e71e8
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Nov 1 09:52:30 2014 -0500
crashrep: get rid of tmpnam()
Change-Id: If84d623719058e4b14f224a433253fac4fd47f85
Reviewed-on: https://gerrit.libreoffice.org/12066
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 65d70e2..d70bb0e 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -71,9 +71,7 @@ static string g_strPStackFileName;
static string g_strChecksumFileName;
static string g_strProgramDir;
-static char g_szStackFile[L_tmpnam] = ;
-static char g_szDescriptionFile[2048] = ;
-static char g_szReportFile[2048] = ;
+//static char g_szStackFile[L_tmpnam] = ;
#define REPORT_SERVER (g_strReportServer.c_str())
#define REPORT_PORT g_uReportPort
@@ -163,87 +161,124 @@ static size_t fcopy( FILE *fpout, FILE *fpin )
from which it can be reviewed and sent
*/
-bool write_report( const boost::unordered_map string, string rSettings )
+char* write_report( const boost::unordered_map string, string rSettings )
{
-FILE*fp = fopen( tmpnam( g_szReportFile ), w );
-const char *pszUserType = getenv( STAROFFICE_USERTYPE );
+char * report_filename;
-fprintf( fp,
- ?xml version=\1.0\ encoding=\UTF-8\?\n
- !DOCTYPE errormail:errormail PUBLIC \-//OpenOffice.org//DTD
ErrorMail 1.0//EN\ \errormail.dtd\\n
- errormail:errormail
xmlns:errormail=\http://openoffice.org/2002/errormail\; usertype=\%s\\n
- reportmail:mail
xmlns:reportmail=\http://openoffice.org/2002/reportmail\; version=\1.1\
feedback=\%s\ email=\%s\\n
- reportmail:title%s/reportmail:title\n
- reportmail:attachment name=\description.txt\
media-type=\text/plain\ class=\UserComment\/\n
- reportmail:attachment name=\stack.txt\ media-type=\text/plain\
class=\pstack output\/\n
- /reportmail:mail\n
- officeinfo:officeinfo
xmlns:officeinfo=\http://openoffice.org/2002/officeinfo\; build=\%s\
platform=\%s\ language=\%s\ exceptiontype=\%d\ product=\%s\
procpath=\%s\/\n
- ,
- pszUserType ? xml_encode( pszUserType ).c_str() : ,
- xml_encode(rSettings.find( CONTACT )-second).c_str(),
- xml_encode(rSettings.find( EMAIL )-second).c_str(),
- xml_encode(rSettings.find( TITLE )-second).c_str(),
- g_buildid.length() ? xml_encode( g_buildid ).c_str() : unknown,
- _INPATH,
- g_strDefaultLanguage.c_str(),
- g_signal,
- g_strProductKey.length() ? xml_encode(g_strProductKey).c_str() :
unknown,
- xml_encode(getprogramdir()).c_str()
- );
-
-struct utsname info;
-
-memset( info, 0, sizeof(info) );
-uname( info );
+report_filename = (char*)calloc(1, 2048);
-fprintf( fp,
- systeminfo:systeminfo
xmlns:systeminfo=\http://openoffice.org/2002/systeminfo\;\n
- systeminfo:System name=\%s\ version=\%s\ build=\%s\
locale=\%s\/\n
- ,
- xml_encode( info.sysname ).c_str(),
- xml_encode( info.version ).c_str(),
- xml_encode( info.release ).c_str(),
- xml_encode( getlocale() ).c_str()
- );
-fprintf( fp, systeminfo:CPU type=\%s\/\n, xml_encode( info.machine
).c_str() );
-fprintf( fp, /systeminfo:systeminfo\n );
-
-FILE *fpxml = fopen( g_strXMLFileName.c_str(), r );
-if ( fpxml )
+if(!report_filename)
{
-fcopy( fp, fpxml );
-fclose( fpxml );
+return NULL;
}
+strncpy( report_filename, P_tmpdir, 2047 );
+strncat( report_filename, /crashreport.XX, 2047 -
strlen(report_filename));
-FILE *fpchk = fopen( g_strChecksumFileName.c_str(), r );
-if ( fpchk )
+int fd = mkstemp(report_filename);
+if(fd == -1)
{
-fcopy( fp, fpchk );
-fclose( fpchk );
+free(report_filename);
+return NULL;
}
+else
+{
+FILE* fp = fdopen(fd, w);
+
+const char* pszUserType = getenv( STAROFFICE_USERTYPE );
+
+fprintf( fp,
+ ?xml version=\1.0\ encoding=\UTF-8\?\n
+ !DOCTYPE errormail:errormail PUBLIC
\-//OpenOffice.org//DTD ErrorMail 1.0//EN\ \errormail.dtd\\n
+ errormail:errormail
xmlns:errormail=\http://openoffice.org/2002/errormail\; usertype=\%s\\n
+ reportmail:mail
xmlns:reportmail=\http://openoffice.org/2002/reportmail\; version=\1.1\
feedback=\%s\ email=\%s\\n
+ reportmail:title%s/reportmail:title\n
+ reportmail:attachment name=\description.txt\
media-type=\text/plain\ class=\UserComment\/\n
+ reportmail:attachment name=\stack.txt\
media-type=\text/plain\ class=\pstack output\/\n
+
[Libreoffice-commits] core.git: 3 commits - dbaccess/source sc/source sw/CppunitTest_sw_tox.mk sw/CppunitTest_sw_uwriter.mk sw/inc sw/Module_sw.mk sw/qa sw/source unusedcode.easy
dbaccess/source/core/api/RowSetCacheIterator.cxx |5 dbaccess/source/core/api/RowSetCacheIterator.hxx |1 sc/source/ui/unoobj/celllistsource.cxx | 16 - sc/source/ui/unoobj/celllistsource.hxx |6 sc/source/ui/unoobj/cellvaluebinding.cxx | 19 -- sc/source/ui/unoobj/cellvaluebinding.hxx |6 sw/CppunitTest_sw_tox.mk | 84 - sw/CppunitTest_sw_uwriter.mk |3 sw/Module_sw.mk |4 sw/inc/ToxLinkProcessor.hxx |2 sw/inc/ToxTabStopTokenHandler.hxx|4 sw/inc/ToxTextGenerator.hxx |2 sw/inc/ToxWhitespaceStripper.hxx |2 sw/inc/modeltoviewhelper.hxx | 25 ++ sw/qa/core/test_ToxLinkProcessor.cxx | 140 sw/qa/core/test_ToxTextGenerator.cxx | 195 +++ sw/qa/core/test_ToxWhitespaceStripper.cxx| 147 + sw/qa/core/uwriter.cxx | 34 +++- sw/qa/extras/tox/test_ToxLinkProcessor.cxx | 140 sw/qa/extras/tox/test_ToxTextGenerator.cxx | 195 --- sw/qa/extras/tox/test_ToxWhitespaceStripper.cxx | 150 - sw/source/core/inc/txmsrt.hxx|2 sw/source/core/text/porlay.cxx |5 sw/source/core/txtnode/modeltoviewhelper.cxx | 70 +--- sw/source/core/txtnode/txtedt.cxx|2 unusedcode.easy |3 26 files changed, 585 insertions(+), 677 deletions(-) New commits: commit 6c52a8b916e52c9ab33461e931a4e75b3dae04f7 Author: Caolán McNamara caol...@redhat.com Date: Mon Nov 3 13:58:52 2014 + drop SW_DLLPUBLICs for unit-test only exposure seeing as have a uwriter target for the non-exposed symbols case. As a motivating side-effect stops crashing on exit on an optimized build with my x86_64 fedora 20 gcc 4.8.3 build Change-Id: If0240ee02d4899e488b12d2d8d5f9b6bf7cca37d diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk deleted file mode 100644 index cca386f..000 --- a/sw/CppunitTest_sw_tox.mk +++ /dev/null @@ -1,84 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -# This file contains the unit test definition for class in the sources/core/tox subfolder -# The macro which defines the main method is contained in test_ToxWhitespaceStripper.cxx - -$(eval $(call gb_CppunitTest_CppunitTest,sw_tox)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox, \ - sw/qa/extras/tox/test_ToxWhitespaceStripper \ - sw/qa/extras/tox/test_ToxLinkProcessor \ - sw/qa/extras/tox/test_ToxTextGenerator \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_tox, \ - $(call gb_Helper_optional,AVMEDIA,avmedia) \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - i18nlangtag \ - i18nutil \ - lng \ - sal \ - salhelper \ - sax \ - sb \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - sw \ - test \ - unotest \ - vcl \ - tk \ - tl \ - ucbhelper \ - utl \ - xmlreader \ - xo \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_tox, \ - boost_headers \ - icuuc \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_tox,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_components,sw_tox, \ - configmgr/source/configmgr \ - framework/util/fwk \ - i18npool/util/i18npool \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_tox)) -$(eval $(call gb_CppunitTest_use_ure,sw_tox)) -$(eval $(call gb_CppunitTest_use_vcl,sw_tox)) - -$(eval $(call gb_CppunitTest_set_include,sw_tox,\ --I$(SRCDIR)/sw/inc \ --I$(SRCDIR)/sw/source/core/inc \ -$$(INCLUDE) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 495d088..9f4e9f9 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \ sw/qa/core/uwriter \ sw/qa/core/Test-BigPtrArray \ +sw/qa/core/test_ToxWhitespaceStripper \ +sw/qa/core/test_ToxLinkProcessor \ +sw/qa/core/test_ToxTextGenerator \ ))
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/CppunitTest_sw_rtfexport.mk sw/qa sw/source
sw/CppunitTest_sw_rtfexport.mk |1 +
sw/qa/extras/rtfexport/data/fdo82858.docx |binary
sw/qa/extras/rtfexport/rtfexport.cxx|6 ++
sw/source/filter/ww8/rtfattributeoutput.cxx |3 +++
4 files changed, 10 insertions(+)
New commits:
commit 0ec92e9bc778d6edf3a349e7c89eac8850caef60
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Oct 25 12:15:16 2014 +0200
fdo#82858 RTF export: fix none line style of TextFrames
Regression from commit 9e6a5b94e00f0054b058dbb42c2c0b6c75236c9d
(RtfAttributeOutput::FormatBox: export line{Color,Width} shape
properties, 2013-04-15), in case lineColor is written, but there is no
border style, then an explicit fLine=0 property is needed, otherwise a
black border shows up.
(cherry picked from commit f824b1b575dbdb2bc515656a66cbb94764031a44)
Change-Id: I6d6eedbc8d3ee4bee0f2aadb51a376c7734c6640
Reviewed-on: https://gerrit.libreoffice.org/12185
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index 9c5e175..bacb2c1 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
uui/util/uui \
writerfilter/util/writerfilter \
xmloff/util/xo \
+ oox/util/oox \
))
$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport))
diff --git a/sw/qa/extras/rtfexport/data/fdo82858.docx
b/sw/qa/extras/rtfexport/data/fdo82858.docx
new file mode 100644
index 000..e0b1a13
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/fdo82858.docx differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 0617258..0f53098 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -661,6 +661,12 @@ DECLARE_RTFEXPORT_TEST(testFdo79599, fdo79599.rtf)
#endif
+DECLARE_RTFEXPORT_TEST(testFdo82858, fdo82858.docx)
+{
+// This was table::BorderLineStyle::SOLID, exporter failed to write
explicit no line when line color was written.
+CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::NONE,
getPropertytable::BorderLine2(getShape(1), TopBorder).LineStyle);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 51f9033..1ac0795 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3042,6 +3042,9 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem rBox)
sal_Int32 nWidth = sal_Int32(fConverted * 635); // Twips -
EMUs
m_aFlyProperties.push_back(std::make_pairOString,
OString(lineWidth, OString::number(nWidth)));
}
+else
+// No border: no line.
+m_aFlyProperties.push_back(std::make_pairOString,
OString(fLine, 0));
}
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: master 'make check' failures: 'sccomp_lpsolver.test' and 'sw_tox.test'
On Mon, 2014-11-03 at 11:53 +0100, Maarten Hoes wrote: Hi, FYI: running 'make check' on master, I have failures (core dumped) for 'sccomp_lpsolver.test' and 'sw_tox.test' (see attachment for logs). Not sure if this needs some attention or not, just thought id mention it. Feel free to ignore. I saw the tox failure yesterday (only with an optimized build and not with dbgutil) and have pushed something which I hope will make it go away. Rebuilding an optimized version at the moment to test. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: coverity warnings update, 170, 0.04 density
On Sun, 2014-11-02 at 22:39 +0100, Thorsten Behrens wrote: Caolan McNamara wrote: I reckon practically all the swapped arguments are ok except maybe for 1242508. (caolanm-quikee: in 1b23e46051d8cc7c01fd8b4d0ea51bfec145db8e there is.. - pWriteAcc-SetPixel( i, x, aResultColor ); + pWriteAcc-SetPixel( x, y, aResultColor ); and SetPixel takes args named x, y. so are those arguments definitely not the wrong way around or is it actually a real detected problem?) Aye. But SetPixel arg ordering is just being totally silly. Fix pushed though. Yesterday's run is now an all-time low of 0.04 defect density, with just 163 issues remaining to be triaged. 735814 Explicit null dereferenced in sc/source/ui/namedlg/namedefdlg.cxx:240 looks like a real problem where pNewEntry is dereferenced but an above code path assigns NULL to it if I could get a calc guy to look at it. and 705391 Inferred misuse of enum really bugs me. xmloff/source/transform/MergeElemTContext.cxx:235 where XML_ATACTION_MOVE_FROM_ELEM_RNG2ISO_DATETIME is from a completely different enum than all the other cases. It looks completely bogus, but I don't know if it should be some other condition or if that case belongs to another switch. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Mon, 2014-11-03 at 12:44 +0100, Maarten Hoes wrote:
Hi,
I ran an gcov/lcov report of 'make check' on master
('sccomp_lpsolver.test' and 'sw_tox.test' failed for some reason with
a core dump, and therefore are excluded from the results), which I
could (if interested) upload (if given access) to
dev-builds.libreoffice.org/lcov_reports/ for comparison with the
report generated for master on 11-Apr-2014.
Maybe cloph or moggi could sort our some type of access there. I'd be
interested especially interested in which dirs in
filter/source/graphicfilter have 0 coverage and are import filters.
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: coverity warnings update, 170, 0.04 density
On Mon, Nov 3, 2014 at 4:24 PM, Caolán McNamara caol...@redhat.com wrote: On Sun, 2014-11-02 at 22:39 +0100, Thorsten Behrens wrote: Caolan McNamara wrote: I reckon practically all the swapped arguments are ok except maybe for 1242508. (caolanm-quikee: in 1b23e46051d8cc7c01fd8b4d0ea51bfec145db8e there is.. - pWriteAcc-SetPixel( i, x, aResultColor ); + pWriteAcc-SetPixel( x, y, aResultColor ); and SetPixel takes args named x, y. so are those arguments definitely not the wrong way around or is it actually a real detected problem?) Aye. But SetPixel arg ordering is just being totally silly. Fix pushed though. Yesterday's run is now an all-time low of 0.04 defect density, with just 163 issues remaining to be triaged. 735814 Explicit null dereferenced in sc/source/ui/namedlg/namedefdlg.cxx:240 looks like a real problem where pNewEntry is dereferenced but an above code path assigns NULL to it if I could get a calc guy to look at it. That looks like one for me. I'll have a look at it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - 24 commits - include/vcl officecfg/registry shell/source vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Module_vcl.mk vcl/
Rebased ref, commits from common ancestor:
commit eb893c1add0b15bc50fb54b1413a23938b71cdb5
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 3 11:10:14 2014 -0500
vcl: Fix the vertices calculations for some drawing operations
Change-Id: Ida92d77d7f828f5ff53e7cceaf4787beeef0022b
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 65cff6a..d79bce0 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -257,33 +257,32 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
{
-GLushort pPoints[4];
+GLfloat pPoints[4];
-pPoints[0] = nX1;
-pPoints[1] = nY1;
-pPoints[2] = nX2;
-pPoints[3] = nY2;
+pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+pPoints[1] = (2 * nY1) / GetHeight() - 1.0;
+pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+pPoints[3] = (2 * nY2) / GetHeight() - 1.0;
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, 4, GL_UNSIGNED_SHORT, GL_FALSE, 0,
pPoints );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_FLOAT, GL_FALSE, 0, pPoints );
glDrawArrays( GL_LINES, 0, 2 );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints, const SalPoint*
pPtAry, bool bClose )
{
-GLushort *pPoints;
+GLfloat pPoints[nPoints * 2];
sal_uInt32 i, j;
-pPoints = new GLushort[nPoints * 2];
-for( i = 0, j = 0; i nPoints; i++, j += 2 )
+for( i = 0, j = 0; i nPoints; i++ )
{
-pPoints[j] = pPtAry[i].mnX;
-pPoints[j+1] = pPtAry[i].mnY;
+pPoints[j++] = (2 * pPtAry[i].mnX) / GetWidth() - 1.0;
+pPoints[j++] = (2 * pPtAry[i].mnY) / GetHeight() - 1.0;
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_UNSIGNED_SHORT,
GL_FALSE, 0, pPoints );
+glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_FLOAT, GL_FALSE, 0,
pPoints );
if( bClose )
glDrawArrays( GL_LINE_LOOP, 0, nPoints );
else
@@ -293,7 +292,7 @@ void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints,
const SalPoint* pPtAr
void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32 nPoints, const
SalPoint* pPtAry )
{
-GLushort pVertices[nPoints * 2];
+GLfloat pVertices[nPoints * 2];
sal_uInt32 i, j;
for( i = 0, j = 0; i nPoints; i++, j += 2 )
@@ -303,7 +302,7 @@ void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32
nPoints, const SalPoin
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_UNSIGNED_SHORT,
GL_FALSE, 0, pVertices );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_FLOAT, GL_FALSE, 0, pVertices
);
glDrawArrays( GL_TRIANGLE_FAN, 0, nPoints );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
@@ -312,8 +311,8 @@ void OpenGLSalGraphicsImpl::DrawRect( long nX, long nY,
long nWidth, long nHeigh
{
long nX1( nX );
long nY1( nY );
-long nX2( nX + nWidth - 1 );
-long nY2( nY + nHeight - 1 );
+long nX2( nX + nWidth );
+long nY2( nY + nHeight );
const SalPoint aPoints[] = { { nX1, nY2 }, { nX1, nY1 },
{ nX2, nY1 }, { nX2, nY2 }};
@@ -350,7 +349,7 @@ void OpenGLSalGraphicsImpl::DrawPolygon( sal_uInt32
nPoints, const SalPoint* pPt
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, aResult.count() * 2,
GL_UNSIGNED_SHORT, GL_FALSE, 0, pVertices );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_UNSIGNED_SHORT, GL_FALSE,
0, pVertices );
glDrawArrays( GL_TRIANGLES, 0, aResult.count() );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
@@ -367,16 +366,16 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const
basegfx::B2DPolyPolygon pPol
const ::basegfx::B2DPolygon aResult(
::basegfx::triangulator::triangulate( pPolygon ) );
-for( j = 0; i aResult.count(); j++ )
+for( j = 0; j aResult.count(); j++ )
{
-const ::basegfx::B2DPoint rPt( aResult.getB2DPoint(i) );
+const ::basegfx::B2DPoint rPt( aResult.getB2DPoint( j ) );
pVertices.push_back( rPt.getX() );
pVertices.push_back( rPt.getY() );
}
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, pVertices.size(), GL_UNSIGNED_SHORT,
GL_FALSE, 0, pVertices.data() );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_UNSIGNED_SHORT, GL_FALSE, 0,
pVertices.data() );
glDrawArrays( GL_TRIANGLES, 0, pVertices.size() / 2 );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
@@ -386,7 +385,7 @@ void OpenGLSalGraphicsImpl::DrawTextureRect( const
SalTwoRect pPosAry )
GLushort aTexCoord[8];
glEnableVertexAttribArray( GL_ATTRIB_TEX );
-glVertexAttribPointer(
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/execute.sh test-bugzilla-files/new-control.py test-bugzilla-files/test-bugzilla-files.py
test-bugzilla-files/execute.sh |7 --- test-bugzilla-files/new-control.py | 14 +- test-bugzilla-files/test-bugzilla-files.py |8 3 files changed, 17 insertions(+), 12 deletions(-) New commits: commit 4c29a00b1877479af42c17e17041189b8852426b Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Nov 3 11:19:54 2014 -0500 fix errors in new version of the script diff --git a/test-bugzilla-files/execute.sh b/test-bugzilla-files/execute.sh index e2c6076..46c1bd9 100755 --- a/test-bugzilla-files/execute.sh +++ b/test-bugzilla-files/execute.sh @@ -1,4 +1,5 @@ -mkdir /srv/crashtestdata/control/$1 -cd /srv/crashtestdata/control/$1 -TMPDIR=/srv/crashtestdata/tmpdir /home/buildslave/build/instdir/program/python /home/buildslave/source/dev-tools/test-bugzilla-files/test-bugzilla-files.py --soffice=path:/home/buildslave/build/instdir/program/soffice --userdir=file:///home/buildslave/.config/libreoffice_$1/4 $1 21 | tee /srv/crashtestdata/console_$i.log +dir_name=$(basename $1) +mkdir /srv/crashtestdata/control/$dir_name +cd /srv/crashtestdata/control/$dir_name +TMPDIR=/srv/crashtestdata/tmpdir /home/buildslave/build/instdir/program/python /home/buildslave/source/dev-tools/test-bugzilla-files/test-bugzilla-files.py --soffice=path:/home/buildslave/build/instdir/program/soffice --userdir=file:///home/buildslave/.config/libreoffice_$dir_name/4 $1 21 | tee /srv/crashtestdata/console_$dir_name.log rm core* diff --git a/test-bugzilla-files/new-control.py b/test-bugzilla-files/new-control.py index c27cb5f..c278a2a 100644 --- a/test-bugzilla-files/new-control.py +++ b/test-bugzilla-files/new-control.py @@ -39,12 +39,13 @@ def get_tasks(directory, files_per_task): task_file = open(filename, w) for item in list_item: task_file.write(%s\n % item) -task_files.append(filename) +task_files.append(os.path.join(os.getcwd(),filename)) i += 1 +print(number of tasks: + str(len(task_files))) return task_files def execute_task(task_file): -# subprocess.call(./execute.sh + task_file, shell=True) +subprocess.call(./execute.sh + task_file, shell=True) time.sleep(1) def usage(): @@ -62,12 +63,15 @@ if __name__ == __main__: usage() sys.exit() -for opt, arg in opts: -if opt in (-d, --directory): -directory = arg +if len(args) == 0: +usage() +sys.exit(1) + +directory = args[0] print(directory) if not os.path.isdir(directory): +print(no valid directory) sys.exit(1) task_size = 100 diff --git a/test-bugzilla-files/test-bugzilla-files.py b/test-bugzilla-files/test-bugzilla-files.py index e43e847..e4a5f36 100644 --- a/test-bugzilla-files/test-bugzilla-files.py +++ b/test-bugzilla-files/test-bugzilla-files.py @@ -72,7 +72,7 @@ def partition(list, pred): def getFiles(file_list_name): file_list = open(file_list_name, r) files = file_list.readlines() -return files +return [file.rstrip() for file in files] ### UNO utilities ### @@ -235,7 +235,7 @@ def mkPropertyValue(name, value): name, 0, value, 0) de -def getComponent(xDoc) +def getComponent(xDoc): if not xDoc: return None @@ -393,7 +393,7 @@ def exportDoc(xDoc, filterName, validationCommand, filename, connection): class ExportFileTest: -def __init__(self, xDoc, component, filename): +def __init__(self, xDoc, filename): self.xDoc = xDoc self.filename = filename def run(self, connection): @@ -576,7 +576,7 @@ def runLoadFileTests(opts, file_list_name): state = State() #print(before map) files = [] -files.extend(getFiles(file_list_name)) +files.extend(getFiles(file_list_name[0])) files.sort() tests.extend( (LoadFileTest(file, state) for file in files) ) runConnectionTests(connection, simpleInvoke, tests) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: master 'make check' failures: 'sccomp_lpsolver.test' and 'sw_tox.test'
On Mon, Nov 03, 2014 at 11:53:53AM +0100, Maarten Hoes wrote: FYI: running 'make check' on master, I have failures (core dumped) for 'sccomp_lpsolver.test' and 'sw_tox.test' (see attachment for logs). sw_tox is https://bugs.freedesktop.org/show_bug.cgi?id=85177. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Mon, 2014-11-03 at 16:57 +0100, Maarten Hoes wrote: On Mon, Nov 3, 2014 at 4:10 PM, Caolán McNamara caol...@redhat.com wrote: I'd be interested especially interested in which dirs in filter/source/graphicfilter have 0 coverage and are import filters. Does this list handle attachments gracefully ? Here's a screenshot of just those directory's. Yeah, so in that screenshot, the import ones are the iFOO dirs. So that clearly states we don't have a single pcd filter import case :-( It should be super easy to add a pcd import test, e.g. http://cgit.freedesktop.org/libreoffice/core/log/0445a0ea1b11c78f03272d42e5a8829b1bd107e2 i.e. take one of the other ones, copy and paste it and change e.g. eps to pcd and Eps to Eps and ips to whatever the pcd library is called (probably ipd). The catch apparently is that we don't have a single image/x-photo-cd pcd attachment in any of the Red Hat, Freedesktop, legacy OpenOffice.org, etc bugzillas to use as a test now that I look into my local horde from ./bin/get-bugzilla-attachments-by-mimetype So there's got to be some (non-offensive) examples out there somewhere else we can use or make some from scratch with ImageMagick or something that can export to the format. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/core/crsr/bookmrk.cxx |8
sw/source/core/crsr/crossrefbookmark.cxx | 16
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 10
sw/source/core/doc/DocumentContentOperationsManager.cxx | 468 +++---
sw/source/core/doc/DocumentDeviceManager.cxx | 80 +-
sw/source/core/doc/DocumentDrawModelManager.cxx | 36 -
sw/source/core/doc/DocumentFieldsManager.cxx | 186 ++---
sw/source/core/doc/DocumentLayoutManager.cxx | 86 +-
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 56 -
sw/source/core/doc/DocumentListsManager.cxx |8
sw/source/core/doc/DocumentOutlineNodesManager.cxx| 12
sw/source/core/doc/DocumentRedlineManager.cxx | 104 +--
sw/source/core/doc/DocumentStateManager.cxx | 20
sw/source/core/doc/DocumentStatisticsManager.cxx | 26
sw/source/core/doc/DocumentStylePoolManager.cxx | 270
sw/source/core/doc/DocumentTimerManager.cxx | 34 -
sw/source/core/doc/docbm.cxx | 25
sw/source/core/inc/DocumentChartDataProviderManager.hxx |2
sw/source/core/inc/DocumentContentOperationsManager.hxx |2
sw/source/core/inc/DocumentDeviceManager.hxx |2
sw/source/core/inc/DocumentDrawModelManager.hxx |2
sw/source/core/inc/DocumentFieldsManager.hxx |2
sw/source/core/inc/DocumentLayoutManager.hxx |2
sw/source/core/inc/DocumentLinksAdministrationManager.hxx |2
sw/source/core/inc/DocumentListsManager.hxx |2
sw/source/core/inc/DocumentOutlineNodesManager.hxx|2
sw/source/core/inc/DocumentRedlineManager.hxx |2
sw/source/core/inc/DocumentStateManager.hxx |2
sw/source/core/inc/DocumentStatisticsManager.hxx |2
sw/source/core/inc/DocumentStylePoolManager.hxx |2
sw/source/core/inc/DocumentTimerManager.hxx |2
sw/source/core/inc/crossrefbookmark.hxx |4
32 files changed, 741 insertions(+), 736 deletions(-)
New commits:
commit 093d54326f94467bc1601c14a38454efcc888017
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 3 17:37:56 2014 +0100
sw: s/m_rSwdoc/m_rDoc/g
... because i can type m_rDoc but m_rSwdoc always comes out m_rSwDoc.
Change-Id: Id50888012da6cf3cf7aebc52e8c70fc359c6e073
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index c243eb3..cd8d0e3 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::uno;
namespace sw {
-DocumentChartDataProviderManager::DocumentChartDataProviderManager( SwDoc
i_rSwdoc ) : m_rSwdoc( i_rSwdoc ),
+DocumentChartDataProviderManager::DocumentChartDataProviderManager( SwDoc
i_rSwdoc ) : m_rDoc( i_rSwdoc ),
maChartDataProviderImplRef(),
mpChartControllerHelper( 0 )
{
@@ -49,7 +49,7 @@ SwChartDataProvider *
DocumentChartDataProviderManager::GetChartDataProvider( bo
if (bCreate !maChartDataProviderImplRef.is())
{
-maChartDataProviderImplRef = new SwChartDataProvider( m_rSwdoc );
+maChartDataProviderImplRef = new SwChartDataProvider( m_rDoc );
}
return maChartDataProviderImplRef.get();
}
@@ -61,13 +61,13 @@ void
DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
OUString aName( pTable-GetFrmFmt()-GetName() );
SwOLENode *pONd;
SwStartNode *pStNd;
-SwNodeIndex aIdx(
*m_rSwdoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
+SwNodeIndex aIdx(
*m_rDoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
while (0 != (pStNd = aIdx.GetNode().GetStartNode()))
{
++aIdx;
if( 0 != ( pONd = aIdx.GetNode().GetOLENode() )
aName == pONd-GetChartTblName() /* OLE node is chart? */
-0 != (pONd-getLayoutFrm(
m_rSwdoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not
hidden */ )
+0 != (pONd-getLayoutFrm(
m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not
hidden */ )
{
uno::Reference embed::XEmbeddedObject xIP =
pONd-GetOLEObj().GetOleRef();
if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
@@ -88,7 +88,7 @@ SwChartLockController_Helper
DocumentChartDataProviderManager::GetChartControl
{
if (!mpChartControllerHelper)
{
-mpChartControllerHelper = new
Re: 'master' 'make check' lcov code coverage report
Hey Maarten,
On Mon, Nov 3, 2014 at 4:10 PM, Caolán McNamara caol...@redhat.com wrote:
On Mon, 2014-11-03 at 12:44 +0100, Maarten Hoes wrote:
Hi,
I ran an gcov/lcov report of 'make check' on master
('sccomp_lpsolver.test' and 'sw_tox.test' failed for some reason with
a core dump, and therefore are excluded from the results), which I
could (if interested) upload (if given access) to
dev-builds.libreoffice.org/lcov_reports/ for comparison with the
report generated for master on 11-Apr-2014.
Maybe cloph or moggi could sort our some type of access there. I'd be
interested especially interested in which dirs in
filter/source/graphicfilter have 0 coverage and are import filters.
That is in general no problem. Just send your public ssh key to cloph.
In general I think it makes sense to move that to one of the TDF VMs
and implement a script similar to the coverity one that is more or
less run once a week. If you are interested in working on that we can
surely work something out to get you access to one of the VMs to
automated the generation of the reports.
Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/textlayoutdevice.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 4c30eb7a067b5a8dfe04689d37ff6a775acaf10a Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 3 18:11:01 2014 +0100 Zero font width means non-scaled ...so make sure to always round small width of a scaled font to one, not zero. Change-Id: I032b28e7f7183770db134f5891393ceaf39e0103 diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index df8617c..12e83f6 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include sal/config.h + +#include algorithm + #include drawinglayer/primitive2d/textlayoutdevice.hxx #include comphelper/processfactory.hxx #include comphelper/scoped_disposing_ptr.hxx @@ -394,7 +398,7 @@ namespace drawinglayer vcl::Font aRetval( rFontAttribute.getFamilyName(), rFontAttribute.getStyleName(), -Size(bFontIsScaled ? nWidth : 0, nHeight)); +Size(bFontIsScaled ? std::maxsal_uInt32(nWidth, 1) : 0, nHeight)); #endif // define various other FontAttribute aRetval.SetAlign(ALIGN_BASELINE); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- sc/uiconfig/scalc/menubar/menubar.xml|8 sd/uiconfig/sdraw/menubar/menubar.xml|3 ++- sd/uiconfig/simpress/menubar/menubar.xml |3 ++- sw/uiconfig/sglobal/menubar/menubar.xml |4 ++-- sw/uiconfig/swform/menubar/menubar.xml |4 ++-- sw/uiconfig/swreport/menubar/menubar.xml |4 ++-- sw/uiconfig/swriter/menubar/menubar.xml |4 ++-- sw/uiconfig/swxform/menubar/menubar.xml |4 ++-- 9 files changed, 19 insertions(+), 17 deletions(-) New commits: commit 7e4920419e4a7c791ad6becd39078f3814876003 Author: Yousuf Philips philip...@hotmail.com Date: Sat Nov 1 01:39:28 2014 +0400 fdo#85620 - Changing the label 'Gallery' and having it in the insert menu Change-Id: I4deaef9a942b82566bc7dcdc65f2a84441045f91 Reviewed-on: https://gerrit.libreoffice.org/12167 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index a5b5140..cb97483 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4398,7 +4398,7 @@ /node node oor:name=.uno:Gallery oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Gallery/value + value xml:lang=en-USClip Art ~Gallery/value /prop prop oor:name=Properties oor:type=xs:int value9/value diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index fc85d04..e1f14b0 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -149,8 +149,9 @@ menu:menuseparator/ menu:menuitem menu:id=.uno:ViewDataSourceBrowser/ menu:menuitem menu:id=.uno:Navigator/ - menu:menuitem menu:id=.uno:Sidebar/ - menu:menuseparator/ +menu:menuitem menu:id=.uno:Gallery/ +menu:menuitem menu:id=.uno:Sidebar/ +menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ menu:menu menu:id=.uno:ZoomMenu menu:menupopup @@ -214,6 +215,7 @@ menu:menu menu:id=.uno:GraphicMenu menu:menupopup menu:menuitem menu:id=.uno:InsertGraphic/ +menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:InsertAVMedia/ menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup @@ -421,8 +423,6 @@ /menu:menupopup /menu:menu menu:menuseparator/ -menu:menuitem menu:id=.uno:Gallery/ -menu:menuseparator/ menu:menu menu:id=.uno:MacrosMenu menu:menupopup menu:menuitem menu:id=.uno:MacroRecorder/ diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 871fb15..c0bad75 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -131,6 +131,7 @@ menu:menuitem menu:id=.uno:ShowAnnotations/ menu:menuseparator/ menu:menuitem menu:id=.uno:Navigator/ + menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:Sidebar/ menu:menuseparator/ menu:menu menu:id=.uno:ZoomMenu @@ -187,6 +188,7 @@ menu:menu menu:id=.uno:GraphicMenu menu:menupopup menu:menuitem menu:id=.uno:InsertGraphic/ + menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:InsertAVMedia/ menu:menu menu:id=.uno:Scan menu:menupopup @@ -261,7 +263,6 @@ /menu:menupopup /menu:menu menu:menuseparator/ - menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:BmpMask/ menu:menuseparator/ menu:menu menu:id=.uno:MacrosMenu diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index f48774b..5c5212e 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -145,6 +145,7 @@ menu:menuitem menu:id=.uno:ShowAnnotations/ menu:menuseparator/ menu:menuitem menu:id=.uno:Navigator/ +menu:menuitem menu:id=.uno:Gallery/ menu:menuseparator/ menu:menuitem menu:id=.uno:HeaderAndFooter/ menu:menu menu:id=.uno:ZoomMenu @@ -204,6 +205,7 @@ menu:menu
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 49 commits - apple_remote/source avmedia/Module_avmedia.mk bridges/Library_cpp_uno.mk bridges/source chart2/source config_host.mk.in
Rebased ref, commits from common ancestor:
commit 01c4ec0dbbf7257416b4296bc0839e9e0086c007
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6bef65a..8afcda5 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit b6835ad7da23b55041974ca3391c63ecceaec7d8
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index b3efcae..f69fbf4 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame = pFrame;
mMarkedRange = NSMakeRange(NSNotFound, 0);
mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
mpMouseEventListener = nil;
mpLastSuperEvent = nil;
}
@@ -1788,7 +1788,7 @@ private:
// some frames never become visible ..
::vcl::Window *pWindow = mpFrame - GetWindow();
if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
mpReferenceWrapper = new ReferenceWrapper;
mpReferenceWrapper - rAccessibleContext = pWindow -
/*GetAccessibleChildWindow( 0 ) -*/ GetAccessible() - getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
[NSNumber numberWithBool:NO],
@kCUIWindowFrameDrawTitleSeparatorKey,
[Libreoffice-commits] core.git: 13 commits - canvas/source dbaccess/source editeng/source reportdesign/source sc/source svx/source sw/source unoxml/source
canvas/source/cairo/cairo_canvashelper_text.cxx |2
dbaccess/source/ui/control/RelationControl.cxx |4
dbaccess/source/ui/control/TableGrantCtrl.cxx |2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 14 +++
editeng/source/accessibility/AccessibleImageBullet.cxx | 14 +++
reportdesign/source/ui/dlg/GroupsSorting.cxx|4
sc/source/ui/Accessibility/AccessibleDocument.cxx |2
svx/source/accessibility/AccessibleTextHelper.cxx | 51 +++-
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 34
unoxml/source/dom/document.cxx |1
10 files changed, 65 insertions(+), 63 deletions(-)
New commits:
commit 76718903d9df053239a7a4ef13e5c5b3046ef121
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 3 17:56:03 2014 +0100
remove some extra empty lines
Change-Id: I88b95a253f19306c6519987a4a8f72e9362d4d9a
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 6338f2d..f14db53 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -78,13 +78,8 @@ using namespace ::com::sun::star::accessibility;
namespace accessibility
{
-
-
// AccessibleTextHelper_Impl declaration
-
-
-
template typename first_type, typename second_type
::std::pair first_type, second_type makeSortedPair( first_type
first,
second_typesecond )
@@ -97,7 +92,6 @@ namespace accessibility
class AccessibleTextHelper_Impl : public SfxListener
{
-
public:
typedef ::std::vector sal_Int16 VectorOfStates;
@@ -272,7 +266,6 @@ namespace accessibility
// normally should employ RAII here...
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
{
-
#ifdef DBG_UTIL
OSL_TRACE( AccessibleTextHelper_Impl received ID: %d,
mnNotifierClientId );
#endif
@@ -280,7 +273,6 @@ namespace accessibility
AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
{
-
SolarMutexGuard aGuard;
try
@@ -294,7 +286,6 @@ namespace accessibility
SvxTextForwarder AccessibleTextHelper_Impl::GetTextForwarder() const
{
-
if( !maEditSource.IsValid() )
throw uno::RuntimeException(Unknown edit source, mxFrontEnd);
@@ -311,7 +302,6 @@ namespace accessibility
SvxViewForwarder AccessibleTextHelper_Impl::GetViewForwarder() const
{
-
if( !maEditSource.IsValid() )
throw uno::RuntimeException(Unknown edit source, mxFrontEnd);
@@ -328,7 +318,6 @@ namespace accessibility
SvxEditViewForwarder AccessibleTextHelper_Impl::GetEditViewForwarder(
bool bCreate ) const
{
-
if( !maEditSource.IsValid() )
throw uno::RuntimeException(Unknown edit source, mxFrontEnd);
@@ -355,7 +344,6 @@ namespace accessibility
SvxEditSourceAdapter AccessibleTextHelper_Impl::GetEditSource() const
{
-
if( maEditSource.IsValid() )
return maEditSource;
else
@@ -364,7 +352,6 @@ namespace accessibility
bool AccessibleTextHelper_Impl::IsSelected() const
{
-
bool bRet = false;
try
@@ -393,7 +380,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
{
-
sal_Int32 nOldOffset( mnStartIndex );
mnStartIndex = nOffset;
@@ -415,7 +401,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool
bHaveFocus )
{
-
if( bHaveFocus )
{
if( mbThisHasFocus )
@@ -441,7 +426,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild )
{
-
if( mbThisHasFocus )
SetShapeFocus( false );
@@ -453,7 +437,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus )
{
-
bool bOldFocus( mbThisHasFocus );
mbThisHasFocus = bHaveFocus;
@@ -499,7 +482,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus )
{
-
bool bOldFocus( mbGroupHasFocus );
mbGroupHasFocus = bHaveFocus;
@@ -523,10 +505,8 @@ namespace accessibility
OSL_TRACE(AccessibleTextHelper_Impl::SetFocus: focus changed, Object
%p, state: %s, this, bHaveFocus ? focused : not focused);
}
-
bool AccessibleTextHelper_Impl::IsActive() const
{
-
try
{
SvxEditSource rEditSource = GetEditSource();
@@ -558,7 +538,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateSelection()
{
-
try
{
ESelection aSelection;
@@ -742,7
Re: parallelizing crashtest runs (was: minutes of ESC call ...)
On 03/11/14 00:28, Markus Mohrhard wrote: The new script should scale nearly perfectly. There are still a few enhancements on my list so if anyone is interested in python tasks please talk to me. I could be completely off, but this makes me think of running an update on gentoo. make can restrict it to x processes at a time (advised as being number of processors plus 1), or (and I don't know how this is done) it monitors load, and only fires off new processes if load is below a target level (again, I'd guess it should default to number of processors). Don't know how practical it would be for someone to try and code that... Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libvisio: arrow head shapes not imported properly
Hello, I will ask you about the handling of POLYGONSTROKEARROW. The following log, mpMetaFile == NULL. I think whether is displayed if correctly set the mpMetaFile. Am I wrong? Of course, mpMetaFile = new GDIMetaFile (); It does not appear in the above. Please advice me. Thank you. ---[log]-- info:drawinglayer:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:1266: default case for POLYGONSTROKEARROW info:drawinglayer:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:628: for Hack : POLYGONSTROKE info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:205: tryDrawPolygonStrokePrimitive2DDirect : no line dashing, just copy info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:253: tryDrawPolygonStrokePrimitive2DDirect : draw simple hairline info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:267: tryDrawPolygonStrokePrimitive2DDirect : aSingle.count : 2 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:388: bTryAA info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:293: TryDrawPolyLineDirectNoAACheck(inpl) info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:316: draw the polyline info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:317: aB2DPolygon : 2:(844.613,692.378)--(844.613,704.179) info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:318: fTransparency : 0 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:319: eLineJoin : 4 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:320: eLineCap : 0 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:391: TryDrawPolyLineDirectNoAACheck info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:393: mpMetaFile : 0 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:414: return true info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:275: tryDrawPolygonStrokePrimitive2DDirect : bTryWorked = true info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:287: tryDrawPolygonStrokePrimitive2DDirect : return bTryWorked 1 info:drawinglayer:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:628: for Hack : POLYPOLYGONCOLOR info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:156: Set, done info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:792: okay, done. In this case no gaps should have to be repaired, too info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:810: mnPolygonStrokePrimitive2D : 0 info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:811: getOptionsDrawinglayer().IsAntiAliasing() : 1 info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:812: (mpOutputDevice-GetAntialiasing() ANTIALIASING_ENABLE_B2DDRAW) : 2 info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:820: when AA is on and this filled polygons are the result of stroked line geometry, info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:823: nCount : 0 info:for Hack:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:834: a : 0 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:140: DrawPolyLine info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:293: TryDrawPolyLineDirectNoAACheck(inpl) info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:316: draw the polyline info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:317: aB2DPolygon : 6:(844.613,692.344)--(844.584,692.373)--(844.592,692.381)--(844.613,692.361)--(844.633,692.381)--(844.641,692.373) info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:318: fTransparency : 0 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:319: eLineJoin : 4 info:for Hack:27314:1:vcl/source/outdev/polyline.cxx:320: eLineCap : 0 info:drawinglayer:27314:1:drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:1269: end recursive for POLYGONSTROKEARROW ---[end]-- On 2014年10月30日 22:41, alonso wrote: Le 30 oct. 2014 à 09:45, TANAKA Hidemune i...@tanaka-cs.co.jp a écrit : Hi there Hello, VSDContentCollector::_lineProperties I am embedded SAL_INFO here, but it did not work. LibVisio already defines a macro to print debug message : VSD_DEBUG_MSG which must be activated when the libvisio’s module is compiled in debug mode. git/libo/workdir/UnpackedTarball/libvisio/src/lib/VSDContentCollector.cpp Please tell me how to do this compilation. Notes: libvisio can also be compiled to create stand-alone executables (vsd2raw, …), see https://wiki.documentfoundation.org/DLP/Libraries/libvisio . If you have/install libodfgen and writerperfect packages, you can also create vsd2odg see http://www.documentliberation.org/projects/ …. This can make the debugging easier or help to see what is generated ( by using
Re: 'master' 'make check' lcov code coverage report
On Mon, Nov 3, 2014 at 6:09 PM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:
Hey Maarten,
On Mon, Nov 3, 2014 at 4:10 PM, Caolán McNamara caol...@redhat.com
wrote:
On Mon, 2014-11-03 at 12:44 +0100, Maarten Hoes wrote:
Hi,
I ran an gcov/lcov report of 'make check' on master
('sccomp_lpsolver.test' and 'sw_tox.test' failed for some reason with
a core dump, and therefore are excluded from the results), which I
could (if interested) upload (if given access) to
dev-builds.libreoffice.org/lcov_reports/ for comparison with the
report generated for master on 11-Apr-2014.
Maybe cloph or moggi could sort our some type of access there. I'd be
interested especially interested in which dirs in
filter/source/graphicfilter have 0 coverage and are import filters.
That is in general no problem. Just send your public ssh key to cloph.
public key is mailed.
In general I think it makes sense to move that to one of the TDF VMs
and implement a script similar to the coverity one that is more or
less run once a week.
Looking briefly at the differences (or lack thereof) in the reports of both
11-Apr-2014 and today, I cannot help but wonder if running the report as
often as weekly would be beneficial at this point. Doing it manually once
every few months seems often enough for now ? Of course, I would be glad to
be wrong here.
;)
If you are interested in working on that we can
surely work something out to get you access to one of the VMs to
automated the generation of the reports.
If bourne/korn shell is considered acceptable, Im willing to try to hack up
a script that runs a git pull/lcov report and scp uploads the results
somewhere. If it needs to be written in something else (buildbot, python,
whatever) I may not be the best man for the job. However, I was able to
generate the report quite easily by following the guidelines for it in the
wiki, so it shouldnt be too hard to do for someone that is able to write a
script for it in other languages I guess.
- Maarten
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make fails when using '--with-system-libs'
On 03/11/14 09:55, Maarten Hoes wrote: I have no problem with editing the wiki. But before one can edit, one must determine what to change it into: I havent determined yet what would be a better way to filter out the unwanted non-libreoffice code from the report, other than running run configure '--with-system-libs'. Adding all unwanted code to the removal line: It's probably a load of work, but how about adding a list of system libs? And saying that if you use --with-system-libs then configure will expect these libs to be there. Be useful with me for gentoo :-) because I can add all those libs to my world file :-) Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01060900.xhp | 40 +--
1 file changed, 38 insertions(+), 2 deletions(-)
New commits:
commit b9e9fb3ea9a4d493038643b831ca9b9149d4c2b8
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Fri Oct 31 18:05:41 2014 -0200
fdo#85686 update help page for Calc Option Formula
Calc's Formula option page has a new entry related to large file
recalculation
Change-Id: I9f4a5834ee58905d865aaedab25bd692445610d0
Reviewed-on: https://gerrit.libreoffice.org/12165
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/source/text/shared/optionen/01060900.xhp
b/source/text/shared/optionen/01060900.xhp
index 02e4950..c1679bd 100644
--- a/source/text/shared/optionen/01060900.xhp
+++ b/source/text/shared/optionen/01060900.xhp
@@ -22,13 +22,19 @@
bookmark_valueformula options;formula syntax/bookmark_value
bookmark_valueformula options;separators/bookmark_value
bookmark_valueformula options;reference syntax in string
parameters/bookmark_value
+bookmark_valueformula options;recalculating
spreadsheets/bookmark_value
+bookmark_valueformula options;large spreadsheet
files/bookmark_value
+bookmark_valueformula options;loading spreadsheet
files/bookmark_value
bookmark_valueseparators;function/bookmark_value
bookmark_valueseparators;array column/bookmark_value
bookmark_valueseparators;array row/bookmark_value
+bookmark_valuerecalculating;formula options/bookmark_value
+bookmark_valuerecalculating;large spreadsheet files/bookmark_value
+bookmark_valueloading;large spreadsheet files/bookmark_value
/bookmark
bookmark xml-lang=en-US
branch=hid/modules/scalc/ui/optformula/OptFormula id=bm_id3149095
localize=false/
paragraph xml-lang=en-US id=hd_id3145071 role=heading
level=1link href=text/shared/optionen/01060900.xhp
name=FormulaFormula/link/paragraph
-paragraph xml-lang=en-US id=par_id3147576 role=paragraphahelp
hid=.Defines formula syntax options for %PRODUCTNAME
Calc./ahelp/paragraph
+paragraph xml-lang=en-US id=par_id3147576 role=paragraphahelp
hid=.Defines formula syntax options and loading options for %PRODUCTNAME
Calc./ahelp/paragraph
/section
section id=howtoget
embed href=text/shared/00/0406.xhp#exopfo/
@@ -58,5 +64,35 @@
paragraph xml-lang=en-US id=par_id0155419 role=paragraphitem
type=input={1,2,3,4,5;6,7,8,9,10}/item/paragraph
paragraph xml-lang=en-US id=hd_id5149399 role=heading
level=2Detailed calculation settings/paragraph
paragraph xml-lang=en-US id=par_id1015549 role=paragraphHere you
can configure the formula syntax to use when parsing references given in string
parameters. This affects built-in functions such as INDIRECT that takes a
reference as a string value./paragraph
-/body
+paragraph xml-lang=en-US id=hd_id5149400 role=heading
level=2Recalculation on File Load/paragraph
+paragraph xml-lang=en-US id=par_id2335549 role=paragraphRecalculating
formulas can take significant time while loading very large files./paragraph
+paragraph xml-lang=en-US id=par_id2115549 role=heading level=3Excel
2007 and newer:/paragraph
+paragraph xml-lang=en-US id=par_id2015549 role=paragraph
+Loading a large spreadsheet file can take a long time. If you don't need to
update your large spreadsheet data immediately, you can postpone the
recalculation at a better time.
+%PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above)
spreadsheets to speedup loading time.
+/paragraph
+paragraph xml-lang=en-US id=par_id2215549 role=heading level=3ODF
Spreadsheets (not saved by %PRODUCTNAME):/paragraph
+paragraph xml-lang=en-US id=par_id2016549 role=paragraph
+Recent versions of %PRODUCTNAME caches spreadsheet formula results into its
ODF file.
+This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved
by %PRODUCTNAME faster.
+/paragraph
+paragraph xml-lang=en-US id=par_id2017549 role=paragraph
+For ODF spreadsheets saved by other programs, where such cached formula
results may not exist, recalculation can be deferred to speedup file loading as
with Excel 2007 files.
+/paragraph
+paragraph xml-lang=en-US id=par_id2315549 role=paragraphFor the
entries above the following choices are possible:/paragraph
+list type=unordered
+ listitem
+paragraph xml-lang=en-US id=par_id3256155
role=listitememphNever recalculate/emph - No formulas will be
recalculated on loading the file./paragraph
+ /listitem
+ listitem
+paragraph xml-lang=en-US id=par_id3247530
role=listitememphAlways recalculate/emph - All formulas will be
recalculated on file load./paragraph
+ /listitem
+ listitem
+paragraph xml-lang=en-US id=par_id3253061
role=listitememphPrompt user/emph - Prompt user for action./paragraph
+ /listitem
+/list
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85b40bd24a59034b2b42ad573e12f75be0cef729 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Oct 31 18:05:41 2014 -0200 Updated core Project: help b9e9fb3ea9a4d493038643b831ca9b9149d4c2b8 fdo#85686 update help page for Calc Option Formula Calc's Formula option page has a new entry related to large file recalculation Change-Id: I9f4a5834ee58905d865aaedab25bd692445610d0 Reviewed-on: https://gerrit.libreoffice.org/12165 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/helpcontent2 b/helpcontent2 index 677001e..b9e9fb3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 677001e7747ae7b61ed93028024e71fb14beb728 +Subproject commit b9e9fb3ea9a4d493038643b831ca9b9149d4c2b8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'master' 'make check' lcov code coverage report
Hey,
On Mon, Nov 3, 2014 at 7:38 PM, Maarten Hoes hoes.maar...@gmail.com wrote:
On Mon, Nov 3, 2014 at 6:09 PM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:
Hey Maarten,
On Mon, Nov 3, 2014 at 4:10 PM, Caolán McNamara caol...@redhat.com
wrote:
On Mon, 2014-11-03 at 12:44 +0100, Maarten Hoes wrote:
Hi,
I ran an gcov/lcov report of 'make check' on master
('sccomp_lpsolver.test' and 'sw_tox.test' failed for some reason with
a core dump, and therefore are excluded from the results), which I
could (if interested) upload (if given access) to
dev-builds.libreoffice.org/lcov_reports/ for comparison with the
report generated for master on 11-Apr-2014.
Maybe cloph or moggi could sort our some type of access there. I'd be
interested especially interested in which dirs in
filter/source/graphicfilter have 0 coverage and are import filters.
That is in general no problem. Just send your public ssh key to cloph.
public key is mailed.
In general I think it makes sense to move that to one of the TDF VMs
and implement a script similar to the coverity one that is more or
less run once a week.
Looking briefly at the differences (or lack thereof) in the reports of both
11-Apr-2014 and today, I cannot help but wonder if running the report as
often as weekly would be beneficial at this point. Doing it manually once
every few months seems often enough for now ? Of course, I would be glad to
be wrong here.
;)
Maybe not weekly but bi-weekly or monthly. Otherwise it will only be
done from time to time without a plan. Even weekly would not hurt as
we have neither a problem with disk space or build hardware.
If you are interested in working on that we can
surely work something out to get you access to one of the VMs to
automated the generation of the reports.
If bourne/korn shell is considered acceptable, Im willing to try to hack up
a script that runs a git pull/lcov report and scp uploads the results
somewhere. If it needs to be written in something else (buildbot, python,
whatever) I may not be the best man for the job. However, I was able to
generate the report quite easily by following the guidelines for it in the
wiki, so it shouldnt be too hard to do for someone that is able to write a
script for it in other languages I guess.
You can choose whatever technology is a good fit and that you know. Of
course something that other people can understand and maintain is
preferred. A shell script sounds like a good idea for this task and
would simplify the handling.
Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Mon, Nov 3, 2014 at 12:38 PM, Maarten Hoes hoes.maar...@gmail.com wrote: Looking briefly at the differences (or lack thereof) in the reports of both 11-Apr-2014 and today, I cannot help but wonder if running the report as often as weekly would be beneficial at this point. Doing it manually once every few months seems often enough for now ? Of course, I would be glad to be wrong here. ;) It's a catch-22 problem... if this is run rarely, it is on the mind of people rarely, it is unlikely to attract the attention of new blood and even less likely to kkep their attention. If it run say weekly... they there is a 'instant' gratification associated with putting some effort to improve the coverage in some part of the code that in turn often motivate to do even more... Surely much of the coverage could be tacckled as easy hacks.. but positive feedback is very important, to motivate new contributor and show them the result of their good work in a tangible way. If bourne/korn shell is considered acceptable, Im willing to try to hack up a script that runs a git pull/lcov report and scp uploads the results somewhere. Sure bash is fine.. and a properly scripted bash script can be tuck under almost any automation system we can think of. for the record buidbot's client are pure bash :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Mon, Nov 3, 2014 at 8:02 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Maybe not weekly but bi-weekly or monthly. Otherwise it will only be done from time to time without a plan. Hrm. Good point. Even weekly would not hurt as we have neither a problem with disk space or build hardware. Cool. You can choose whatever technology is a good fit and that you know. Of course something that other people can understand and maintain is preferred. A shell script sounds like a good idea for this task and would simplify the handling. Alright, I guess that means Ill have a go at it, then. So who do I need to mail my pub ssh key and what is the hostname/ip of the machine I would be allowed to royally mess up for this purpose ? ;) - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fix Penguin Penalty 17th October2014 ( mail-archive.com )
Dear Sir Did your website get hit by Google Penguin update on October 17th 2014? What basically is Google Penguin Update? It is actually a code name for Google algorithm which aims at decreasing your websites search engine rankings that violate Googles guidelines by using black hat SEO techniques to rank your webpage by giving number of spammy links to the page. We are one of those few SEO companies that can help you avoid penalties from Google Updates like Penguin and Panda. Our clients have survived all the previous and present updates with ease. They have never been hit because we use 100% white hat SEO techniques to rank Webpages. Simple thing that we do to keep websites away from any Penguin or Panda penalties is follow Google guidelines and we give Google users the best answers to their queries. If you are looking to increase the quality of your websites and to get more targeted traffic or save your websites from these Google penalties email us back with your interest. We will be glad to serve you and help you grow your business. Regards Vince G SEO Manager ( TOB ) B7 Green Avenue, Amritsar 143001 Punjab NO CLICK in the subject to STOP EMAILS ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/cmd/lc_designerdialog.png |binary icon-themes/tango/cmd/lc_designerdialog.svg | 573 ++ icon-themes/tango/cmd/lc_insertreferencefield.png |binary 3 files changed, 573 insertions(+) New commits: commit 4d447ebc44e6051fd0a208fcc0581e9d0c81d032 Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 18:37:45 2014 +0400 TANGO: Add designerdialog icon from tango_testing and reference from human Change-Id: I662842eb293d4b0d98ea2a39c3fd66abe1fc730b Reviewed-on: https://gerrit.libreoffice.org/12217 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/tango/cmd/lc_designerdialog.png b/icon-themes/tango/cmd/lc_designerdialog.png index 7a01491..3ce4266 100644 Binary files a/icon-themes/tango/cmd/lc_designerdialog.png and b/icon-themes/tango/cmd/lc_designerdialog.png differ diff --git a/icon-themes/tango/cmd/lc_designerdialog.svg b/icon-themes/tango/cmd/lc_designerdialog.svg new file mode 100644 index 000..cf3f38f --- /dev/null +++ b/icon-themes/tango/cmd/lc_designerdialog.svg @@ -0,0 +1,573 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=24 + height=24 + id=svg2 + version=1.1 + inkscape:version=0.48.3.1 r9886 + sodipodi:docname=lc_designerdialog.svg + inkscape:export-filename=/home/alexander/tango_testing/cmd/lc_text.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 +linearGradient + id=linearGradient7648 + stop + id=stop7650 + offset=0 + style=stop-color:#ff;stop-opacity:1 / + stop + style=stop-color:#2e3436;stop-opacity:1 + offset=0.46662426 + id=stop7652 / + stop + style=stop-color:#888a85;stop-opacity:1 + offset=0.85851747 + id=stop7654 / + stop + id=stop7656 + offset=1 + style=stop-color:#2e3436;stop-opacity:1 / +/linearGradient +linearGradient + y2=123.53689 + x2=227.56795 + y1=142.72978 + x1=236.77655 + gradientUnits=userSpaceOnUse + id=linearGradient9586 + xlink:href=#linearGradient7113-62-4 + inkscape:collect=always / +linearGradient + y2=122.14792 + x2=224.9845 + y1=147.02293 + x1=236.32954 + gradientUnits=userSpaceOnUse + id=linearGradient9584 + xlink:href=#linearGradient6977-28-2-3-5 + inkscape:collect=always / +linearGradient + id=linearGradient7113-62-4 + inkscape:collect=always + stop + id=stop7115-8-23 + offset=0 + style=stop-color:#00;stop-opacity:1; / + stop + id=stop7117-6-6 + offset=1 + style=stop-color:#888a85;stop-opacity:1 / +/linearGradient +linearGradient + id=linearGradient6977-28-58 + stop + style=stop-color:#ff;stop-opacity:1 + offset=0 + id=stop6979-4-6 / + stop + id=stop6981-1-3 + offset=0.6102711 + style=stop-color:#2e3436;stop-opacity:1 / + stop + id=stop6983-3-6 + offset=0.85851747 + style=stop-color:#888a85;stop-opacity:1 / + stop + style=stop-color:#2e3436;stop-opacity:1 + offset=1 + id=stop6985-44-67 / +/linearGradient +linearGradient + id=linearGradient3787-2-5 + inkscape:collect=always + stop + id=stop3789-6-2 + offset=0 + style=stop-color:#00;stop-opacity:1 / + stop + id=stop3791-7-7 + offset=1 + style=stop-color:#00;stop-opacity:0 / +/linearGradient +linearGradient + id=linearGradient6977-28-2-3-5 + stop + style=stop-color:#ff;stop-opacity:1 + offset=0 + id=stop6979-4-5-5-4 / + stop + id=stop6981-1-2-8-5 + offset=0.6102711 + style=stop-color:#2e3436;stop-opacity:1 / + stop + id=stop6983-3-5-43-5 + offset=0.85851747 + style=stop-color:#888a85;stop-opacity:1 / + stop + style=stop-color:#2e3436;stop-opacity:1 + offset=1 + id=stop6985-44-1-5-4 / +/linearGradient +radialGradient + inkscape:collect=always + xlink:href=#linearGradient3787-2-5 + id=radialGradient7664 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(0.89852202,0,0,0.2730159,1.2657764,12.449603) + cx=12.47341 +
Re: make fails when using '--with-system-libs'
On Mon, Nov 3, 2014 at 7:42 PM, Wols Lists antli...@youngman.org.uk wrote: On 03/11/14 09:55, Maarten Hoes wrote: I have no problem with editing the wiki. But before one can edit, one must determine what to change it into: I havent determined yet what would be a better way to filter out the unwanted non-libreoffice code from the report, other than running run configure '--with-system-libs'. Adding all unwanted code to the removal line: It's probably a load of work, but how about adding a list of system libs? And saying that if you use --with-system-libs then configure will expect these libs to be there. Not exactly sure what you mean here... But if you mean explicitly excluding/removing all non-libreoffice code/libs from the report... You could start with doing 'grep with-system configure.ac', which lists quite a few for you. But the real issue with keeping a list is that the list needs to be modified each time an additional library is used for or removed from the project, which might not be as rare an occurrence as you might think. - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
Hi Maarten, *, On Mon, Nov 3, 2014 at 8:12 PM, Maarten Hoes hoes.maar...@gmail.com wrote: On Mon, Nov 3, 2014 at 8:02 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Alright, I guess that means Ill have a go at it, then. So who do I need to mail my pub ssh key and what is the hostname/ip of the machine I would be allowed to royally mess up for this purpose ? ;) That would be me - and IP/hostename will be decided once I created it :-) - what kind of specs does it need? Does running it needs lots of RAM? Does it benefit of many cores? ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: + would be nice to have some blog-posts / picture posts (Bjoern) I just finished mine. http://kohei.us/2014/11/03/seattle-librefest/ Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Mon, Nov 3, 2014 at 8:25 PM, Christian Lohmaier cl...@documentfoundation.org wrote: Hi Maarten, *, On Mon, Nov 3, 2014 at 8:12 PM, Maarten Hoes hoes.maar...@gmail.com wrote: On Mon, Nov 3, 2014 at 8:02 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Alright, I guess that means Ill have a go at it, then. So who do I need to mail my pub ssh key and what is the hostname/ip of the machine I would be allowed to royally mess up for this purpose ? ;) That would be me - and IP/hostename will be decided once I created it :-) - what kind of specs does it need? Does running it needs lots of RAM? Does it benefit of many cores? It basically needs to be able to run 'make build-nocheck' and 'make -k check', which benefit from multiple cores and memory. Running lcov is a single threaded thing as far as I can determine, so that would not benefit. Ive created the report on a 4 cpu 8 GB ram vmware vm in about a few hours I guess, so that would be more than sufficient if you ask me. Furthermore, it needs to be able to run 'git clone/pull' to get the latest code. And lastly, it needs to be able to run './configure --with-system-libs make build-nocheck' without problems, so the prerequisite non-libreoffice libs can be easily filtered out of the resulting report. - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/svx sc/inc sc/source sc/uiconfig svx/Library_svx.mk svx/source
include/svx/sidebar/ColorControl.hxx | 91 ---
include/svx/sidebar/ColorPopup.hxx | 54
include/svx/tbcontrl.hxx | 15 +
sc/inc/helpids.h |1
sc/inc/sc.hrc|5
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 131 ---
sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc |2
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 20 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 20 -
sc/uiconfig/scalc/ui/sidebarcellappearance.ui|4
svx/Library_svx.mk |2
svx/source/sidebar/tools/ColorControl.cxx| 224 ---
svx/source/sidebar/tools/ColorPopup.cxx | 59 -
svx/source/tbxctrls/colorwindow.hxx |4
svx/source/tbxctrls/tbcontrl.cxx | 185 ---
15 files changed, 168 insertions(+), 649 deletions(-)
New commits:
commit 8e399602ea7aa11a81d704ff6ce8e660df4205b9
Author: Maxim Monastirsky momonas...@gmail.com
Date: Mon Nov 3 16:41:10 2014 +0200
Related: fdo#84844 Get rid of ColorControl and ColorPopup
Change-Id: Ie2d00cfbccefd69c8e46381b712620def655a798
diff --git a/include/svx/sidebar/ColorControl.hxx
b/include/svx/sidebar/ColorControl.hxx
deleted file mode 100644
index 87ebf30..000
--- a/include/svx/sidebar/ColorControl.hxx
+++ /dev/null
@@ -1,91 +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 .
- */
-
-#ifndef INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
-#define INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
-
-#include svx/sidebar/PopupControl.hxx
-
-#include svtools/valueset.hxx
-#include boost/function.hpp
-#include svx/SvxColorValueSet.hxx
-
-namespace vcl { class Window; }
-class SfxBindings;
-class RedId;
-class FloatingWindow;
-
-
-namespace svx { namespace sidebar {
-
-/** The ColorControl uses a ValueSet control for displaying all named
-colors in a matrix.
-*/
-class SVX_DLLPUBLIC ColorControl
-: public PopupControl
-{
-public:
-/** Create a new ColorControl object.
-@param rControlResId
-The resource id for the whole color control.
-@param rNoColorGetter
-A functor for getting the color which will be returned when the
-WB_NONEFIELD is used and got selected
-@param rColorSetter
-A functor for setting the color that is selected by the
-user.
-@param pNoColorStringResId
-Resource id of an optional string for the no color
-string. When a value is given then a
-field/button is created above the color matrix for
-selecting no color ie. transparent.
-When zero is given then no such field is created.
-*/
-ColorControl (
-vcl::Window* pParent,
-SfxBindings* pBindings,
-const ResId rControlResId,
-const ResId rValueSetResId,
-const ::boost::functionColor(void) rNoColorGetter,
-const ::boost::functionvoid(OUString,Color) rColorSetter,
-FloatingWindow* pFloatingWindow,
-const ResId* pNoColorStringResId);
-virtual ~ColorControl (void);
-
-void GetFocus (void) SAL_OVERRIDE;
-void SetCurColorSelect (
-const Color aCol,
-const bool bAvl);
-
-private:
-SvxColorValueSet maVSColor;
-FloatingWindow* mpFloatingWindow;
-const OUString msNoColorString;
-::boost::functionColor(void) maNoColorGetter;
-::boost::functionvoid(OUString,Color) maColorSetter;
-
-void FillColors (void);
-DECL_LINK(VSSelectHdl, void *);
-};
-
-} } // end of namespace svx::sidebar
-
-#endif // INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sidebar/ColorPopup.hxx
b/include/svx/sidebar/ColorPopup.hxx
deleted file mode 100644
index 3226be0..000
--- a/include/svx/sidebar/ColorPopup.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/map.cxx| 19 ---
vcl/source/outdev/outdev.cxx | 15 +--
vcl/source/outdev/text.cxx |8
3 files changed, 17 insertions(+), 25 deletions(-)
New commits:
commit 188b0d899c277a2ac2b0c5f52d992db2b45a882d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 3 17:16:13 2014 +
coverity#1209395 Dereference after null check
since
commit 808d273db098e2269e53813595a6bfc7b160e28e
Date: Fri Apr 25 11:56:54 2014 +1000
Remove ImpInitOutDevData and ImplDeInitOutDevData in OutputDevice
All these do is some very, very basic initialization. There is no need
to lazy load the structure, it should be initialized when OutputDevice
is created in the constructor and deinitialized in the destructor.
mpOutDevData is never NULL
Change-Id: Ie08f7520e8c09b57e056c086bba3089abe2486fa
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index c646f8a..8e95882 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -354,19 +354,16 @@ inline void ImplCalcMapResolution( const MapMode
rMapMode,
// #i75163#
void OutputDevice::ImplInvalidateViewTransform()
{
-if(mpOutDevData)
+if(mpOutDevData-mpViewTransform)
{
-if(mpOutDevData-mpViewTransform)
-{
-delete mpOutDevData-mpViewTransform;
-mpOutDevData-mpViewTransform = NULL;
-}
+delete mpOutDevData-mpViewTransform;
+mpOutDevData-mpViewTransform = NULL;
+}
-if(mpOutDevData-mpInverseViewTransform)
-{
-delete mpOutDevData-mpInverseViewTransform;
-mpOutDevData-mpInverseViewTransform = NULL;
-}
+if(mpOutDevData-mpInverseViewTransform)
+{
+delete mpOutDevData-mpInverseViewTransform;
+mpOutDevData-mpInverseViewTransform = NULL;
}
}
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 546f36d..3c9e519 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -96,7 +96,6 @@ OutputDevice::OutputDevice() :
mpGetDevFontList= NULL;
mpGetDevSizeList= NULL;
mpOutDevStateStack = new boost::ptr_dequeOutDevState();
-mpOutDevData= NULL;
mpPDFWriter = NULL;
mpAlphaVDev = NULL;
mpExtOutDevData = NULL;
@@ -191,16 +190,12 @@ OutputDevice::~OutputDevice()
mpUnoGraphicsList = NULL;
}
-if ( mpOutDevData )
-{
-if ( mpOutDevData-mpRotateDev )
-delete mpOutDevData-mpRotateDev;
+delete mpOutDevData-mpRotateDev;
-// #i75163#
-ImplInvalidateViewTransform();
+// #i75163#
+ImplInvalidateViewTransform();
-delete mpOutDevData;
-}
+delete mpOutDevData;
// for some reason, we haven't removed state from the stack properly
if ( !mpOutDevStateStack-empty() )
@@ -783,7 +778,7 @@ bool OutputDevice::HasMirroredGraphics() const
bool OutputDevice::ImplIsRecordLayout() const
{
-return mpOutDevData mpOutDevData-mpRecordLayout;
+return mpOutDevData-mpRecordLayout;
}
// EPS public function
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 90cd4a4..2dd7859 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -233,7 +233,7 @@ bool OutputDevice::ImplDrawRotateText( SalLayout
rSalLayout )
}
// cache virtual device for rotation
-if ( !mpOutDevData-mpRotateDev )
+if (!mpOutDevData-mpRotateDev)
mpOutDevData-mpRotateDev = new VirtualDevice( *this, 1 );
VirtualDevice* pVDev = mpOutDevData-mpRotateDev;
@@ -849,7 +849,7 @@ void OutputDevice::DrawText( const Point rStartPt, const
OUString rStr,
}
-if( mpOutDevData mpOutDevData-mpRecordLayout )
+if (mpOutDevData-mpRecordLayout)
{
pVector = mpOutDevData-mpRecordLayout-m_aUnicodeBoundRects;
pDisplayText = mpOutDevData-mpRecordLayout-m_aDisplayText;
@@ -867,7 +867,7 @@ void OutputDevice::DrawText( const Point rStartPt, const
OUString rStr,
vcl::Region aClip( GetClipRegion() );
if( meOutDevType == OUTDEV_WINDOW )
aClip.Intersect( Rectangle( Point(), GetOutputSize() ) );
-if( mpOutDevData mpOutDevData-mpRecordLayout )
+if (mpOutDevData-mpRecordLayout)
{
mpOutDevData-mpRecordLayout-m_aLineIndices.push_back(
mpOutDevData-mpRecordLayout-m_aDisplayText.getLength() );
aClip.Intersect( mpOutDevData-maRecordRect );
@@ -1805,7 +1805,7 @@ void OutputDevice::DrawText( const Rectangle rRect,
const OUString rOrigStr, s
MetricVector* pVector, OUString* pDisplayText,
::vcl::ITextLayout* _pTextLayout )
{
-if( mpOutDevData mpOutDevData-mpRecordLayout )
+if
[Libreoffice-commits] core.git: 19 commits - bridges/source cui/source external/cppunit hwpfilter/source reportdesign/source rsc/source sc/source svtools/source svx/source sw/source tools/source unoxm
bridges/source/cpp_uno/shared/bridge.cxx |1
bridges/source/jni_uno/jni_bridge.cxx|2
cui/source/customize/cfg.cxx |3
external/cppunit/coverity.patch | 10 +
hwpfilter/source/hcode.cxx |8
reportdesign/source/filter/xml/xmlExport.cxx |4
rsc/source/rscpp/cpp4.c |3
rsc/source/rscpp/cpp5.c |2
sc/source/filter/oox/addressconverter.cxx|5
svtools/source/brwbox/datwin.cxx |2
svx/source/table/tablecontroller.cxx |3
sw/source/core/doc/SwStyleNameMapper.cxx |8
sw/source/core/doc/htmltbl.cxx | 13 +
sw/source/core/layout/findfrm.cxx|4
sw/source/core/text/txtfrm.cxx |2
tools/source/generic/fract.cxx |2
unoxml/Library_unoxml.mk |1
unoxml/source/events/testlistener.cxx| 132 ---
unoxml/source/events/testlistener.hxx| 100 ---
unoxml/source/service/services.cxx |9 -
unoxml/source/service/unoxml.component |3
vcl/generic/fontmanager/fontmanager.cxx |5
vcl/source/gdi/pdfwriter_impl.cxx| 12 -
vcl/source/gdi/pdfwriter_impl.hxx|2
vcl/source/outdev/map.cxx|2
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2
xmloff/source/core/xmlictxt.cxx |1
27 files changed, 65 insertions(+), 276 deletions(-)
New commits:
commit d42c80e534c715f85a86c61f18fbccb465facd60
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 3 16:07:29 2014 +
coverity#735452 Logically dead code
Change-Id: If50b62e63160c4a26fe97b6fc59494339a566188
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 0bf3db9..fd84461 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -924,9 +924,7 @@ void ORptExport::exportContainer(const Reference
XSection _xSection)
if ( xReportElement.is() )
exportReportElement(xReportElement);
-if ( eToken == XML_GROUP xSection.is() )
-exportContainer(xSection);
-else if ( eToken == XML_SUB_DOCUMENT
xReportDefinition.is() )
+if (eToken == XML_SUB_DOCUMENT
xReportDefinition.is())
{
SvXMLElementExport aOfficeElement( *this,
XML_NAMESPACE_OFFICE, XML_BODY, true, true );
SvXMLElementExport aElem( *this, true,
commit 7439af47d1dcc0925d57cc878c2714c8fb2cd67e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 3 16:06:51 2014 +
coverity#982297 EBCDIC-related cleanup
Change-Id: I8da7911c342ffe114d7b25b996602aabed7aa1ed
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index 6240c1b..034c012 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -49,8 +49,7 @@ void InitCpp4()
* the formal parameter name is encountered in the replacement
* string, it is replaced by a character in the range 128 to
* 128+NPARAM (this allows up to 32 parameters within the
- * Dec Multinational range). If cpp is ported to an EBCDIC
- * machine, you will have to make other arrangements.
+ * Dec Multinational range).
*
* There is some special case code to distinguish
* #define foo bar
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index d7bd98c..a6b9e14 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -741,7 +741,7 @@ FILE_LOCAL int evalchar(int skip)
(--count = 0))
{
value *= 16;
-value += (c = '0') ? (c - '0') : ((c 0xF) + 9);
+value += (c - '0');
}
unget();
break;
commit cb2d414fe910702002d7dc800db68e2bae935b23
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 3 15:43:53 2014 +
coverity#1209010 Unchecked return value
Change-Id: I92c2472a34aca9f7f1a61707040cadb0b643
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 4280bb1..40e5b7b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3844,7 +3844,7 @@ void PDFWriterImpl::appendBuiltinFontsToDict(
OStringBuffer rDict ) const
bool PDFWriterImpl::emitFonts()
{
-
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/transform/AttrTransformerAction.hxx |6 --
xmloff/source/transform/ElemTransformerAction.hxx |6 ++
xmloff/source/transform/MergeElemTContext.cxx |4 ++--
xmloff/source/transform/Oasis2OOo.cxx | 14 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 76dce95eed6892d729fbea2b990911edd82ded82
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 3 21:20:56 2014 +0100
coverity#705391: xmloff: XMLMergeElemTransformerContext misuse of enum
The enum types XMLElemTransformerAction and XMLAttrTransformerAction
use the same integer values so a mixture of values from these 2 in one
switch is very suspicious. In the various *ActionTable arrays in
OOo2Oasis/Oasis2OOo there is just one such array that mixes values from
the 2 enums, and that is just the values that coverity complains about.
The XML_ETACTION_EXTRACT_CHARACTERS was added at a later date in commits
8d374c039e7d349141befe3c9ef97f82f42bfa7
2685b93a6a23867baa4df265bb0cc35abaf76c0e
7d2405a54d13f68a35dfc5f619ad4bdb0b761856
c276550e07f8078fe9345985f70e8384d930a83f
...but it turns out that the XMLAttrTransformerAction ones are handled
in StartElement() and ProcessAttrs() methods but the
XMLElemTransformerAction ones are handled in CreateChildContext()
methods so probably the XML_ATACTION_MOVE_FROM_ELEM* values are in
the wrong enum.
Change-Id: Ib1791f6eafac4fb1e99334f41c17a90cfb076359
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx
b/xmloff/source/transform/AttrTransformerAction.hxx
index 7800af5..81b2d93 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -69,9 +69,6 @@ enum XMLAttrTransformerAction
XML_ATACTION_MOVE_TO_ELEM, // turn attr into an elem
// - param1: namespace +
// token of local name
-XML_ATACTION_MOVE_FROM_ELEM,// turn elem into an attr:
-// - param1: namespace +
-// token of local name
XML_ATACTION_NEG_PERCENT, // replace % val with 100-%
XML_ATACTION_RENAME_NEG_PERCENT,// replace % val with 100-%, rename
attr
// - param1: namespace +
@@ -113,9 +110,6 @@ enum XMLAttrTransformerAction
XML_ATACTION_RENAME_RNG2ISO_DATETIME,// converts . into , in datetimes and
renames the attribute
// - param1: namespace +
// token of local name
-XML_ATACTION_MOVE_FROM_ELEM_RNG2ISO_DATETIME, // turn elem into an attr
and convert . to , in datetimes
-// - param1: namespace +
-// token of local name
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO, // replace inch with in and
subtracts 1/100th mm
XML_ATACTION_SVG_WIDTH_HEIGHT_OASIS, // replace in with inch and adds
1/100th mm
XML_ATACTION_DRAW_MIRROR_OOO,// renames draw:mirror to
style:mirror and adapts values
diff --git a/xmloff/source/transform/ElemTransformerAction.hxx
b/xmloff/source/transform/ElemTransformerAction.hxx
index 04f7dda..68deafd 100644
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
@@ -81,6 +81,12 @@ enum XMLElemTransformerAction
// and put them together into the
// current element
// the child elements are removed
+XML_ETACTION_MOVE_TO_ATTR, // turn elem into an attr:
+// - param1: namespace +
+// token of local name
+XML_ETACTION_MOVE_TO_ATTR_RNG2ISO_DATETIME, // turn elem into an attr and
convert . to , in datetimes
+// - param1: namespace +
+// token of local name
XML_ETACTION_USER_DEFINED=0x4000,// user defined actions start here
XML_ETACTION_END=XML_TACTION_END
};
diff --git a/xmloff/source/transform/MergeElemTContext.cxx
b/xmloff/source/transform/MergeElemTContext.cxx
index d14a1be..da066a7 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -232,7 +232,7 @@ XMLTransformerContext
*XMLMergeElemTransformerContext::CreateChildContext(
{
switch( (*aIter).second.m_nActionType )
{
-case XML_ATACTION_MOVE_FROM_ELEM_RNG2ISO_DATETIME:
+case XML_ETACTION_MOVE_TO_ATTR_RNG2ISO_DATETIME:
{
Re: coverity warnings update, 170, 0.04 density
On 03.11.2014 16:24, Caolán McNamara wrote: 705391 Inferred misuse of enum really bugs me. xmloff/source/transform/MergeElemTContext.cxx:235 where XML_ATACTION_MOVE_FROM_ELEM_RNG2ISO_DATETIME is from a completely different enum than all the other cases. It looks completely bogus, but I don't know if it should be some other condition or if that case belongs to another switch. that was a nasty case, fixed in commit 76dce95eed6892d729fbea2b990911edd82ded82 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/source
vcl/inc/sft.hxx |2 +-
vcl/source/fontsubset/sft.cxx | 41 +++--
2 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit ca08fcbb90defb44456a5973bd1cc76b817d9a4f
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 3 19:55:02 2014 +0100
coverity#1242811 untrusted pointer read
Change-Id: I74c29a39367e7781e5e6cf9795c7176ef599f97e
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 711ef17..5d07368 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1067,7 +1067,7 @@ typedef struct _subHeader2 {
sal_uInt16 idRangeOffset;
} subHeader2;
-static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, sal_uInt32, sal_uInt32 c) {
+static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const sal_uInt32
nMaxCmapSize, sal_uInt32 c) {
sal_uInt16 *CMAP2 = (sal_uInt16 *) cmap;
sal_uInt8 theHighByte;
@@ -1075,14 +1075,20 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap,
sal_uInt32, sal_uInt32 c) {
subHeader2* subHeader2s;
sal_uInt16* subHeader2Keys;
sal_uInt16 firstCode;
-int k;
+int k = -1;
sal_uInt32 ToReturn;
theHighByte = (sal_uInt8)((c 8) 0x00ff);
theLowByte = (sal_uInt8)(c 0x00ff);
subHeader2Keys = CMAP2 + 3;
subHeader2s = (subHeader2 *)(subHeader2Keys + 256);
-k = Int16FromMOTA(subHeader2Keys[theHighByte]) / 8;
+if(reinterpret_castsal_uInt8*(subHeader2Keys[theHighByte]) - cmap
nMaxCmapSize - 2)
+{
+k = Int16FromMOTA(subHeader2Keys[theHighByte]) / 8;
+// check if the subheader record fits into available space
+if((k = 0) (reinterpret_castsal_uInt8*(subHeader2s[k]) - cmap
= int(nMaxCmapSize - sizeof(subHeader2
+k = -1;
+}
if(k == 0) {
firstCode = Int16FromMOTA(subHeader2s[k].firstCode);
commit 0150921c3d898c9fd31e8312df1d717a4632d16d
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 3 19:42:09 2014 +0100
coverity#1242806 untrusted pointer read
Change-Id: Ib92e1a22d7d25f4498272731af12c485937f38ef
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 6dae9de..5d0f493 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -564,7 +564,7 @@ namespace vcl
sal_uInt32 numOfLongVerMetrics; /* if this number
is not 0, font has vertical metrics information */
const sal_uInt8* cmap;
int cmapType;
-sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32); /* character to
glyphID translation function */
+sal_uInt32 (*mapper)(const sal_uInt8 *, sal_uInt32, sal_uInt32); /*
character to glyphID translation function */
const sal_uInt8 **tables;/* array of
pointers to raw subtables in SFNT file*/
sal_uInt32 *tlens;/* array of table
lengths */
int kerntype; /* Defined in the
KernType enum */
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index cc13d17..711ef17 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1052,7 +1052,7 @@ enum cmapType {
* getGlyph12() function and friends by:
* @author HDU
*/
-static sal_uInt32 getGlyph0(const sal_uInt8* cmap, sal_uInt32 c) {
+static sal_uInt32 getGlyph0(const sal_uInt8* cmap, sal_uInt32, sal_uInt32 c) {
if (c = 255) {
return *(cmap + 6 + c);
} else {
@@ -1067,7 +1067,7 @@ typedef struct _subHeader2 {
sal_uInt16 idRangeOffset;
} subHeader2;
-static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, sal_uInt32 c) {
+static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, sal_uInt32, sal_uInt32 c) {
sal_uInt16 *CMAP2 = (sal_uInt16 *) cmap;
sal_uInt8 theHighByte;
@@ -1115,7 +1115,7 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap,
sal_uInt32 c) {
}
}
-static sal_uInt32 getGlyph6(const sal_uInt8 *cmap, sal_uInt32 c) {
+static sal_uInt32 getGlyph6(const sal_uInt8 *cmap, sal_uInt32, sal_uInt32 c) {
sal_uInt16 firstCode, lastCode, count;
sal_uInt16 *CMAP6 = (sal_uInt16 *) cmap;
@@ -1150,7 +1150,7 @@ static sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16
length, sal_uInt16 toSe
return (sal_uInt16)lastfound;
}
-static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) {
+static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, const sal_uInt32
nMaxCmapSize, sal_uInt32 c) {
sal_uInt16 i;
int ToReturn;
sal_uInt16 segCount;
@@ -1172,22 +1172,25 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap,
sal_uInt32 c) {
}
startCode = endCode + segCount + 1;
-if(Int16FromMOTA(startCode[i]) c) {
+if((reinterpret_castsal_uInt8*(startCode[i]) - cmap = nMaxCmapSize -
2) || Int16FromMOTA(startCode[i]) c) {
Re: coverity warnings update, 150, 0.04 density
On Mon, 2014-11-03 at 21:48 +0100, Michael Stahl wrote: On 03.11.2014 16:24, Caolán McNamara wrote: 705391 Inferred misuse of enum really bugs me. xmloff/source/transform/MergeElemTContext.cxx:235 where XML_ATACTION_MOVE_FROM_ELEM_RNG2ISO_DATETIME is from a completely different enum than all the other cases. It looks completely bogus, but I don't know if it should be some other condition or if that case belongs to another switch. that was a nasty case, fixed in commit 76dce95eed6892d729fbea2b990911edd82ded82 Excellent, that one was super-bugging me. FWIW that leaves just one MIXED_ENUM warning left. 705369 where XML_TOK_ENCODING in dbaccess/source/filter/xml/xmlDataSourceInfo.cxx:67 is also from an utterly different enum from the rest of the cases :-( C. p.s. I want to leave 982918, 983056 and 1250404 *untriaged* or now to find out if I have the right inline coverity markup to automark false positives as intentional if the code is sent to a different coverity instance than the public one. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: open calc / sorting issues ...
Hi, Le 03/11/2014 13:36, Michael Meeks a écrit : On Mon, 2014-10-27 at 19:56 +0100, Jean-Baptiste Faure wrote: Le 23/10/2014 17:20, Michael Meeks a écrit : [...] * Pending Action Items: + get a clear use-case description of what doesn't work vs. master wrt. Calc sorting (JBF) First draft here: https://bugs.freedesktop.org/show_bug.cgi?id=85490 So - I don't grok that bug; I was expecting a tracker bug; are you trying to use 'see also' for that ? rather than 'depends on' ? the see also is a zoo that doesn't solve the problem here I think. I am trying to summarize the different use-cases I can find related to sorting range of cells with references. Many things are not clear with the collection of bugs you can find in bugzilla with the keyword sort. For many bugs reported in BZ, it is not clear, for me, if the bug is really in Calc or between the chair and the keyboard. We are missing a clear description of all use-cases that Calc is able to handle and, for each use-case, how Calc should do sorting. In other words we are missing the specifications of sorting. So I am working on a spreadsheet gathering the use-cases I am able to describe. Each use-case has data, description, how to test, what is expected and how it works in master, 4.3.4.0.0+, 4.2.6.3, 4.1.6.2 and 4.0.6.2. The spreadsheet is not finished yet but, at the moment, I have at least 2 clear conclusions: 1/ the issue with the use-case bank account (bugs 81633 and 85215) is fixed in 4.3.4.0.0+ and 4.4.0.0.alpha1, except for the fact that in 4.3 the legacy behavior is obtained with the default value of option UpdateReferenceOnSort, when in 4.4 you have to change it to get back the legacy behavior. 2/ with 4.3, it is not possible to make all tests of the spreadsheet working, without changing the option, which implies that you need to restart LO each time you need to change the value of the option. It is not a user experience as good as we expect. I hope to be able to attach the spreadsheet to the metabug shortly. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/Library_scfilt.mk
sc/Library_scfilt.mk | 13 ++--- sc/inc/pch/precompiled_sc.hxx |1 - 2 files changed, 2 insertions(+), 12 deletions(-) New commits: commit abc22a091c27b92c5b20964375098faa11d3546e Author: Michael Stahl mst...@redhat.com Date: Mon Nov 3 22:44:03 2014 +0100 fix the PCH after 8e399602ea7aa11a81d704ff6ce8e660df4205b9 Change-Id: Ia5e05901a066619e0e819b3b06c0a7da3b2de536 diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index e46f17c..ff70147 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -779,7 +779,6 @@ #include svx/sdtditm.hxx #include svx/selctrl.hxx #include svx/shapepropertynotifier.hxx -#include svx/sidebar/ColorControl.hxx #include svx/sidebar/ContextChangeEventMultiplexer.hxx #include svx/sidebar/PopupContainer.hxx #include svx/sidebar/SelectionAnalyzer.hxx commit 39d445e0eb439e5aea94214f63aa4a04e5829011 Author: Michael Stahl mst...@redhat.com Date: Mon Nov 3 21:52:54 2014 +0100 sc: clean up Library_scfilt.mk duplication wrt. ORCUS Change-Id: Ide3c9987fb15112d5a4c8c2b5e15277b2579ee51 diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 77c8486..d19b379 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -29,13 +29,8 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\ )) $(eval $(call gb_Library_use_externals,scfilt,\ - orcus \ - orcus-parser \ boost_headers \ - boost_system \ - boost_iostreams \ mdds_headers \ - zlib \ )) $(eval $(call gb_Library_use_libraries,scfilt,\ @@ -230,15 +225,11 @@ ifeq ($(ENABLE_ORCUS),TRUE) $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ orcus-parser \ + boost_system \ + boost_iostreams \ zlib \ )) -ifneq ($(SYSTEM_ZLIB),) -$(eval $(call gb_Library_add_defs,scfilt,\ - -DSYSTEM_ZLIB \ -)) -endif - $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/orcus/interface \ sc/source/filter/orcus/orcusfiltersimpl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/icu external/lpsolve external/python3 odk/qa
external/icu/ExternalProject_icu.mk |2 +-
external/lpsolve/lp_solve_5.5-windows.patch |2 +-
external/python3/python-msvc-disable-sse2.patch.1 | 11 +++
odk/qa/checkapi/checkapi.cxx |5 +
4 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit c79d2dbe3a75e3376a5997444b6a3a5f947da107
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 3 00:54:12 2014 +0100
fdo#82430: MSVC build: disable a few more cases of SSE2 in externals
Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 8d59edf..d302a7c 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -22,7 +22,7 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_ExternalProject_run,build,\
export LIB=$(ILIB) \
-CFLAGS=-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS)
CPPFLAGS=$(SOLARINC) CXXFLAGS=$(SOLARINC) $(gb_DEBUG_CFLAGS) \
+CFLAGS=-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS)
CPPFLAGS=$(SOLARINC) CXXFLAGS=-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS) \
INSTALL=`cygpath -m /usr/bin/install` \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug
--disable-release) \
diff --git a/external/lpsolve/lp_solve_5.5-windows.patch
b/external/lpsolve/lp_solve_5.5-windows.patch
index 70fb553..368c90d 100644
--- a/external/lpsolve/lp_solve_5.5-windows.patch
+++ b/external/lpsolve/lp_solve_5.5-windows.patch
@@ -46,7 +46,7 @@
-rc lpsolve.rc
+rc %SOLARINC% lpsolve.rc
-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL
-DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL
-DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -arch:SSE -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz
-D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res
..\lp_solve.def -Felpsolve55.dll
-rem /link /LINK50COMPAT
-
-if exist a.obj del a.obj
diff --git a/external/python3/python-msvc-disable-sse2.patch.1
b/external/python3/python-msvc-disable-sse2.patch.1
index a01423f..399aa60 100644
--- a/external/python3/python-msvc-disable-sse2.patch.1
+++ b/external/python3/python-msvc-disable-sse2.patch.1
@@ -10,3 +10,14 @@ fdo#82430 disable SSE2 default of MSVC2012
/ClCompile
/ItemDefinitionGroup
ItemGroup
+--- python3/PCbuild/make_buildinfo.c.orig 2014-11-03 00:48:58.84100
+0100
python3/PCbuild/make_buildinfo.c 2014-11-03 00:49:16.26620 +0100
+@@ -109,7 +109,7 @@
+
+ int main(int argc, char*argv[])
+ {
+-char command[CMD_SIZE] = cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS
-DWIN32 -D_WINDLL ;
++char command[CMD_SIZE] = cl.exe -arch:SSE -c -D_WIN32 -DUSE_DL_EXPORT
-D_WINDOWS -DWIN32 -D_WINDLL ;
+ char tmppath[CMD_SIZE] = ;
+ int do_unlink, result;
+ char *tmpdir = NULL;
commit fa836cab8d3a300e196c7f1b0990098567f7cd62
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 3 23:14:11 2014 +0100
odk: disable MSVC warning C4996
Change-Id: I6c2dab3b427121366bb2d39b95262311286ae371
diff --git a/odk/qa/checkapi/checkapi.cxx b/odk/qa/checkapi/checkapi.cxx
index 29ec390..67e11c6 100644
--- a/odk/qa/checkapi/checkapi.cxx
+++ b/odk/qa/checkapi/checkapi.cxx
@@ -29,6 +29,11 @@
// This module contains no tests, this is for the build system.
#include cppunit/plugin/TestPlugIn.h
+#ifdef _MSC_VER
+// deprecation warnings do not matter here
+#pragma warning (disable : 4996)
+#endif
+
#include allheaders.hxx
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
OutputDevice::PaintLineGeometryWithEvtlExpand()
Hi all, With the function OutputDevice::PaintLineGeometryWithEvtlExpand() in VCL, what on earth does Evtl mean, and what is being expanded? From what I can see of this function, it allows you to make lines with dots and dashes, as well as set line thickness. Can anyone clarify this? Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/outdev.hxx |8
vcl/inc/generic/genpspgraphics.h |2
vcl/inc/headless/svpgdi.hxx |1
vcl/inc/quartz/salgdi.h |1
vcl/inc/salgdi.hxx | 11
vcl/inc/unx/salgdi.h |2
vcl/inc/win/salgdi.h |1
vcl/source/gdi/salgdilayout.cxx |5
vcl/source/outdev/gradient.cxx | 521 ---
9 files changed, 461 insertions(+), 91 deletions(-)
New commits:
commit ad6d94009cf8ea526eb70bf1a07e5c6a21320f83
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Oct 25 18:51:51 2014 +1100
vcl: Allow SalGraphics to draw gradients natively
The aim of this patch is to allow for native gradient rendering in
SalGraphics (i.e. let OpenGL do this natively). It is a two step
process:
1. I need to allow gradient draw into SalGraphics, however the current
completely intertwined with the metafile code in OutputDevice. I am
seperating the gradient metafile code from the gradient drawing code.
2. After splitting the metafile stuff from the actual gradient drawing,
I am now able to call on SalGraphics::DrawGradient(). This just
calls on SalGraphics::drawGradient() which returns false if there is
no way of drawing native gradients, and true if there is. If false,
then we use OutputDevice's DrawGradient() functionality.
Change-Id: Ibaaabe13b76a8e7a037d9f751b5f662653a50566
Reviewed-on: https://gerrit.libreoffice.org/12119
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 30da2ea..7603351 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -833,8 +833,12 @@ protected:
private:
-SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle rRect,
const Gradient rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
-SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle rRect,
const Gradient rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
+SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle rRect,
const Gradient rGradient, const tools::PolyPolygon* pClipPolyPoly );
+SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle rRect,
const Gradient rGradient, const tools::PolyPolygon* pClipPolyPoly );
+
+SAL_DLLPRIVATE void DrawGradientToMetafile( const
tools::PolyPolygon rPolyPoly, const Gradient rGradient );
+SAL_DLLPRIVATE void DrawLinearGradientToMetafile( const Rectangle
rRect, const Gradient rGradient );
+SAL_DLLPRIVATE void DrawComplexGradientToMetafile( const
Rectangle rRect, const Gradient rGradient );
SAL_DLLPRIVATE long GetGradientSteps( const Gradient rGradient,
const Rectangle rRect, bool bMtf, bool bComplex=false );
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 2a562c3..30c8fec 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -148,6 +148,8 @@ public:
const sal_uInt32* pPoints,
const SalPoint* const*
pPtAry,
const sal_uInt8* const*
pFlgAry ) SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
+
virtual voidcopyArea( long nDestX,
long nDestY,
long nSrcX,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index a872d4a..cbbac7a 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -211,6 +211,7 @@ public:
const sal_uInt32* pPoints,
const SalPoint* const*
pPtAry,
const sal_uInt8* const*
pFlgAry ) SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
virtual voidcopyArea( long nDestX,
long nDestY,
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 23d3bb3..eb21e09 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -237,6 +237,7 @@ public:
const ::basegfx::B2DVector rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap eLineCap)
SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
// CopyArea -- No RasterOp, but ClipRegion
virtual voidcopyArea(
Re: OutputDevice::PaintLineGeometryWithEvtlExpand()
On 03.11.2014 23:50, Chris Sherlock wrote: Hi all, With the function OutputDevice::PaintLineGeometryWithEvtlExpand() in VCL, what on earth does Evtl mean, and what is being expanded? Evtl usually means German eventuell which means possible or optional (i.e. totally different meaning from English eventual). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - starmath/inc
starmath/inc/cursor.hxx |2 ++
starmath/inc/parse.hxx |8 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 5c5e809605d750d87ae7a5334f8406894f6a4184
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Nov 4 00:56:45 2014 +0900
mark as noncopyable
Change-Id: Ic464974087f9f8fb161aaffde232668ba01c2f62
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 22de086..c740991 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -26,6 +26,7 @@
#include types.hxx
+#include boost/noncopyable.hpp
#include boost/ptr_container/ptr_vector.hpp
class SmNode;
@@ -169,7 +170,7 @@ struct SmTokenTableEntry
sal_uInt16 nLevel;
};
-class SmParser
+class SmParser : boost::noncopyable
{
OUStringm_aBufferString;
SmToken m_aCurToken;
@@ -190,10 +191,6 @@ class SmParser
//! locale where '.' is decimal separator!
::com::sun::star::lang::Locale m_aDotLoc;
-// declare copy-constructor and assignment-operator private
-SmParser(const SmParser );
-SmParser operator = (const SmParser );
-
protected:
#if OSL_DEBUG_LEVEL 1
boolIsDelimiter( const OUString rTxt, sal_Int32 nPos );
commit 67276f70039c460332eabc00bd4109d301b2f40a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Nov 4 00:40:34 2014 +0900
include list where needed
Change-Id: Ia6784bf95d9d0c57b79bdf7373f4836709563b7a
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 6f80e41..4ce2efc 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -12,6 +12,8 @@
#include node.hxx
#include caret.hxx
+#include list
+
/** Factor to multiple the squared horizontal distance with
* Used for Up and Down movement.
*/
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 376113c..22de086 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -23,7 +23,6 @@
#include set
#include stack
-#include list
#include types.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/starmath.hrc | 31 ++
starmath/source/ElementsDockingWindow.cxx | 27 +++
starmath/source/commands.src | 51 ++
starmath/source/smres.src | 41
4 files changed, 149 insertions(+), 1 deletion(-)
New commits:
commit 38e21f422cd5ee9ce97aae9f0be32f46f6d22904
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Tue Nov 4 00:14:27 2014 -0200
Math: Add new colors in the Sidebar
Regine add new colors to Math in fe5840aab17e366749c373e4f8683e06e40b4b05
and
this commit just take those new colors and show in the Math Sidebar.
Change-Id: Idd67cf4a04b2855970b115aac8d15d6506f73298
Reviewed-on: https://gerrit.libreoffice.org/12239
Reviewed-by: Marcos Paulo de Souza marcos.souza@gmail.com
Tested-by: Marcos Paulo de Souza marcos.souza@gmail.com
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ae9cafb..e5aab19 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -113,6 +113,16 @@
#define STR_ALIGN_LEFT (RID_APP_START + 836)
#define STR_ALIGN_CENTER(RID_APP_START + 837)
#define STR_ALIGN_RIGHT (RID_APP_START + 838)
+#define STR_AQUA(RID_APP_START + 839)
+#define STR_FUCHSIA (RID_APP_START + 840)
+#define STR_GRAY(RID_APP_START + 841)
+#define STR_LIME(RID_APP_START + 842)
+#define STR_MAROON (RID_APP_START + 843)
+#define STR_NAVY(RID_APP_START + 844)
+#define STR_OLIVE (RID_APP_START + 845)
+#define STR_PURPLE (RID_APP_START + 846)
+#define STR_SILVER (RID_APP_START + 847)
+#define STR_TEAL(RID_APP_START + 848)
#define RID_ERR_IDENT (RID_APP_START + 920)
#define RID_ERR_UNKNOWN (RID_APP_START + 921)
@@ -401,6 +411,16 @@
#define RID_COLORX_CYAN (RID_APP_START + 1729)
#define RID_COLORX_MAGENTA (RID_APP_START + 1730)
#define RID_COLORX_YELLOW (RID_APP_START + 1731)
+#define RID_COLORX_AQUA (RID_APP_START + 1732)
+#define RID_COLORX_FUCHSIA (RID_APP_START + 1733)
+#define RID_COLORX_GRAY (RID_APP_START + 1734)
+#define RID_COLORX_LIME (RID_APP_START + 1735)
+#define RID_COLORX_MAROON (RID_APP_START + 1736)
+#define RID_COLORX_NAVY (RID_APP_START + 1737)
+#define RID_COLORX_OLIVE(RID_APP_START + 1738)
+#define RID_COLORX_PURPLE (RID_APP_START + 1739)
+#define RID_COLORX_SILVER (RID_APP_START + 1740)
+#define RID_COLORX_TEAL (RID_APP_START + 1741)
#define RID_LRPARENTX (RID_APP_START + 1801)
#define RID_LRBRACKETX (RID_APP_START + 1802)
@@ -676,6 +696,17 @@
#define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189)
#define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190)
+#define RID_COLORX_AQUA_HELP(RID_APP_START + 4191)
+#define RID_COLORX_FUCHSIA_HELP (RID_APP_START + 4192)
+#define RID_COLORX_GRAY_HELP(RID_APP_START + 4193)
+#define RID_COLORX_LIME_HELP(RID_APP_START + 4194)
+#define RID_COLORX_MAROON_HELP (RID_APP_START + 4195)
+#define RID_COLORX_NAVY_HELP(RID_APP_START + 4196)
+#define RID_COLORX_OLIVE_HELP (RID_APP_START + 4197)
+#define RID_COLORX_PURPLE_HELP (RID_APP_START + 4198)
+#define RID_COLORX_SILVER_HELP (RID_APP_START + 4199)
+#define RID_COLORX_TEAL_HELP(RID_APP_START + 4200)
+
#define RID_ALIGNLX_HELP (RID_APP_START + 4275)
#define RID_ALIGNCX_HELP (RID_APP_START + 4276)
#define RID_ALIGNRX_HELP (RID_APP_START + 4277)
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 5b5a833..ac29644 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -163,7 +163,12 @@ const sal_uInt16 SmElementsControl::aAttributes[][2] =
{RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE,
RID_COLORX_BLUE_HELP},
{RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED,
RID_COLORX_RED_HELP},
{RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA,
RID_COLORX_MAGENTA_HELP},
-{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}
+{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_AQUA,
RID_COLORX_AQUA_HELP},
+{RID_COLORX_FUCHSIA, RID_COLORX_FUCHSIA_HELP}, {RID_COLORX_GRAY,
RID_COLORX_GRAY_HELP},
+{RID_COLORX_LIME, RID_COLORX_LIME_HELP}, {RID_COLORX_MAROON,
RID_COLORX_MAROON_HELP},
+{RID_COLORX_NAVY, RID_COLORX_NAVY_HELP}, {RID_COLORX_OLIVE,
RID_COLORX_OLIVE_HELP},
+
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - include/vcl vcl/source vcl/win
include/vcl/opengl/OpenGLContext.hxx |2 ++
vcl/source/opengl/OpenGLContext.cxx | 31 +--
vcl/win/source/gdi/salgdi.cxx|2 ++
3 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit ade03f86a390889d3888c7c1c603f5b415446d76
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Nov 4 01:19:12 2014 +0100
use the new virtual device support in OpenGL for win backend
Change-Id: Icd67dd7bad1399c861db41c418095c2b6b1d6d78
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 9dfcf74..17074a8 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -487,6 +487,8 @@ void WinSalGraphics::InitGraphics()
OpenGLSalGraphicsImpl* pImpl =
dynamic_castOpenGLSalGraphicsImpl*(mpImpl.get());
if (pImpl)
{
+if (mbVirDev)
+pImpl-GetOpenGLContext().requestVirtualDevice();
pImpl-GetOpenGLContext().init(mhLocalDC, mhWnd);
}
}
commit 6dfbb195d18047b9808abe1a58801606da8d7245
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Nov 4 01:15:30 2014 +0100
support rendering to memory device contexts on Windows
Change-Id: I91fdd429663fae76bfe17d37de86d118621cf160
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 3a8ec9a..a8344d6 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -156,6 +156,7 @@ public:
void requestLegacyContext();
void requestSingleBufferedRendering();
+void requestVirtualDevice();
bool init(vcl::Window* pParent = 0);
bool init(SystemChildWindow* pChildWindow);
@@ -211,6 +212,7 @@ private:
bool mbInitialized;
bool mbRequestLegacyContext;
bool mbUseDoubleBufferedRendering;
+bool mbRequestVirtualDevice;
};
#endif
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index fe97372..508bf0b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -37,7 +37,8 @@ OpenGLContext::OpenGLContext():
m_pChildWindow(NULL),
mbInitialized(false),
mbRequestLegacyContext(false),
-mbUseDoubleBufferedRendering(true)
+mbUseDoubleBufferedRendering(true),
+mbRequestVirtualDevice(false)
{
}
@@ -77,6 +78,11 @@ void OpenGLContext::requestSingleBufferedRendering()
mbUseDoubleBufferedRendering = false;
}
+void OpenGLContext::requestVirtualDevice()
+{
+mbRequestVirtualDevice = true;
+}
+
#if defined( _WIN32 )
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
lParam)
{
@@ -182,7 +188,8 @@ bool WGLisExtensionSupported(const char *extension)
}
}
-bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int rPixelFormat, bool
bUseDoubleBufferedRendering)
+bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int rPixelFormat,
+bool bUseDoubleBufferedRendering, bool bRequestVirtualDevice)
{
HWND hWnd = NULL;
GLWindow glWin;
@@ -235,6 +242,11 @@ bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int
rPixelFormat, bool bUseDoub
if (!bUseDoubleBufferedRendering)
iAttributes[1] = GL_FALSE;
+if (bRequestVirtualDevice)
+{
+iAttributes[2] = WGL_DRAW_TO_BITMAP_ARB;
+}
+
bool bArbMultisampleSupported = true;
// First We Check To See If We Can Get A Pixel Format For 4 Samples
@@ -589,9 +601,7 @@ bool OpenGLContext::ImplInit()
{
sizeof(PIXELFORMATDESCRIPTOR),
1, // Version Number
-PFD_DRAW_TO_WINDOW |
-PFD_SUPPORT_OPENGL |
-PFD_DOUBLEBUFFER,
+PFD_SUPPORT_OPENGL,
PFD_TYPE_RGBA, // Request An RGBA Format
(BYTE)32, // Select Our Color Depth
0, 0, 0, 0, 0, 0, // Color Bits Ignored
@@ -607,9 +617,18 @@ bool OpenGLContext::ImplInit()
0, 0, 0 // Layer Masks Ignored
};
+if (mbUseDoubleBufferedRendering)
+PixelFormatFront.dwFlags |= PFD_DOUBLEBUFFER;
+
+if (mbRequestVirtualDevice)
+PixelFormatFront.dwFlags |= PFD_DRAW_TO_BITMAP;
+else
+PixelFormatFront.dwFlags |= PFD_DRAW_TO_WINDOW;
+
// we must check whether can set the MSAA
int WindowPix = 0;
-bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix,
mbUseDoubleBufferedRendering);
+bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix,
+mbUseDoubleBufferedRendering, mbRequestVirtualDevice);
if (bMultiSampleSupport WindowPix != 0)
{
m_aGLWin.bMultiSampleSupported = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/opengl-vcl-text'
New branch 'feature/opengl-vcl-text' available with the following commits: commit 4af8f41df1c85fe0ec84b6a2c8f39b741aa5f09f Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Tue Nov 4 04:29:13 2014 +0100 extract cairo rendering and abstract platform bits The text rendering is now abstracted into the TextRender abstract class. Additionally we have now an abstracted cairo rendering class CairoTextRender which is a subclass of the TextRender class. The CairoTextRender class is still platform independent and needs to be subclassed to implement the few platform dependent methods. You can reuse the cairo based text rendering now by subclassing CairoTextRender for the platform that you need. Change-Id: I8b07e3fe646a81563d308971d30e14a00fd921ad ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - 3 commits - vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win
vcl/headless/svpbmp.cxx |5 +++
vcl/inc/headless/svpbmp.hxx |2 +
vcl/inc/impbmp.hxx|3 +
vcl/inc/opengl/salbmp.hxx |4 ++
vcl/inc/openglgdiimpl.hxx | 10 +++---
vcl/inc/quartz/salbmp.h |2 +
vcl/inc/salbmp.hxx|2 +
vcl/inc/unx/salbmp.h |2 +
vcl/inc/win/salbmp.h |2 +
vcl/opengl/gdiimpl.cxx| 24 +--
vcl/opengl/salbmp.cxx | 53 +++---
vcl/opengl/textureFragmentShader.glsl |4 +-
vcl/opengl/textureVertexShader.glsl |2 -
vcl/quartz/salbmp.cxx |5 +++
vcl/source/gdi/bitmap3.cxx|7
vcl/source/gdi/impbmp.cxx |5 +++
vcl/unx/generic/gdi/salbmp.cxx|5 +++
vcl/win/source/gdi/salbmp.cxx |5 +++
18 files changed, 108 insertions(+), 34 deletions(-)
New commits:
commit 0a1ddd6775f1d9b3d610682095922898c590b58e
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 3 22:52:43 2014 -0500
vcl: Fix creation of textures and wrong format
Change-Id: I9357b79b9f2e1e9506b83b40e35b882b4ee4cc37
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 40e2998..da8ff18 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -34,7 +34,8 @@ static bool isValidBitCount( sal_uInt16 nBitCount )
}
OpenGLSalBitmap::OpenGLSalBitmap()
-: mnTexture(0)
+: mpContext(NULL)
+, mnTexture(0)
, mbDirtyTexture(true)
, mnBits(0)
, mnBytesPerRow(0)
@@ -368,7 +369,12 @@ GLuint OpenGLSalBitmap::CreateTexture()
if( !mnTexture )
glGenTextures( 1, mnTexture );
glBindTexture( GL_TEXTURE_2D, mnTexture );
-glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, mnWidth, mnHeight, 0, nFormat,
nType, pData );
+glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, mnTexWidth, mnTexHeight, 0,
nFormat, nType, pData );
glBindTexture( GL_TEXTURE_2D, 0 );
if( bAllocated )
@@ -473,12 +479,11 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( bool
/*bReadOnly*/ )
case 16:pBuffer-mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK;
pBuffer-maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f );
break;
-case 24:pBuffer-mnFormat = BMP_FORMAT_24BIT_TC_BGR; break;
-case 32:pBuffer-mnFormat = BMP_FORMAT_32BIT_TC_ARGB;
-pBuffer-maColorMask = ColorMask( 0x00ff, 0xff00,
0x00ff );
+case 24:pBuffer-mnFormat = BMP_FORMAT_24BIT_TC_RGB; break;
+case 32:pBuffer-mnFormat = BMP_FORMAT_32BIT_TC_RGBA;
+pBuffer-maColorMask = ColorMask( 0xff00, 0x00ff,
0xff00 );
break;
}
-// FIXME pBuffer-mnFormat |= BMP_FORMAT_BOTTOM_UP;
return pBuffer;
}
commit 146474b98b63df5759811bdbeb3469822f92303c
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 3 22:51:47 2014 -0500
vcl: Remove some more extra colons
Change-Id: Ic40607ae3cd96ebd9ad90bdbb4134cf80242c5cf
diff --git a/vcl/opengl/textureFragmentShader.glsl
b/vcl/opengl/textureFragmentShader.glsl
index eb510d8..81d68c7 100644
--- a/vcl/opengl/textureFragmentShader.glsl
+++ b/vcl/opengl/textureFragmentShader.glsl
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-precision mediump float;
+/* precision mediump float; */
varying vec2 tex_coord;
uniform sampler2D sampler;
void main() {
gl_FragColor = texture2D(sampler, tex_coord);
-};
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/textureVertexShader.glsl
b/vcl/opengl/textureVertexShader.glsl
index 303ddec..99d7f37 100644
--- a/vcl/opengl/textureVertexShader.glsl
+++ b/vcl/opengl/textureVertexShader.glsl
@@ -14,6 +14,6 @@ varying vec2 tex_coord;
void main() {
gl_Position = position;
tex_coord = tex_coord_in;
-};
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5d3000939239ab1dece880a32136a7e09b5163cd
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 3 22:51:15 2014 -0500
vcl: Allow SalBitmap implementation to do scaling
Change-Id: If4431fb276c9c2629acbc95aeff2ef7c4a683d86
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 3920aea..b5fcc24 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -339,6 +339,11 @@ bool SvpSalBitmap::GetSystemData( BitmapSystemData )
return false;
}
+bool SvpSalBitmap::Scale( const double /*rScaleX*/, const double
/*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
+{
+
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 10 commits - include/vcl vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl.mk vcl/source vcl/unx
include/vcl/opengl/OpenGLContext.hxx|2
vcl/Library_vcl.mk |1
vcl/Module_vcl.mk |1
vcl/Package_opengl.mk | 23
vcl/inc/opengl/salbmp.hxx | 90 +++
vcl/inc/openglgdiimpl.hxx | 51 ++
vcl/inc/salgdiimpl.hxx |3
vcl/opengl/gdiimpl.cxx | 646 ++--
vcl/opengl/maskFragmentShader.glsl | 21
vcl/opengl/maskVertexShader.glsl| 19
vcl/opengl/maskedTextureFragmentShader.glsl | 22
vcl/opengl/maskedTextureVertexShader.glsl | 19
vcl/opengl/salbmp.cxx | 521 ++
vcl/opengl/solidFragmentShader.glsl | 17
vcl/opengl/solidVertexShader.glsl | 16
vcl/opengl/textureFragmentShader.glsl | 18
vcl/opengl/textureVertexShader.glsl | 19
vcl/source/opengl/OpenGLContext.cxx |9
vcl/unx/generic/gdi/gdiimpl.cxx |6
vcl/unx/generic/gdi/gdiimpl.hxx |2
vcl/unx/generic/gdi/salbmp.cxx |8
vcl/unx/generic/gdi/salgdi.cxx | 21
22 files changed, 1479 insertions(+), 56 deletions(-)
New commits:
commit 1931334a0f4ae604467c649eb7d0bcd5d4d85614
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Nov 4 04:55:44 2014 +0100
fix signed/unsigned comparison warning
Change-Id: I0d1ce56514ff9dfff620f11cf987d6d53c4be5e4
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 84ada34..5edeed8 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -190,7 +190,7 @@ bool OpenGLSalBitmap::AllocateUserData()
#ifdef DBG_UTIL
else
{
-for (size_t i = 0; i mnBytesPerRow * mnHeight; i++)
+for (size_t i = 0; i size_t(mnBytesPerRow * mnHeight); i++)
maUserBuffer.get()[i] = (i 0xFF);
}
#endif
commit a2c4dc3d0e4adf85ba1dcbfab68c318b6d637ead
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 3 11:10:14 2014 -0500
vcl: Fix the vertices calculations for some drawing operations
Change-Id: Ida92d77d7f828f5ff53e7cceaf4787beeef0022b
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 65cff6a..d79bce0 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -257,33 +257,32 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
{
-GLushort pPoints[4];
+GLfloat pPoints[4];
-pPoints[0] = nX1;
-pPoints[1] = nY1;
-pPoints[2] = nX2;
-pPoints[3] = nY2;
+pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+pPoints[1] = (2 * nY1) / GetHeight() - 1.0;
+pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+pPoints[3] = (2 * nY2) / GetHeight() - 1.0;
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, 4, GL_UNSIGNED_SHORT, GL_FALSE, 0,
pPoints );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_FLOAT, GL_FALSE, 0, pPoints );
glDrawArrays( GL_LINES, 0, 2 );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints, const SalPoint*
pPtAry, bool bClose )
{
-GLushort *pPoints;
+GLfloat pPoints[nPoints * 2];
sal_uInt32 i, j;
-pPoints = new GLushort[nPoints * 2];
-for( i = 0, j = 0; i nPoints; i++, j += 2 )
+for( i = 0, j = 0; i nPoints; i++ )
{
-pPoints[j] = pPtAry[i].mnX;
-pPoints[j+1] = pPtAry[i].mnY;
+pPoints[j++] = (2 * pPtAry[i].mnX) / GetWidth() - 1.0;
+pPoints[j++] = (2 * pPtAry[i].mnY) / GetHeight() - 1.0;
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_UNSIGNED_SHORT,
GL_FALSE, 0, pPoints );
+glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_FLOAT, GL_FALSE, 0,
pPoints );
if( bClose )
glDrawArrays( GL_LINE_LOOP, 0, nPoints );
else
@@ -293,7 +292,7 @@ void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints,
const SalPoint* pPtAr
void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32 nPoints, const
SalPoint* pPtAry )
{
-GLushort pVertices[nPoints * 2];
+GLfloat pVertices[nPoints * 2];
sal_uInt32 i, j;
for( i = 0, j = 0; i nPoints; i++, j += 2 )
@@ -303,7 +302,7 @@ void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32
nPoints, const SalPoin
}
glEnableVertexAttribArray( GL_ATTRIB_POS );
-glVertexAttribPointer( GL_ATTRIB_POS, nPoints * 2, GL_UNSIGNED_SHORT,
GL_FALSE, 0, pVertices );
+glVertexAttribPointer( GL_ATTRIB_POS, 2, GL_FLOAT, GL_FALSE, 0, pVertices
);
glDrawArrays( GL_TRIANGLE_FAN, 0, nPoints );
glDisableVertexAttribArray( GL_ATTRIB_POS );
}
@@ -312,8 +311,8 @@ void OpenGLSalGraphicsImpl::DrawRect( long nX, long nY,
long nWidth, long nHeigh
{
long nX1( nX
