LibreOffice Gerrit News for core on 2014-04-04
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#43157 : clean up more OSL_POSTCOND in https://gerrit.libreoffice.org/8832 from Michaël Lefèvre about module accessibility, canvas, connectivity, desktop, extensions, forms, include, mysqlc, registry, sc, sdext, svtools, svx, unotools + Typo for SERVICE_SDB_CALLABLESTATEMENT in https://gerrit.libreoffice.org/8831 from Julien Nabet about module dbaccess + fdo#72276 introduce .uno:ZoomMenu so we can split the menu entries/labels in https://gerrit.libreoffice.org/8503 from Joren De Cuyper about module officecfg, sc, sd, starmath, sw * Merged changes on master for project core changed in the last 25 hours: + fdo#43157 : clean up OSL_POSTCOND in https://gerrit.libreoffice.org/8805 from Michaël Lefèvre + fdo#73552 - Set name of CSV import sheet to something friendly in https://gerrit.libreoffice.org/8811 from Caolán McNamara + fdo#76589 : FILESAVE: DOCX: Numbered list is not preserved after RT in https://gerrit.libreoffice.org/8768 from Pallavi Jadhav * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Suzuki Beach 2014 con mensualidades de $3,800. ¡Solo este mes!
Please see the web version: http://a1a6e.s11.it/f/rnl.aspx/?fdc=uxusotux:9ii=orxch7=oqzwx5-6-:=:97g5.6-35x=ppq/a9dei46c5085djda/.hNCLM Si no puedes ver bien este email da click aqui. Correo seguro Mailclick Suzuki Plaza Palmira Cel. (938) 137 88 59 Desuscríbete de nuestras listas http://a1a6e.s11.it/f/oou.aspx/?94=pyysoov/94:x=pvhe=or1-4x=pv:=tuusx-5d8=p0vvsnuvz2nzvzqsssz2s_7z44zr11rwy646NCLM |Reenvia a un amigo Mailclick Div. Tabasco | Tulia 309 Alto | Vhsa., Tabasco | México | Tels. 01(993) 131-00-03 y 266-01-29 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source svl/source
sd/source/core/stlpool.cxx |2 ++ svl/source/items/IndexedStyleSheets.cxx |4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit cb1384b324580f23f652a1d8b922e94a7a212f1e Author: Muthu Subramanian sumu...@collabora.com Date: Fri Apr 4 12:10:01 2014 +0530 cp#154: Avoid crashing. Change-Id: Iedafa35cfedce1d56468774fcb6bbfa8e42612df diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 8a7cc23..19f3031 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -655,6 +655,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool rSourcePool, SfxStyleFamily it != aSheetsWithFamily.end(); ++it ) { rtl::Reference SfxStyleSheetBase xSheet = GetStyleSheetByPositionInIndex( *it ); +if( !xSheet.is() ) +continue; rtl::OUString aName( xSheet-GetName() ); // now check whether we already have a sheet with the same name diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx index ca45b53..087f817 100644 --- a/svl/source/items/IndexedStyleSheets.cxx +++ b/svl/source/items/IndexedStyleSheets.cxx @@ -182,7 +182,9 @@ IndexedStyleSheets::HasStyleSheet(rtl::Reference SfxStyleSheetBase style) con rtl::Reference SfxStyleSheetBase IndexedStyleSheets::GetStyleSheetByPosition(unsigned pos) { -return mStyleSheets.at(pos); +if( pos mStyleSheets.size() ) +return mStyleSheets.at(pos); +return NULL; } void ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textcharacterpropertiescontext.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f565646382e1383276bcf4cac30b614cdaccc056 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 4 10:13:11 2014 +0300 Turn an unhelpful SAL_WARN into a SAL_INFO Change-Id: Ic5551e915e724957fed74770b405c39c4e601cda diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 7bedd8e..898806e 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -216,7 +216,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl } break; default: -SAL_WARN(oox, TextCharacterPropertiesContext::onCreateContext: unhandled element: getBaseToken(aElementToken)); +SAL_INFO(oox, TextCharacterPropertiesContext::onCreateContext: unhandled element: getBaseToken(aElementToken)); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fixing Bug 46200 [Easy Hack]
First of all Thank you for the help. :) On Fri, Apr 4, 2014 at 1:56 AM, Michael Stahl mst...@redhat.com wrote: On 01/04/14 06:50, Tharindu Amila Perera wrote: Hi all, Using the reply I found out that the events coming from the keyboard has this behavior. Using the argument KeyEvent coming to function in file tabvwsh4.cxx bool ScTabViewShell::TabKeyInput(const KeyEvent rKEvt) I can get codes of all keys except of Caps-Lock, NumLock and Scroll(Which is the needed input). I noticed that when any of the above keys are pressed this function is called twice. But in both events the keycodes are not accessible. hmm... indeed the keycode is 0 there... it looks like the lock keys are not mapped to a keycode in VCL... perhaps intentionally. Maybe they did it on purpose as only finding if it is on or off is the only operation done on the value. When CapsLock is on pressing key 'A' in keyboard will give the same keycode as when it is not on. So there must be a place where it is handled to differentiate a and A inputs. It would be appreciated if I can get a code pointer for this. if i read the bug correctly you don't actually need the key events, you just need to know if the lock key is active when some other input happens. Yes I only need to know if it was on or not. vcl/unx/generic/app/saldisp.cxx: sal_uInt16 SalDisplay::GetIndicatorState() const { unsigned int _state = 0; sal_uInt16 nState = 0; XkbGetIndicatorState(pDisp_, XkbUseCoreKbd, _state); if ((_state 0x0001)) nState |= INDICATOR_CAPSLOCK; if ((_state 0x0002)) nState |= INDICATOR_NUMLOCK; if ((_state 0x0004)) nState |= INDICATOR_SCROLLLOCK; return nState; } there is an example for requesting the caps-lock key state in editeng/source/misc/svxacorr.cxx: bool bLockKeyOn = pFrameWin (pFrameWin-GetIndicatorState() INDICATOR_CAPSLOCK); so you need a VCL Window to get the state; a SfxViewShell like the ScTabVierwShell has a pointer to its Window. (since i read the bug too late i've already got a patch to assign a keycode for the scroll-lock key (see attachment), but i now think that is actually useless) Following your example I went ahead and added Window* pWin = (pThisFrame-GetWindow()); bool bScrollLockKeyOn = pWin (pWin-GetIndicatorState() INDICATOR_SCROLLLOCK); to tabvwsh4.cxx If I'm using this method to find capslock on it works fine. I checked the value of pWin-GetIndicatorState() It returns 1 for CapsLock 2 for NumLock and 0 for ScrollLock. My keyboard doesn't have ScrollLock key in it. I was using the onboard app in Ubuntu. Maybe it caused the error. I'm going ahead with the rest of the implementation. And try to fix getting the input later :). -- Thanks and regards, Tharindu Amila Perera Undergraduate Department of Computer Science Engineering University of Moratuwa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shapecontext.cxx |5 + oox/source/drawingml/shapegroupcontext.cxx |2 ++ oox/source/drawingml/textcharacterpropertiescontext.cxx |2 +- 3 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 527440c9d9086ae01c277b0dca96a87eb0868ae6 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 4 10:11:33 2014 +0200 oox: fix a few bogus SAL_WARN The idea is that when an element is unhandled, it's either unhandled explicitly by an empty case..break block (so grep can quickly find it) or we raise a warning. Add a few placeholders for cases that we won't probably handle better in the near future to silence warnings. Change-Id: I41dec7802c4671550130393b4f98a8f0d8dfc059 diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index eef5a78..bc246d2 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -103,6 +103,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const case XML_txXfrm: { mpShapePtr-getTextBody()-getTextProperties().moRotation = rAttribs.getInteger( XML_rot ); +return 0; break; } case XML_cNvSpPr: @@ -120,6 +121,10 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const break; case XML_nvPicPr: break; +case XML_relIds: +break; +case XML_nvSpPr: +break; default: SAL_WARN(oox, ShapeContext::onCreateContext: unhandled element: getBaseToken(aElementToken)); break; diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index d5eb503..d795c39 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -75,6 +75,8 @@ ContextHandlerRef ShapeGroupContext::onCreateContext( sal_Int32 aElementToken, c case XML_grpSpPr: return new ShapePropertiesContext( *this, *mpGroupShapePtr ); +case XML_nvGrpSpPr: +return 0; case XML_spPr: return new ShapePropertiesContext( *this, *mpGroupShapePtr ); /* diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 898806e..7bedd8e 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -216,7 +216,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl } break; default: -SAL_INFO(oox, TextCharacterPropertiesContext::onCreateContext: unhandled element: getBaseToken(aElementToken)); +SAL_WARN(oox, TextCharacterPropertiesContext::onCreateContext: unhandled element: getBaseToken(aElementToken)); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: soltools/cpp
soltools/cpp/_unix.c |2 -- soltools/cpp/cpp.h |2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 247bfbdb46f0f89e784574791d2bbc8748dd3717 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 4 10:29:04 2014 +0200 Move prototype to include Change-Id: I90c093c704609429f9997f3ffed6a9a79c8956a6 diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index d29970a..e5f9eab 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -49,8 +49,6 @@ int Cflag = 0; /* do not remove any comments */ int Dflag = 0; /* add parameter check to delete op */ int Cplusplus = 0; -extern void setup_kwtab(void); - void setup(int argc, char **argv) { diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index 15c2e60..5e57118 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -57,6 +57,8 @@ enum kwtype KMACHINE, KLINENO, KFILE, KDATE, KTIME, KSTDC, KEVAL }; +extern void setup_kwtab(void); + #define ISDEFINED 0x01/* has #defined value */ #define ISKW0x02/* is PP keyword */ #define ISUNCHANGE 0x04/* can't be #defined in PP */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/12090102.xhp | 56 +++-- source/text/shared/00/0001.xhp |2 - 2 files changed, 25 insertions(+), 33 deletions(-) New commits: commit 296331ddff2fdc3d61fde8c762990f80bcc758e5 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 09:33:08 2014 +0100 convert old pivot table help for new dialog Change-Id: Ib7ab115157d6bb38973d2ccd8e601fe6652031e0 diff --git a/source/text/scalc/01/12090102.xhp b/source/text/scalc/01/12090102.xhp index 396b16c..7d363a7 100644 --- a/source/text/scalc/01/12090102.xhp +++ b/source/text/scalc/01/12090102.xhp @@ -31,7 +31,7 @@ bookmark_valuepivot table function;drill down/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:DataPilotExec id=bm_id3154514 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/PivotTableLayout id=bm_id3154514 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/PivotTableLayout id=bm_id3154514 localize=false/ paragraph xml-lang=en-US id=hd_id3149165 role=heading level=1 l10n=U oldref=1Pivot Table/paragraph paragraph xml-lang=en-US id=par_id3155922 role=paragraph l10n=CHG oldref=13ahelp hid=.uno:DataPilotExecSpecify the layout of the table that is generated by the pivot table./ahelp/paragraph section id=howtoget @@ -39,60 +39,52 @@ /section embed href=text/scalc/guide/datapilot.xhp#datapilot/ paragraph xml-lang=en-US id=par_id3148798 role=paragraph l10n=U oldref=34The pivot table displays data fields as buttons which you can drag and drop to define the pivot table./paragraph -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/buttonfield id=bm_id3335062 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/columnfield id=bm_id9569689 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/rowfield id=bm_id7529526 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/datafield id=bm_id2920621 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/pagefield id=bm_id7411420 localize=false/commentUFI: changed help id from 59001 to dply_page/comment +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/listbox-fields id=bm_id3335062 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/listbox-column id=bm_id9569689 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/listbox-row id=bm_id7529526 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/listbox-data id=bm_id2920621 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayoutdialog/listbox-page id=bm_id7411420 localize=false/commentUFI: changed help id from 59001 to dply_page/comment paragraph xml-lang=en-US id=hd_id3154908 role=heading level=2 l10n=U oldref=18Layout/paragraph - paragraph xml-lang=en-US id=par_id3150768 role=paragraph l10n=CHG oldref=19ahelp hid=modules/scalc/ui/pivottablelayout/buttonfieldTo define the layout of a pivot table, drag and drop data field buttons onto the emphPage Fields, Row Fields, Column Fields, /emphandemph Data Fields /emphareas./ahelp You can also use drag and drop to rearrange the data fields on a pivot table./paragraph + paragraph xml-lang=en-US id=par_id3150768 role=paragraph l10n=CHG oldref=19ahelp hid=modules/scalc/ui/pivottablelayoutdialog/listbox-fieldsTo define the layout of a pivot table, drag and drop data field buttons onto the emphPage Fields, Row Fields, Column Fields, /emphandemph Data Fields /emphareas./ahelp You can also use drag and drop to rearrange the data fields on a pivot table./paragraph paragraph xml-lang=en-US id=par_id3147229 role=paragraph l10n=CHG oldref=20$[officename] automatically adds a caption to buttons that are dragged into the emphData Fields /empharea. The caption contains the name of the data field as well as the formula that created the data./paragraph paragraph xml-lang=en-US id=par_id3145749 role=paragraph l10n=CHG oldref=21To change the function that is used by a data field, double-click a button in the emphData Fields/emph area to open the link href=text/scalc/01/12090105.xhp name=Data FieldData Field/link dialog. You can also double-click buttons in the emphRow Fields/emph or emphColumn Fields/emph areas./paragraph -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/pivottablelayout/remove id=bm_id1926938 localize=false/ -paragraph xml-lang=en-US id=hd_id3149260 role=heading level=2 l10n=U - oldref=28Remove/paragraph - paragraph xml-lang=en-US id=par_id3150010 role=paragraph l10n=U oldref=27ahelp hid=modules/scalc/ui/pivottablelayout/removeRemoves the selected data field from the table
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 59432cffa9c32b5a39be1e1904731ce4a04d0307 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 09:33:08 2014 +0100 Updated core Project: help 296331ddff2fdc3d61fde8c762990f80bcc758e5 diff --git a/helpcontent2 b/helpcontent2 index c719458..296331d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c719458fbdafdb833a17874de420876a54e6ded3 +Subproject commit 296331ddff2fdc3d61fde8c762990f80bcc758e5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |9 - ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx |5 +++-- ucb/source/ucp/webdav/SerfRequestProcessor.cxx |8 +++- 3 files changed, 18 insertions(+), 4 deletions(-) New commits: commit e250a013bae4b58a9304518aefc6da0dab574103 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Apr 4 10:30:38 2014 +0200 webdav: Allow to save documents again, after locking is implemented. We need to extend PUT method with lock token in 'If' header, so that it does not fail on a resource locked by us. Change-Id: I82a9e3303a34607dba8bb874d1eb0fac23b9f11d diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index a64ecff..20a9984 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -29,10 +29,12 @@ namespace http_dav_ucp SerfPutReqProcImpl::SerfPutReqProcImpl( const char* inPath, const DAVRequestHeaders inRequestHeaders, const char* inData, -apr_size_t inDataLen ) +apr_size_t inDataLen, +const OUString sToken ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpData( inData ) , mnDataLen( inDataLen ) +, msToken( sToken ) { } @@ -64,6 +66,11 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in // general header fields provided by caller setRequestHeaders( hdrs_bkt ); +// 'If' header with token, so that we can save document locked by us +const OString sIfHeader( + OString(getPathStr()) + ( + OUStringToOString( +msToken, RTL_TEXTENCODING_UTF8) + ) ); +serf_bucket_headers_set( hdrs_bkt, If, sIfHeader.getStr() ); + return req_bkt; } diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx index a0bcccd..4bb8adb 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx @@ -31,7 +31,8 @@ public: SerfPutReqProcImpl( const char* inPath, const DAVRequestHeaders inRequestHeaders, const char* inData, -apr_size_t inDataLen ); +apr_size_t inDataLen, +const OUString sToken ); virtual ~SerfPutReqProcImpl(); @@ -49,7 +50,7 @@ protected: private: const char* mpData; apr_size_t mnDataLen; - +OUString msToken; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index ddeecca..c0bda26 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -203,10 +203,16 @@ bool SerfRequestProcessor::processPut( const char* inData, apr_size_t inDataLen, apr_status_t outSerfStatus ) { +// get the lock from lock store +const OUString sToken( + apr_environment::AprEnv::getAprEnv()-getSerfLockStore()-getLockToken( +OUString::createFromAscii(mPathStr)) ); + mpProcImpl = new SerfPutReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, - inDataLen ); + inDataLen, + sToken ); outSerfStatus = runProcessor(); return outSerfStatus == APR_SUCCESS; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/source
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |9 - ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx |5 +++-- ucb/source/ucp/webdav/SerfRequestProcessor.cxx |8 +++- 3 files changed, 18 insertions(+), 4 deletions(-) New commits: commit 2b39f36386c78c819864ff374c4cc61007aa73ea Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Apr 4 10:30:38 2014 +0200 webdav: Allow to save documents again, after locking is implemented. We need to extend PUT method with lock token in 'If' header, so that it does not fail on a resource locked by us. Change-Id: I82a9e3303a34607dba8bb874d1eb0fac23b9f11d (cherry picked from commit e250a013bae4b58a9304518aefc6da0dab574103) diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index a64ecff..20a9984 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -29,10 +29,12 @@ namespace http_dav_ucp SerfPutReqProcImpl::SerfPutReqProcImpl( const char* inPath, const DAVRequestHeaders inRequestHeaders, const char* inData, -apr_size_t inDataLen ) +apr_size_t inDataLen, +const OUString sToken ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpData( inData ) , mnDataLen( inDataLen ) +, msToken( sToken ) { } @@ -64,6 +66,11 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in // general header fields provided by caller setRequestHeaders( hdrs_bkt ); +// 'If' header with token, so that we can save document locked by us +const OString sIfHeader( + OString(getPathStr()) + ( + OUStringToOString( +msToken, RTL_TEXTENCODING_UTF8) + ) ); +serf_bucket_headers_set( hdrs_bkt, If, sIfHeader.getStr() ); + return req_bkt; } diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx index a0bcccd..4bb8adb 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx @@ -31,7 +31,8 @@ public: SerfPutReqProcImpl( const char* inPath, const DAVRequestHeaders inRequestHeaders, const char* inData, -apr_size_t inDataLen ); +apr_size_t inDataLen, +const OUString sToken ); virtual ~SerfPutReqProcImpl(); @@ -49,7 +50,7 @@ protected: private: const char* mpData; apr_size_t mnDataLen; - +OUString msToken; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index ddeecca..c0bda26 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -203,10 +203,16 @@ bool SerfRequestProcessor::processPut( const char* inData, apr_size_t inDataLen, apr_status_t outSerfStatus ) { +// get the lock from lock store +const OUString sToken( + apr_environment::AprEnv::getAprEnv()-getSerfLockStore()-getLockToken( +OUString::createFromAscii(mPathStr)) ); + mpProcImpl = new SerfPutReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, - inDataLen ); + inDataLen, + sToken ); outSerfStatus = runProcessor(); return outSerfStatus == APR_SUCCESS; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ad6c7bc74ca9aac32a47bc9428c36bf1d71c400a Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Fri Apr 4 10:38:45 2014 +0200 Fix -Werror=type-limits and -Werror=sign-compare This time hopefully for real Change-Id: I5bf06a9353ea94aef04d862ab25dfc38129b2b12 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c2f8819..4ba7f2b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2153,7 +2153,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co if( rStyleProps != NULL pBorderLine !pBorderLine-isEmpty() pBorderLine-GetBorderLineStyle() == rStyleProps-LineStyle pBorderLine-GetColor() == rStyleProps-Color -pBorderLine-GetWidth() == MM100_TO_TWIP( rStyleProps-LineWidth ) ) +(sal_uInt32) pBorderLine-GetWidth() == MM100_TO_TWIP_UNSIGNED( rStyleProps-LineWidth ) ) return; pAttr-add( FSNS( XML_w, XML_val ), OString( pVal ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo76628.rtf | 10 ++ sw/qa/extras/rtfimport/rtfimport.cxx | 12 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 +-- writerfilter/source/rtftok/rtfdocumentimpl.hxx | 10 +- 4 files changed, 36 insertions(+), 15 deletions(-) New commits: commit 8baff038befe47957967278a7225bc48e0d89889 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 4 10:29:49 2014 +0200 fdo#76628 RTF import: allow the same font to have multiple encodings Commit bbe3627eece0c3486e7ea11f2f13377aaa3a8fed (rtftok: stop sending sprm:CRgFtc{0,1,2} tokens, 2014-03-05) dropped support for case when a font name is used in multiple entries in the font table, but with different encodings. Turns out that this is a valid use-case, so revert back to the old behavior where the key of the encoding table is the font index, not the font name. Change-Id: I048dff58af801d704fd4bc75a6a4dcb0f03bf185 diff --git a/sw/qa/extras/rtfimport/data/fdo76628.rtf b/sw/qa/extras/rtfimport/data/fdo76628.rtf new file mode 100644 index 000..9429fb8 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo76628.rtf @@ -0,0 +1,10 @@ +{\rtf1\deff0 +{\fonttbl +{\f0\froman\fcharset204\fprq2 Times New Roman;} +{\f18\froman\fcharset0\fprq2 Times New Roman;} +} +{\header \pard\plain \'cf\'ee\'e4\'e3\'ee\'f2\'ee\'e2\'eb\'e5\'ed\'ee +\par } +{\pard\plain \'ce\'c1\'d0\'c0\'c7\'c5\'d6 +\par } +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index cb19476..2a56941 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1619,6 +1619,18 @@ DECLARE_RTFIMPORT_TEST(testDprectAnchor, dprect-anchor.rtf) CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getPropertytext::TextContentAnchorType(getShape(1), AnchorType)); } +DECLARE_RTFIMPORT_TEST(testFdo76628, fdo76628.rtf) +{ +OUString aExpected(\xd0\x9e\xd0\x91\xd0\xa0\xd0\x90\xd0\x97\xd0\x95\xd0\xa6, 14, RTL_TEXTENCODING_UTF8); +// Should be 'SAMPLE' in Russian, was garbage. +getParagraph(1, aExpected); + +uno::Referencetext::XText xHeaderText = getProperty uno::Referencetext::XText (getStyles(PageStyles)-getByName(DEFAULT_STYLE), HeaderText); +OUString aExpectedHeader(\xd0\x9f\xd0\xbe\xd0\xb4\xd0\xb3\xd0\xbe\xd1\x82\xd0\xbe\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xbe, 24, RTL_TEXTENCODING_UTF8); +// Should be 'prepared' in Russian, was garbage. +getParagraphOfText(1, xHeaderText, aExpectedHeader); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index cf7b0d6..57b106d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -380,6 +380,7 @@ void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId, OUString rIgnoreF pImpl-setAuthorInitials(m_aAuthorInitials); m_aAuthorInitials = ; } +pImpl-m_nDefaultFontIndex = m_nDefaultFontIndex; pImpl-seek(nPos); SAL_INFO(writerfilter, substream start); Mapper().substream(nId, pImpl); @@ -615,17 +616,17 @@ sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32 nIndex) return m_pSuperstream-getColorTable(nIndex); } -rtl_TextEncoding RTFDocumentImpl::getEncoding(const OUString aFontName) +rtl_TextEncoding RTFDocumentImpl::getEncoding(int nFontIndex) { if (!m_pSuperstream) { -std::mapOUString, rtl_TextEncoding::iterator it = m_aFontEncodings.find(aFontName); +std::mapint, rtl_TextEncoding::iterator it = m_aFontEncodings.find(nFontIndex); if (it != m_aFontEncodings.end()) return it-second; return msfilter::util::getBestTextEncodingFromLocale(Application::GetSettings().GetLanguageTag().getLocale()); } else -return m_pSuperstream-getEncoding(aFontName); +return m_pSuperstream-getEncoding(nFontIndex); } OUString RTFDocumentImpl::getFontName(int nIndex) @@ -1086,7 +1087,7 @@ void RTFDocumentImpl::text(OUString rString) m_aFontNames[m_nCurrentFontIndex] = aName; if (m_nCurrentEncoding 0) { -m_aFontEncodings[aName] = m_nCurrentEncoding; +m_aFontEncodings[m_nCurrentFontIndex] = m_nCurrentEncoding; m_nCurrentEncoding = 0; } m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Font_name, RTFValue::Pointer_t(new RTFValue(aName))); @@ -2471,9 +2472,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_PLAIN: { m_aStates.top().aCharacterSprms =
[Libreoffice-commits] core.git: vcl/generic vcl/source
vcl/generic/print/genprnpsp.cxx |2 +- vcl/source/src/print.src|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c067735f222d41698f4353fa7cbeaeb432573405 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 09:43:09 2014 +0100 make query fax number dialog a little less lame Change-Id: I73e68fcbbff5d153196e5ad617e04c3d5c52e513 diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 12ffe7a..2b92a64 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -117,7 +117,7 @@ namespace m_pOKButton-SetClickHdl(LINK(this, QueryString, ClickBtnHdl)); m_pFixedText-SetText(rQuery); m_pEdit-SetText(m_rReturnValue); -SetText(Application::GetDisplayName()); +SetText(rQuery); } IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton ) diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index e959e92..cbfe6ed 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -107,7 +107,7 @@ Image SV_PRINT_NOCOLLATE_IMG String SV_PRINT_QUERYFAXNUMBER_TXT { -Text [ en-US ] = Please enter the fax number.; +Text [ en-US ] = Please enter the fax number; }; String SV_PRINT_INVALID_TXT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/test76734_2K7.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 sw/source/filter/ww8/docxattributeoutput.cxx | 13 ++--- 3 files changed, 18 insertions(+), 3 deletions(-) New commits: commit df098f6207fdf79d566bf50cc2c2c87fcd295ff8 Author: Sourav sourav.maha...@synerzip.com Date: Fri Mar 28 18:25:39 2014 +0530 fdo76734-Text Box is not preserved for file created in MSWord 2007. Issue:Only one AlternateContent is getting written in the RT file irrespective of the number of TextBoxes in the original file which is causing the issue. RootCause is found in DocxAttributeOutput::OutputFlyFrame_Impl where under case sw::Frame::eTxtBox,m_aFramesOfParagraph.push_back(sw::Frame(rFrame)); is getting executed only once. push_back should happen as many number of times as there are TextBoxes in the original file. if(rFrame.GetFrmFmt().GetName() == m_aFramesOfParagraph[nIndex].GetFrmFmt().GetName()) bDuplicate = true; In the above check both the GetName() are returning values as empty which leads to bDuplicate equals TRUE and hence push_back does not happen. I have introduced one more check to handle this. Also changes are made in for loop to make it more efficient. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8782 Change-Id: I397aa3c4548cb57e8dacbf3fbf9ebaf87c0daa80 diff --git a/sw/qa/extras/ooxmlexport/data/test76734_2K7.docx b/sw/qa/extras/ooxmlexport/data/test76734_2K7.docx new file mode 100644 index 000..5e0e114 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test76734_2K7.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 1e1fd6d..68ef7ebb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3041,6 +3041,14 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76586, fdo76586.docx) assertXPath(pXmlDoc, //w:tblGrid/w:gridCol[2], w, 7843); } +DECLARE_OOXMLEXPORT_TEST(test76734_2K7, test76734_2K7.docx) +{ +xmlDocPtr pXmlDoc = parseExport(word/document.xml); +if (!pXmlDoc) +return; +assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1], Requires, wps); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4ba7f2b..04f5d37 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4179,10 +4179,17 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame rFrame, const Po { // The frame output is postponed to the end of the anchor paragraph bool bDuplicate = false; -for( unsigned nIndex = 0; nIndex m_aFramesOfParagraph.size(); ++nIndex ) +const OUString rName = rFrame.GetFrmFmt().GetName(); +unsigned nSize = m_aFramesOfParagraph.size(); +for( unsigned nIndex = 0; nIndex nSize; ++nIndex ) { -if( rFrame.GetFrmFmt().GetName() == m_aFramesOfParagraph[nIndex].GetFrmFmt().GetName() ) -bDuplicate = true; +const OUString rNameExisting = m_aFramesOfParagraph[nIndex].GetFrmFmt().GetName(); + +if (!rName.isEmpty() !rNameExisting.isEmpty()) +{ +if (rName == rNameExisting) +bDuplicate = true; +} } if( !bDuplicate ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlnumfi.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit dfcc851d65c8d81988843ef31a75b5d30051ddfd Author: Eike Rathke er...@redhat.com Date: Fri Apr 4 11:57:43 2014 +0200 accept proper number style condition != as not equal operator, fdo#76777 ODF 1.2 specifies '!=' as not equal operator in number:number-style style:map style:condition attribute. So far '' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index a9cf3dc..393f1db 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2068,7 +2068,14 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) if (!bDefaultCond) { -sal_Int32 nPos = sRealCond.indexOf( '.' ); +// Convert != to +sal_Int32 nPos = sRealCond.indexOf( != ); +if ( nPos = 0 ) +{ +sRealCond = sRealCond.replaceAt( nPos, 2, ); +} + +nPos = sRealCond.indexOf( '.' ); if ( nPos = 0 ) { // #i8026# #103991# localize decimal separator ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - ucb/Library_ucpdav1.mk
ucb/Library_ucpdav1.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 670c81edfcc7c5c004925d1e5362f107bf641a3a Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 4 13:15:50 2014 +0300 libapr needs -liconv on OS X Change-Id: Ic1f24d534779c8a04a8a27be70541693f0892b02 diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 46777de..81046e4 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ $(eval $(call gb_Library_add_libs,ucpdav1,\ $(if $(filter $(OS),LINUX),-lpthread -ldl) \ + $(if $(filter $(OS),MACOSX),-liconv) \ )) $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlnumfe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3bc729b4b97ff3df67bb7af541b088f88248a1ec Author: Eike Rathke er...@redhat.com Date: Fri Apr 4 12:22:49 2014 +0200 resolved fdo#76777 now write correct number style condition operator != https://gerrit.libreoffice.org/8834 and https://gerrit.libreoffice.org/8836 will prepare 4.2.4 and 4.1.6 to accept the correct != operator instead of that was written so far. Change-Id: Ib89bbaf096e2d459767c4d05e5bf5151a1120c1a diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 125035c..0cfb0cd 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -707,7 +707,7 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, switch ( nOp ) { case NUMBERFORMAT_OP_EQ: aCondStr.append( '=' ); break; -case NUMBERFORMAT_OP_NE: aCondStr.appendAscii( ); break; +case NUMBERFORMAT_OP_NE: aCondStr.appendAscii( != ); break; case NUMBERFORMAT_OP_LT: aCondStr.append( '' ); break; case NUMBERFORMAT_OP_LE: aCondStr.appendAscii( = ); break; case NUMBERFORMAT_OP_GT: aCondStr.append( '' ); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
On Thu, Apr 03, 2014 at 02:02:08PM -0700, julien2412 [via Document Foundation Mail Archive] wrote: I found another part however: 1622 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) ... 1641 return (nValue SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS; 1642 } whereas we have: 1644 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) ... 1663 return (nValue SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS; 1664 } (See http://opengrok.libreoffice.org/xref/core/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx#1622) One of them must be wrong. It would seem to me that indeed the ownDeletesAreVisible is wrong. OTOH, it was == and it was changed in (by Ocke Janssen, not Olivier Bolte, who as far as I understand has done the merge): commit bb075c9e3f2f8e0e9ce073a3dad5201f4e5fcc91 Author: Oliver Bolte o...@openoffice.org Date: Fri Mar 18 08:57:23 2005 + INTEGRATION: CWS dba25 (1.27.204); FILE MERGED 2005/03/04 11:37:35 oj 1.27.204.2: simple correct for ownDeletesAreVisible 2005/03/04 10:12:19 oj 1.27.204.1: correct operator order So I would like to be cautious there. I cannot find any definite source whether ownDeletesAreVisible means the deleted rows are still visible or the delete action is visible - the deleted rows are not visible. If we can find some good documentation or example from another JDBC driver... -- Lionel -- View this message in context: http://nabble.documentfoundation.org/About-parts-in-ODatabaseMetaData-cxx-connectivy-module-odbc-part-tp4104005p4104066.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 28 commits - filter/source forms/source include/svtools rsc/inc rsc/source sc/inc sc/source sd/source svl/source sw/source unusedcode.easy
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx |5 +- forms/source/component/imgprod.cxx | 14 + forms/source/xforms/xformsevent.hxx | 10 +++- include/svtools/imapcirc.hxx |4 - include/svtools/imappoly.hxx |4 - rsc/inc/rscdef.hxx |5 +- rsc/source/parser/rscpar.cxx |2 sc/inc/chgviset.hxx | 46 +-- sc/inc/pivot.hxx |2 sc/source/core/data/pivot2.cxx |9 --- sc/source/filter/inc/eeparser.hxx|4 - sc/source/filter/inc/pivottablebuffer.hxx|1 sc/source/filter/inc/rtfparse.hxx| 11 +++- sc/source/filter/inc/scflt.hxx |6 ++ sc/source/filter/lotus/lotattr.cxx |1 sc/source/filter/lotus/tool.cxx |1 sc/source/filter/oox/externallinkfragment.cxx|7 +- sc/source/filter/oox/stylesbuffer.cxx|5 +- sc/source/filter/oox/worksheethelper.cxx | 12 ++-- sc/source/filter/qpro/biff.cxx |9 ++- sc/source/ui/Accessibility/AccessibleContextBase.cxx | 15 -- sc/source/ui/dbgui/consdlg.cxx |6 ++ sc/source/ui/inc/AccessibleContextBase.hxx |4 - sd/source/ui/app/optsitem.cxx| 15 ++ sd/source/ui/dlg/docprev.cxx |2 sd/source/ui/unoidl/SdUnoOutlineView.cxx | 13 + svl/source/filerec/filerec.cxx |5 +- sw/source/core/docnode/ndtbl.cxx |2 sw/source/core/text/txtfly.cxx |1 sw/source/filter/inc/fltshell.hxx| 18 +-- unusedcode.easy |3 - 31 files changed, 119 insertions(+), 123 deletions(-) New commits: commit 2bd665fadb312356f09ba59ad84957bc88e35e6d Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 11:33:01 2014 +0100 callcatcher: another layer post pivottable conversion Change-Id: I58a6a1f0cf0d67bfadddb331364551776998908a diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 37bca61..6102137 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -163,8 +163,6 @@ struct ScPivotFuncData css::sheet::DataPilotFieldReference maFieldRef; explicit ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ); -explicit ScPivotFuncData( SCCOL nCol, long nOriginalDim, sal_uInt16 nFuncMask, sal_uInt8 nDupCount, - const css::sheet::DataPilotFieldReference rFieldRef ); bool operator== (const ScPivotFuncData r) const; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index 24e46cd..a88de02 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -215,15 +215,6 @@ ScPivotFuncData::ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ) : mnDupCount(0) {} -ScPivotFuncData::ScPivotFuncData(SCCOL nCol, long nOriginalDim, sal_uInt16 nFuncMask, - sal_uInt8 nDupCount, const DataPilotFieldReference rFieldRef) : -mnCol(nCol), -mnOriginalDim(nOriginalDim), -mnFuncMask(nFuncMask), -mnDupCount(nDupCount), -maFieldRef(rFieldRef) -{} - bool ScPivotFuncData::operator== (const ScPivotFuncData rFuncData) const { if (mnCol != rFuncData.mnCol || diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 9a19e13..f521e7a 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -521,21 +521,6 @@ void ScAccessibleContextBase::CommitChange(const AccessibleEventObject rEvent) comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent ); } -void ScAccessibleContextBase::ChangeName() -{ -AccessibleEventObject aEvent; -aEvent.EventId = AccessibleEventId::NAME_CHANGED; -aEvent.Source = uno::Reference XAccessibleContext (const_castScAccessibleContextBase*(this)); -aEvent.OldValue = msName; - -msName = ; // reset the name so it will be hold again -getAccessibleName(); // create the new name - -aEvent.NewValue = msName; - -CommitChange(aEvent); -} - void ScAccessibleContextBase::CommitFocusGained() const { AccessibleEventObject aEvent; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 943fca3..23a32d3 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -284,10 +284,6 @@ public: void CommitChange(const com::sun::star::accessibility::AccessibleEventObject rEvent) const; -/// change the name
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.cpp | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) New commits: commit b1d482cb6fa2182e15d73b0bb0d339c4000fc695 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 13:25:18 2014 +0200 Try hard to avoid a sequence of several Z segments Change-Id: I14a1f987ed59131fe3f262f81354da0f2d2fe21d diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp index 2da377a..c199aed 100644 --- a/src/lib/CDRContentCollector.cpp +++ b/src/lib/CDRContentCollector.cpp @@ -266,8 +266,11 @@ void libcdr::CDRContentCollector::_flushCurrentPath() } } - else -tmpPath.push_back(i()); + else if (i()[librevenge:path-action]-getStr() == Z) + { +if (tmpPath.back()[librevenge:path-action] tmpPath.back()[librevenge:path-action]-getStr() != Z) + tmpPath.push_back(i()); + } } if (!tmpPath.empty()) { @@ -275,9 +278,12 @@ void libcdr::CDRContentCollector::_flushCurrentPath() { if ((CDR_ALMOST_ZERO(initialX - previousX) CDR_ALMOST_ZERO(initialY - previousY)) || isPathClosed) { - librevenge::RVNGPropertyList closedPath; - closedPath.insert(librevenge:path-action, Z); - tmpPath.push_back(closedPath); + if (tmpPath.back()[librevenge:path-action] tmpPath.back()[librevenge:path-action]-getStr() != Z) + { +librevenge::RVNGPropertyList closedPath; +closedPath.insert(librevenge:path-action, Z); +tmpPath.push_back(closedPath); + } } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m | 18 ++ 1 file changed, 12 insertions(+), 6 deletions(-) New commits: commit 561f5a875379a01f1c31a5b0226bfefe82432df2 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 4 14:28:23 2014 +0300 Use tile coordinates for the DRAW_ONLY_TILE functionality CATiledLayer does not guarantee that tiles are drawn in the same order each time so using a tile number for DRAW_ONLY_TILE was not perfect. Use tile coordinates instead when wanting to restrict to showing just one tile. Change-Id: I23f4a3ecaf47cd3392d2d950bd279260b3a7b9f4 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m index cea417a..80680dd 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m @@ -102,6 +102,15 @@ static void updateTilesPerSecond(UILabel *label) return [CATiledLayer class]; } +static bool tileMatches(const char *spec, CGRect bb) +{ +int x, y; + +return (sscanf(spec, %d,%d, x, y) == 2 +x == (int) (bb.origin.x / bb.size.width) +y == (int) (bb.origin.y / bb.size.height)); +} + - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx { // Even if I set the CATL's tileSize to 512x512 above, this is @@ -129,10 +138,7 @@ static void updateTilesPerSecond(UILabel *label) // as needed at the current zoom levels. I keep thinking about // pixels incorrectly. -volatile static int number = 0; -int thisTile = number++; - -if (!getenv(DRAW_ONLY_TILE) || thisTile == atoi(getenv(DRAW_ONLY_TILE))) +if (!getenv(DRAW_ONLY_TILE) || tileMatches(getenv(DRAW_ONLY_TILE), bb)) touch_lo_draw_tile(ctx, tileSize.width, tileSize.height, CGPointMake(bb.origin.x/self.scale, bb.origin.y/self.scale), @@ -157,10 +163,10 @@ static void updateTilesPerSecond(UILabel *label) } if (getenv(DRAW_TILE_NUMBERS)) { -// Also draw the order number of the tile;) +// Also draw the coordinates of the tile;) CGContextSaveGState(ctx); float scale = 1/[((View *) [self superview]) zoomScale]; -NSString *s = [NSString stringWithFormat:@%d, thisTile]; +NSString *s = [NSString stringWithFormat:@%d,%d, (int) (bb.origin.x / bb.size.width), (int) (bb.origin.y / bb.size.height)]; CFAttributedStringRef as = CFAttributedStringCreate(NULL, (__bridge CFStringRef)(s), NULL); CTLineRef l = CTLineCreateWithAttributedString(as); CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/01/06040700.xhp |5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 1aa90a58fe65e3232beec56ccd08f60a2371ff69 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 13:04:39 2014 +0100 update help ids for smart tags tabpage .ui conversion Change-Id: I81dd180b5ca8b744fe9813131acdca86f4b7b108 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 5444c95..f2109e6 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2443,7 +2443,6 @@ HID_OFADLG_OPTIONS_TREE,35097, HID_OFADLG_TREELISTBOX,35098, HID_OFAPAGE_AUTOCORR_OPTIONS,35029, HID_OFAPAGE_AUTOFORMAT_CLB,35075, -HID_OFAPAGE_SMARTTAG_OPTIONS,35155, HID_OFA_FONT_SUBST_CLB,35084, HID_OFA_HYPERLINK_NAME,35079, HID_OFA_HYPERLINK_TARGET,35053, @@ -5897,7 +5896,6 @@ svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575, svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561, svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573, svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572, -svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194, @@ -6214,7 +6212,6 @@ svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RENAME,1241813511, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RUN,1241813507, svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK,1345966596, svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821, -svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743, svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837, svx_PushButton_RID_SFXPAGE_PATH_BTN_STANDARD,733581838, svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595, diff --git a/source/text/shared/01/06040700.xhp b/source/text/shared/01/06040700.xhp index 7880f45..ad246c1 100644 --- a/source/text/shared/01/06040700.xhp +++ b/source/text/shared/01/06040700.xhp @@ -30,6 +30,7 @@ /meta body section id=smarttags +bookmark xml-lang=en-US branch=hid/cui/ui/smarttagoptionspage/SmartTagOptionsPage id=bm_id8832055 localize=false/ bookmark xml-lang=en-US branch=index id=bm_id9057588bookmark_valuesmart tag configuration/bookmark_value /bookmarkcommentMW moved 2 index entries to the Writer guide smarttags.xhp and added a new one/commentparagraph role=heading id=hd_id3563951 xml-lang=en-US level=1 l10n=NEWSmart Tags/paragraph paragraph role=paragraph id=par_id1827448 xml-lang=en-US l10n=NEWahelp hid=.When you have installed at least one Smart Tag extension, you see the Smart Tags page./ahelp/paragraph @@ -38,11 +39,11 @@ embed href=text/shared/00/0406.xhp#autokosmarttags/ /section embed href=text/swriter/guide/smarttags.xhp#smarttags/ -bookmark xml-lang=en-US branch=hid/SVX_CHECKBOX_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS id=bm_id8832056 localize=false/paragraph role=heading id=hd_id68 xml-lang=en-US level=2 l10n=NEWLabel text with smart tags/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/smarttagoptionspage/main id=bm_id8832056 localize=false/paragraph role=heading id=hd_id68 xml-lang=en-US level=2 l10n=NEWLabel text with smart tags/paragraph paragraph role=paragraph id=par_id3259376 xml-lang=en-US l10n=NEWahelp hid=.Enables Smart Tags to be evaluated and shown in your text document./ahelp/paragraph paragraph role=heading id=hd_id4024170 xml-lang=en-US level=2 l10n=NEWCurrently installed smart tags/paragraph paragraph role=paragraph id=par_id2847071 xml-lang=en-US l10n=NEWahelp hid=.Displays all installed Smart Tags. To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/SVX_PUSHBUTTON_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS id=bm_id9547410 localize=false/paragraph role=heading id=hd_id8424329 xml-lang=en-US level=2 l10n=NEWProperties/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/smarttagoptionspage/properties id=bm_id9547410 localize=false/paragraph role=heading id=hd_id8424329 xml-lang=en-US level=2 l10n=NEWProperties/paragraph paragraph role=paragraph id=par_id3912167 xml-lang=en-US l10n=NEWahelp hid=.To configure a Smart Tag, select the name of the Smart Tag, then click Properties. Not all Smart Tags can be configured./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1f6d9d5b9e05440006a8cc96d1e02de18a3910f Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 13:04:39 2014 +0100 Updated core Project: help 1aa90a58fe65e3232beec56ccd08f60a2371ff69 diff --git a/helpcontent2 b/helpcontent2 index 296331d..1aa90a5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 296331ddff2fdc3d61fde8c762990f80bcc758e5 +Subproject commit 1aa90a58fe65e3232beec56ccd08f60a2371ff69 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk|1 cui/UIConfig_cui.mk|1 cui/source/inc/autocdlg.hxx|7 - cui/source/inc/cuires.hrc |1 cui/source/inc/helpid.hrc |1 cui/source/tabpages/autocdlg.cxx | 79 ++--- cui/source/tabpages/autocdlg.hrc | 64 - cui/source/tabpages/autocdlg.src | 72 --- cui/uiconfig/ui/smarttagoptionspage.ui | 123 + 9 files changed, 167 insertions(+), 182 deletions(-) New commits: commit d25b1bf2bd617a9e29fd27c9550170fef0469481 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 12:52:33 2014 +0100 convert smarttag options page to .ui Change-Id: Iae72fb5debaa5fe642cba940cf6775f5fd927fcd diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index bb32b79..ebc0ce4 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -51,7 +51,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/options/optlingu.src \ cui/source/options/optpath.src \ cui/source/options/treeopt.src \ -cui/source/tabpages/autocdlg.src \ cui/source/tabpages/border.src \ cui/source/tabpages/frmdirlbox.src \ cui/source/tabpages/page.src \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 8a4d328..cd18592 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/showcoldialog \ cui/uiconfig/ui/similaritysearchdialog \ cui/uiconfig/ui/slantcornertabpage \ + cui/uiconfig/ui/smarttagoptionspage \ cui/uiconfig/ui/smoothdialog \ cui/uiconfig/ui/solarizedialog \ cui/uiconfig/ui/specialcharacters \ diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index a74f09e..e6748d0 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -461,10 +461,9 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage private: // controls -CheckBoxm_aMainCB; -SvxCheckListBox m_aSmartTagTypesLB; -PushButton m_aPropertiesPB; -FixedText m_aTitleFT; +CheckBox* m_pMainCB; +SvxCheckListBox*m_pSmartTagTypesLB; +PushButton* m_pPropertiesPB; /// construction via Create() OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet rSet ); diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 6d2df87..2d7f527 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -128,7 +128,6 @@ #define OFA_TP_VIEW (RID_OFA_START + 202) #define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) #define RID_OFAPAGE_MSFILTEROPT2(RID_OFA_START + 121) -#define RID_OFAPAGE_SMARTTAG_OPTIONS(RID_OFA_START + 125) #define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) #define RID_SVXPAGE_OPTIONS_JAVA(RID_SVX_START + 253) #define RID_SVXPAGE_ABOUT_CONFIG(RID_SVX_START + 301) diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 263a788..8b23869 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -32,7 +32,6 @@ #define HID_OFA_FONT_SUBST_CLB CUI_HID_OFA_FONT_SUBST_CLB #define HID_DBPATH_CTL_PATH CUI_HID_DBPATH_CTL_PATH #define HID_DBPATH_HEADERBAR CUI_HID_DBPATH_HEADERBAR -#define HID_OFAPAGE_SMARTTAG_OPTIONS CUI_HID_OFAPAGE_SMARTTAG_OPTIONS #define HID_OFADLG_TREELISTBOX CUI_HID_OFADLG_TREELISTBOX #define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST #define HID_COLORPAGE_DOCCOLOR_LB CUI_HID_COLORPAGE_DOCCOLOR_LB diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f681ee7..43edca3 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -46,11 +46,11 @@ #include rtl/strbuf.hxx #include autocdlg.hxx -#include autocdlg.hrc #include helpid.hrc #include editeng/acorrcfg.hxx #include editeng/svxacorr.hxx #include cuicharmap.hxx +#include cuires.hrc #include editeng/unolingu.hxx #include dialmgr.hxx #include svx/svxids.hrc @@ -2357,22 +2357,23 @@ extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet rSet ) -: SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet), -m_aMainCB( this, CUI_RES(CB_SMARTTAGS) ), -m_aSmartTagTypesLB( this, CUI_RES(LB_SMARTTAGS) ), -m_aPropertiesPB( this, CUI_RES(PB_SMARTTAGS) ), -m_aTitleFT( this, CUI_RES(FT_SMARTTAGS) ) +: SfxTabPage(pParent, SmartTagOptionsPage, cui/ui/smarttagoptionspage.ui, rSet) { -FreeResource(); +get(m_pMainCB, main); +get(m_pSmartTagTypesLB, list); +
[Libreoffice-commits] core.git: filter/source
filter/source/flash/impswfdialog.cxx |4 - filter/source/flash/swfexporter.cxx | 22 - filter/source/flash/swfexporter.hxx |4 - filter/source/flash/swffilter.cxx| 19 - filter/source/flash/swfwriter.cxx| 129 --- filter/source/flash/swfwriter.hxx| 14 --- 6 files changed, 192 deletions(-) New commits: commit eaf260871e1cb00f7b9ff94efe788a197c174a04 Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Apr 4 17:47:11 2014 +0900 Drop dead code since 2002 AUGUSTUS has been never defined Change-Id: I7dafcf57586483f590f26a1c164c8f958aa511f3 Reviewed-on: https://gerrit.libreoffice.org/8835 Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index eea9ab8..3de33b2 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -54,10 +54,6 @@ ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence PropertyValue rFilterD mpCheckExportBackgrounds-Disable(); mpCheckExportBackgroundObjects-Disable(); mpCheckExportSlideContents-Disable(); - -#ifdef AUGUSTUS -mpCheckExportMultipleFiles-Check(); -#endif } diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index b9e7850..50ddc3b 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -359,28 +359,6 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference XDrawPage xDrawPage, s return nPage; } -#ifdef AUGUSTUS -sal_Bool FlashExporter::exportSound( Reference XOutputStream xOutputStream, const char* wavfilename ) -{ -try -{ -delete mpWriter; -mpWriter = new Writer( 0, 0, 0, 0 ); -} -catch( const Exception ) -{ -OSL_ASSERT( false ); -} - -if (!mpWriter-streamSound(wavfilename)) -return sal_False; -else -mpWriter-storeTo( xOutputStream ); - -return sal_True; -} -#endif // defined AUGUSTUS - sal_Int32 nPlaceDepth; diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 59138e3..f3ec8c8 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -160,10 +160,6 @@ public: sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference ::com::sun::star::drawing::XDrawPage xDrawPage, com::sun::star::uno::Reference com::sun::star::io::XOutputStream xOutputStream, sal_uInt16 nPage, sal_Bool bExportObjects ); sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference ::com::sun::star::drawing::XDrawPage xDrawPage, sal_uInt16 nPage, sal_Bool bExportObjects ); -#ifdef AUGUSTUS -sal_Bool exportSound( com::sun::star::uno::Reference com::sun::star::io::XOutputStream xOutputStream, const char* wavfilename ); -#endif - ChecksumCache gMasterCache; ChecksumCache gPrivateCache; ChecksumCache gObjectCache; diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 80969c7..7af99f1 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -381,25 +381,6 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence PropertyValue if (nPage nPageCount - 1) osl_writeFile(xBackgroundConfig, |, 1, bytesWritten); } - -#ifdef AUGUSTUS -if (findPropertyValuesal_Bool(aFilterData, ExportSound, true)) -{ -fullpath = swfdirpath + STR(/slide) + VAL(nPage+1) + STR(s.swf); - -OUString wavpath = sPath + STR(/) + sPresentationName + STR(.ppt-audio/slide) + VAL(nPage+1) + STR(.wav); -FileBase::getSystemPathFromFileURL(wavpath, wavpath); -OString sASCIIPath(wavpath.getStr(), wavpath.getLength(), RTL_TEXTENCODING_ASCII_US); - -ReferenceXOutputStream xOutputStreamWrap(*(new OslOutputStreamWrapper(fullpath)), UNO_QUERY); -sal_Bool ret = aFlashExporter.exportSound(xOutputStreamWrap, sASCIIPath.getStr()); -aFlashExporter.Flush(); -xOutputStreamWrap.clear(); - -if (!ret) -osl_removeFile(fullpath.pData); -} -#endif // defined AUGUSTUS } if (bExportAll) diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 9e3aa19..a2fda1a 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -66,7 +66,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int mnDocXScale = (double)nTWIPWidthOutput / mnDocWidth; mnDocYScale = (double)nTWIPHeightOutput / mnDocHeight; -#ifndef AUGUSTUS // define an invisible button with the size of a page Rectangle aRect( 0, 0, (long)( mnDocWidth * mnDocXScale ), (long)( mnDocHeight *
Re: About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
Le 04/04/2014 13:13, Lionel Elie Mamane a écrit : Hi, So I would like to be cautious there. I cannot find any definite source whether ownDeletesAreVisible means the deleted rows are still visible or the delete action is visible - the deleted rows are not visible. If we can find some good documentation or example from another JDBC driver... In StarOffice 5.x and then OpenOffice.org, the DBF driver used to allow a user to see deleted tuples in the data source browser pane and in table view mode, and as far as I can remember it was an option in the UI that could be switched on/off. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extensions/source
extensions/source/plugin/base/nfuncs.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 4da62012fea1796c1fed5bb2d87a353d1be79ea5 Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Apr 3 13:28:47 2014 +0900 Fix a memory leak by freeing last pBytes Change-Id: I7d170d704fa8950057698856d12df63992e38381 Reviewed-on: https://gerrit.libreoffice.org/8822 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index d56e02a..796a4a1 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -44,6 +44,7 @@ #include plugin/impl.hxx #include vcl/svapp.hxx +#include boost/scoped_array.hpp #if OSL_DEBUG_LEVEL 1 #include osl/thread.h @@ -425,20 +426,19 @@ extern C { return NPERR_FILE_NOT_FOUND; PluginInputStream* pInputStream = (PluginInputStream*)pStream; -sal_Int8* pBytes = NULL; +boost::scoped_arraysal_Int8 pBytes; int nBytes = 0; pPlugin-enterPluginCallback(); while( rangeList ) { if( pBytes nBytes (int)rangeList-length ) -{ -delete [] pBytes; -pBytes = NULL; +pBytes.reset(); +if( ! pBytes ) { +nBytes = rangeList-length; +pBytes.reset(new sal_Int8[ nBytes ]); } -if( ! pBytes ) -pBytes = new sal_Int8[ nBytes = rangeList-length ]; int nRead = -pInputStream-read( rangeList-offset, pBytes, rangeList-length ); +pInputStream-read( rangeList-offset, pBytes.get(), rangeList-length ); int nPos = 0; int nNow; do @@ -451,7 +451,7 @@ extern C { stream, rangeList-offset + nPos, nNow, - pBytes+nPos ); + pBytes.get()+nPos ); nPos += nNow; nRead -= nNow; } while( nRead 0 nNow ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source canvas/source connectivity/source desktop/source extensions/source forms/source include/sal mysqlc/source registry/source sc/source sdext/source sv
accessibility/source/extended/textwindowaccessibility.cxx |7 --- canvas/source/tools/spriteredrawmanager.cxx |6 -- connectivity/source/commontools/parameters.cxx|7 +-- connectivity/source/drivers/hsqldb/HConnection.cxx|2 +- connectivity/source/drivers/kab/KDriver.cxx |2 +- connectivity/source/drivers/macab/MacabDriver.cxx |2 +- desktop/source/deployment/registry/component/dp_component.cxx |2 +- extensions/source/propctrlr/formlinkdialog.cxx|4 +++- forms/source/richtext/richtextimplcontrol.cxx |2 +- include/sal/log-areas.dox |6 ++ mysqlc/source/mysqlc_driver.cxx |2 +- registry/source/keyimpl.cxx |2 +- sc/source/core/data/documen2.cxx |2 +- sdext/source/pdfimport/wrapper/wrapper.cxx|2 +- svtools/source/toolpanel/paneltabbar.cxx |4 ++-- svx/source/form/formcontroller.cxx|2 +- unotools/source/config/bootstrap.cxx |5 +++-- 17 files changed, 37 insertions(+), 22 deletions(-) New commits: commit 453ee351f32494b1f30b477069cc7a1834352377 Author: Michaël Lefèvre lefevr...@yahoo.fr Date: Fri Apr 4 00:13:31 2014 +0200 fdo#43157 : clean up more OSL_POSTCOND Change-Id: Iaca31b4e12c258b762b3d88fbad0fb08b4f1fc16 Reviewed-on: https://gerrit.libreoffice.org/8832 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index e289104..fe77780 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1856,9 +1856,10 @@ void Document::determineVisibleRange() } } -OSL_POSTCOND( -(m_aVisibleBegin == m_xParagraphs-end() m_aVisibleEnd == m_xParagraphs-end() m_nVisibleBeginOffset == 0) -|| (m_aVisibleBegin m_aVisibleEnd m_nVisibleBeginOffset = 0), +SAL_WARN_IF( +!((m_aVisibleBegin == m_xParagraphs-end() m_aVisibleEnd == m_xParagraphs-end() m_nVisibleBeginOffset == 0) +|| (m_aVisibleBegin m_aVisibleEnd m_nVisibleBeginOffset = 0)), +accessibility, invalid visible range); } diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index ee97967..7873883 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -366,9 +366,11 @@ namespace canvas ::basegfx::B2DRectangle aTotalBounds( o_rMoveStart ); aTotalBounds.expand( o_rMoveEnd ); -OSL_POSTCOND(impIsEqualB2DRange(rUpdateArea.maTotalBounds, basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange(aTotalBounds), 0.5), +SAL_WARN_IF(!impIsEqualB2DRange(rUpdateArea.maTotalBounds, basegfx::unotools::b2DSurroundingIntegerRangeFromB2DRange(aTotalBounds), 0.5), +canvas, SpriteRedrawManager::isAreaUpdateScroll(): sprite area and total area mismatch); -OSL_POSTCOND(impIsEqualB2DVector(o_rMoveStart.getRange(), o_rMoveEnd.getRange(), 0.5), +SAL_WARN_IF(!impIsEqualB2DVector(o_rMoveStart.getRange(), o_rMoveEnd.getRange(), 0.5), +canvas, SpriteRedrawManager::isAreaUpdateScroll(): scroll start and end area have mismatching size); #endif diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 77599d8..09f5dca 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -322,7 +322,8 @@ namespace dbtools if ( bValidLink ) aStrippedMasterFields.push_back( *pMasterFields ); } -OSL_POSTCOND( aStrippedMasterFields.size() == aStrippedDetailFields.size(), +SAL_WARN_IF( aStrippedMasterFields.size() != aStrippedDetailFields.size(), +connectivity.commontools, ParameterManager::classifyLinks: inconsistency in new link pairs! ); if ( bNeedExchangeLinks ) @@ -502,7 +503,9 @@ namespace dbtools return; } // if ( !initializeComposerByComponent( m_xComponent ) ) } -OSL_POSTCOND( m_xInnerParamColumns.is(), ParameterManager::updateParameterInfo: initializeComposerByComponent did nonsense (1)! ); +SAL_WARN_IF( !m_xInnerParamColumns.is(), +connectivity.commontools, +ParameterManager::updateParameterInfo: initializeComposerByComponent did nonsense (1)! ); // collect all parameters which are defined by
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #20 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=453ee351f32494b1f30b477069cc7a1834352377 fdo#43157 : clean up more OSL_POSTCOND 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
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/base.desktop|1 - sysui/desktop/menus/calc.desktop|1 - sysui/desktop/menus/draw.desktop|1 - sysui/desktop/menus/impress.desktop |1 - sysui/desktop/menus/math.desktop|1 - sysui/desktop/menus/startcenter.desktop |6 -- sysui/desktop/menus/writer.desktop |1 - 7 files changed, 12 deletions(-) New commits: commit 84770f1fbfd456f70c5c48e158b268a773ca9c45 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 13:52:01 2014 +0100 drop OnlyShowIn from .desktop files mclasen I see libreoffice installs desktop actions with OnlyShowIn=Unity mclasen I believe OnlyShowIn for actions was kicked out when they got merged in the spec caolan mclasen: so drop the OnlyShowIn lines ? mclasen would be my recommendation Change-Id: I5d119d361be197bac3fc20c08b4e43f11f4b0c0c diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 62626d4..26f1c6a 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -37,4 +37,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Database Exec=${UNIXBASISROOTNAME} --base -OnlyShowIn=Unity; diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index e50de65..fc5e241 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -37,4 +37,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Spreadsheet Exec=${UNIXBASISROOTNAME} --calc -OnlyShowIn=Unity; diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index a807fe0..b5d58ce 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -37,4 +37,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Drawing Exec=${UNIXBASISROOTNAME} --draw -OnlyShowIn=Unity; diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index fda44e4..c1f6231 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -37,4 +37,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Presentation Exec=${UNIXBASISROOTNAME} --impress -OnlyShowIn=Unity; diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 57b1734..b6981f5 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -38,4 +38,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Formula Exec=${UNIXBASISROOTNAME} --math -OnlyShowIn=Unity; diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index dabe887..3858c89 100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -38,31 +38,25 @@ Actions=Writer;Calc;Impress;Draw;Base;Math; [Desktop Action Writer] Name=Text Document Exec=${UNIXBASISROOTNAME} --writer -OnlyShowIn=Unity; [Desktop Action Calc] Name=Spreadsheet Exec=${UNIXBASISROOTNAME} --calc -OnlyShowIn=Unity; [Desktop Action Impress] Name=Presentation Exec=${UNIXBASISROOTNAME} --impress -OnlyShowIn=Unity; [Desktop Action Draw] Name=Drawing Exec=${UNIXBASISROOTNAME} --draw -OnlyShowIn=Unity; [Desktop Action Base] Name=Database Exec=${UNIXBASISROOTNAME} --base -OnlyShowIn=Unity; [Desktop Action Math] Name=Formula Exec=${UNIXBASISROOTNAME} --math -OnlyShowIn=Unity; ##End of actions menu diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index e59187e..c4cea12 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -37,4 +37,3 @@ Actions=NewDocument; [Desktop Action NewDocument] Name=New Document Exec=${UNIXBASISROOTNAME} --writer -OnlyShowIn=Unity; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 62957] FILESAVE: Save Last Slide Position in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=62957 --- Comment #13 from Sujay sujaym.suj...@gmail.com --- (In reply to comment #12) You should go to the IRC channel or the dev mailing list - not many people will follow the bug tracker so you might get faster/better feedback going to the list/chat I usually ask in the irc or dev list. i wanted to update what i ve done, and thought i will put a question in there too. I ll ask in IRC.. Thank you for the quick reply :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - editeng/source sc/source
editeng/source/uno/unotext.cxx |2 +- sc/source/ui/app/scdll.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6a761619141a42123c64b942bdfd24294e3a7b91 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 13:57:14 2014 +0100 translate comment for posterity anyway Change-Id: I0a83f1a2fd50d8772b02ae61bf903123c4779fc8 diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 63a68c9..755839a 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -248,7 +248,7 @@ void ScDLL::Init() // Child-Windows -// Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist +// Hack: register input line with 42 so it is always visible in the PlugIn ScInputWindowWrapper::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); ScNavigatorDialogWrapper ::RegisterChildWindowContext(static_castsal_uInt16(ScTabViewShell::GetInterfaceId()), pMod); ScSolverDlgWrapper ::RegisterChildWindow(false, pMod); commit 3d330f20ef65a8723bcb1b4fde7a673a41b5554c Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 15:56:55 2014 +0100 Resolves: coverity#705447 Self assignment in every other !bAbsorb branch we set the StartPara to the EndPara Change-Id: I4fc877e9d63f823679acf9c4b1550d5e877819be diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 9c46bfb..1bbd3b2 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1891,8 +1891,8 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference text } else { +aRange.nStartPara = aRange.nEndPara; aRange.nStartPos = aRange.nEndPos; -aRange.nStartPara = aRange.nStartPara; } pForwarder-QuickInsertLineBreak( aRange ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.cpp | 40 +--- 1 file changed, 37 insertions(+), 3 deletions(-) New commits: commit 168d996f23d74ea2a47b4d06e841e3fc9a87f97a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 14:59:13 2014 +0200 First try of YIQ Change-Id: I14e981584a5d62cc9e1eff8da5821530c99ff43c diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 01d318b..9ac58e5 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -479,12 +479,46 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor color) } // YIQ case 0x0a: - { -break; - } // YIQ255 case 0x0b: { +double y = (double)col0; +double i = (double)col1; +double q = (double)col2; +if (colorModel == 0x0a) +{ + y /= 100.0; + i /= 100.0; + q /= 100.0; +} +else +{ + y /= 255.0; + i /= 255.0; + q /= 255.0; +} +i /= 2.0*0.5957; +i -= 0.5957; +q /= 2.0*0.5226; +q -= 0.5226; +double RR = y + 0.9563*i + 0.6210*q; +double GG = y - 0.2127*i - 0.6474*q; +double BB = y - 1.1070*i + 1.7046*q; +if (RR 1.0) + RR = 1.0; +if (RR 0.0) + RR = 0.0; +if (GG 1.0) + GG = 1.0; +if (GG 0.0) + GG = 0.0; +if (BB 1.0) + BB = 1.0; +if (BB 0.0) + BB = 0.0; +red = (unsigned char)cdr_round(255*RR); +green = (unsigned char)cdr_round(255*GG); +blue = (unsigned char)cdr_round(255*BB); break; } // Lab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdicommon.cxx |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit d4cfcac610e96cd5d1afecc5a23f715298dad939 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 4 13:21:28 2014 +0300 Add more CG_TRACEs for completeness Change-Id: If502c3f11c034f3c7386754d84d694a7119c0d37 diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 7134675..33ee232 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1601,14 +1601,19 @@ void AquaSalGraphics::ResetClipRegion() void AquaSalGraphics::SetState() { +CG_TRACE( CGContextRestoreGState( mrContext ) mnContextStackDepth--); CGContextRestoreGState( mrContext ); +CG_TRACE( CGContextSaveGState( mrContext ) ++mnContextStackDepth ); CGContextSaveGState( mrContext ); // setup clipping if( mxClipPath ) { +CG_TRACE( CGContextBeginPath( mrContext ) ); CGContextBeginPath( mrContext );// discard any existing path +CG_TRACE( CGContextAddPath( mrContext , mxClipPath ) ); CGContextAddPath( mrContext, mxClipPath ); // set the current path to the clipping path +CG_TRACE( CGContextClip( mrContext ) ); CGContextClip( mrContext ); // use it for clipping } @@ -1998,7 +2003,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex // We will return early a few lines lower. // Undo the stack initialization done at the initial call of // this method, see end. -CG_TRACE( CGContextRestoreGState( mrContext ) ); +CG_TRACE( CGContextRestoreGState( mrContext ) mnContextStackDepth--); CGContextRestoreGState( mrContext ); } #endif @@ -2048,7 +2053,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex } // initialize stack of CGContext states -CG_TRACE( CGContextSaveGState( mrContext ) ); +CG_TRACE( CGContextSaveGState( mrContext ) ++mnContextStackDepth ); CGContextSaveGState( mrContext ); SetState(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xlsx/functions-excel-2010.xlsx |binary sc/qa/unit/subsequent_filters-test.cxx | 17 - 2 files changed, 12 insertions(+), 5 deletions(-) New commits: commit 50820ace559d715891e35d9cf1213001049c96a4 Author: Eike Rathke er...@redhat.com Date: Fri Apr 4 15:21:37 2014 +0200 updated test document for new Excel functions, fdo#70798 https://bugs.freedesktop.org/attachment.cgi?id=96899 Two function calls currently fail where implementation needs to be fixed: - row 45, function name=[ NETWORKDAYS.INTL ], result=18, expected=19 - row 79, function name=[ WORKDAY.INTL ], result=41755 , expected=41754 Change-Id: Ibb58dfa2f8687c7daa2cb7409803cd14b015dc98 diff --git a/sc/qa/unit/data/xlsx/functions-excel-2010.xlsx b/sc/qa/unit/data/xlsx/functions-excel-2010.xlsx index 208c1c5..c6d6ebb8ab 100644 Binary files a/sc/qa/unit/data/xlsx/functions-excel-2010.xlsx and b/sc/qa/unit/data/xlsx/functions-excel-2010.xlsx differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 1e08cf7..92429ad 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -465,9 +465,9 @@ void ScFiltersTest::testFunctionsExcel2010() { 40, true }, { 41, true }, { 42, true }, -{ 43, false }, // fdo73147 to be set to true +{ 43, true }, { 44, true }, -{ 45, true }, +{ 45, false }, // name=[ NETWORKDAYS.INTL ], result=18, expected=19 { 46, true }, { 47, true }, { 48, true }, @@ -488,14 +488,21 @@ void ScFiltersTest::testFunctionsExcel2010() { 63, true }, { 64, true }, { 65, true }, -{ 66, false }, +{ 66, true }, { 67, true }, { 68, true }, { 69, true }, { 70, true }, { 71, true }, -{ 72, false }, // fdo73147 to be set to true -{ 73, true } +{ 72, true }, +{ 73, true }, +{ 74, true }, +{ 75, true }, +{ 76, true }, +{ 77, true }, +{ 78, true }, +{ 79, false }, // name=[ WORKDAY.INTL ], result=41755 , expected=41754 +{ 80, true } }; for (size_t i=0; i SAL_N_ELEMENTS(aTests); ++i) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67712, which changed state. Bug 67712 Summary: FORMCONTROLS: anchored to cell but changes position after reopening https://bugs.freedesktop.org/show_bug.cgi?id=67712 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sfx2 sc/source sfx2/source
include/sfx2/childwin.hxx|2 +- sc/source/ui/app/scdll.cxx |3 +-- sfx2/source/appl/workwin.cxx |3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) New commits: commit ca479763afc33824abc7afeaf41a5de1010ac777 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 14:01:43 2014 +0100 I can't see that the bVisible as 42 is any difference from 'true' ...in practise. If I'm wrong then this needs to be a TriState Change-Id: I4aa499c89ce2f1a46edf443db053b264f285b0d5 diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 03fa2c6..8e2827b 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -50,7 +50,7 @@ class SfxChildWindowContext; // ChildWindow Configuration struct SfxChildWinInfo { -sal_BoolbVisible; // this can be sal_True, or sal_False, or 42 +boolbVisible; Point aPos; SizeaSize; sal_uInt16 nFlags; diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 755839a..4a7f182 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -248,8 +248,7 @@ void ScDLL::Init() // Child-Windows -// Hack: register input line with 42 so it is always visible in the PlugIn -ScInputWindowWrapper::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); +ScInputWindowWrapper::RegisterChildWindow(true, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); ScNavigatorDialogWrapper ::RegisterChildWindowContext(static_castsal_uInt16(ScTabViewShell::GetInterfaceId()), pMod); ScSolverDlgWrapper ::RegisterChildWindow(false, pMod); ScOptSolverDlgWrapper ::RegisterChildWindow(false, pMod); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 8eec8bcb..a8b8973 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1514,8 +1514,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFocus ) { -if ( pCW-aInfo.bVisible != 42 ) -pCW-aInfo.bVisible = sal_True; +pCW-aInfo.bVisible = true; SfxChildWindow *pChildWin = SfxChildWindow::CreateChildWindow( pCW-nId, pWorkWin, GetBindings(), pCW-aInfo); if (pChildWin) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.cpp | 33 +++-- 1 file changed, 19 insertions(+), 14 deletions(-) New commits: commit 534d406ff9f6b124fddb3e18b44176aaba54f032 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 15:30:06 2014 +0200 YIQ255 - second service - deuce Change-Id: I7cc39c45a3d4a826a20d4e57dc703bec7bd0818e diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 9ac58e5..ae5a744 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -477,30 +477,35 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor color) blue = col0; break; } - // YIQ - case 0x0a: // YIQ255 case 0x0b: { double y = (double)col0; double i = (double)col1; double q = (double)col2; -if (colorModel == 0x0a) -{ + +y -= 100.0; +if (y 0.0) y /= 100.0; +else + y /= 155.0; +y *= 0.5; +y += 0.5; + +i -= 100.0; +if (i = 0.0) i /= 100.0; +else + i /= 155; +i *= 0.5957; + +q -= 100.0; +if (q = 0) q /= 100.0; -} else -{ - y /= 255.0; - i /= 255.0; - q /= 255.0; -} -i /= 2.0*0.5957; -i -= 0.5957; -q /= 2.0*0.5226; -q -= 0.5226; + q /= 155; +q *= 0.5226; + double RR = y + 0.9563*i + 0.6210*q; double GG = y - 0.2127*i - 0.6474*q; double BB = y - 1.1070*i + 1.7046*q; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - 2 commits - src/lib
src/lib/CDRCollector.cpp | 49 ++- 1 file changed, 44 insertions(+), 5 deletions(-) New commits: commit 3aee2631795df394df7f69b6e30fa74fbd837618 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 15:30:06 2014 +0200 YIQ255 - second service - deuce Change-Id: I7cc39c45a3d4a826a20d4e57dc703bec7bd0818e (cherry picked from commit 534d406ff9f6b124fddb3e18b44176aaba54f032) diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 3bf86f7..0140a4f 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -497,30 +497,35 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor color) blue = col0; break; } - // YIQ - case 0x0a: // YIQ255 case 0x0b: { double y = (double)col0; double i = (double)col1; double q = (double)col2; -if (colorModel == 0x0a) -{ + +y -= 100.0; +if (y 0.0) y /= 100.0; +else + y /= 155.0; +y *= 0.5; +y += 0.5; + +i -= 100.0; +if (i = 0.0) i /= 100.0; +else + i /= 155; +i *= 0.5957; + +q -= 100.0; +if (q = 0) q /= 100.0; -} else -{ - y /= 255.0; - i /= 255.0; - q /= 255.0; -} -i /= 2.0*0.5957; -i -= 0.5957; -q /= 2.0*0.5226; -q -= 0.5226; + q /= 155; +q *= 0.5226; + double RR = y + 0.9563*i + 0.6210*q; double GG = y - 0.2127*i - 0.6474*q; double BB = y - 1.1070*i + 1.7046*q; commit f90de3de9839f31ca6c7cb5479b6fd73506ad5dc Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 14:59:13 2014 +0200 First try of YIQ Change-Id: I14e981584a5d62cc9e1eff8da5821530c99ff43c (cherry picked from commit 168d996f23d74ea2a47b4d06e841e3fc9a87f97a) diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 3083855..3bf86f7 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -499,12 +499,46 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor color) } // YIQ case 0x0a: - { -break; - } // YIQ255 case 0x0b: { +double y = (double)col0; +double i = (double)col1; +double q = (double)col2; +if (colorModel == 0x0a) +{ + y /= 100.0; + i /= 100.0; + q /= 100.0; +} +else +{ + y /= 255.0; + i /= 255.0; + q /= 255.0; +} +i /= 2.0*0.5957; +i -= 0.5957; +q /= 2.0*0.5226; +q -= 0.5226; +double RR = y + 0.9563*i + 0.6210*q; +double GG = y - 0.2127*i - 0.6474*q; +double BB = y - 1.1070*i + 1.7046*q; +if (RR 1.0) + RR = 1.0; +if (RR 0.0) + RR = 0.0; +if (GG 1.0) + GG = 1.0; +if (GG 0.0) + GG = 0.0; +if (BB 1.0) + BB = 1.0; +if (BB 0.0) + BB = 0.0; +red = (unsigned char)cdr_round(255*RR); +green = (unsigned char)cdr_round(255*GG); +blue = (unsigned char)cdr_round(255*BB); break; } // Lab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: Branch 'libcdr-0.0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e29774fa8f4f7e915842070ec689c829d5ca2fa1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 15:38:48 2014 +0200 Bump to 0.0.15 and multiply the content of NEWS Change-Id: I39ecdf9566f0196decc1505eb0fc2e7bbe6cc37e diff --git a/configure.ac b/configure.ac index 689e44d..404a0f7 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libcdr_version_major],[0]) m4_define([libcdr_version_minor],[0]) -m4_define([libcdr_version_micro],[14]) +m4_define([libcdr_version_micro],[15]) m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.15'
Tag 'libcdr-0.0.15' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2014-04-04 14:39 -0700 Tagging the libcdr 0.0.15 release Changes since libcdr-0.0.14-37: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/macosx-codesign-app-bundle |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0927d77cfb284704e7586ccde83f8d6fb26cc459 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Jan 10 16:51:26 2014 -0600 give an identifier to the app_bundle itself Language Pack did not seem to pick a decent default value for that Change-Id: I567f24882e16533e10d8ba91b777ad91dc507b87 Reviewed-on: https://gerrit.libreoffice.org/7485 Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index 5d65b2a..99f7565 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -19,7 +19,7 @@ for V in \ fi done -APP_BUNDLE=$1 +APP_BUNDLE=$1 # Sign dylibs # @@ -72,6 +72,6 @@ if test $ENABLE_MACOSX_SANDBOX = TRUE; then entitlements=--entitlements $BUILDDIR/lo.xcent fi -codesign --force --verbose --sign $MACOSX_CODESIGNING_IDENTITY $entitlements $APP_BUNDLE +codesign --force --verbose --identifier=${MACOSX_BUNDLE_IDENTIFIER}.$(basename ${APP_BUNDLE}) --sign $MACOSX_CODESIGNING_IDENTITY $entitlements $APP_BUNDLE exit 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cppuhelper/source sccomp/source sc/source
cppuhelper/source/servicemanager.cxx |7 +-- sc/source/ui/miscdlgs/solverutil.cxx | 72 +++ sccomp/source/solver/CoinMPSolver.cxx|5 ++ sccomp/source/solver/LpsolveSolver.cxx |5 ++ sccomp/source/solver/SolverComponent.cxx |5 -- sccomp/source/solver/SolverComponent.hxx |2 6 files changed, 32 insertions(+), 64 deletions(-) New commits: commit 5f0321b3d0666e2f9011a76e6e0a5e4efaf91c5f Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Apr 4 09:27:38 2014 +0200 fix creating com.sun.star.sheet.Solver instance Change-Id: I100d45b8f749ece5496d8e5a0e3343dee96f7138 diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 6a0543c..94d2ec5 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -1246,10 +1246,9 @@ cppuhelper::ServiceManager::createContentEnumeration( } else if (impl-factory2.is()) { factories.push_back(css::uno::makeAny(impl-factory2)); } else { -throw css::uno::DeploymentException( -(Implementation + impl-info-name - + does not provide a factory), -static_cast cppu::OWeakObject * (this)); +css::uno::Reference css::lang::XSingleComponentFactory factory( +new ImplementationWrapper(this, *i)); +factories.push_back(css::uno::makeAny(factory)); } } return new ContentEnumeration(factories); diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index a8f401d..bf98592 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -20,10 +20,8 @@ #include solverutil.hxx #include com/sun/star/container/XContentEnumerationAccess.hpp -#include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/lang/XSingleComponentFactory.hpp -#include com/sun/star/lang/XSingleServiceFactory.hpp #include com/sun/star/beans/XPropertySet.hpp #include com/sun/star/beans/PropertyValue.hpp #include com/sun/star/sheet/XSolver.hpp @@ -37,39 +35,6 @@ using namespace com::sun::star; #define SCSOLVER_SERVICE com.sun.star.sheet.Solver -static uno::Referencesheet::XSolver lcl_CreateSolver( const uno::Referenceuno::XInterface xIntFac, - const uno::Referenceuno::XComponentContext xCtx ) -{ -uno::Referencesheet::XSolver xSolver; - -uno::Referencelang::XSingleComponentFactory xCFac( xIntFac, uno::UNO_QUERY ); -uno::Referencelang::XSingleServiceFactory xFac( xIntFac, uno::UNO_QUERY ); -if ( xCFac.is() ) -{ -try -{ -uno::Referenceuno::XInterface xInterface = xCFac-createInstanceWithContext(xCtx); -xSolver = uno::Referencesheet::XSolver( xInterface, uno::UNO_QUERY ); -} -catch(uno::Exception) -{ -} -} -if ( !xSolver.is() xFac.is() ) -{ -try -{ -uno::Referenceuno::XInterface xInterface = xFac-createInstance(); -xSolver = uno::Referencesheet::XSolver( xInterface, uno::UNO_QUERY ); -} -catch(uno::Exception) -{ -} -} - -return xSolver; -} - void ScSolverUtil::GetImplementations( uno::SequenceOUString rImplNames, uno::SequenceOUString rDescriptions ) { @@ -78,10 +43,9 @@ void ScSolverUtil::GetImplementations( uno::SequenceOUString rImplNames, uno::Referenceuno::XComponentContext xCtx( comphelper::getProcessComponentContext() ); -uno::Referencelang::XMultiServiceFactory xMSF( -xCtx-getServiceManager(), uno::UNO_QUERY_THROW ); -uno::Referencecontainer::XContentEnumerationAccess xEnAc( xMSF, uno::UNO_QUERY ); +uno::Referencecontainer::XContentEnumerationAccess xEnAc( +xCtx-getServiceManager(), uno::UNO_QUERY ); if ( xEnAc.is() ) { uno::Referencecontainer::XEnumeration xEnum = @@ -92,17 +56,18 @@ void ScSolverUtil::GetImplementations( uno::SequenceOUString rImplNames, while ( xEnum-hasMoreElements() ) { uno::Any aAny = xEnum-nextElement(); -uno::Referenceuno::XInterface xIntFac; -aAny = xIntFac; -if ( xIntFac.is() ) +uno::Referencelang::XServiceInfo xInfo; +aAny = xInfo; +if ( xInfo.is() ) { -uno::Referencelang::XServiceInfo xInfo( xIntFac, uno::UNO_QUERY ); -if ( xInfo.is() ) +uno::Referencelang::XSingleComponentFactory xCFac( xInfo, uno::UNO_QUERY ); +if ( xCFac.is() ) { OUString sName = xInfo-getImplementationName(); OUString sDescription;
[Libreoffice-commits] core.git: download.lst external/libcdr
download.lst|4 ++-- external/libcdr/UnpackedTarball_libcdr.mk |4 external/libcdr/libcdr-wpx_seek_end.patch.1 | 14 -- 3 files changed, 2 insertions(+), 20 deletions(-) New commits: commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 15:45:36 2014 +0200 Uploading libcdr-0.0.15: Support for CorelDraw x7 Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520 diff --git a/download.lst b/download.lst index 733f4c7..09b64ac 100644 --- a/download.lst +++ b/download.lst @@ -4,8 +4,8 @@ APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d export APR_TARBALL := apr-1.4.8.tar.gz APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz -CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 -export CDR_TARBALL := libcdr-0.0.14.tar.bz2 +CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998 +export CDR_TARBALL := libcdr-0.0.15.tar.bz2 COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129 export COINMP_TARBALL := CoinMP-1.7.6.tgz EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978 diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index dff6a57..a91bc8e 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ - external/libcdr/libcdr-wpx_seek_end.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/libcdr-wpx_seek_end.patch.1 b/external/libcdr/libcdr-wpx_seek_end.patch.1 deleted file mode 100644 index 67b8587..000 --- a/external/libcdr/libcdr-wpx_seek_end.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ a/src/lib/CDRZipStream.cpp -+++ b/src/lib/CDRZipStream.cpp -@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name) - - bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd() - { --#if defined(LIBWPD_STREAM_VERSION_MAJOR) defined(LIBWPD_STREAM_VERSION_MINOR) defined(LIBWPD_STREAM_VERSION_REVISION) \ -- (LIBWPD_STREAM_VERSION_MAJOR 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 (LIBWPD_STREAM_VERSION_MINOR 9 \ -- || (LIBWPD_STREAM_VERSION_MINOR == 9 LIBWPD_STREAM_VERSION_REVISION = 5 - if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END)) --#endif - m_input-seek(m_cdir_offset, WPX_SEEK_SET); - try - { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/qa
postprocess/qa/services.cxx | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) New commits: commit c05ef7eeb1c6d5f797103e9edda3896f8eb87536 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Sat Apr 5 00:36:03 2014 +1100 Make service unit test easier to debug It's sort of hard to break into this function with gdb. Seperating it out makes it a lot easier to work out where things are breaking. Change-Id: If99effd44fe677452ac3c1012b99da7da80c720e Reviewed-on: https://gerrit.libreoffice.org/8844 Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com Tested-by: Chris Sherlock chris.sherloc...@gmail.com diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx index 654a9ef..680ad63 100644 --- a/postprocess/qa/services.cxx +++ b/postprocess/qa/services.cxx @@ -48,7 +48,7 @@ void ServicesTest::test() } SAL_WARN( postprocess.cppunit, -trying \ s[i] \); +trying (index: i ) \ s[i] \); Reference XServiceTypeDescription2 xDesc( xTypeManager-getByHierarchicalName(s[i]), UNO_QUERY_THROW); Sequence Reference XServiceConstructorDescription xseq = xDesc-getConstructors(); @@ -56,16 +56,18 @@ void ServicesTest::test() if (!xseq[c]-getParameters().hasElements()) try { -CPPUNIT_ASSERT_MESSAGE( -OUStringToOString(s[i], RTL_TEXTENCODING_UTF8).getStr(), -((xseq[c]-isDefaultConstructor() - ? (m_xContext-getServiceManager() - -createInstanceWithContext(s[i], m_xContext)) - : (m_xContext-getServiceManager() - -createInstanceWithArgumentsAndContext( - s[i], css::uno::Sequencecss::uno::Any(), - m_xContext))) - .is())); +OString message = OUStringToOString(s[i], RTL_TEXTENCODING_UTF8); +sal_Bool bDefConstructor = xseq[c]-isDefaultConstructor(); +Reference css::lang::XMultiComponentFactory serviceManager = m_xContext-getServiceManager(); +Reference XInterface instance; + +if( bDefConstructor ) +instance = serviceManager-createInstanceWithContext(s[i], m_xContext); +else +instance = serviceManager-createInstanceWithArgumentsAndContext( +s[i], css::uno::Sequencecss::uno::Any(), m_xContext); + +CPPUNIT_ASSERT_MESSAGE( message.getStr(), instance.is() ); } catch(const Exception e) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
On Thu, Apr 03, 2014 at 01:28:24PM -0700, julien2412 [via Document Foundation Mail Archive] wrote: Also, I noticed in this same file: 1252 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) 1253 { 1254 SQLUINTEGER nValue; 1255 OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); 1256 return nValue; 1257 } Searching about getDefaultTransactionIsolation, I found SQL_DEFAULT_TXN_ISOLATION. But this attribute isn't in sqlext.h but in isqlext.h (see http://sourcecodebrowser.com/unixodbc/2.2.11/nn_2isqlext_8h.html) Nevertheless, looking the number of locations where sqlext.h is used in LO, I wonder what impact would be including isqlext.h Still, the above code with SQL_SUBQUERIES seems weird. Why would there be any problem in including isqlext.h? Just do it... Yes, the above call with SQL_SUBQUERIES looks obviously wrong, and needs to be replaced by SQL_DEFAULT_TXN_ISOLATION + translating from ODBC constants (SQL_TXN_READ_UNCOMMITTED, SQL_TXN_READ_COMMITTED, SQL_TXN_REPEATABLE_READ, SQL_TXN_SERIALIZABLE) to SDBC constants (com::sun::star::sdbc::TransactionIsolation). -- Lionel -- View this message in context: http://nabble.documentfoundation.org/About-parts-in-ODatabaseMetaData-cxx-connectivy-module-odbc-part-tp4104005p4104094.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ww8import/data/bnc821208.doc |binary sw/qa/extras/ww8import/ww8import.cxx |3 +++ sw/source/core/txtnode/thints.cxx |2 +- 3 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 4862068a2c7343c100ec2f56c9ab8159e6e51a17 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 3 17:40:05 2014 +0200 bnc#821208 DOC import: fix unwanted char background in numbering char style Word supports formatting the paragraph parker itself, and we import that as a formatting at a position after the last character (e.g. foo will have that formatting at char pos 3, which is ignored by the layout). In addition to this hack, commit 1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering text style changed after importing the *.doc, 2012-08-24) added a SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case such a paragraph marker attribute is set, and the SwTxtNode has a numbering, then also modify the associated character style as well. As that commit already noticed, there are attributes which should not be propagated to that character style. Extend this blacklist to ignore RES_CHRATR_BACKGROUND as well, as Word does. Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799 (cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4) Reviewed-on: https://gerrit.libreoffice.org/8827 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc b/sw/qa/extras/ww8import/data/bnc821208.doc index d89d711..cfe7680 100755 Binary files a/sw/qa/extras/ww8import/data/bnc821208.doc and b/sw/qa/extras/ww8import/data/bnc821208.doc differ diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 17296e4..410b02b 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -241,6 +241,9 @@ DECLARE_WW8IMPORT_TEST(testBnc821208, bnc821208.doc) beans::PropertyState ePropertyState = xPropertyState-getPropertyState(CharFontName); // This was beans::PropertyState_DIRECT_VALUE. CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState); + +// Background of the numbering itself should have been the default, was yellow (0x00). +CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getPropertysal_Int32(xPropertyState, CharBackColor)); } DECLARE_WW8IMPORT_TEST(testCp144, cp144.doc) diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 9e56478..7b417df 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1758,7 +1758,7 @@ void SwTxtNode::DelSoftHyph( const xub_StrLen nStt, const xub_StrLen nEnd ) //In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich) { -return (nWhich == RES_CHRATR_UNDERLINE); +return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND); } //In MS Word, following properties of the paragraph end position wont affect the formatting of bullets, so we ignore them: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: What does contact mean in svx?
Chris Sherlock wrote: What does contact mean in ObjectContact? See http://opengrok.libreoffice.org/xref/core/svx/README for some ascii art illustration. That *contact postfix is used for something not unlike facade objects, that abstract away a larger subsystem, being the 'contact person' for client code. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 24 commits - filter/source lotuswordpro/source reportdesign/source sc/source sd/source starmath/inc svl/source svtools/source vcl/unx
filter/source/graphicfilter/ipsd/ipsd.cxx|4 ++-- lotuswordpro/source/filter/lwpcelllayout.cxx | 12 ++-- lotuswordpro/source/filter/lwpcontent.cxx|4 +++- lotuswordpro/source/filter/lwpdivinfo.cxx|5 - lotuswordpro/source/filter/lwpdivopts.cxx| 17 ++--- lotuswordpro/source/filter/lwpdoc.cxx|9 +++-- reportdesign/source/ui/report/dlgedfunc.cxx | 19 +-- sc/source/core/data/dpoutput.cxx |3 +++ sc/source/core/data/table1.cxx |3 +++ sc/source/filter/excel/xiescher.cxx |1 + sc/source/filter/excel/xlpage.cxx|2 +- sc/source/ui/formdlg/dwfunctr.cxx|3 ++- sc/source/ui/formdlg/formdata.cxx|5 - sc/source/ui/inc/dwfunctr.hxx|5 - sc/source/ui/vba/vbacharacters.cxx |2 +- sc/source/ui/vba/vbacharacters.hxx |2 +- sd/source/filter/eppt/pptx-epptooxml.cxx | 13 +++-- sd/source/ui/inc/FrameView.hxx |1 - starmath/inc/document.hxx|5 - svl/source/misc/adrparse.cxx |2 ++ svtools/source/contnr/treelistentry.cxx | 11 +++ vcl/unx/generic/gdi/salbmp.cxx |6 ++ 22 files changed, 87 insertions(+), 47 deletions(-) New commits: commit ba5093e723bdaf30a94f598c89d733bfc220ec7b Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 15:45:18 2014 +0100 coverity#1187856 Uncaught exception Change-Id: Ia164bdab36657b1d13cf612db96295b2933b55e2 diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index d7aea27..64bf594 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaCharacters::ScVbaCharacters( const uno::Reference XHelperInterface xParent, const uno::Reference uno::XComponentContext xContext, const ScVbaPalette dPalette, const uno::Reference text::XSimpleText xRange,const css::uno::Any Start, const css::uno::Any Length, bool Replace ) throw ( css::lang::IllegalArgumentException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) +ScVbaCharacters::ScVbaCharacters( const uno::Reference XHelperInterface xParent, const uno::Reference uno::XComponentContext xContext, const ScVbaPalette dPalette, const uno::Reference text::XSimpleText xRange,const css::uno::Any Start, const css::uno::Any Length, bool Replace ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) { Start = nStart; if ( nStart 1 ) diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index e95369e..116eda5 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -40,7 +40,7 @@ private: // Add because of MSO has diferent behavior. bool bReplace; public: -ScVbaCharacters( const css::uno::Reference ov::XHelperInterface xParent, const css::uno::Reference css::uno::XComponentContext xContext, const ScVbaPalette dPalette, const css::uno::Reference css::text::XSimpleText xRange, const css::uno::Any Start, const css::uno::Any Length, bool bReplace = false ) throw ( css::lang::IllegalArgumentException ); +ScVbaCharacters( const css::uno::Reference ov::XHelperInterface xParent, const css::uno::Reference css::uno::XComponentContext xContext, const ScVbaPalette dPalette, const css::uno::Reference css::text::XSimpleText xRange, const css::uno::Any Start, const css::uno::Any Length, bool bReplace = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); virtual ~ScVbaCharacters() {} // Attributes commit 5d0562f11f7e438758d44971c02c44f15cb14e79 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 15:35:47 2014 +0100 coverity#738804 Uninitialized pointer field Change-Id: I75efc97e77336f8b4be72e3b7b4e8af9bb7c6e06 diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index fd77fdf..fcbeada 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -99,7 +99,8 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, aDDFuncList ( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ), aInsertButton ( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ), aFiFuncDesc ( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ), -aOldSize(0,0) +aOldSize(0,0), +pFuncDesc (NULL) { FreeResource(); InitLRUList(); commit 4e8add43d5461d1752fc73de3ccfaa8d90348b6e Author: Caolán McNamara caol...@redhat.com
[Libreoffice-commits] core.git: include/sfx2 sc/source sfx2/source sw/inc sw/source
include/sfx2/objsh.hxx |3 +-- sc/source/ui/docshell/docsh.cxx |2 +- sc/source/ui/inc/docsh.hxx |2 +- sfx2/source/appl/appserv.cxx |2 +- sfx2/source/doc/objserv.cxx |2 +- sfx2/source/doc/objxtor.cxx |4 ++-- sw/inc/docsh.hxx |2 +- sw/source/core/uibase/app/docsh2.cxx |2 +- 8 files changed, 9 insertions(+), 10 deletions(-) New commits: commit e7c0f8711f95895b501c869959fe07b93d0a1e80 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 14:59:35 2014 +0100 2 as arg for PrepareClose is never checked for The 2 for PrepareClose came in with 38db42605a5b72efd55a43eff81fbc517fe0424b #89423#: added SID_CLOSEDOC, SID_BACKTOWEBTOP, SID_LOGOUT in PluginMenu and was checked with if( SfxApplication::IsPlugin() == sal_False || bUI == 2 ) in sfx2/source/doc/objxtor.cxx and then that was removed with 367568c891771d20bb8f8b3b579857f51c0e9016 #132394#: remove superfluous code Change-Id: Ib273c88b4365ea6b261c7e52bbe1876aa796dc17 diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c7b9ad9..a3d32c9 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -401,8 +401,7 @@ public: static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); virtual voidViewAssigned(); -// the bUI parameter may be sal_False, sal_True or 2 - there is some kind of hack at work -virtual boolPrepareClose( sal_Bool bUI = sal_True ); +virtual boolPrepareClose(bool bUI = true); virtual boolIsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 28ae7fa..329e38e 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2505,7 +2505,7 @@ bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId ) } -bool ScDocShell::PrepareClose( sal_Bool bUI ) +bool ScDocShell::PrepareClose( bool bUI ) { if(SC_MOD()-GetCurRefDlgId()0) { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 2941b62..9da6caf 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -209,7 +209,7 @@ public: virtual boolSave() SAL_OVERRIDE; virtual boolSaveAs( SfxMedium rMedium ) SAL_OVERRIDE; virtual boolConvertTo( SfxMedium rMedium ) SAL_OVERRIDE; -virtual boolPrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; +virtual boolPrepareClose( bool bUI = true ) SAL_OVERRIDE; virtual voidPrepareReload() SAL_OVERRIDE; virtual boolIsInformationLost() SAL_OVERRIDE; virtual voidLoadStyles( SfxObjectShell rSource ) SAL_OVERRIDE; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index a80a91a..50e71ce 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -286,7 +286,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq ) if ( !pFrame || !pFrame-GetWindow().IsReallyVisible() ) continue; -if ( pObjSh-PrepareClose(2) ) +if (pObjSh-PrepareClose(true)) pObjSh-SetModified( false ); else return; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 085b697..f01f199 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -855,7 +855,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest rReq) } // Cancelled by the user? -if ( !PrepareClose( 2 ) ) +if (!PrepareClose(true)) { rReq.SetReturnValue( SfxBoolItem(0, false) ); rReq.Done(); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a8fae9e..0d00015 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -558,8 +558,8 @@ struct BoolEnv_Impl bool SfxObjectShell::PrepareClose ( -sal_BoolbUI // sal_True: Dialog and so on is allowed - // sal_False: silent-mode +bool bUI // true: Dialog and so on is allowed + // false: silent-mode ) { if( pImp-bInPrepareClose || pImp-bPreparedForClose ) diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index a3c09ab..179744a 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -90,7 +90,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium rMedium ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage xStorage ) SAL_OVERRIDE; -
[Libreoffice-commits] core.git: vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf |binary vcl/source/gdi/dibtools.cxx |4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 9984807f17593b97778fc31824c50706ea2e826c Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 4 17:29:02 2014 +0200 WMF import: restore support for the ImplReadDIB(bFileHeader=false) version Regression from commit f7799c9317cc3187ae8aaedc36f829d478a59e77 (Resolves: #i124467# add check for image data offset..., 2014-03-28). Change-Id: I71e78aefca2ca5b07f763ec798226b9bb39a5254 diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf new file mode 100644 index 000..bfd7e20 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf differ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index d6f1e4d..e46b7d3 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -605,7 +605,9 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, Bitmap* pBmpAlpha, sal_uLon if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown) aHeader.nWidth aHeader.nHeight aHeader.nBitCount) { -if (aHeader.nSize nOffset) +// In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before +// this method, nOffset is 0, that's OK. +if (nOffset aHeader.nSize nOffset) { // Header size claims to extend into the image data. // Looks like an error. ___ 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/ui/index/cnttab.cxx | 21 + 1 file changed, 1 insertion(+), 20 deletions(-) New commits: commit 97b20c9deee46195357896197440cc1cc43d3452 Author: Michael Stahl mst...@redhat.com Date: Fri Apr 4 15:17:47 2014 +0200 SwMultiTOXTabDialog: the file we ship is called idxexample.odt Change-Id: Ib62f992814ec83f3bb25a0197b50b0b85979d0bb diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 394cf83..a296eeb 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -473,31 +473,12 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl ) if(!pExampleFrame !bExampleCreated) { bExampleCreated = sal_True; -OUString sTemplate(internal/idxexample); - -OUString sTemplateWithoutExt( sTemplate ); -sTemplate += .odt; +OUString sTemplate(internal/idxexample.odt); SvtPathOptions aOpt; aOpt.SetTemplatePath(OUString(LIBO_SHARE_FOLDER /template/common)); -// 6.0 (extension .sxw) bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); -if( !bExist ) -{ -// 6.0 (extension .sxw) -sTemplate = sTemplateWithoutExt; -sTemplate += .sxw; -bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); -} -if( !bExist ) -{ -// 5.0 (extension .vor) -sTemplate = sTemplateWithoutExt; -sTemplate += .sdw; -bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); -} - if(!bExist) { OUString sInfo(SW_RESSTR(STR_FILE_NOT_FOUND)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source
xmloff/source/style/xmlnumfi.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 42ab5947518d92db9f0e1ccf063b211a3fd308ff Author: Eike Rathke er...@redhat.com Date: Fri Apr 4 11:57:43 2014 +0200 accept proper number style condition != as not equal operator, fdo#76777 ODF 1.2 specifies '!=' as not equal operator in number:number-style style:map style:condition attribute. So far '' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 (cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd) Reviewed-on: https://gerrit.libreoffice.org/8834 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 20500af..8773f3a 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2068,7 +2068,14 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) if (!bDefaultCond) { -sal_Int32 nPos = sRealCond.indexOf( '.' ); +// Convert != to +sal_Int32 nPos = sRealCond.indexOf( != ); +if ( nPos = 0 ) +{ +sRealCond = sRealCond.replaceAt( nPos, 2, ); +} + +nPos = sRealCond.indexOf( '.' ); if ( nPos = 0 ) { // #i8026# #103991# localize decimal separator ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libcdr
download.lst|4 ++-- external/libcdr/UnpackedTarball_libcdr.mk |4 external/libcdr/libcdr-wpx_seek_end.patch.1 | 14 -- 3 files changed, 2 insertions(+), 20 deletions(-) New commits: commit c1a756df130082ba25ba40c67293eab5fe15bd5b Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 15:45:36 2014 +0200 Uploading libcdr-0.0.15: Support for CorelDraw x7 (cherry picked from commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a) Conflicts: download.lst Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520 Reviewed-on: https://gerrit.libreoffice.org/8845 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/download.lst b/download.lst index 080d2ab..24639dc 100644 --- a/download.lst +++ b/download.lst @@ -1,7 +1,7 @@ ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d export ABW_TARBALL := libabw-0.0.2.tar.bz2 -CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 -export CDR_TARBALL := libcdr-0.0.14.tar.bz2 +CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998 +export CDR_TARBALL := libcdr-0.0.15.tar.bz2 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4 diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index dff6a57..a91bc8e 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ - external/libcdr/libcdr-wpx_seek_end.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/libcdr-wpx_seek_end.patch.1 b/external/libcdr/libcdr-wpx_seek_end.patch.1 deleted file mode 100644 index 67b8587..000 --- a/external/libcdr/libcdr-wpx_seek_end.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ a/src/lib/CDRZipStream.cpp -+++ b/src/lib/CDRZipStream.cpp -@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name) - - bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd() - { --#if defined(LIBWPD_STREAM_VERSION_MAJOR) defined(LIBWPD_STREAM_VERSION_MINOR) defined(LIBWPD_STREAM_VERSION_REVISION) \ -- (LIBWPD_STREAM_VERSION_MAJOR 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 (LIBWPD_STREAM_VERSION_MINOR 9 \ -- || (LIBWPD_STREAM_VERSION_MINOR == 9 LIBWPD_STREAM_VERSION_REVISION = 5 - if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END)) --#endif - m_input-seek(m_cdir_offset, WPX_SEEK_SET); - try - { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmloff/source
xmloff/source/style/xmlnumfi.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit bfab5b3bccf34f65d4238d0b43743c7c0365f859 Author: Eike Rathke er...@redhat.com Date: Fri Apr 4 11:57:43 2014 +0200 accept proper number style condition != as not equal operator, fdo#76777 ODF 1.2 specifies '!=' as not equal operator in number:number-style style:map style:condition attribute. So far '' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 (cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd) Reviewed-on: https://gerrit.libreoffice.org/8836 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index ece3ea8..3debbf4 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -2067,7 +2067,14 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) if (!bDefaultCond) { -sal_Int32 nPos = sRealCond.indexOf( '.' ); +// Convert != to +sal_Int32 nPos = sRealCond.indexOf( != ); +if ( nPos = 0 ) +{ +sRealCond = sRealCond.replaceAt( nPos, 2, ); +} + +nPos = sRealCond.indexOf( '.' ); if ( nPos = 0 ) { // #i8026# #103991# localize decimal separator ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Chris Laplante license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. - Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#62957 FILESAVE: Save Last Slide Position in Impress. Need help.
Hi all, I was working on this enhancement before.. But had stopped for some time for getting some fresh way of solving it. This is still my second hack, so please bear with me :p.. I was going through the source using some random keywords and found a code pointer to the function sd::FrameView::ReadUserDataSequence (there are multiple implementations of ReadUserDataSequence, but i think this has the answer) in /sd/source/ui/view/frmview.cxx.. This has reference to another function sd::FrameView::SetSelectedPageOnLoad.. http://docs.libreoffice.org/sd/html/classsd_1_1FrameView.html#aa52d470e1ee409a897dec8d4d7918d9f Here it says, the function is for storing the page that was selected while last saving the document. And there is also the function sd::FrameView::GetSelectedPageOnLoa, to get that page. The way i understood the functions, this is the key for the solution to my bug. Is the implementation of the above mentioned functions is what i have to manipulate to get my result?? I am currently tracking the working of GetPageKindOnLoad( ) and SetPageKindOnLoad( ), because I think that the Page Kind property is working properly. Can somebody tell me if i am on the right track, or guide me to the right track, please? :) http://opengrok.libreoffice.org/s?defs=GetPageKindOnLoadproject=core ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - avmedia/Library_avmediaogl.mk avmedia/source include/avmedia include/svl include/svx sd/qa sd/source svx/source xmloff/source
avmedia/Library_avmediaogl.mk|2 avmedia/source/framework/mediaitem.cxx | 24 +++- avmedia/source/gstreamer/gstframegrabber.hxx |5 - avmedia/source/inc/mediamisc.hxx |7 ++ avmedia/source/opengl/oglplayer.cxx |4 - avmedia/source/viewer/mediawindow_impl.cxx | 76 --- avmedia/source/viewer/mediawindow_impl.hxx |8 ++ include/avmedia/mediaitem.hxx|3 + include/svl/solar.hrc|2 include/svx/svdomedia.hxx|2 include/svx/unoshprp.hxx |3 - sd/qa/unit/data/media_embedding.odp |binary sd/qa/unit/import-tests.cxx | 72 + sd/qa/unit/sdmodeltestbase.hxx |3 - sd/source/ui/inc/View.hxx|2 sd/source/ui/view/sdview4.cxx| 10 +-- svx/source/svdraw/svdomedia.cxx |8 ++ svx/source/unodraw/unoprov.cxx |1 svx/source/unodraw/unoshap4.cxx | 21 ++- xmloff/source/draw/shapeexport.cxx | 29 +++--- xmloff/source/draw/ximpshap.cxx |2 21 files changed, 167 insertions(+), 117 deletions(-) New commits: commit b715d83cfa220a93bb7d58ea059eab3cf07d3d5a Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 4 13:59:04 2014 +0200 Fix make file header Change-Id: If4e65e5ba5146e93572b314f806a617adb811df9 diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 6257e8d..34677b5 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -1,4 +1,4 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # commit 327b0a6cc0dbc68552293c0ca9a8f61de280523e Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Apr 3 20:50:59 2014 +0200 ODP filter test: embedded media and glTF model Change-Id: I2340fa5a20a5774e5db78940cf7d4dc584f09b82 diff --git a/sd/qa/unit/data/media_embedding.odp b/sd/qa/unit/data/media_embedding.odp new file mode 100644 index 000..14ea460 Binary files /dev/null and b/sd/qa/unit/data/media_embedding.odp differ diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 12063c2..073169a 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -25,6 +25,7 @@ #include svx/svdotext.hxx #include svx/svdoashp.hxx #include svx/svdogrp.hxx +#include svx/svdomedia.hxx #include animations/animationnodehelper.hxx #include com/sun/star/drawing/XDrawPage.hpp @@ -68,6 +69,7 @@ public: void testN862510_3(); void testN862510_4(); void testFdo71961(); +void testMediaEmbedding(); CPPUNIT_TEST_SUITE(SdFiltersTest); CPPUNIT_TEST(testDocumentLayout); @@ -90,6 +92,7 @@ public: CPPUNIT_TEST(testN862510_3); CPPUNIT_TEST(testN862510_4); CPPUNIT_TEST(testFdo71961); +CPPUNIT_TEST(testMediaEmbedding); CPPUNIT_TEST_SUITE_END(); }; @@ -678,6 +681,29 @@ void SdFiltersTest::testFdo71961() xDocShRef-DoClose(); } +void SdFiltersTest::testMediaEmbedding() +{ +::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc(/sd/qa/unit/data/media_embedding.odp)); +xDocShRef = saveAndReload( xDocShRef, ODP ); + +SdDrawDocument *pDoc = xDocShRef-GetDoc(); +CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL ); +const SdrPage *pPage = pDoc-GetPage (1); +CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL ); + +// First object is a glTF model +SdrMediaObj *pModelObj = dynamic_castSdrMediaObj*( pPage-GetObj( 1 )); +CPPUNIT_ASSERT_MESSAGE( missing model, pModelObj != NULL); +CPPUNIT_ASSERT_EQUAL( OUString( vnd.sun.star.Package:Model/duck/duck.json ), pModelObj-getMediaProperties().getURL()); +CPPUNIT_ASSERT_EQUAL( OUString( application/vnd.gltf+json ), pModelObj-getMediaProperties().getMimeType()); + +// Second object is a sound +SdrMediaObj *pMediaObj = dynamic_castSdrMediaObj*( pPage-GetObj( 2 )); +CPPUNIT_ASSERT_MESSAGE( missing media object, pMediaObj != NULL); +CPPUNIT_ASSERT_EQUAL( OUString( vnd.sun.star.Package:Media/button-1.wav ), pMediaObj-getMediaProperties().getURL()); +CPPUNIT_ASSERT_EQUAL( OUString( application/vnd.sun.star.media ), pMediaObj-getMediaProperties().getMimeType()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT(); commit 7d7e2a01a686c063f071318d8f5b9864b441db39 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Apr 3 16:26:15 2014 +0200 SdFiltersTest: reduce code duplication Change-Id: I95ddae64001015f911494e11fa15373dfaedd6ba diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index d532b6c..12063c2 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -156,8
[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file
https://bugs.freedesktop.org/show_bug.cgi?id=67544 --- Comment #7 from Vishv vishvbrahmbhat...@gmail.com --- Hi, My patch related to this bug is at https://gerrit.libreoffice.org/#/c/8700/ . I have tried much but I am kind of stuck since few days. Any help will be really helpful. In-order to embed the music in the slidetransition, we have to use EmbedMedia() function. I have used that function, but I am not successful in embedding the media file. The EmbedMedia() takes a reference of XModel object and XModel itself takes a reference of SdDrawDocument. And it is initialized like this: XModel(GetDoc().GetObjectShell()-GetModel()). So here GetDoc() returns a reference of SdDrawDocument(i.e SdDrawDocument) and then it proceeds accordingly. In the SlideTransitionPane.cxx, I have access to SdDrawDocument* mpDrawDoc. So I do like this: uno::Referenceframe::XModel const xModel(mpDrawDoc-GetObjectShell()-GetModel()); And then use this xModel in the EmbedMedia(). The above code don't give me any compilation error. But, when I open an instance of Impress from my terminal, I could see this messages http://pastebin.ca/2679016. And this seems to be the reason behind the EmbedMedia() not able to create store the .mp3 file in Media/ (which is vnd.sun.star.Package:Media). So I think, I require a reference to SdDrawDocument, but I am not sure how can I get one. Typecasting is not possible because 'Operator=' is not defined for SdDrawDocument. My current patch includes a changed dialog and also it's compiling correctly. So can someone please look at my patch and let me know their views and guide me? And let me know if I am in the right direction. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf |binary vcl/source/gdi/dibtools.cxx |4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit eeb86ba2a97e85b32ab790494a25f465140a55db Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 4 17:29:02 2014 +0200 WMF import: restore support for the ImplReadDIB(bFileHeader=false) version Regression from commit f7799c9317cc3187ae8aaedc36f829d478a59e77 (Resolves: #i124467# add check for image data offset..., 2014-03-28). Change-Id: I71e78aefca2ca5b07f763ec798226b9bb39a5254 (cherry picked from commit 9984807f17593b97778fc31824c50706ea2e826c) Reviewed-on: https://gerrit.libreoffice.org/8849 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf new file mode 100644 index 000..bfd7e20 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf differ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 2759c20..077f0b0 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -626,7 +626,9 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, Bitmap* pBmpAlpha, sal_uLon if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown) aHeader.nWidth aHeader.nHeight aHeader.nBitCount) { -if (aHeader.nSize nOffset) +// In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before +// this method, nOffset is 0, that's OK. +if (nOffset aHeader.nSize nOffset) { // Header size claims to extend into the image data. // Looks like an error. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/ExternalProject_coinmp.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 6731f6c36faf64ab4522f0ffe2045c794849fabe Author: Michael Stahl mst...@redhat.com Date: Fri Apr 4 18:12:16 2014 +0200 coinmp: actually link the libraries Several people named Chris report failures in the solver unit test, and apparently the CoinMP libraries have loads of unresolved symbols because they don't have NEEDED entries, i.e. were not linked properly; let's see if this fixes it. Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0 Reviewed-on: https://gerrit.libreoffice.org/8850 Reviewed-by: Chris Laplante mostthings...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index b66e877..c18f2d5 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -27,6 +27,7 @@ else $(call gb_ExternalProject_get_state_target,coinmp,build) : +$(call gb_ExternalProject_run,build,\ ./configure COIN_SKIP_PROJECTS=Data/Sample \ + --enable-dependency-linking \ $(MAKE) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autotext/lang/sv/acor/SentenceExceptList.xml | 21 +++-- 1 file changed, 19 insertions(+), 2 deletions(-) New commits: commit a3cdf77616684f65dac108beae9439fe6b1c9186 Author: Niklas Johansson sleeping.pil...@gmail.com Date: Fri Apr 4 18:30:18 2014 +0200 Update Swedish abbreviations in SentenceExceptionsList Adds a few Swedish abbreviations and replaces two wrong ones. Change-Id: If0ee3d8edaa2ab08f9d486a4337e74bd1fd26492 Reviewed-on: https://gerrit.libreoffice.org/8851 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/autotext/lang/sv/acor/SentenceExceptList.xml b/extras/source/autotext/lang/sv/acor/SentenceExceptList.xml index d67d614..41fdbf3 100644 --- a/extras/source/autotext/lang/sv/acor/SentenceExceptList.xml +++ b/extras/source/autotext/lang/sv/acor/SentenceExceptList.xml @@ -25,11 +25,14 @@ block-list:block block-list:abbreviated-name=co./ block-list:block block-list:abbreviated-name=d./ block-list:block block-list:abbreviated-name=d.v.s./ + block-list:block block-list:abbreviated-name=d.y./ + block-list:block block-list:abbreviated-name=d.ä./ block-list:block block-list:abbreviated-name=dec./ block-list:block block-list:abbreviated-name=div./ block-list:block block-list:abbreviated-name=dr./ block-list:block block-list:abbreviated-name=dvs./ block-list:block block-list:abbreviated-name=dyl./ + block-list:block block-list:abbreviated-name=e.d./ block-list:block block-list:abbreviated-name=e.g./ block-list:block block-list:abbreviated-name=e.Kr./ block-list:block block-list:abbreviated-name=e.l./ @@ -44,12 +47,17 @@ block-list:block block-list:abbreviated-name=ex./ block-list:block block-list:abbreviated-name=exkl./ block-list:block block-list:abbreviated-name=exv./ + block-list:block block-list:abbreviated-name=f.d./ block-list:block block-list:abbreviated-name=f.k./ block-list:block block-list:abbreviated-name=f.Kr./ block-list:block block-list:abbreviated-name=f.n./ + block-list:block block-list:abbreviated-name=f.v.t./ block-list:block block-list:abbreviated-name=f.ö./ block-list:block block-list:abbreviated-name=febr./ block-list:block block-list:abbreviated-name=ff./ + block-list:block block-list:abbreviated-name=fig./ + block-list:block block-list:abbreviated-name=fil.kand./ + block-list:block block-list:abbreviated-name=fil.lic./ block-list:block block-list:abbreviated-name=fm./ block-list:block block-list:abbreviated-name=forts./ block-list:block block-list:abbreviated-name=fr./ @@ -58,6 +66,7 @@ block-list:block block-list:abbreviated-name=följ./ block-list:block block-list:abbreviated-name=föreg./ block-list:block block-list:abbreviated-name=förf./ + block-list:block block-list:abbreviated-name=gr./ block-list:block block-list:abbreviated-name=hr./ block-list:block block-list:abbreviated-name=ht./ block-list:block block-list:abbreviated-name=i.e./ @@ -68,6 +77,7 @@ block-list:block block-list:abbreviated-name=inkl./ block-list:block block-list:abbreviated-name=inv./ block-list:block block-list:abbreviated-name=jan./ + block-list:block block-list:abbreviated-name=jur.kand./ block-list:block block-list:abbreviated-name=kand./ block-list:block block-list:abbreviated-name=kap./ block-list:block block-list:abbreviated-name=kl./ @@ -96,14 +106,18 @@ block-list:block block-list:abbreviated-name=nr./ block-list:block block-list:abbreviated-name=nuv./ block-list:block block-list:abbreviated-name=o./ + block-list:block block-list:abbreviated-name=o.d./ block-list:block block-list:abbreviated-name=o.l./ block-list:block block-list:abbreviated-name=o.s.a./ block-list:block block-list:abbreviated-name=o.s.v./ block-list:block block-list:abbreviated-name=obs./ block-list:block block-list:abbreviated-name=okt./ + block-list:block block-list:abbreviated-name=omkr./ block-list:block block-list:abbreviated-name=ons./ + block-list:block block-list:abbreviated-name=op.cit./ block-list:block block-list:abbreviated-name=ordf./ block-list:block block-list:abbreviated-name=orig./ + block-list:block block-list:abbreviated-name=osv./ block-list:block block-list:abbreviated-name=p.g.a./ block-list:block block-list:abbreviated-name=P.M./ block-list:block block-list:abbreviated-name=pers./ @@ -123,11 +137,13 @@ block-list:block block-list:abbreviated-name=sg./ block-list:block block-list:abbreviated-name=sid./ block-list:block block-list:abbreviated-name=spec./ + block-list:block block-list:abbreviated-name=ss./ block-list:block block-list:abbreviated-name=st./ block-list:block block-list:abbreviated-name=st.f./ block-list:block block-list:abbreviated-name=stf./ block-list:block block-list:abbreviated-name=sön./ block-list:block block-list:abbreviated-name=t.ex./ + block-list:block
[Libreoffice-commits] core.git: 9 commits - embeddedobj/source svtools/source svx/source sw/source
embeddedobj/source/general/dummyobject.cxx | 60 - embeddedobj/source/inc/dummyobject.hxx |3 - embeddedobj/source/inc/oleembobj.hxx |2 embeddedobj/source/msole/olemisc.cxx |2 embeddedobj/source/msole/olepersist.cxx|2 svtools/source/control/stdmenu.cxx | 33 --- svx/source/gallery2/galtheme.cxx |4 + sw/source/core/layout/frmtool.cxx |2 sw/source/core/layout/paintfrm.cxx |2 sw/source/core/unocore/unochart.cxx|3 + sw/source/filter/ww8/wrtww8.cxx|2 11 files changed, 66 insertions(+), 49 deletions(-) New commits: commit d4e4bcb2df3f12f7ee19c084a5deab6691f290f2 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 20:56:23 2014 +0100 coverity#706511 Uncaught exception Change-Id: I2822c35e60a93b86bdcb56f1e4782aa46e1ce8e0 diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 9215e10..96a0392 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -383,7 +383,7 @@ uno::Reference util::XCloseable SAL_CALL OleEmbeddedObject::getComponent() if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED ) { // the object is still not running -throw embed::WrongStateException( OUString( The object is not loaded!\n ), +throw uno::RuntimeException( OUString( The object is not loaded!\n ), uno::Reference uno::XInterface ( static_cast ::cppu::OWeakObject* (this) ) ); } commit 3140af0a32a862d4300790522ccbbb47b468698d Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 4 20:53:56 2014 +0100 coverity#706508 Uncaught exception and coverity#706509, coverity#706510 Change-Id: Ib160cc65ed50073f9302ac071b2e8970a7316a54 diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 5b3e72c..85f1843 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -void ODummyEmbeddedObject::CheckInit() +void ODummyEmbeddedObject::CheckInit_WrongState() { if ( m_bDisposed ) throw lang::DisposedException(); @@ -48,7 +48,15 @@ void ODummyEmbeddedObject::CheckInit() uno::Reference uno::XInterface ( static_cast ::cppu::OWeakObject* (this) ) ); } +void ODummyEmbeddedObject::CheckInit_Runtime() +{ +if ( m_bDisposed ) +throw lang::DisposedException(); +if ( m_nObjectState == -1 ) +throw uno::RuntimeException( OUString( The object has no persistence!\n ), +uno::Reference uno::XInterface ( static_cast ::cppu::OWeakObject* (this) ) ); +} void ODummyEmbeddedObject::PostEvent_Impl( const OUString aEventName ) { if ( m_pInterfaceContainer ) @@ -96,7 +104,7 @@ void SAL_CALL ODummyEmbeddedObject::changeState( sal_Int32 nNewState ) uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); if ( nNewState == embed::EmbedStates::LOADED ) return; @@ -110,7 +118,7 @@ uno::Sequence sal_Int32 SAL_CALL ODummyEmbeddedObject::getReachableStates() uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); uno::Sequence sal_Int32 aResult( 1 ); aResult[0] = embed::EmbedStates::LOADED; @@ -124,7 +132,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getCurrentState() uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); return m_nObjectState; } @@ -138,7 +146,7 @@ void SAL_CALL ODummyEmbeddedObject::doVerb( sal_Int32 ) uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); // no supported verbs } @@ -149,7 +157,7 @@ uno::Sequence embed::VerbDescriptor SAL_CALL ODummyEmbeddedObject::getSupport uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); return uno::Sequence embed::VerbDescriptor (); } @@ -161,7 +169,7 @@ void SAL_CALL ODummyEmbeddedObject::setClientSite( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +CheckInit_WrongState(); m_xClientSite = xClient; } @@ -172,7 +180,7 @@ uno::Reference embed::XEmbeddedClient SAL_CALL ODummyEmbeddedObject::getClien uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); -CheckInit(); +
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfexport.cxx |6 ++ sw/source/filter/ww8/rtfexport.hxx |4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 8ed74dc19bb659f5ca58156aad6c28b50259b8fc Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 4 21:49:54 2014 +0200 RtfExport: convert remaining two naked pointer members Change-Id: I2cafd91841801ef22272ba83de2ce6294ca61918 diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 306b086..844fb07 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -836,13 +836,13 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren { mbExportModeRTF = true; // the attribute output for the document -m_pAttrOutput = new RtfAttributeOutput( *this ); +m_pAttrOutput.reset(new RtfAttributeOutput(*this)); // that just causes problems for RTF bSubstituteBullets = false; // needed to have a complete font table maFontHelper.bLoadAllFonts = true; // the related SdrExport -m_pSdrExport = new RtfSdrExport( *this ); +m_pSdrExport.reset(new RtfSdrExport(*this)); if (!m_pWriter) m_pWriter = m_pFilter-m_aWriter; @@ -850,8 +850,6 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren RtfExport::~RtfExport() { -delete m_pAttrOutput, m_pAttrOutput = NULL; -delete m_pSdrExport, m_pSdrExport = NULL; } SvStream RtfExport::Strm() diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 103429f..78e8d81 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -41,12 +41,12 @@ class RtfExport : public MSWordExportBase Writer* m_pWriter; /// Attribute output for document. -RtfAttributeOutput *m_pAttrOutput; +boost::shared_ptrRtfAttributeOutput m_pAttrOutput; /// Sections/headers/footers MSWordSections *m_pSections; -RtfSdrExport *m_pSdrExport; +boost::shared_ptrRtfSdrExport m_pSdrExport; bool m_bOutOutlineOnly; public: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/qa
sc/qa/unit/data/contentCSV/database-functions.csv | 12 ++ sc/qa/unit/data/contentCSV/text-functions.csv | 38 +- sc/qa/unit/data/ods/database-functions.ods|binary sc/qa/unit/data/ods/functions.ods |binary sc/qa/unit/subsequent_filters-test.cxx| 12 +- 5 files changed, 59 insertions(+), 3 deletions(-) New commits: commit 0b25aab6276612bf165ee670f5f84e8e88f3453b Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri Apr 4 01:50:36 2014 +0200 integrate database function test Change-Id: Ieb21b0a26caabfd3976de0eb20049e8ac8ec8533 diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 0ba507b..86699888 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -409,6 +409,14 @@ void ScFiltersTest::testFunctionsODS() testFile(aCSVFileName, pDoc, 6); xDocSh-DoClose(); + +xDocSh = loadDoc(database-functions., ODS); +CPPUNIT_ASSERT_MESSAGE(Failed to load functions.*, xDocSh.Is()); +xDocSh-DoHardRecalc(true); +pDoc = xDocSh-GetDocument(); + +createCSVPath(database-functions., aCSVFileName); +testFile(aCSVFileName, pDoc, 0); } void ScFiltersTest::testFunctionsExcel2010() commit dce1a07be479468ac6b6d4cba619313e38edeb69 Author: Ken Biondi kenbio...@hotmail.com Date: Fri Apr 4 01:49:05 2014 +0200 add tests for database functions Change-Id: I65f8087772318eb14adc0eb65ab896e57677cbe3 diff --git a/sc/qa/unit/data/contentCSV/database-functions.csv b/sc/qa/unit/data/contentCSV/database-functions.csv new file mode 100644 index 000..df547d7 --- /dev/null +++ b/sc/qa/unit/data/contentCSV/database-functions.csv @@ -0,0 +1,12 @@ +44.25 +2 +5 +7 +51 +150 +89760 +6.36396103067893 +3 +1650 +27 +4 diff --git a/sc/qa/unit/data/ods/database-functions.ods b/sc/qa/unit/data/ods/database-functions.ods new file mode 100644 index 000..0dde2f8 Binary files /dev/null and b/sc/qa/unit/data/ods/database-functions.ods differ commit 8ed4cc64302415defd1838c4a3799583e602b545 Author: Ken Biondi kenbio...@hotmail.com Date: Thu Apr 3 22:00:58 2014 +0200 improve text function tests Change-Id: Ia84fc5fa460dd27955dfc843d29b213b3b40ea46 diff --git a/sc/qa/unit/data/contentCSV/text-functions.csv b/sc/qa/unit/data/contentCSV/text-functions.csv index 8002212..7d68f02 100644 --- a/sc/qa/unit/data/contentCSV/text-functions.csv +++ b/sc/qa/unit/data/contentCSV/text-functions.csv @@ -1,2 +1,38 @@ -te,est,est +1014,2002 +ABCDEFGHIJKLMNOPQRSTUVWXYZ +0017,10001,00FF +A,a,d +dog +72,104,97 +Good Morning Mrs. Doe +17,64206,5 +$255.00,$367.46 +FALSE + +6,2 +1234567.890 + t,tes,testing + +6 +12 +happy,ape +te,est,est + +100.35,4500.75 +Cat,Monkey +output,outputce +shoeshoeshoe +day + +CMXCIX,CMXCIX,LMVLIV,XMIX,VMIV,IM +onpba +2 +12abc12abc12abc,12312abc123 +,12345 +12.35,012.35 +hello world + +169 +MAYBE +4321 diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods index 97d3b16..7f0d2ec 100644 Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 92429ad..0ba507b 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -400,7 +400,7 @@ void ScFiltersTest::testFunctionsODS() testFile(aCSVFileName, pDoc, 3); // text functions createCSVPath(OUString(text-functions.), aCSVFileName); -testFile(aCSVFileName, pDoc, 4); +testFile(aCSVFileName, pDoc, 4, PureString); // statistical functions createCSVPath(OUString(statistical-functions.), aCSVFileName); testFile(aCSVFileName, pDoc, 5); @@ -559,7 +559,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() testFile(aCSVFileName, pDoc, 3); // text functions createCSVPath(OUString(text-functions.), aCSVFileName); -testFile(aCSVFileName, pDoc, 4); +testFile(aCSVFileName, pDoc, 4, PureString); xDocSh-DoClose(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdomedia.cxx | 34 -- 1 file changed, 34 deletions(-) New commits: commit ee947932eadd08682bb37eb265a6fdd0672d0888 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 4 23:38:06 2014 +0200 Remove some extra empty line diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 8bc8f4d..b7f5956 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include svx/svdomedia.hxx #include rtl/ustring.hxx @@ -47,7 +46,6 @@ using namespace ::com::sun::star; // - SdrMediaObj - - // Note: the temp file is read only, until it is deleted! // It may be shared between multiple documents in case of copy/paste, // hence the shared_ptr. @@ -78,36 +76,26 @@ SdrMediaObj::SdrMediaObj() { } - - SdrMediaObj::SdrMediaObj( const Rectangle rRect ) : SdrRectObj( rRect ) , m_pImpl( new Impl() ) { } - - SdrMediaObj::~SdrMediaObj() { } - - bool SdrMediaObj::HasTextEdit() const { return false; } - - sdr::contact::ViewContact* SdrMediaObj::CreateObjectSpecificViewContact() { return new ::sdr::contact::ViewContactOfSdrMediaObj( *this ); } - - void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec rInfo ) const { rInfo.bSelectAllowed = true; @@ -132,15 +120,11 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec rInfo ) const rInfo.bCanConvToPolyLineToArea = false; } - - sal_uInt16 SdrMediaObj::GetObjIdentifier() const { return sal_uInt16( OBJ_MEDIA ); } - - OUString SdrMediaObj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulMEDIA)); @@ -158,15 +142,11 @@ OUString SdrMediaObj::TakeObjNameSingul() const return sName.makeStringAndClear(); } - - OUString SdrMediaObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralMEDIA); } - - SdrMediaObj* SdrMediaObj::Clone() const { return CloneHelper SdrMediaObj (); @@ -196,8 +176,6 @@ uno::Reference graphic::XGraphic SdrMediaObj::getSnapshot() return m_pImpl-m_xCachedSnapshot; } - - void SdrMediaObj::AdjustToMaxRect( const Rectangle rMaxRect, bool bShrinkOnly /* = false */ ) { Size aSize( Application::GetDefaultDevice()-PixelToLogic( getPreferredSize(), MAP_100TH_MM ) ); @@ -242,8 +220,6 @@ void SdrMediaObj::AdjustToMaxRect( const Rectangle rMaxRect, bool bShrinkOnly / } } - - void SdrMediaObj::setURL( const OUString rURL, const OUString rReferer, const OUString rMimeType ) { ::avmedia::MediaItem aURLItem; @@ -253,37 +229,27 @@ void SdrMediaObj::setURL( const OUString rURL, const OUString rReferer, const setMediaProperties( aURLItem ); } - - const OUString SdrMediaObj::getURL() const { return m_pImpl-m_MediaProperties.getURL(); } - - void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem rState ) { mediaPropertiesChanged( rState ); static_cast ::sdr::contact::ViewContactOfSdrMediaObj ( GetViewContact() ).executeMediaItem( getMediaProperties() ); } - - const ::avmedia::MediaItem SdrMediaObj::getMediaProperties() const { return m_pImpl-m_MediaProperties; } - - Size SdrMediaObj::getPreferredSize() const { return static_cast ::sdr::contact::ViewContactOfSdrMediaObj ( GetViewContact() ).getPreferredSize(); } - - uno::Referenceio::XInputStream SdrMediaObj::GetInputStream() { if (!m_pImpl-m_pTempFile) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/sweetshark/deploy'
New branch 'private/sweetshark/deploy' available with the following commits: commit 0458d316f137ca1970d9f90bfbe9be81cd41a7d3 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Apr 4 18:47:28 2014 +0200 ignore legacy OpenOffice.org-*-version, when a LibreOffice-*-version is given Change-Id: Ie5b6ffee07b6e5ebf922bad1b4a268ff636412c9 commit 39d99809cef0594bd85bcee6ca8e3bbae0db9bc7 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Apr 4 18:17:57 2014 +0200 set OOo reference version to 4.1 for incompatible MessageBox changes This commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=805c6101b3427cc98b53f1c48f22f705206c384d make LibreOffice 4.2 (and AOO 4.1) widely incompatible to previous versions. We should thus update the reference version to 4.1 as that is the version we are least incompatible with. Extension developers are encouraged to use LibreOffice-minimal-version instead anyway, instead of the obsolete OOo versioning. see: https://wiki.documentfoundation.org/Development/Extension_Development https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=commitdiff;h=61f9ca7b18de1adc58cf5d7cb295ba81eb3e5d92;hp=20b8edc74b846db6d143a9e327fb7f7eb2c1fb77 Change-Id: I8275a8244d642100d7b3bc17aa0b12ae7d63e583 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/sweetshark/deploy' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfexport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7d3a899f0ea4311b216b8398751d33a88b83d6ec Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Apr 5 02:06:31 2014 +0200 fix the build Change-Id: I9ac19624a611a6468979aa8771662845356ca365 diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 844fb07..69b68a2 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -823,9 +823,9 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren : MSWordExportBase( pDocument, pCurrentPam, pOriginalPam ), m_pFilter( pFilter ), m_pWriter( pWriter ), - m_pAttrOutput( NULL ), + m_pAttrOutput(), m_pSections( NULL ), - m_pSdrExport( NULL ), + m_pSdrExport(), m_bOutOutlineOnly( bOutOutlineOnly ), eDefaultEncoding( rtl_getTextEncodingFromWindowsCharset( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LibreOffice 4.2.3 RC3 test builds available
Hi *, for the upcoming new version 4.2.3, the builds for rc3 are now available on pre-releases (windows helppacks still uploading) This is an initially unscheduled rc Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.3 RC2 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-3-release-4.2.3.3.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Who is currently testing Android/iOS remotes?
I have reported a bug regarding Android Remote on March 21, but until now no one is confirming it: https://bugs.freedesktop.org/show_bug.cgi?id=76436 Bug 76436 - VIEWING:Impress file can not be edited when remote control is stoped -- Kevin Suo 锁琨珑 On 2014年4月4日 格林尼治标准时间+0800上午2时24分37秒, Robinson Tryon [via Document Foundation Mail Archive] ml-node+s969070n4103989...@n3.nabble.com wrote: Hi all, As a part of our testing of LibreOffice, it's important that make sure that our Android and iOS remotes are held to the same standards as our primary application. Right now, I don't see anyone in the QA Team listed as being available to test the iOS remote, and see just a couple of names available for Android: https://wiki.documentfoundation.org/QA/Team I think that Steve Bell and Florian R. may have previously indicated that they both could both help out with testing on iOS yes? :-) Testing the remote shouldn't take too long -- in fact, this seems like an ideal use-case for MozTrap, where one could just walk through a list of manual tests to perform and complete the process in under half an hour. Sophie -- could you help us set up a list of tests to perform with each remote? -- View this message in context: http://nabble.documentfoundation.org/Re-Libreoffice-qa-Who-is-currently-testing-Android-iOS-remotes-tp4104022.html Sent from the QA mailing list archive at Nabble.com.___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Calc Import Unit Tests - Database Functions
Hey, On Wed, Apr 2, 2014 at 12:13 AM, Ken Biondi kenbio...@hotmail.com wrote: Hello, Attached are tests for all calc database functions. Patch has been pushed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=dce1a07be479468ac6b6d4cba619313e38edeb69 Thanks for your work. Regards, Markus ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Calc Import Unit Tests - Text Functions
Hey, On Wed, Mar 26, 2014 at 11:20 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey Ken, On Wed, Mar 26, 2014 at 12:27 AM, Ken Biondi kenbio...@hotmail.comwrote: Hello, See the attached two files: functions.ods and text-functions.csv. I extended functions.ods with tests (normal parameter values only) for every text function except BAHTTEXT. text-functions.csv contains the expected results. Both files created on WIN 8 machine. I license this content under MPL/LGPLv3+. Sorry that I missed this patch. I'm going to review it as soon as possible but it looks good already. Please add me in the future in CC so I'm less likely to miss such a mail. Thanks for your work, Markus And has been pushed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=8ed4cc64302415defd1838c4a3799583e602b545 I had to remove some lines as they were either trying to access the internet or not working. Sadly it seems that either our csv test import or our csv export has some problems with some UTF-8 strings. Anyway it helps quite a bit. Thanks, Markus ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 65410] LibO unresponsive with 100% CPU usages when pasting pictures from web browser
https://bugs.freedesktop.org/show_bug.cgi?id=65410 --- Comment #13 from Alf Tonny Bätz alf...@gmail.com --- Alf Tonny Bätz: what about 4.2.0.4? Sorry to say the bug i stil there in libreoffice version 4.2.2.1 (and i guess also in 4.2.0.4..;) Best regards -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77042] New: RTF: wrong formatting tables in the rtf file
https://bugs.freedesktop.org/show_bug.cgi?id=77042 Priority: medium Bug ID: 77042 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: RTF: wrong formatting tables in the rtf file Severity: normal Classification: Unclassified OS: Windows (All) Reporter: ttro2...@mail.ru Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.2.1 release Component: Writer Product: LibreOffice Created attachment 96886 -- https://bugs.freedesktop.org/attachment.cgi?id=96886action=edit Attachment contents 7 file : source rtf-file and 6 screensoot Problem description: Every month we recive rtf-file via e-mail. When I am opening file in libre writer, table inside it have been corrupted. Ordinary corrupted first(or second) and last pages, but this time almost all table corrupted. I don`t see content of the table. The number and width of columns are wrong. I try to use libre writer version from 3.5 to 4.2.3.2 in windows XP(32bit),vista(32bit),7(64bit), ubuntu 12.04(64bit). In open office 3.2.1(attached file fileOOO1.png and fileOOO2.png) and MS word 2003-2010(fileWORD2003.png WORD2010.png) file opened normally. Steps to reproduce: 1. Open file(attached file file1.rtf) 2. look at the table. It looks like on attached file(libre1.png and libre2.png) Current behavior: Content of the table in the file is corrupted. Expected behavior: The table should look fine. Operating System: Windows XP Version: 4.2.2.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77044] New: FILEOPEN : Incorrect docX import (frames border)
https://bugs.freedesktop.org/show_bug.cgi?id=77044 Priority: medium Bug ID: 77044 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN : Incorrect docX import (frames border) Severity: normal Classification: Unclassified OS: All Reporter: jmgigan...@libertysurf.fr Hardware: All Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice Created attachment 96890 -- https://bugs.freedesktop.org/attachment.cgi?id=96890action=edit frames in .docx file are not properly rendered in Writer Import of MS DocX documents with frames is not correct. Writer adds a border where there's none in MS Word. Saving the same document as .doc in MS Word, and importing it in Writer is ok. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59818] VIEWING: Bad Font Rendering in KDE
https://bugs.freedesktop.org/show_bug.cgi?id=59818 --- Comment #23 from Zeki Bildirici kobz...@gmail.com --- Hi, Adolfo, it is clear that you didn't read what i've post here hundred of lines, and if you just decide and act without any info this won't be a respectful way of communication. I don't have time to re-write the things that i've written before just to explain the problem to you... You say it's a distro bug of Kubuntu but on https://bugs.freedesktop.org/show_bug.cgi?id=59818#c12 you may see that i wrote 4 other KDE distros has the same issue. Lubos wrote that font rendering is made by LO, not the DE... But in KDE DE it seems not, and i tried to prove that... Which may be the reason, but you come and cut the issue 'LO respects the hinting...' who said it doesn't? On the other hand, my workaround is not a solution. I'm a KDE user and i am not the only KDE user, LO is a cross platform software and KDE users can demand good font rendering as rest of the enviroments and platforms without any third party tool or hacking... This is all about to improve LO, not about just closing the bugs for 'any reason'... I always try to encourage people to involve in community and contribute to LO. But your way of behaviour is not correct. You just marked 'Worksforme' without giving any detail... And then you marked as 'Notourbug' without any proper prove... This way gives no benefit to anyone... And just an advise, please do not interfere without reading and understanding the whole issue. Anyway, Joel is right... Regards, Zeki -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76995] MAILMERGE: Wrong record Number in Mailing
https://bugs.freedesktop.org/show_bug.cgi?id=76995 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Hello I reproduce on windows 7/64 Version: 4.2.3.2 Build ID: 7c5c769e412afd32da4d946d2cb0c8b0674e95e0 Thank you for reporting Regards Pierre-Yves -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60165] Calc spends lots of time after loading a large xls document.
https://bugs.freedesktop.org/show_bug.cgi?id=60165 suokunl...@gmail.com changed: What|Removed |Added Status|NEW |NEEDINFO CC||suokunl...@gmail.com --- Comment #2 from suokunl...@gmail.com --- The attachment link is not valid, setting as needinfo. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77047] New: EDITING: Impossible to modify a mailto link without deleting its content
https://bugs.freedesktop.org/show_bug.cgi?id=77047 Priority: medium Bug ID: 77047 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Impossible to modify a mailto link without deleting its content Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ma...@free.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.1 rc Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 1. From your web browser (tested with Firefox), copy a mailto: link (email address) 2. Start Libo Calc with a blank document. Paste the link into any cell. 3. If the mailto: link is properly taken into account it will appear in colour (the text background is blue in my case) 4. Click on the cell, try to modify its content from the top bar Current behavior: When trying to remove a character from the cell content (that belonged to a mailto link) it will clear the whole text. Expected behavior: It should be possible to change a few letters in a mailto: link without having to rewrite the whole text. Usual use case : when you have a document with a column containing email addresses. If you didn't do a special paste (raw text with no style), this problem will occur. Advanced users can select the column and remove the formatting but other users will have some trouble. Operating System: Ubuntu Version: 4.2.3.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77048] New: JDBC no-compliance
https://bugs.freedesktop.org/show_bug.cgi?id=77048 Priority: medium Bug ID: 77048 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: JDBC no-compliance Severity: normal Classification: Unclassified OS: All Reporter: lio...@mamane.lu Hardware: All Status: UNCONFIRMED Version: unspecified Component: Database Product: LibreOffice http://jaybirdwiki.firebirdsql.org/jaybird/doku.php?id=config:oobase claims that we do not comply with the JDBC specification in few places, and the Jaybird JDBC driver for Firebird implements special work-arounds for us. We should find out where we are non-compliant, and fix it. We should ask the JayBird developers what bugs they found in our JDBC support, and then file / correct these bugs one by one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76734] Text Box is not preserved for file created in MSWord 2007
https://bugs.freedesktop.org/show_bug.cgi?id=76734 Sourav sourav.maha...@synerzip.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Sourav sourav.maha...@synerzip.com --- Code changes are pushed and the issue is resolved now. https://gerrit.libreoffice.org/#/c/8782/ -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77049] New: FILEOPEN: loss of zero when opening CSV file
https://bugs.freedesktop.org/show_bug.cgi?id=77049 Priority: medium Bug ID: 77049 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: loss of zero when opening CSV file Severity: normal Classification: Unclassified OS: All Reporter: kevin.per...@trivia-marketing.com Hardware: Other Status: UNCONFIRMED Version: 4.2.1.1 release Component: Spreadsheet Product: LibreOffice When opening CSV file, we lose the prepended zero when the cells containts only numbers. I guess the data is converted as NUMBER but for phone numbers for example, we need the 0 at the begining (so the data should be kept as TEXT rather than NUMBER). Phone number is one example, but in my office, we use a lot of numbers with some potentiel prepended zero. When opening, Calc should only convert as NUMBER if the field containts digits only AND do not start by 0. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77049] FILEOPEN: loss of zero when opening CSV file
https://bugs.freedesktop.org/show_bug.cgi?id=77049 kevin.per...@trivia-marketing.com changed: What|Removed |Added Hardware|Other |All Severity|normal |critical Priority|medium |high -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73658] VIEWING: Page zoom, page preview and correct cell wrapping
https://bugs.freedesktop.org/show_bug.cgi?id=73658 --- Comment #5 from m...@willpom.com --- Optimal row height is dependant on zoom level and changes in zoom alter rendering after Yes I have discovered this and experimented. Using optimal row height at zoom level 75% represents accurately what is seen in the page preview and gives the best result when exporting to PDF. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77050] New: Formatting of heading lost if inserted as cross-reference field
https://bugs.freedesktop.org/show_bug.cgi?id=77050 Priority: medium Bug ID: 77050 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Formatting of heading lost if inserted as cross-reference field Severity: normal Classification: Unclassified OS: Windows (All) Reporter: s-varoxamox...@vf.uni-konstanz.de Hardware: All Status: UNCONFIRMED Version: 4.2.0.4 release Component: Writer Product: LibreOffice Created attachment 96895 -- https://bugs.freedesktop.org/attachment.cgi?id=96895action=edit example doc Cross-reference fields don't retain the formatting that their sources (headings, Figure titles etc.) have. Steps to reproduce: 1) Create heading with some formatting as reference source 2) Insert | Fields | Cross-references 3) Insert the formatted reference expected: same formatting in inserted reference field instead: no formatting :-( This is esp. problematic for scientists who want to write manuscripts in LibreOffice. Species names are often put into headings. It is then not helpful to use fields in order to compose a manuscript coherently, e.g. with same sub-headings in Materials Methods, Results and Discussion sections. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77051] New: FILESAVE: '\f' field flag of Index is not getting preserved in LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=77051 Priority: medium Bug ID: 77051 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: '\f' field flag of Index is not getting preserved in LibreOffice Severity: normal Classification: Unclassified OS: Linux (All) Reporter: yogesh.bhar...@synerzip.com Hardware: IA64 (Itanium) Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 96896 -- https://bugs.freedesktop.org/attachment.cgi?id=96896action=edit File contains Index field f Following Identifier tags need to be preserved. \f (Creates an index using only the specified entry type) [not supported in LO] In Original File: {INDEX \c 2 \f Syn \z 1033 } In Roundtrip file: {INDEX \c 2 } -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68167] Create an outline view similar to that in MS Word and Apple Pages
https://bugs.freedesktop.org/show_bug.cgi?id=68167 Matej Cepl mc...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE CC||mc...@redhat.com --- Comment #34 from Matej Cepl mc...@redhat.com --- *** This bug has been marked as a duplicate of bug 38262 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 38262] Outline View (aka MS Word)
https://bugs.freedesktop.org/show_bug.cgi?id=38262 Matej Cepl mc...@redhat.com changed: What|Removed |Added CC||scorp1...@gmail.com --- Comment #11 from Matej Cepl mc...@redhat.com --- *** Bug 68167 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76479] Problem to show Comments
https://bugs.freedesktop.org/show_bug.cgi?id=76479 --- Comment #2 from Taouktsis Vasilis taoukt...@gmail.com --- I think that spellchecker is preventing to display the normal context menu, but in previous versions i had no problem 2014-04-03 17:16 GMT+03:00 bugzilla-dae...@freedesktop.org: sophie gautier.sop...@gmail.com changed bug 76479https://bugs.freedesktop.org/show_bug.cgi?id=76479 What Removed Added CC gautier.sop...@gmail.com *Comment # 1 https://bugs.freedesktop.org/show_bug.cgi?id=76479#c1 on bug 76479 https://bugs.freedesktop.org/show_bug.cgi?id=76479 from sophie gautier.sop...@gmail.com * Hi, could you give the document where you are not able to add the comment. Are you sure it's not because the spellchecker is preventing to display the normal contextual menu? What is your operating system - Thanks! I cannot reproduce with version 4.2.3.2 Ubuntu 13.10 - Sophie -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77017] Failed to insert record by ODBC Access2Base
https://bugs.freedesktop.org/show_bug.cgi?id=77017 --- Comment #2 from Diego Ariel d.a.capele...@gmail.com --- El mismo procedimiento utilizado por Acces2Base, el error que aparece cuando se utiliza ODBC con MS Access, no aparece en HSQLDB. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77012] Failed to insert record by ODBC Access2Base
https://bugs.freedesktop.org/show_bug.cgi?id=77012 --- Comment #3 from Diego Ariel d.a.capele...@gmail.com --- El mismo procedimiento utilizado por Acces2Base, el error que aparece cuando se utiliza ODBC con MS Access, no aparece en HSQLDB. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77017] Failed to insert record by ODBC Access2Base
https://bugs.freedesktop.org/show_bug.cgi?id=77017 --- Comment #3 from Diego Ariel d.a.capele...@gmail.com --- The same procedure used by Acces2Base, the error that appears when using ODBC with MS Access, does not appear in HSQLDB. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77012] Failed to insert record by ODBC Access2Base
https://bugs.freedesktop.org/show_bug.cgi?id=77012 --- Comment #4 from Diego Ariel d.a.capele...@gmail.com --- The same procedure used by Acces2Base, the error that appears when using ODBC with MS Access, does not appear in HSQLDB. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54314] FORMATTING: Insert - Cross reference - Heading - number options do not work properly
https://bugs.freedesktop.org/show_bug.cgi?id=54314 s-varoxamox...@vf.uni-konstanz.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=77050 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77050] Formatting of heading lost if inserted as cross-reference field
https://bugs.freedesktop.org/show_bug.cgi?id=77050 s-varoxamox...@vf.uni-konstanz.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=54314 Version|4.2.0.4 release |4.2.2.1 release --- Comment #1 from s-varoxamox...@vf.uni-konstanz.de --- occurs also in v4.2.2.1 initially reported for v4.2.0.2 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69098] FILEOPEN Imported MS-word document (.doc) does not show check boxes
https://bugs.freedesktop.org/show_bug.cgi?id=69098 Xisco Faulí aniste...@gmail.com changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Xisco Faulí aniste...@gmail.com --- I change the status of this issue to NEEDINFO as the link to the document doesn't work any longer. Please, update the link or update the document directly to bugzilla. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70666] EDITING: Diacritic placement problem with Graphite font
https://bugs.freedesktop.org/show_bug.cgi?id=70666 --- Comment #9 from László Németh nem...@numbertext.org --- Martin: I have forgot to use the original gr_count_unicode_characters() in my last patch. It works well, but is there a performance issue here? [Also I am very interested in the word and line end dependent font features, yet. Maybe I have to add an extra space here to fix the explicit space related italic correction feature of Linux Libertine G.] mst__ 13.45.40 nemeth, hello do i see it right that https://bugs.freedesktop.org/show_bug.cgi?id=70666 is fixed only on master but not release branches? any reason why not? mst__: It seems, I have forgot it. (Precisely, I had an idea to change my last patch to add the Graphite Unicode helper function, as in the original code of Martin Hosken, maybe it would be an optimization, but I haven’t done it. I will ask Martin in the issue.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77052] New: EDITING: cell's border
https://bugs.freedesktop.org/show_bug.cgi?id=77052 Priority: medium Bug ID: 77052 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: cell's border Severity: normal Classification: Unclassified OS: Windows (All) Reporter: jmpsuperhor...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.2.1 release Component: Spreadsheet Product: LibreOffice Problem description: i can't change the type of the border Steps to reproduce: 1. Select a cells range 2. Try create a border not predefinited 3. Allways appear the predefinided border Current behavior: It's impossible customize borders in cells ranges Expected behavior:Be able to customize borders Operating System: Windows 7 Version: 4.2.2.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs