LibreOffice Gerrit News for core on 2014-03-31
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#49431 PDF Import: Improve line and space detection algorithm in https://gerrit.libreoffice.org/8800 from Vort about module sdext + oox, writerfilter: add missing headers for C++ containers in https://gerrit.libreoffice.org/8796 from Douglas Mencken about module oox, writerfilter + Icon Redux 02: Optimised Galaxy theme in https://gerrit.libreoffice.org/8799 from Andrew Dent about module icon-themes + vcl-quartz: fix build of recently introduced DrawTextSpecial for OSX<10.6 in https://gerrit.libreoffice.org/8790 from Douglas Mencken about module vcl + Icon Redux 02: Optimised Sifr theme in https://gerrit.libreoffice.org/8795 from Andrew Dent about module icon-themes + Icon redux 01: Tidy hicontrast icons in https://gerrit.libreoffice.org/8794 from Andrew Dent about module icon-themes + sal: add universal aligned memory allocation with malloc in https://gerrit.libreoffice.org/8405 from Douglas Mencken about module build, sal + Improved coding style as shown in examples Bug 75240. in https://gerrit.libreoffice.org/8787 from Milan Zelenka about module vcl End of freshness + fdo#73147 add Excel2010 functions NETWORKDAYS.INTL and WORKDAY.INTL in https://gerrit.libreoffice.org/8772 from Winfried Donkers about module formula, include, sc + fdo#74702 OutputDevice::ImplInitFontList() fails if no fonts on device in https://gerrit.libreoffice.org/8741 from Chris Sherlock about module vcl * Merged changes on master for project core changed in the last 25 hours: + vcl-osx fix: 'NSEvent' may not respond to '-magnification' in https://gerrit.libreoffice.org/8792 from Douglas Mencken * 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: + 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
[Libreoffice-commits] core.git: sal/cppunittester unotools/source
sal/cppunittester/cppunittester.cxx| 37 + unotools/source/ucbhelper/tempfile.cxx | 14 ++-- 2 files changed, 49 insertions(+), 2 deletions(-) New commits: commit c176cb8907530a795cb0e38de8193df931f891fb Author: Norbert Thiebaud Date: Sun Mar 30 20:20:23 2014 -0500 decorate tempfile name's to help identify leaks' author unottols TempFile class check in debug bod for and env variable LO_TESTNAME.. if present it use that as the root for the tempfile filename. cppunitteset framework is augmented so that it export such LO_TESNAME using the cppunit testName(), after replacement of non-alphnum characters by _ Change-Id: Iebb9545d3bd789083afbeaf4c64eab086b56049a diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 1faae71..0f4d58a 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -95,6 +95,39 @@ private: sal_uInt32 m_nStartTime; }; +#ifdef UNX +#include +// Setup an env variable so that temp file (or other) can +// have a usefull value to identify the source +class EyecatcherListener +: public CppUnit::TestListener +, private boost::noncopyable +{ +public: +void startTest( CppUnit::Test* test) SAL_OVERRIDE +{ +char* tn = new char [ test->getName().length() + 2 ]; +strcpy(tn, test->getName().c_str()); +int len = strlen(tn); +for(int i = 0; i < len; i++) +{ +if(!isalnum(tn[i])) +{ +tn[i] = '_'; +} +tn[len] = '_'; +tn[len + 1] = 0; +} +setenv("LO_TESTNAME", tn, true); +delete[] tn; +} + +void endTest( CppUnit::Test* /* test */ ) SAL_OVERRIDE +{ +} +}; +#endif + //Allow the whole uniting testing framework to be run inside a "Protector" //which knows about uno exceptions, so it can print the content of the //exception before falling over and dying @@ -144,6 +177,10 @@ public: result.addListener(&timer); #endif +#ifdef UNX +EyecatcherListener eye; +result.addListener(&eye); +#endif for (size_t i = 0; i < protectors.size(); ++i) result.pushProtector(protectors[i]); diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 17dafaa..9585639 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -184,8 +184,18 @@ void CreateTempName_Impl( OUString& rName, bool bKeep, bool bDir = true ) // 36 ** 6 == 2176782336 unsigned const nRadix = 36; unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix); -OUString aName = rName + "lu"; - +OUString aName; +OUString aEyeCatcher = "lu"; +#ifdef DBG_UTIL +#ifdef UNX +const char* eye = getenv("LO_TESTNAME"); +if(eye) +{ +aEyeCatcher = OUString(eye, strlen(eye), RTL_TEXTENCODING_ASCII_US); +} +#endif +#endif +aName = rName + aEyeCatcher; rName = ""; static unsigned long u = Time::GetSystemTicks() % nMax; for ( unsigned long nSeed = u; ++u != nSeed; ) ___ 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/frmdlg/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2996f24c6999833c57a041c362ce4abc82e9279d Author: Michael Stahl Date: Mon Mar 31 00:35:38 2014 +0200 sw: '+' will be evaluated first [-Werror,-Wparentheses] Change-Id: Ie87d242844638972120c967f167d96efc45c59bc diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index dcefde3..9d2b241 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1002,7 +1002,7 @@ IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld ) } else { -const sal_uInt16 nVis = nFirstVis + (pFld == &aDistEd2) ? 1 : 0; +const sal_uInt16 nVis = nFirstVis + ((pFld == &aDistEd2) ? 1 : 0); long nDiff = nActValue - nColDist[nVis]; if(nDiff) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/moggi/opengl-3D-bar-rendering'
New branch 'private/moggi/opengl-3D-bar-rendering' available with the following commits: commit 2ed0f7b48bab3f9fffcb0c3ee9e1236ba78e17fc Author: Markus Mohrhard Date: Mon Mar 31 00:28:14 2014 +0200 add initial code for creating 3D bar shapes Change-Id: I55489fad8723f204003fe502eea5e02de4c8d6ef commit 482f4c39480ae69174d0f6d9333406be5f136540 Author: Markus Mohrhard Date: Fri Mar 28 00:08:56 2014 +0100 most likley nobody has used that profiling code in years Change-Id: I6ad7aea0d77b54509c3c919d0015f3a94118a398 commit 74c4525a2be3874f3cdaef67059b854d88d81639 Author: Markus Mohrhard Date: Fri Mar 28 00:07:35 2014 +0100 put some functions into an anonzmous namespace Change-Id: I39357685bfd3b2e556d0c6f83a3833fd64bc7e52 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - sw/source
sw/source/core/uibase/inc/mailmrge.hxx |2 sw/source/ui/envelp/labelexp.cxx |4 - sw/source/ui/envelp/labfmt.cxx | 81 +++-- sw/source/ui/envelp/labprt.cxx |4 - sw/source/ui/envelp/mailmrge.cxx | 40 +++- 5 files changed, 61 insertions(+), 70 deletions(-) New commits: commit 4e9565b24b3a1d393cc7093b363709c233de9d43 Author: Matteo Casalin Date: Sun Mar 30 23:35:07 2014 +0200 sal_uInt16 to sal_Int32 Change-Id: I7c658f74c70daeece6343e69bd89313d22620a60 diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 669d513..649323c 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -52,7 +52,7 @@ void SwVisitingCardPage::InitFrameControl() uno::Sequence aNames = m_xAutoText->getElementNames(); const OUString* pGroups = aNames.getConstArray(); -for(sal_uInt16 i = 0; i < aNames.getLength(); i++) +for(sal_Int32 i = 0; i < aNames.getLength(); ++i) { uno::Any aGroup = m_xAutoText->getByName(pGroups[i]); uno::Reference< text::XAutoTextGroup > xGroup; @@ -66,7 +66,7 @@ void SwVisitingCardPage::InitFrameControl() uno::Any aTitle = xPrSet->getPropertyValue( UNO_NAME_TITLE ); OUString uTitle; aTitle >>= uTitle; -sal_uInt16 nEntry = m_pAutoTextGroupLB->InsertEntry(uTitle); +const sal_Int32 nEntry = m_pAutoTextGroupLB->InsertEntry(uTitle); m_pAutoTextGroupLB->SetEntryData(nEntry, new OUString(pGroups[i])); } } commit fa8f89cf46da59c4362537103f4cae39c7e4362d Author: Matteo Casalin Date: Sun Mar 30 23:30:06 2014 +0200 sal_uInt16 to sal_Int32/size_t Change-Id: I1c6a0aff1515e8e4fe86f2027f405a9a7c7aa579 diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 1e06a910..c763b0e 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -157,8 +157,10 @@ void SwLabPreview::Paint(const Rectangle &) // Labels SetClipRegion(Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH; SetFillColor( COL_LIGHTGRAYBLUE ); -for (sal_uInt16 nRow = 0; nRow < std::min((sal_uInt16) 2, (sal_uInt16) aItem.nRows); nRow++) -for (sal_uInt16 nCol = 0; nCol < std::min((sal_uInt16) 2, (sal_uInt16) aItem.nCols); nCol++) +const sal_Int32 nRows = std::min(2, aItem.nRows); +const sal_Int32 nCols = std::min(2, aItem.nCols); +for (sal_Int32 nRow = 0; nRow < nRows; ++nRow) +for (sal_Int32 nCol = 0; nCol < nCols; ++nCol) DrawRect(Rectangle( Point(lX0 + ROUND(f * (aItem.lLeft + nCol * aItem.lHDist)), lY0 + ROUND(f * (aItem.lUpper + nRow * aItem.lVDist))), @@ -495,8 +497,8 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) rItem.lHeight = rRec.lHeight = static_cast< long >(GETFLDVAL(*m_pHeightField)); rItem.lLeft = rRec.lLeft = static_cast< long >(GETFLDVAL(*m_pLeftField )); rItem.lUpper = rRec.lUpper = static_cast< long >(GETFLDVAL(*m_pUpperField )); -rItem.nCols = rRec.nCols = (sal_uInt16) m_pColsField->GetValue(); -rItem.nRows = rRec.nRows = (sal_uInt16) m_pRowsField->GetValue(); +rItem.nCols = rRec.nCols = static_cast< sal_Int32 >(m_pColsField->GetValue()); +rItem.nRows = rRec.nRows = static_cast< sal_Int32 >(m_pRowsField->GetValue()); rItem.lPWidth = rRec.lPWidth = static_cast< long >(GETFLDVAL(*m_pPWidthField )); rItem.lPHeight = rRec.lPHeight = static_cast< long >(GETFLDVAL(*m_pPHeightField)); } @@ -552,8 +554,8 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl) aRec.lHeight = static_cast< long >(GETFLDVAL(*m_pHeightField)); aRec.lLeft = static_cast< long >(GETFLDVAL(*m_pLeftField )); aRec.lUpper = static_cast< long >(GETFLDVAL(*m_pUpperField )); -aRec.nCols = (sal_uInt16) m_pColsField->GetValue(); -aRec.nRows = (sal_uInt16) m_pRowsField->GetValue(); +aRec.nCols = static_cast< sal_Int32 >(m_pColsField->GetValue()); +aRec.nRows = static_cast< sal_Int32 >(m_pRowsField->GetValue()); aRec.lPWidth = static_cast< long >(GETFLDVAL(*m_pPWidthField )); aRec.lPHeight = static_cast< long >(GETFLDVAL(*m_pPHeightField)); aRec.bCont = aItem.bCont; @@ -594,7 +596,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); const std::vector& rMan = rCfg.GetManufacturers(); -for (sal_uInt16 i = 0; i < rMan.size(); i++) +for (size_t i = 0; i < rMan.size(); ++i) { m_pMakeCB->InsertEntry(rMan[i]); } @@ -621,9 +623,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) replaceAll("%1", sMake).replaceAll("%2", sType)); aQuery.set_secondary_text(aQuery.get_secondary_text().
[Libreoffice-commits] core.git: basic/source sot/source svl/source tools/source
basic/source/runtime/iosys.cxx |2 +- sot/source/sdstor/stgstrms.cxx |2 +- sot/source/sdstor/ucbstorage.cxx |2 +- svl/source/misc/strmadpt.cxx |4 ++-- tools/source/stream/stream.cxx |6 +++--- tools/source/stream/strmwnt.cxx |2 +- 6 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 4e3cf9cd8eb4602883339e5c9b9d4edcf05929d0 Author: Michael Stahl Date: Sun Mar 30 23:08:54 2014 +0200 MSVC helpfully provides warning C4310: cast truncates constant value Change-Id: I985216d7bade6cbb3a037b07fe44438543d63ba0 diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 43942b8..be07963 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -375,7 +375,7 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos ) { ::osl::FileBase::RC rc = ::osl::FileBase::E_None; // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nPos != SAL_MAX_UINT32); if( nPos == STREAM_SEEK_TO_END ) { rc = maFile.setPos( osl_Pos_End, 0 ); diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 214b32e..62118b8 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1284,7 +1284,7 @@ sal_uLong StgTmpStrm::PutData( const void* pData, sal_uLong n ) sal_uInt64 StgTmpStrm::SeekPos(sal_uInt64 n) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(n != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(n != SAL_MAX_UINT32); if( n == STREAM_SEEK_TO_END ) n = GetSize(); if( n && n > THRESHOLD && !pStrm ) diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index deb5303..b26a355 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -942,7 +942,7 @@ sal_uLong UCBStorageStream_Impl::PutData( const void* pData, sal_uLong nSize ) sal_uInt64 UCBStorageStream_Impl::SeekPos(sal_uInt64 const nPos) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nPos != SAL_MAX_UINT32); if( !Init() ) return 0; diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index bc7eaac..8023efb 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -449,7 +449,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) return 0; } // check if a truncated STREAM_SEEK_TO_END was passed -assert(m_nSeekedFrom != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(m_nSeekedFrom != SAL_MAX_UINT32); sal_uInt32 nRead = 0; if (m_xSeekable.is()) { @@ -551,7 +551,7 @@ void SvInputStream::FlushData() sal_uInt64 SvInputStream::SeekPos(sal_uInt64 const nPos) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nPos != SAL_MAX_UINT32); if (open()) { if (nPos == STREAM_SEEK_TO_END) diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index a8ce39c..7a41595 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -309,7 +309,7 @@ ErrCode SvAsyncLockBytes::FillAppend(const void * pBuffer, sal_Size nCount, sal_uInt64 SvAsyncLockBytes::Seek(sal_uInt64 const nPos) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nPos != SAL_MAX_UINT32); if (nPos != STREAM_SEEK_TO_END) m_nSize = nPos; return m_nSize; @@ -346,7 +346,7 @@ sal_Size SvStream::PutData( const void* pData, sal_Size nSize ) sal_uInt64 SvStream::SeekPos(sal_uInt64 const nPos) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nPos != SAL_MAX_UINT32); if( !GetError() && nPos == STREAM_SEEK_TO_END ) { DBG_ASSERT( xLockBytes.Is(), "pure virtual function" ); @@ -1843,7 +1843,7 @@ sal_uInt64 SvMemoryStream::SeekPos(sal_uInt64 const nNewPos) // nSize: Size of allocated buffer // check if a truncated STREAM_SEEK_TO_END was passed -assert(nNewPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); +assert(nNewPos != SAL_MAX_UINT32); if( nNewPos < nEndOfData ) nPos = nNewPos; else if( nNewPos == STREAM_SEEK_TO_END ) diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index ad4f133..8989921 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -163,7 +163,7 @@ sal_Size SvFileStream::PutData( const void* pData, sal_Size nSize ) sal_uInt64 SvFileStream::SeekPos(sal_uInt64 const nPos) { // check if a truncated STREAM_SEEK_TO_END was passed -assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END);
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 Adolfo Jayme changed: What|Removed |Added Status|NEW |ASSIGNED CC||f...@libreoffice.org --- Comment #8 from Adolfo Jayme --- Patch by Darshana: https://gerrit.libreoffice.org/#/c/8696/ -- 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: 5 commits - basic/source include/sal sc/source sot/source svl/source tools/source vcl/unx
basic/source/runtime/iosys.cxx|2 ++ include/sal/log-areas.dox |4 sc/source/filter/excel/xistream.cxx |1 - sot/source/sdstor/stgdir.cxx |3 ++- sot/source/sdstor/stgstrms.cxx|7 +++ sot/source/sdstor/ucbstorage.cxx |3 +++ svl/source/misc/strmadpt.cxx |4 tools/source/stream/stream.cxx|7 ++- tools/source/stream/strmunx.cxx |2 ++ tools/source/stream/strmwnt.cxx |2 ++ vcl/unx/kde4/tst_exclude_socket_notifiers.hxx |2 +- 11 files changed, 29 insertions(+), 8 deletions(-) New commits: commit 0dd6d4ed6ce66cdff14688d7acdf81992e86e64f Author: Michael Stahl Date: Sat Mar 29 21:45:44 2014 +0100 kde4: loplugin:saloverride Change-Id: I3d299a5dc98ff2775d36c839363461b727a512d9 diff --git a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx index 0c874fd..01f01b9 100644 --- a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx +++ b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx @@ -95,7 +95,7 @@ class SocketTestThread : public QThread Q_OBJECT public: SocketTestThread():QThread(0),testResult(false){}; -void run() +virtual void run() SAL_OVERRIDE { SocketEventsTester *tester = new SocketEventsTester(); if (tester->init()) commit a6f0f4156e1484f9ee2566b814fd0c18b88d94d3 Author: Michael Stahl Date: Sun Mar 30 22:26:13 2014 +0200 sot: convert that to SAL_INFO Change-Id: Iaf2de623c0893b0f500d54ce6558bf40af6e655b diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 60a6aac..88ca865 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -266,6 +266,10 @@ certain functionality. @li @c slideshow.eventqueue @li @c slideshow.opengl +@section sot + +@li @c sot - COM structured storage + @section svl @li @c svl diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index c027867..6aed09b 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -416,7 +416,8 @@ sal_Int32 StgDirEntry::Seek( sal_Int32 nNew ) { if ( !( nMode & STREAM_WRITE ) || !SetSize( nNew ) ) { -OSL_ENSURE( nMode & STREAM_WRITE, "Trying to resize readonly stream by seeking, could be a wrong offset!" ); +SAL_WARN_IF(!(nMode & STREAM_WRITE), "sot", +"Trying to resize readonly stream by seeking, could be a wrong offset: " << nNew); return nPos; } else commit b3e52299c91d7f2ef16280fa2a0f5c4c6be37f6e Author: Michael Stahl Date: Sun Mar 30 22:38:42 2014 +0200 tools, sc: fix GCC -Werror=type-limits (comparison is always true) ... on 32 bit platforms. These asserts appear to be impossible anyway. Change-Id: I6bd332ca49e9992740315e0f6c58e98ac337817c diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 5f98314..d31268c 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -430,7 +430,6 @@ XclImpStream::XclImpStream( SvStream& rInStrm, const XclImpRoot& rRoot, bool bCo mrStrm.Seek( STREAM_SEEK_TO_END ); mnStreamSize = mrStrm.Tell(); mrStrm.Seek( STREAM_SEEK_TO_BEGIN ); -OSL_ENSURE( mnStreamSize < STREAM_SEEK_TO_END, "XclImpStream::XclImpStream - stream error" ); } XclImpStream::~XclImpStream() diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 9921d6f..a8ce39c 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1769,7 +1769,6 @@ void* SvMemoryStream::SetBuffer( void* pNewBuf, sal_Size nCount, ResetError(); -DBG_ASSERT( nEndOfData Date: Sun Mar 30 22:31:53 2014 +0200 deploy some asserts to detect truncated STREAM_SEEK_TO_END Since STREAM_SEEK_TO_END is now 64 bits it could happen that some existing code uses it in some indirect manner and it gets truncated to 32 bits somewhere (on 32 bit platforms); try to detect that with asserts. Of course the checked value is now a valid stream position, so perhaps the checks should eventually be removed. Change-Id: I4248c00d758220bdc3ee94c7aa7a7bd4c86c57f0 diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 940d6d5..43942b8 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -374,6 +374,8 @@ sal_Size OslStream::PutData(const void* pData, sal_Size nSize) sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos ) { ::osl::FileBase::RC rc = ::osl::FileBase::E_None; +// check if a truncated STREAM_SEEK_TO_END was passed +assert(nPos != (sal_uInt64)(sal_uInt32)STREAM_SEEK_TO_END); if( nPos == STREAM_SEEK_TO_END ) { rc = maFile.setPos( osl_Pos_End, 0 ); diff
[Libreoffice-commits] core.git: 15 commits - chart2/source cui/source framework/source sc/inc sc/source svx/source sw/inc sw/source test/source vcl/generic
chart2/source/controller/dialogs/res_BarGeometry.cxx |6 +++--- chart2/source/controller/dialogs/res_BarGeometry.hxx |6 +++--- cui/source/options/optgdlg.cxx |2 +- framework/source/fwe/classes/addonsoptions.cxx |7 --- sc/inc/scabstdlg.hxx |6 +++--- sc/source/ui/attrdlg/scdlgfact.cxx |6 +++--- sc/source/ui/attrdlg/scdlgfact.hxx |6 +++--- sc/source/ui/inc/shtabdlg.hxx|6 +++--- sc/source/ui/miscdlgs/mvtabdlg.cxx |2 +- sc/source/ui/miscdlgs/shtabdlg.cxx | 10 +++--- svx/source/sdr/properties/textproperties.cxx |2 +- sw/inc/swabstdlg.hxx |4 ++-- sw/source/core/doc/doctxm.cxx|7 +-- sw/source/core/uibase/inc/selglos.hxx|4 ++-- sw/source/core/uibase/uiview/view.cxx|4 ++-- sw/source/core/uibase/utlui/numfmtlb.cxx |2 +- sw/source/core/unocore/unostyle.cxx | 18 +- sw/source/ui/dialog/swdlgfact.cxx|4 ++-- sw/source/ui/dialog/swdlgfact.hxx|4 ++-- sw/source/ui/misc/outline.cxx|2 +- test/source/bootstrapfixture.cxx |2 +- vcl/generic/print/prtsetup.hxx |2 +- 22 files changed, 52 insertions(+), 60 deletions(-) New commits: commit 383c7a6913291af010e7e49f337de9b8450e8930 Author: Caolán McNamara Date: Sun Mar 30 21:17:10 2014 +0100 coverity#1194905 Explicit null dereferenced Change-Id: I397765007afb9bc8fdb7cd224c31fdcda924de17 diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index c3ef6d1..e33ddc8 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -492,8 +492,9 @@ voidSwDoc::SetDefaultTOXBase(const SwTOXBase& rBase) case TOX_BIBLIOGRAPHY: prBase = &mpDefTOXBases->pBiblioBase; break; case TOX_CITATION: /** TODO */break; } -if(*prBase) -delete (*prBase); +if (!prBase) +return; +delete (*prBase); (*prBase) = new SwTOXBase(rBase); } commit 720574cfecff6bf5f45f651d2f88a08d58581cdd Author: Caolán McNamara Date: Sun Mar 30 21:15:43 2014 +0100 coverity#1194904 Explicit null dereferenced Change-Id: I50c6547206a33d3f8e06688c99ccf7bffbc75bfc diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index c37bc37..c3ef6d1 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -466,6 +466,8 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate ) case TOX_BIBLIOGRAPHY: prBase = &mpDefTOXBases->pBiblioBase; break; case TOX_CITATION: /** TODO */break; } +if (!prBase) +return NULL; if(!(*prBase) && bCreate) { SwForm aForm(eTyp); commit f9f7b70bd0e88d0094369257f07919182b1f2bdb Author: Caolán McNamara Date: Sun Mar 30 21:02:36 2014 +0100 coverity#1194929 String not null terminated Change-Id: I749f4cb8340b4642040baed7f3363e2f1e4b65ad diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index c7f8da1..dc7c7b0 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -131,7 +131,7 @@ OString loadFile(const OUString& rURL) sal_uInt64 nBytesRead; aFile.read(aBytes.get(), nSize, nBytesRead); CPPUNIT_ASSERT_EQUAL(nSize, nBytesRead); -OString aContent(aBytes.get()); +OString aContent(aBytes.get(), nBytesRead); return aContent; } commit 1062aaf005b429fa4b480c2857c3479488208ed8 Author: Caolán McNamara Date: Sun Mar 30 20:59:33 2014 +0100 coverity#1194922 Overflowed return value Change-Id: Id00dc5b37685ac81125e5ed075680c4dab2426c9 diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 13a16e7..725b2cc 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -44,17 +44,17 @@ void BarGeometryResources::Enable( bool bEnable ) m_pLB_Geometry->Enable( bEnable ); } -sal_uInt16 BarGeometryResources::GetSelectEntryCount() const +sal_Int32 BarGeometryResources::GetSelectEntryCount() const { return m_pLB_Geometry->GetSelectEntryCount(); } -sal_uInt16 BarGeometryResources::GetSelectEntryPos() const +sal_Int32 BarGeometryResources::GetSelectEntryPos() const { return m_pLB_Geometry->GetSelectEntryPos(); } -void BarGeometryResources::SelectEntryPos( sal_uInt16 nPos ) +void BarGeometryResources::SelectEntryPos(sal_Int32 nPos) { if( nPos < m_pLB_Geometry->GetEntryCount() ) m_pLB_Geometry->SelectEntryPos( nPos ); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/cha
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 28 +-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 2ee552c8973859aafae95a967c395f670c202e88 Author: Stephan Bergmann Date: Sun Mar 30 22:19:37 2014 +0200 loplugin:saloverride Change-Id: I19d7a8eb9f53a7f5ab7acf9dc7b0ca0b90950ee5 diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index 7f7f501..696553d 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -91,32 +91,32 @@ public: virtual ~MacSpellChecker(); // XSupportedLocales (for XSpellChecker) -virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); -virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); +virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException) SAL_OVERRIDE; +virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException) SAL_OVERRIDE; // XSpellChecker -virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); -virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); +virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) SAL_OVERRIDE; +virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) SAL_OVERRIDE; // XLinguServiceEventBroadcaster -virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); -virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); +virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) SAL_OVERRIDE; +virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) SAL_OVERRIDE; // XServiceDisplayName -virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); +virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException) SAL_OVERRIDE; // XInitialization -virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); +virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) SAL_OVERRIDE; // XComponent -virtual void SAL_CALL dispose() throw(RuntimeException); -virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); -virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); +virtual void SAL_CALL dispose() throw(RuntimeException) SAL_OVERRIDE; +virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) SAL_OVERRIDE; +virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) SAL_OVERRIDE; // XServiceInfo -virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); -virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); -virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); +virtual OUString SAL_CALL getImplementationName() throw(RuntimeException) SAL_OVERRIDE; +virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException) SAL_OVERRIDE; +virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException) SAL_OVERRIDE; static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy
unusedcode.easy |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9ae80565f69f6f48cd2b606de646677301eb0e82 Author: Caolán McNamara Date: Sun Mar 30 20:28:50 2014 +0100 update unusedcode Change-Id: Ia34424f3ad57ee1de23cd15d53c8a4f495bfb6fd diff --git a/unusedcode.easy b/unusedcode.easy index df93e10..fb1151f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -28,7 +28,9 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) +ScBitMaskCompressedArray::GetFirstForCondition(int, int, unsigned char const&, unsigned char const&) const ScDocument::CreateFormatTable() const +ScDocument::GetRowFlagsArray(short) const ScExtIButton::GetSelected() const ScFormulaCellGroup::scheduleCompilation() ScVbaFormat::getAddIndent() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/WpftImportTestBase.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 95f52db109094e2a3c8f305986867de253ca23fd Author: Stephan Bergmann Date: Sun Mar 30 22:08:42 2014 +0200 -Werror,-Wmismatched-tags Change-Id: I5927d88bee642a047a5282eed2b7ff1327b58a27 diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx index 2024e8f..3aa50a0 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.hxx +++ b/writerperfect/qa/unit/WpftImportTestBase.hxx @@ -20,7 +20,7 @@ #include namespace com { namespace sun { namespace star { -namespace beans { class PropertyValue; } +namespace beans { struct PropertyValue; } namespace container { class XNameAccess; } namespace document { class XFilter; } namespace frame { class XDesktop2; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/StaticLibrary_writerperfect_importtestbase.mk
writerperfect/StaticLibrary_writerperfect_importtestbase.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0b680037c24582b3aceca05b5faffe58904218d Author: Stephan Bergmann Date: Sun Mar 30 22:04:51 2014 +0200 Typo Change-Id: I3128bf9c7f80582d07a799c81e259490144993a3 diff --git a/writerperfect/StaticLibrary_writerperfect_importtestbase.mk b/writerperfect/StaticLibrary_writerperfect_importtestbase.mk index 172ca40c..bdd7970 100644 --- a/writerperfect/StaticLibrary_writerperfect_importtestbase.mk +++ b/writerperfect/StaticLibrary_writerperfect_importtestbase.mk @@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_set_include,writerperfect_importtestbase,\ $$(INCLUDE) \ )) -$(eval $(call gb_StatiLibrary_use_externals,writerperfect_importtestbase,\ +$(eval $(call gb_StaticLibrary_use_externals,writerperfect_importtestbase,\ boost_headers \ cppunit \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/backends/macbe/macbackend.hxx | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 5eb733cf67240c05c8e4d6f5728c99d3028f6cd2 Author: Stephan Bergmann Date: Sun Mar 30 21:55:17 2014 +0200 loplugin:saloverride Change-Id: I028d6da250bad64cca2d85c8bbf4a3b5a1300f1b diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index d7c3fab..33687e8 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -40,13 +40,13 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() -throw (uno::RuntimeException, std::exception); +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) -throw (uno::RuntimeException, std::exception); +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence SAL_CALL getSupportedServiceNames() -throw (uno::RuntimeException, std::exception); +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Provides the implementation name. @@ -64,7 +64,7 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL -getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) +getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -73,20 +73,20 @@ public: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removePropertyChangeListener( @@ -94,7 +94,7 @@ public: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL addVetoableChangeListener( @@ -102,7 +102,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeVetoableChangeListener( @@ -110,7 +110,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, -css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} protected: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/ui/ImageList.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 701d93081684cc7ad482e77148f8970e3c2c1d72 Author: Julien Nabet Date: Sun Mar 30 21:38:04 2014 +0200 Resolves: fdo#76802 error msg in Web Page Wizard dialog Change-Id: I0fa0537a8726bbda182dea8c3a9014d77973edea diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index a42eb01..7decec7 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -242,7 +242,7 @@ class ImageList(ListDataListener): def refreshCounterText(self): self.lblCounter.Model.Label = self.counterRenderer.render( -self.Counter (self.pageStart + 1, self.pageEnd, +self.Counter (self.pageStart + 1, self.pageEnd(), self.listModel.getSize())) def pageEnd(self): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Mac OSX tb blow up du to many.many 4G temp file created during the build
tb are red on Mac.. for tb21 at least that was due to many 4G 'temp' file created in $TMPDIR that lead to disk exhaustion. investigating Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 05b55fd2a170209c21175f9fa727169f3998052e Author: Markus Mohrhard Date: Sun Mar 30 17:13:04 2014 +0200 remove one more merge marker diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 8e0a4f9..ead4350 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -556,7 +556,6 @@ void Chart2ExportTest::testUpDownBars() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"); } -<<< HEAD void Chart2ExportTest::testDoughnutChart() { load("/chart2/qa/extras/data/docx/", "doughnutChart.docx"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - chart2/qa chart2/source oox/source
chart2/qa/extras/chart2export.cxx | 11 +++ chart2/qa/extras/data/ods/smoothedLines.ods |binary chart2/source/view/main/ShapeFactory.cxx|2 +- oox/source/drawingml/chart/seriescontext.cxx| 15 +-- oox/source/drawingml/chart/typegroupcontext.cxx |5 +++-- oox/source/export/chartexport.cxx | 11 +-- 6 files changed, 29 insertions(+), 15 deletions(-) New commits: commit 6162ce7feb89d2f973ce1077b76ca691f00df1ac Author: Markus Mohrhard Date: Sun Mar 30 15:26:42 2014 +0200 set first position and then size, fdo#75075 Change-Id: Ica8a82619f492bd30929ce88198f621f7a1f88a2 diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 1652673..989337f 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -2067,8 +2067,8 @@ uno::Reference< drawing::XShape > ShapeFactory::createRectangle( else xTarget->add(xShape); -xShape->setSize( rSize ); xShape->setPosition( rPosition ); +xShape->setSize( rSize ); uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY_THROW ); PropertyMapper::setMultiProperties( rPropNames, rPropValues, xPropSet ); } commit 8ac95ba6904d68f746e44f276c4297c345182cbf Author: Markus Mohrhard Date: Sun Mar 30 00:31:37 2014 +0100 add test for fdo#74619 Change-Id: I94ed07b730b976f32ce8572f1ccefa96be0a6e77 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 7697bab..8e0a4f9 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -54,6 +54,7 @@ public: void testPieChartRotation(); void testEmbeddingsOleObjectGrabBag(); void testGapWidthXLSX(); +void testSmoothedLines(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); @@ -80,6 +81,7 @@ public: CPPUNIT_TEST(testPieChartRotation); CPPUNIT_TEST(testEmbeddingsOleObjectGrabBag); CPPUNIT_TEST(testGapWidthXLSX); +CPPUNIT_TEST(testSmoothedLines); CPPUNIT_TEST_SUITE_END(); protected: @@ -554,6 +556,7 @@ void Chart2ExportTest::testUpDownBars() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"); } +<<< HEAD void Chart2ExportTest::testDoughnutChart() { load("/chart2/qa/extras/data/docx/", "doughnutChart.docx"); @@ -772,6 +775,14 @@ void Chart2ExportTest::testGapWidthXLSX() checkSheetForGapWidthAndOverlap(xChartDoc, 50, 30); } +void Chart2ExportTest::testSmoothedLines() +{ +load("/chart2/qa/extras/data/ods/", "smoothedLines.ods"); +xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); +CPPUNIT_ASSERT(pXmlDoc); +assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", "0"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/ods/smoothedLines.ods b/chart2/qa/extras/data/ods/smoothedLines.ods new file mode 100644 index 000..725827e Binary files /dev/null and b/chart2/qa/extras/data/ods/smoothedLines.ods differ commit 51a84b701d93a608ecee2451b8b286b6870cebc3 Author: Markus Mohrhard Date: Sun Mar 30 00:30:40 2014 +0100 enable smoothed property export for line charts, fdo#74619 Change-Id: I1b9796411a6f688f2bc7c53212fb4245c55ab3e1 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 2b5f9ce..54733ea 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1822,7 +1822,8 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ exportSeriesValues( xValuesSeq, nYValueType ); } -if( eChartType == chart::TYPEID_SCATTER ) +if( eChartType == chart::TYPEID_SCATTER +|| eChartType == chart::TYPEID_LINE ) exportSmooth(); pFS->endElement( FSNS( XML_c, XML_ser ) ); commit 6d34f1cd928ad444cf9941bd8bc01652c84b67d4 Author: Markus Mohrhard Date: Sun Mar 30 00:19:41 2014 +0100 adapt smooth import to OOXML and not to MSO 2007 Change-Id: Id1dc62a89e2858f81dc9b6eb8a5f3d9996ba85ec diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 4bf61e5..fde2952 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -582,8 +582,9 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( marker ): return this; case C_TOKEN( smooth ): -// default is 'false', not 'true' as specified -mrModel.mbSmooth = rAttribs.getBool( XML_val,
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salframeview.mm | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) New commits: commit f8f28ae91d9a57fdf9d39105ea5537fc7e95fa84 Author: Douglas Mencken Date: Sun Mar 30 08:52:41 2014 -0400 vcl-osx fix: 'NSEvent' may not respond to '-magnification' (error: invalid operands of types 'float' and 'objc_object*' to binary 'operator+') Change-Id: Iade7acde31fad21d7dde1a8c20c8900d9cbbd446 Reviewed-on: https://gerrit.libreoffice.org/8792 Tested-by: Norbert Thiebaud Reviewed-by: Norbert Thiebaud diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index e556bf3..d44411f 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -765,11 +765,19 @@ private: if( bNewSeries ) mfMagnifyDeltaSum = 0.0; +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +mfMagnifyDeltaSum += [pEvent deltaZ]; +#else mfMagnifyDeltaSum += [pEvent magnification]; +#endif - mfLastMagnifyTime = [pEvent timestamp]; - // TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control - static const float fMagnifyFactor = 0.25*500; +mfLastMagnifyTime = [pEvent timestamp]; +// TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +static const float fMagnifyFactor = 0.25; +#else +static const float fMagnifyFactor = 0.25*500; // steps are 500 times smaller for -magnification +#endif static const float fMinMagnifyStep = 15.0 / fMagnifyFactor; if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |3 ++- sw/source/filter/ww8/rtfattributeoutput.cxx |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit c2ed5f000efafdababa5aa2caa47b159b33ef65c Author: Miklos Vajna Date: Sun Mar 30 16:27:52 2014 +0200 coverity#735942 Unchecked dynamic_cast Change-Id: Id508e771b0f117437671f40060c68122a408e386 diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 2074a06..97749ff 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3679,7 +3679,8 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENod oox::FormulaExportBase* pBase = dynamic_cast(dynamic_cast(xClosable.get())); assert( pBase != NULL ); OStringBuffer aBuf; -pBase->writeFormulaRtf(aBuf, m_rExport.eCurrentEncoding); +if (pBase) +pBase->writeFormulaRtf(aBuf, m_rExport.eCurrentEncoding); m_aRunText->append(aBuf.makeStringAndClear()); // Replacement graphic. m_aRunText->append("{" LO_STRING_SVTOOLS_RTF_MMATHPICT " "); commit 1ad901464afa29c96682bde59a12f864fccd525a Author: Miklos Vajna Date: Sun Mar 30 16:26:50 2014 +0200 coverity#735940 Unchecked dynamic_cast Change-Id: Ic5acb9afd69dda3fc630a438324ef692950ff2de diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index a425ae0..15874e3 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3729,7 +3729,8 @@ void DocxAttributeOutput::WritePostponedMath() // to RTLD_GLOBAL, so most probably a gcc bug. oox::FormulaExportBase* formulaexport = dynamic_cast(dynamic_cast(xInterface.get())); assert( formulaexport != NULL ); -formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion()); +if (formulaexport) +formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion()); m_postponedMath = NULL; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source writerfilter/source
cui/source/tabpages/tparea.cxx| 15 -- writerfilter/source/resourcemodel/sprmcodetostrfooter |1 writerfilter/source/resourcemodel/sprmcodetostrheader | 39 -- 3 files changed, 55 deletions(-) New commits: commit de2050c0220d068f9a9d3dc2033bcdc9ec02d5b7 Author: Miklos Vajna Date: Sun Mar 30 16:14:41 2014 +0200 writerfilter: unused sprmcodetostr* Change-Id: Ia35b098033c92fdc7d2313d12b01324ef7232b1f diff --git a/writerfilter/source/resourcemodel/sprmcodetostrfooter b/writerfilter/source/resourcemodel/sprmcodetostrfooter deleted file mode 100644 index 5c34318..000 --- a/writerfilter/source/resourcemodel/sprmcodetostrfooter +++ /dev/null @@ -1 +0,0 @@ -} diff --git a/writerfilter/source/resourcemodel/sprmcodetostrheader b/writerfilter/source/resourcemodel/sprmcodetostrheader deleted file mode 100644 index 7df97a4..000 --- a/writerfilter/source/resourcemodel/sprmcodetostrheader +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include - -namespace writerfilter -{ - -SprmIdToString::Pointer_t SprmIdToString::pInstance; - -SprmIdToString::Pointer_t SprmIdToString::Instance() -{ -if (pInstance.get() == NULL) -pInstance = SprmIdToString::Pointer_t(new SprmIdToString()); - -return pInstance; -} - -string SprmIdToString::operator()(sal_uInt32 nId) -{ -return mMap[nId]; -} - commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3 Author: Miklos Vajna Date: Sun Mar 30 16:09:02 2014 +0200 cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl Once again this is unused since commit 5627d0bdaf1385df9d90dcec3a319c82c089c2ca (Fix #86988#: Redesign of dialogs, 2001-05-15), and just getting rid of it avoids a crash on Insert -> Frame -> Area -> Color in Writer. Change-Id: I4e93b8e5f68c229b3093f60b463bb21173dbd0e5 diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 408988c..73be1ba 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -1825,21 +1825,6 @@ void SvxAreaTabPage::ClickColorHdl_Impl() // Controls for Hatch-Background m_pFlHatchBckgrd->Hide(); -// set table text -OUStringaString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += ": "; -INetURLObject aURL( pColorList->GetPath() ); - -aURL.Append( pColorList->GetName() ); -DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - -if( aURL.getBase().getLength() > 18 ) -{ -aString += aURL.getBase().copy( 0, 15 ); -aString += "..."; -} -else -aString += aURL.getBase(); - ModifyColorHdl_Impl( this ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70652] Merge bibisect repositories to one big one ...
https://bugs.freedesktop.org/show_bug.cgi?id=70652 Björn Michaelsen changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #8 from Björn Michaelsen --- docs updated and all, RESOLVED/FIXED for now. -- 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: filter/source
filter/source/config/cache/filtercache.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f110f4875b8661476a81c9617f97e62d09b29afb Author: Julien Nabet Date: Sun Mar 30 15:07:28 2014 +0200 Typo: manualy->manually Change-Id: I136347660d91c619941fb1036dd77678e0f945df diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 5bb39ce..a6b4e17 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -328,7 +328,7 @@ class FilterCache : public BaseLock This method "load(xxx)" synchronize such load-on-demand requests. Of course it would be possible to supress this special load thread -in general and start it manualy inside this load() request. +in general and start it manually inside this load() request. The outside code decide then, if and when this cache will be filled with all available information ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
dailog conversion problem
Hello! I'm making a dialog conversion. I have a ComboBox* pOldSymbols that is GtkComboBoxText in .ui file. When I runned program I got this: nwarn:vcl.layout:6634:1:include/vcl/builder.hxx:269: .ui widget "oldSymbols" needs to correspond to vcl type 8ComboBox. I saw with gdb and there is the problem: get(pOldSymbols, "oldSymbols"); Why do I get this nwarn?? Another GtkWidgets and CustomWidgets worked well in get function. Regards, Mihály Palenik ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/iodlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c4ce2c9190c30cbdab9f51896a1c5490df49511 Author: Andras Timar Date: Sun Mar 30 13:03:30 2014 +0200 fix warning: shadowed declaration Change-Id: If602f8ee11938278ce67c77c909d05272ac585fd diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index b3ba51b..7e3184f 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2500,7 +2500,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt ) nQuestionMarkPos = -1; -sal_Int32 nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos ); +nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos ); } rFilter = aEmpty; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/iodlg.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit e7384daa27c954efa6a66dda829f23d7ad1b2a01 Author: Andras Timar Date: Sun Mar 30 12:54:05 2014 +0200 fdo#76778 fix wildcard support in File Open dialog Change-Id: Ifbdf6847ddecc7848828247655e729dfe2299b30 diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index e850f7d..b3ba51b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2490,6 +2490,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r OUString aEmpty; OUString aReversePath = comphelper::string::reverseString(rPath); sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' ); +sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD ); if ( nQuestionMarkPos != -1 ) { @@ -2498,8 +2499,10 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt ) nQuestionMarkPos = -1; + +sal_Int32 nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos ); } -sal_Int32 nWildCardPos = std::min( rPath.indexOf( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos ); + rFilter = aEmpty; if ( nWildCardPos != -1 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits