[Libreoffice-commits] .: sdext/source

[Lubos Lunak]

 sdext/source/pdfimport/test/tests.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit df6097ab4fc7008997caa93fb6674b1e2599e227
Author: Luboš Luňák 
Date:   Sat Mar 10 22:27:38 2012 +0100

operator must be in template or argument namespace

clang has more strict (and probably more spec compliant) lookup

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index a98600c..d3fa3e7 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -87,15 +87,18 @@ using namespace ::pdfparse;
 using namespace ::pdfi;
 using namespace ::com::sun::star;
 
-namespace
+namespace rtl
 {
-
 template< typename charT, typename traits > std::basic_ostream &
 operator <<(
 std::basic_ostream & stream, rtl::OString const 
& string)
 {
 return stream << string.getStr();
 }
+}
+
+namespace
+{
 
 class TestSink : public ContentSink
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basegfx/source build_env comphelper/inc comphelper/source cppuhelper/source

[Stefan Knorr]

 basegfx/source/tools/zoomtools.cxx  |   10 --
 build_env   |   11 +++
 comphelper/inc/comphelper/oslfile2streamwrap.hxx|4 ++--
 comphelper/source/container/container.cxx   |6 +++---
 comphelper/source/eventattachermgr/eventattachermgr.cxx |6 +++---
 comphelper/source/property/propagg.cxx  |2 +-
 cppuhelper/source/propshlp.cxx  |4 ++--
 7 files changed, 30 insertions(+), 13 deletions(-)

New commits:
commit 5bec57a0b784a3bc8a181705f04f7af53ca4e04b
Author: Stefan Knorr (astron) 
Date:   Sat Mar 10 21:58:25 2012 +0100

Correct some mistranslated comments

diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx 
b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 64ebca6..f43297b 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -42,7 +42,7 @@ namespace comphelper
 
 //==
 // FmUnoIOStream,
-// Stream to read and write from data read from a file
+// Stream to read and write data, based on File
 //==
 class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public 
::cppu::WeakImplHelper1
 {
@@ -63,7 +63,7 @@ public:
 
 //==
 // FmUnoOutStream,
-// sync data for the files
+// data sink for the files
 //==
 class OSLOutputStreamWrapper : public 
::cppu::WeakImplHelper1
 {
diff --git a/comphelper/source/container/container.cxx 
b/comphelper/source/container/container.cxx
index d3012c2..5274059 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -91,18 +91,18 @@ IndexAccessIterator::~IndexAccessIterator() {}
 xContainerAccess = ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess>(xParent, 
::com::sun::star::uno::UNO_QUERY);
 OSL_ENSURE(xContainerAccess.is(), 
"IndexAccessIterator::Next : a content has an invalid parent !");
 
-// Update the search loop index
+// Remove the index that SearchLoop had within this parent 
from my stack
 sal_Int32 nOldSearchChildIndex = 
m_arrChildIndizies[m_arrChildIndizies.size() - 1];
 m_arrChildIndizies.pop_back();
 
 if (nOldSearchChildIndex < xContainerAccess->getCount() - 
1)
 {   // Move to the right in this row
 ++nOldSearchChildIndex;
-// and check the nex child
+// and check the next child
 ::com::sun::star::uno::Any 
aElement(xContainerAccess->getByIndex(nOldSearchChildIndex));
 xSearchLoop = *(::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface>*) aElement.getValue();
 bCheckingStartingPoint = sal_False;
-// and update is position in the list.
+// and update its position in the list.
 
m_arrChildIndizies.push_back((sal_Int32)nOldSearchChildIndex);
 
 break;
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx 
b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 70a8ad8..b72cd2c 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -789,7 +789,7 @@ void SAL_CALL ImplEventAttacherManager::write(const 
Reference< XObjectOutputStre
 // Write out the version
 OutStream->writeShort( 2 );
 
-// Position the position for length
+// Remember position for length
 sal_Int32 nObjLenMark = xMarkStream->createMark();
 OutStream->writeLong( 0L );
 
@@ -838,8 +838,8 @@ void SAL_CALL ImplEventAttacherManager::read(const 
Reference< XObjectInputStream
 // Read in the version
 nVersion = InStream->readShort();
 
-// Next is the time since version 1.
-// Should this be deprecated in later versions?
+// At first there's the data according to version 1 --
+// this part needs to be kept in later versions.
 sal_Int32 nLen = InStream->readLong();
 
 // Position for comparative purposes
diff --git a/comphelper/source/property/propagg.cxx 
b/comphelper/source/property/propagg.cxx
index e186582..22305d4 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -301,7 +301,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
 n = n >> 1;
 }
 
-// Number of the searched properties * the Log2 of the reamining 
properties
+// (Number of properties yet to be found) * (Log2 of properties 

[Libreoffice-commits] .: sc/source

[Julien Nabet]

 sc/source/ui/vba/vbarange.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c604a738f48ffa4c12f7c9801d03a146303d3123
Author: Julien Nabet 
Date:   Sat Mar 10 19:58:39 2012 +0100

Fix Possible null pointer dereference

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 6ae2d08..d8c3a9f 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4527,10 +4527,10 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const 
uno::Any& Criteria1, const
 if ( xCurrent.is() )
 {
 ScVbaRange* pRange = getImplementation( xCurrent );
-if ( pRange->isSingleCellRange() )
-throw uno::RuntimeException( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("Can't create AutoFilter") ), uno::Reference< 
uno::XInterface >() );
 if ( pRange )
 {
+if ( pRange->isSingleCellRange() )
+   throw uno::RuntimeException( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("Can't create AutoFilter") ), uno::Reference< 
uno::XInterface >() );
 RangeHelper currentRegion( pRange->mxRange );
 autoFiltAddress = 
currentRegion.getCellRangeAddressable()->getRangeAddress();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Julien Nabet]

 sc/source/ui/vba/vbaapplication.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 638f68e68a1810ba3a3cd603c509745360b2ef8d
Author: Julien Nabet 
Date:   Sat Mar 10 19:57:24 2012 +0100

Fix Prefer prefix ++/-- operators for non-primitive types

diff --git a/sc/source/ui/vba/vbaapplication.cxx 
b/sc/source/ui/vba/vbaapplication.cxx
index b51623c..c674791 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1667,7 +1667,7 @@ ScVbaApplication::GetSaveAsFilename( const 
::com::sun::star::uno::Any& InitialFi
 {
 break;
 }
-aIt++;
+++aIt;
 }
 if ( !bValidFilter )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Julien Nabet]

 sc/source/core/data/dptabsrc.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4c5fd7a27b5337c4da4f02133c2d023d4caebe66
Author: Julien Nabet 
Date:   Sat Mar 10 19:03:32 2012 +0100

Fix : statement following break will never be executed

diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 3d41f86..65d70c7 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2527,8 +2527,6 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 case SC_DAPI_LEVEL_DAY:
 nGroupBy = sheet::DataPilotFieldGroupBy::DAYS;
 break;
-nGroupBy = sheet::DataPilotFieldGroupBy::YEARS;
-break;
 default:
 ;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - chart2/source sc/source

[Markus Mohrhard]

 chart2/source/view/axes/VCartesianAxis.cxx |4 ++--
 sc/source/ui/unoobj/chart2uno.cxx  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1ed8aae1050a0900998726e0484a032c097b6a60
Author: Markus Mohrhard 
Date:   Sat Mar 10 16:23:34 2012 +0100

take explicit number format before implicit number format, fdo#47084

Follow-up to fdo#43467

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 034d261..5ff808b 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3280,7 +3280,7 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const 
ScAddress& rPos)
 return nFormat;
 
 ScBaseCell* pCell = pDoc->GetCell(rPos);
-if (!pCell || pCell->GetCellType() != CELLTYPE_FORMULA)
+if (!pCell || pCell->GetCellType() != CELLTYPE_FORMULA || nFormat)
 return nFormat;
 
 // With formula cell, the format may be inferred from the formula result.
commit 2ddf3a73030c04f5060654894dc5a6543cbe2ed0
Author: Markus Mohrhard 
Date:   Sat Mar 10 00:49:50 2012 +0100

add two accidently removed return statements

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 264450d..f56cae0 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -556,7 +556,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< 
::std::vector< TickInfo
 TickIter* VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
 {
 if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 
>(m_aAllTickInfos.size()) )
-new PureTickIter( m_aAllTickInfos[nTextLevel] );
+return new PureTickIter( m_aAllTickInfos[nTextLevel] );
 return NULL;
 }
 
@@ -573,7 +573,7 @@ TickIter* VCartesianAxis::createMaximumLabelTickIterator( 
sal_Int32 nTextLevel )
 if( !m_aAllTickInfos.empty() )
 {
 sal_Int32 nLongestLabelIndex = m_bUseTextLabels ? 
this->getIndexOfLongestLabel( m_aTextLabels ) : 0;
-new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex );
+return new MaxLabelTickIter( m_aAllTickInfos[0], 
nLongestLabelIndex );
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits