[Libreoffice-commits] .: 3 commits - basegfx/source build_env comphelper/inc comphelper/source cppuhelper/source
Stefan Knorr
astron at kemper.freedesktop.org
Sat Mar 10 13:02:13 PST 2012
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) <heinzlesspam at gmail.com>
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<stario::XInputStream>
{
@@ -63,7 +63,7 @@ public:
//==================================================================
// FmUnoOutStream,
-// sync data for the files
+// data sink for the files
//==================================================================
class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
{
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 yet to be searched)
if( (nReqLen - i) * nLog >= pEnd - pCur )
{
// linear search is better
commit caacafe4dbd3283a08c558104458d5b61c0e0743
Author: Tom Thorogood <tom at tomthorogood.com>
Date: Sat Mar 10 14:13:16 2012 -0500
Translate German comments in core/cppuhelper
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index a66f185..9c5610f 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -702,7 +702,7 @@ void OPropertySetHelper::fire
pLC = aBoundLC.getContainer( pEvts[i].PropertyHandle );
if( pLC )
{
- // Ueber alle Listener iterieren und Events senden
+ // Iterate over all listeners and send events
OInterfaceIteratorHelper aIt( *pLC);
while( aIt.hasMoreElements() )
{
@@ -759,7 +759,7 @@ void OPropertySetHelper::fire
}
if( pLC )
{
- // Ueber alle Listener iterieren und Events senden
+ // Iterate over all listeners and send events.
OInterfaceIteratorHelper aIt( *pLC);
while( aIt.hasMoreElements() )
{
commit f7226666d48f6019f0244b0ac572d29e9aaffc93
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date: Tue Feb 21 19:02:01 2012 +0100
Add more values that zoom shouldn't skip
diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx
index 89ea0cc..d4b274c 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -104,8 +104,11 @@ static long enforceStep(long nCurrent, long nPrevious, int nStep)
long zoomIn(long nCurrent)
{
long nNew = roundZoom( nCurrent * ZOOM_FACTOR );
- // make sure 100% isn't skipped
+ // make sure some values are not skipped
+ nNew = enforceStep(nNew, nCurrent, 200);
nNew = enforceStep(nNew, nCurrent, 100);
+ nNew = enforceStep(nNew, nCurrent, 75);
+ nNew = enforceStep(nNew, nCurrent, 50);
nNew = enforceStep(nNew, nCurrent, 25);
return nNew;
}
@@ -118,8 +121,11 @@ long zoomIn(long nCurrent)
long zoomOut(long nCurrent)
{
long nNew = roundZoom( nCurrent / ZOOM_FACTOR );
- // make sure 100% isn't skipped
+ // make sure some values are not skipped
+ nNew = enforceStep(nNew, nCurrent, 200);
nNew = enforceStep(nNew, nCurrent, 100);
+ nNew = enforceStep(nNew, nCurrent, 75);
+ nNew = enforceStep(nNew, nCurrent, 50);
nNew = enforceStep(nNew, nCurrent, 25);
return nNew;
}
diff --git a/build_env b/build_env
new file mode 100644
index 0000000..eb6a75a
--- /dev/null
+++ b/build_env
@@ -0,0 +1,11 @@
+
+if hash lo_proxy_start 2>&- ; then
+ base_alias="lo_proxy_start"
+else
+ base_alias="/home/frootzowrath/lo-apply/code/core/solenv/bin/lo_proxy_start"
+fi
+
+alias build="$base_alias build"
+alias deliver="$base_alias deliver"
+
+unset base_alias
More information about the Libreoffice-commits
mailing list