[Libreoffice-commits] .: framework/source
framework/source/services/desktop.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f3d78616dfc0805ff31038e00148e115d409ef9a Author: Bjoern Michaelsen Date: Mon Mar 5 08:50:10 2012 +0100 lp#562027: actually give the quickstart suppressor a scope diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 6c63aea..3d164f0 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -428,7 +428,7 @@ namespace bool SAL_CALL Desktop::terminateQuickstarterToo() throw( css::uno::RuntimeException ) { -QuickstartSuppressor(this, m_xQuickLauncher); +QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher); return terminate(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/activex/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08d65d27827d462fcf7f9768a22352f405a13955 Author: David Tardon Date: Mon Mar 5 07:36:45 2012 +0100 fix path diff --git a/extensions/source/activex/Makefile b/extensions/source/activex/Makefile index bf79e4c..65f82ea 100644 --- a/extensions/source/activex/Makefile +++ b/extensions/source/activex/Makefile @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -% : $(SRCDIR)/source/activex/% +% : $(SRCDIR)/extensions/source/activex/% cp $< $@ .DEFAULT_GOAL := all ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/sallayout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 330461ffa3871e125bce16e0c26f45b034289d8f Author: Norbert Thiebaud Date: Sun Mar 4 21:36:15 2012 -0600 iterator end should be tested with != not < diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 3ca646d..781cb03 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -863,7 +863,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const // rightmost cluster edge is the leftmost edge of next cluster // for clusters that do not have x-sorted glyphs // TODO: avoid recalculation of left bound in next cluster iteration -for( GlyphVector::const_iterator pN = pG; ++pN < end; ) +for( GlyphVector::const_iterator pN = pG; ++pN != end; ) { if( pN->IsClusterStart() ) break; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in vcl/generic vcl/inc vcl/source
configure.in |8 - vcl/generic/glyphs/gcach_layout.cxx |4 vcl/generic/print/genpspgraphics.cxx |3 vcl/inc/sallayout.hxx|5 vcl/source/gdi/pdfwriter_impl.cxx|1 vcl/source/gdi/sallayout.cxx | 267 ++- 6 files changed, 125 insertions(+), 163 deletions(-) New commits: commit 2ea4964b2e81a25125eec7ce3eb0b06b3883edf0 Author: Norbert Thiebaud Date: Sun Mar 4 19:30:04 2012 -0600 help GlyphItems vector to be sized correctly up-front diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 5f92f48..ef03aa3 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -106,6 +106,8 @@ bool ServerFontLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutAr int nGlyphWidth = 0; GlyphItem aPrevItem; bool bRightToLeft; + +rLayout.Reserve(rArgs.mnLength); for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); ) { sal_UCS4 cChar = rArgs.mpStr[ nCharPos ]; @@ -409,6 +411,8 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rAr // allocate temporary arrays, note: round to even int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos ) | 15) + 1; +rLayout.Reserve(nGlyphCapacity); + struct IcuPosition{ float fX, fY; }; const int nAllocSize = sizeof(LEGlyphID) + sizeof(le_int32) + sizeof(IcuPosition); LEGlyphID* pIcuGlyphs = (LEGlyphID*)alloca( (nGlyphCapacity * nAllocSize) + sizeof(IcuPosition) ); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index b806c1d..29c0610 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -616,6 +616,9 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) Point aNewPos( 0, 0 ); GlyphItem aPrevItem; rtl_TextEncoding aFontEnc = mrPrinterGfx.GetFontMgr().getFontEncoding( mnFontID ); + +Reserve(rArgs.mnLength); + for(;;) { bool bRightToLeft; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index a9a30d0..85c04f0 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -345,6 +345,7 @@ class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout public: // used by layout engines voidAppendGlyph( const GlyphItem& ); +voidReserve(int size) { m_GlyphItems.reserve(size + 1); } virtual voidAdjustLayout( ImplLayoutArgs& ); virtual voidApplyDXArray( ImplLayoutArgs& ); virtual voidJustify( long nNewWidth ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3820d81..603104f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2364,6 +2364,7 @@ bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs ) Point aNewPos( 0, 0 ); bool bRightToLeft; +Reserve(rArgs.mnLength); for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); ) { // TODO: handle unicode surrogates commit 6bb68cae7c31918eff8386d5b52be0759386bb60 Author: Norbert Thiebaud Date: Sun Mar 4 07:34:14 2012 -0600 GenericSalLayout: manage the collection of GlyphItem with a vector. There was a TODO to replace a manually managed array of Glyphs to use std::list a GlyphItem is 36 bytes long. the colleciton of GlyphItems is mostly used in a sequential access. random insert/delete are fairly rare. using std::list would increase the size by at least 8 to 16 bytes per element (depending on the size of void*) (25 to 50% overhead) and would greatly degrade data locality for most iterations loops. so std::vector seems more appropriate here. diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 51a6415..a9a30d0 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -374,9 +374,7 @@ protected: boolGetCharWidths( sal_Int32* pCharWidths ) const; private: -GlyphItem* mpGlyphItems; // TODO: change to GlyphList -int mnGlyphCount; -int mnGlyphCapacity; +GlyphVector m_GlyphItems; mutable Point maBasePoint; // enforce proper copy semantic diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 95118bf..3ca646d 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -797,37 +797,18 @@ const ImplFontData* SalLayout::GetFallbackFontData( sal_GlyphId /*nGlyphId*/ ) c // === GenericSalLayout::GenericSalLayout() -: mpGlyphItems(0), -mnGlyphCount(0), -mnGlyphCapacity(0) {} // --- GenericSalLayout::~GenericSalLayout() -{ -delete[] mpGlyphItems; -} +{} // -
[Libreoffice-commits] .: 3 commits - comphelper/inc comphelper/source svx/source unusedcode.easy
comphelper/inc/comphelper/accessibleselectionhelper.hxx |2 -- comphelper/inc/comphelper/accessibletexthelper.hxx |1 - comphelper/source/misc/accessibleselectionhelper.cxx|5 - comphelper/source/misc/accessibletexthelper.cxx |6 -- svx/source/table/propertyset.cxx| 14 -- svx/source/table/propertyset.hxx|2 -- unusedcode.easy |4 7 files changed, 34 deletions(-) New commits: commit 6457d8bf66c7860dcde037cda98a7d3363d6f651 Author: Marc-André Laverdière-Papineau Date: Sun Mar 4 20:31:05 2012 -0500 Removed dead code diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index ef15231..9043a7c 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -40,12 +40,6 @@ namespace comphelper { // FastPropertySetInfo // - -FastPropertySetInfo::FastPropertySetInfo() -{ -} - -// - - FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps ) { addProperties( rProps ); @@ -59,14 +53,6 @@ FastPropertySetInfo::~FastPropertySetInfo() // - -void FastPropertySetInfo::addProperty( const Property& rProperty ) -{ -maProperties.push_back( rProperty ); -maMap[ rProperty.Name ] = maProperties.size() - 1; -} - -// - - void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) { sal_uInt32 nIndex = maProperties.size(); diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 31cce85..3f1cc3f 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -52,11 +52,9 @@ typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { public: -FastPropertySetInfo(); FastPropertySetInfo( const PropertyVector& rProps ); virtual ~FastPropertySetInfo(); -void addProperty( const ::com::sun::star::beans::Property& rProperty ); void addProperties( const PropertyVector& rProps ); const ::com::sun::star::beans::Property& getProperty( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); diff --git a/unusedcode.easy b/unusedcode.easy index 1fd951b..2f9f7df 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -886,8 +886,6 @@ canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRang cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference const&, rtl::OUString const&) -comphelper::FastPropertySetInfo::FastPropertySetInfo() -comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&) comphelper::MimeConfigurationHelper::GetFilterFlags(rtl::OUString const&) comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int) comphelper::OSelectionChangeListener::disposeAdapter() commit 1d6cadf516c682b9cad0a103519569da8a104016 Author: Marc-André Laverdière-Papineau Date: Sun Mar 4 20:26:22 2012 -0500 Removed dead code diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx index 4456c99..b47bc30 100644 --- a/comphelper/inc/comphelper/accessibletexthelper.hxx +++ b/comphelper/inc/comphelper/accessibletexthelper.hxx @@ -121,7 +121,6 @@ namespace comphelper public OAccessibleTextHelper_Base { protected: -OAccessibleTextHelper(); // see the respective base class ctor for an extensive comment on this, please OAccessibleTextHelper( IMutex* _pExternalLock ); diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index ffdd6c3..754aefe 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -790,12 +790,6 @@ namespace comphelper // OAccessibleTextHelper //== -OAccessibleTextHelper::OAccessibleTextHelper() -{ -} - -// - - OAccessibleTextHelper::OAccessibleTextHelper( IMutex* _pExternalLock ) :OAccessibleExtendedComponentHelper( _pExternalLock ) { diff --git a/unusedcode.easy b/unusedcode.easy index 0f9a9e9..1fd951b 100755 --- a/unusedcode.easy +++ b/unusedc
[Libreoffice-commits] .: sc/source
sc/source/core/data/table2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c0e58cdcac9c5138d2d6f84e4da97110eb397621 Author: Markus Mohrhard Date: Mon Mar 5 02:26:12 2012 +0100 and two more errors of the same kind It is alarming that the Notes unit test did not fail for any of these errors diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 42f1b6e..2b9d141 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -264,7 +264,7 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE ScPostIt* pPostIt = itr->second; ++itr; -if (nCol >= nStartRow) +if (nRow >= nStartRow) { aNotes.insert(nCol, nRow - nSize, pPostIt); maNotes.ReleaseNote(nCol, nRow); @@ -483,7 +483,7 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE ScPostIt* pPostIt = itr->second; ++itr; -if (nCol >= nStartRow) +if (nCol >= nStartCol) { aNotes.insert(nCol - nSize, nRow, pPostIt); maNotes.ReleaseNote(nCol, nRow); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/table2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3ebd8340f781b3e51bce6b8eeb2123ac026bedf Author: Markus Mohrhard Date: Mon Mar 5 02:12:58 2012 +0100 well one copy/paste error is not enough diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 4aa6dbe..42f1b6e 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -184,7 +184,7 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE ScPostIt* pPostIt = itr->second; ++itr; -if (nCol >= nStartRow) +if (nRow >= nStartRow) { aNotes.insert(nCol, nRow + nSize, pPostIt); maNotes.ReleaseNote(nCol, nRow); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/table2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 569e8b8a9ea68588d1ae2b32596f3ce57f36ccf8 Author: Markus Mohrhard Date: Mon Mar 5 01:53:43 2012 +0100 fix copy/paste error I can't express how dumb I feel after searching for hours for a bug in the note handling and then it is just such a small copy/paste error diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 69021ce..4aa6dbe 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -374,7 +374,7 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE ScPostIt* pPostIt = itr->second; ++itr; -if (nCol >= nStartRow) +if (nCol >= nStartCol) { aNotes.insert(nCol + nSize, nRow, pPostIt); maNotes.ReleaseNote(nCol, nRow); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/table2.cxx | 10 ++ sc/source/core/data/table6.cxx |6 ++ 2 files changed, 16 insertions(+) New commits: commit bbb80dfbfff998b55c665daf366499fdbd6605d0 Author: Markus Mohrhard Date: Mon Mar 5 00:20:48 2012 +0100 add notes back to ScTable::SearchRangeForAllEmptyCells diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 1050413..3ef92e1 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -1027,6 +1027,12 @@ bool ScTable::SearchRangeForAllEmptyCells( { ScAddress aCellPos(nCol, nRow, nTab); pUndoDoc->PutCell(nCol, nRow, nTab, pCell->Clone(*pUndoDoc, aCellPos)); +ScNotes* pNotes = pUndoDoc->GetNotes(nTab); +ScPostIt* pPostIt = maNotes.findByAddress(nCol, nRow); +if (pPostIt) +{ +pNotes->insert(nCol, nRow, pPostIt->Clone(ScAddress(nCol, nRow, nTab), *pUndoDoc, ScAddress(nCol, nRow, nTab), true)); +} } aCol[nCol].SetString(nRow, nTab, rSearchItem.GetReplaceString(), pDocument->GetAddressConvention()); } commit 50506b3840980c671fde55b82954d253bd9e4ac1 Author: Markus Mohrhard Date: Mon Mar 5 00:12:33 2012 +0100 readd note handling to CopyUpdated diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index f058d07..69021ce 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1077,6 +1077,16 @@ void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] ); + +// insert notes with captions +for(ScNotes::iterator itr = pDestTab->maNotes.begin(); itr != pDestTab->maNotes.end(); ++itr) +{ +SCCOL nCol = itr->first.first; +SCROW nRow = itr->first.second; +ScPostIt* pPostIt = itr->second; + +pDestTab->maNotes.insert(nCol, nRow, pPostIt->Clone( ScAddress(nCol, nRow, nTab),*pDestTab->pDocument, ScAddress(nCol, nRow, pDestTab->nTab), true )); +} } void ScTable::InvalidateTableArea() ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 05a0b08606ac77cf7d3e294998138610b53b1b6d Author: Katarina Machalkova Date: Sun Mar 4 23:19:48 2012 +0100 fdo#37197: No legend entry for regression curve if not applicable make the original check more general, to cover all chart types that don't support statistics diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 82cec0c..8dfef2e 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2303,8 +2303,9 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( aResult.push_back(aEntry); } -// regression curves -if ( 3 == m_nDimension ) // #i63016# +// don't show legend entry of regression curve & friends if this type of chart +// doesn't support statistics #i63016#, fdo#37197 +if (!ChartTypeHelper::isSupportingStatisticProperties( m_xChartTypeModel, m_nDimension )) return aResult; Reference< XRegressionCurveContainer > xRegrCont( rSeries.getModel(), uno::UNO_QUERY ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/viewuno.hxx | 63 +++ sc/source/ui/unoobj/viewuno.cxx | 160 ++-- 2 files changed, 106 insertions(+), 117 deletions(-) New commits: commit 07342a6aac8c32823fde4be163bb9132ed17d537 Author: Noel Grandin Date: Wed Feb 29 13:11:18 2012 +0200 Convert usages of SV_DECL_PTRARR_DEL to boost::ptr_vector * Make typedefs private to class ScTabViewObj * rename field aSelectionListeners to aSelectionChgListeners diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 723cf89..cf867b7 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -51,38 +51,13 @@ #include #include "address.hxx" +#include "boost/ptr_container/ptr_vector.hpp" class ScTabViewShell; class ScPreviewShell; #define SC_VIEWPANE_ACTIVE 0x - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::sheet::XRangeSelectionListener >* XRangeSelectionListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionListenerArr_Impl, XRangeSelectionListenerPtr, 4 ) - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::sheet::XRangeSelectionChangeListener >* XRangeSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionChangeListenerArr_Impl, XRangeSelectionChangeListenerPtr, 4 ) - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::view::XSelectionChangeListener >* XSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XSelectionChangeListenerArr_Impl, XSelectionChangeListenerPtr, 4 ) - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::beans::XPropertyChangeListener >* XViewPropertyChangeListenerPtr; -SV_DECL_PTRARR_DEL( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListenerPtr, 4 ) - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::awt::XEnhancedMouseClickHandler >* XMouseClickHandlerPtr; -SV_DECL_PTRARR_DEL( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr, 4 ) - -typedef ::com::sun::star::uno::Reference< -::com::sun::star::sheet::XActivationEventListener >* XActivationEventListenerPtr; -SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4 ) - - // ScViewPaneBase not derived from OWeakObject // to avoid duplicate OWeakObject in ScTabViewObj @@ -194,13 +169,37 @@ class ScTabViewObj : public ScViewPaneBase, public com::sun::star::sheet::XSelectedSheetsSupplier { private: +typedef ::com::sun::star::uno::Reference< +::com::sun::star::sheet::XRangeSelectionListener > XRangeSelectionListenerUnoRef; +typedef boost::ptr_vector XRangeSelectionListenerVector; + +typedef ::com::sun::star::uno::Reference< +::com::sun::star::sheet::XRangeSelectionChangeListener > XRangeSelectionChangeListenerUnoRef; +typedef boost::ptr_vector XRangeSelectionChangeListenerVector; + +typedef ::com::sun::star::uno::Reference< +::com::sun::star::view::XSelectionChangeListener > XSelectionChangeListenerUnoRef; +typedef boost::ptr_vector XSelectionChangeListenerVector; + +typedef ::com::sun::star::uno::Reference< +::com::sun::star::beans::XPropertyChangeListener > XViewPropertyChangeListenerUnoRef; +typedef boost::ptr_vector XViewPropertyChangeListenerVector; + +typedef ::com::sun::star::uno::Reference< +::com::sun::star::awt::XEnhancedMouseClickHandler > XMouseClickHandlerUnoRef; +typedef boost::ptr_vector XMouseClickHandlerVector; + +typedef ::com::sun::star::uno::Reference< +::com::sun::star::sheet::XActivationEventListener > XActivationEventListenerUnoRef; +typedef boost::ptr_vector XActivationEventListenerVector; + SfxItemPropertySet aPropSet; -XSelectionChangeListenerArr_ImplaSelectionListeners; -XRangeSelectionListenerArr_Impl aRangeSelListeners; -XRangeSelectionChangeListenerArr_Impl aRangeChgListeners; -XViewPropertyChangeListenerArr_Impl aPropertyChgListeners; -XMouseClickHandlerArr_Impl aMouseClickHandlers; -XActivationEventListenerArr_ImplaActivationListeners; +XSelectionChangeListenerVector aSelectionChgListeners; +XRangeSelectionListenerVector aRangeSelListeners; +XRangeSelectionChangeListenerVector aRangeChgListeners; +XViewPropertyChangeListenerVector aPropertyChgListeners; +XMouseClickHandlerVectoraMouseClickHandlers; +XActivationEventListenerVector aActivationListeners; SCTAB nPreviousTab; sal_BoolbDrawSelModeSet; sal_BoolbFilteredRangeSelection; diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index e0b0c14..b477620 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -76,6 +76,7 @@ #include "sce
[Libreoffice-commits] .: 2 commits - chart2/source sc/source
chart2/source/view/axes/VCartesianAxis.cxx |2 +- sc/source/ui/unoobj/chart2uno.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a769fd1ec076b61c1ce2f84da87283cc637dd5d5 Author: Markus Mohrhard Date: Sun Mar 4 17:06:49 2012 +0100 correctly set the position of the axis labels, related fdo#44832 There are still some more issues but at least they are now correctly located in the right position All advanced attributes are not yet applied. diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index fa20c2e..a6547ef 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -473,11 +473,11 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s rAllTickInfos.clear(); sal_Int32 nLevel=0; sal_Int32 nLevelCount = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoryLevelCount(); +sal_Int32 nCatIndex = 0; for( ; nLevel aTickInfoVector; std::vector< ComplexCategory > aComplexCategories( m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel( nLevel ) ); -sal_Int32 nCatIndex = 0; std::vector< ComplexCategory >::const_iterator aIt(aComplexCategories.begin()); std::vector< ComplexCategory >::const_iterator aEnd(aComplexCategories.end()); for(;aIt!=aEnd;++aIt) commit 6ba126ce26c83a0e6766e8dc8c38202d2a2ab238 Author: Markus Mohrhard Date: Sun Mar 4 00:05:33 2012 +0100 don't crash for empty input data in charts, fdo#46885 diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 90d1b07..034d261 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1560,7 +1560,7 @@ ScChart2DataProvider::createDataSource( } Reference< chart2::data::XLabeledDataSequence > xChartSeries = lcl_createLabeledDataSequenceFromTokens( pValueTokens, pLabelTokens, m_pDocument, this, m_bIncludeHiddenCells ); //ownership of pointers is transfered! -if ( xChartSeries.is() && xChartSeries->getValues()->getData().getLength() ) +if ( xChartSeries.is() && xChartSeries->getValues().is() && xChartSeries->getValues()->getData().getLength() ) { aSeqs.push_back( xChartSeries ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit bd52977757ea8cf71897340bc938baf183b9787f Author: Julien Nabet Date: Sat Mar 3 23:41:06 2012 +0100 Fix lacking break in switch diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index c27bf15..7fa889f 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -532,6 +532,7 @@ static bool isOperator( char c ) case '?': case '$': ret = true; +break; default: ret = false; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/activex/idl/Makefile |3 +++ 1 file changed, 3 insertions(+) New commits: commit cbeeae7f81555409cafb677a2292b8be40c449e6 Author: Andras Timar Date: Sun Mar 4 14:53:19 2012 +0100 fdo#46847 use windows style path for midl.exe diff --git a/extensions/source/activex/idl/Makefile b/extensions/source/activex/idl/Makefile index 742a822..62b9150 100644 --- a/extensions/source/activex/idl/Makefile +++ b/extensions/source/activex/idl/Makefile @@ -30,6 +30,9 @@ include $(GBUILDDIR)/gbuild_simple.mk # XXX: I presume that the "$(COM)"=="GCC" case in the original # extensions/source/activex/msidl/makefile.mk was for the # use-mingw-on-windows case and thus is not interesting for us. +ifeq ($(OS_FOR_BUILD),WNT) +override SRCDIR := $(shell cygpath -m $(SRCDIR)) +endif so_activex.tlb : midl.exe \ -tlb $@ \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - berkeleydb/prj lpsolve/lp_solve_5.5.patch lpsolve/makefile.mk lpsolve/prj redland/raptor
berkeleydb/prj/d.lst |2 +- lpsolve/lp_solve_5.5.patch |9 +++-- lpsolve/makefile.mk|2 +- lpsolve/prj/d.lst |1 + redland/raptor/makefile.mk |8 5 files changed, 10 insertions(+), 12 deletions(-) New commits: commit f65ed052f124f51bd5aaf538752bfd121c6c483c Author: David Tardon Date: Sun Mar 4 11:49:35 2012 +0100 mingw: change liblpsolve.a -> .dll.a diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 88e8828..590da2e 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -1,6 +1,6 @@ --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011 -@@ -1,15 +1,28 @@ +@@ -1,25 +1,40 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc +c=$CC @@ -19,9 +19,11 @@ +inline= +if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then + so=dll ++ a=dll.a + inline=-DINLINE=static +else + so=so ++ a=a + soprefix=lib + libs="-lm" + pic=-fpic @@ -35,7 +37,10 @@ opts='-O3' $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -@@ -18,8 +31,8 @@ +-ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib liblpsolve55.a ++ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++ranlib liblpsolve55.$a if [ "$so" != "" ] then diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 7e47591..232faad 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE BUILD_ACTION=sh ccc -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a .ENDIF .ELSE BUILD_ACTION=cmd /c cvc6.bat diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index 68001dc..bf8d87c 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib ..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a +..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll commit cd5bcd60266f0b99ad015c193d567c992f7e65bd Author: David Tardon Date: Fri Mar 2 10:51:48 2012 +0100 do not change the lib name diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst index 1d50f61..1de53d4 100644 --- a/berkeleydb/prj/d.lst +++ b/berkeleydb/prj/d.lst @@ -6,7 +6,7 @@ mkdir: %_DEST%\inc\berkeleydb ..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a ..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so ..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib -..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb47.dll.a ..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll commit 5efc793653950ea8efcd9638a0669a62a9e662c8 Author: David Tardon Date: Fri Mar 2 10:47:46 2012 +0100 it seems this is not necessary after all Maybe it depends on the day of the week or something like that... diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 9143f99..a2a3bd3 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -97,14 +97,6 @@ BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -# Hack to get librdf.dll linked on mingw. I am already wearied of -# fighting libtool's pseudo-intelligence, so I am just going to go with -# the flow here. -ALL : $(OUT)/lib/libraptor.la - -$(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor - $(SED) "/^dlname/s@='@='../bin/@" $(MISC)/build/$(TARFILE_NAME)/src/libraptor.la > $@ - .ELSE # there is no wntmsci build environment in the tarball; we use custom dmakefile ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/activex/idl/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 717aff55d2d2fa021a6ee479c93ce12b973cc3da Author: Andras Timar Date: Sun Mar 4 12:06:53 2012 +0100 fdo#46847 typo in midl command line diff --git a/extensions/source/activex/idl/Makefile b/extensions/source/activex/idl/Makefile index 82e4f50..742a822 100644 --- a/extensions/source/activex/idl/Makefile +++ b/extensions/source/activex/idl/Makefile @@ -37,7 +37,7 @@ so_activex.tlb : -iid so_activex_i.c \ -dlldata so_activex_dll.c \ -proxy so_activex_p.c \ - -0icf \ + -Oicf \ $(INCLUDE) \ $(SRCDIR)/extensions/source/activex/so_activex.idl ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Module_extensions.mk extensions/Package_so_activex_idl.mk extensions/Package_so_ac
extensions/Library_so_activex.mk| 17 ++- extensions/Library_so_activex_x64.mk| 12 +++- extensions/Module_extensions.mk |2 + extensions/Package_so_activex_idl.mk| 36 extensions/Package_so_activex_x64.mk| 41 +++ extensions/WinResTarget_activex.mk |8 +++-- extensions/source/activex/Makefile | 41 +++ extensions/source/activex/idl/Makefile | 48 extensions/source/activex/so_activex.rc |2 - 9 files changed, 183 insertions(+), 24 deletions(-) New commits: commit 09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c Author: David Tardon Date: Sun Mar 4 09:57:54 2012 +0100 fix building of so_activex (fdo#46847) diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 292b7e1..235bcbe 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -30,22 +30,13 @@ $(eval $(call gb_Library_Library,so_activex)) -$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb - -$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: $(SRCDIR)/extensions/source/activex/so_activex.idl - mkdir -p $(WORKDIR)/CustomTarget/so_activex - midl.exe -out $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) -Oicf $(call gb_Helper_convert_native,$<) \ - $(foreach i,$(SOLARINC_FOR_BUILD), $(patsubst -I,/I,$(i))) - -$(call gb_Library_get_clean_target,so_activex) : extensions_activex_idlclean - -.PHONY: extensions_activex_idlclean -extensions_activex_idlclean: - rm -rf $(WORKDIR)/CustomTarget/so_activex +$(eval $(call gb_Library_add_package_headers,so_activex,\ +extensions_so_activex_idl \ +)) $(eval $(call gb_Library_set_include,so_activex,\ $$(INCLUDE) \ - -I$(WORKDIR)/CustomTarget/so_activex \ + -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 6283900..af70b66 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -32,16 +32,15 @@ $(eval $(call gb_Library_Library,so_activex_x64)) $(eval $(call gb_Library_set_x64,so_activex_x64,YES)) -$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb - $(eval $(call gb_Library_add_package_headers,so_activex_x64,\ +extensions_so_activex_idl \ extensions_so_activex_x64_sources \ )) $(eval $(call gb_Library_set_include,so_activex_x64,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/source/activex \ - -I$(WORKDIR)/CustomTarget/so_activex \ + -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 1be04f9..4e1b027 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -71,6 +71,7 @@ ifneq ($(DISABLE_ACTIVEX),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ WinResTarget_activex \ Library_so_activex \ + Package_so_activex_idl \ )) ifeq ($(BUILD_X64),TRUE) diff --git a/extensions/Package_so_activex_idl.mk b/extensions/Package_so_activex_idl.mk new file mode 100644 index 000..b49c482 --- /dev/null +++ b/extensions/Package_so_activex_idl.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,extensions_so_activex_idl,$(WORKDIR)/extensions/source/activex/idl)) + +$(eval $(call gb_Package_add_customtarget,extensions_so_activex_idl,extensions/source/activex/idl)) + +$(eval $(call gb_CustomTarget_add_dependencies,extensions/source/activex/idl,\ +exte