mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#39468 Make forms/ German comments clean

Browse Source 
Change-Id: Iec24928324bec1caee65ca37cbf0fb5b66e6975e
Reviewed-on: https://gerrit.libreoffice.org/11760
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Philipp Weissenbacher
2014-10-02 11:54:57 +02:00
committed by Noel Grandin
parent d8be5a5576
commit 0658889bcd
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
forms/source/misc/InterfaceContainer.cxx
View File

@@ -334,7 +334,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre
if (xScripts.is()) if (xScripts.is())
xScripts->write(_rxOutStream); xScripts->write(_rxOutStream);
// feststellen der Laenge // Determine length
nObjLen = xMark->offsetToMark(nMark) - 4; nObjLen = xMark->offsetToMark(nMark) - 4;
xMark->jumpToMark(nMark); xMark->jumpToMark(nMark);
_rxOutStream->writeLong(nObjLen); _rxOutStream->writeLong(nObjLen);
@@ -441,7 +441,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
{ {
::osl::MutexGuard aGuard( m_rMutex ); ::osl::MutexGuard aGuard( m_rMutex );
// Scripting Info lesen // Read scripting info
Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY); Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY);
sal_Int32 nObjLen = _rxInStream->readLong(); sal_Int32 nObjLen = _rxInStream->readLong();
if (nObjLen) if (nObjLen)
@@ -455,7 +455,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
xMark->deleteMark(nMark); xMark->deleteMark(nMark);
} }
// Attachement lesen // Read Attachement
if ( m_xEventAttacher.is() ) if ( m_xEventAttacher.is() )
{ {
OInterfaceArray::const_iterator aAttach = m_aItems.begin(); OInterfaceArray::const_iterator aAttach = m_aItems.begin();
@@ -475,7 +475,7 @@ void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >
::osl::MutexGuard aGuard( m_rMutex ); ::osl::MutexGuard aGuard( m_rMutex );
sal_Int32 nLen = m_aItems.size(); sal_Int32 nLen = m_aItems.size();
// schreiben der laenge // Write length
_rxOutStream->writeLong(nLen); _rxOutStream->writeLong(nLen);
if (nLen) if (nLen)
@@ -483,7 +483,7 @@ void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >
// 1. Version // 1. Version
_rxOutStream->writeShort(0x0001); _rxOutStream->writeShort(0x0001);
// 2. Objekte // 2. Objects
for (sal_Int32 i = 0; i < nLen; i++) for (sal_Int32 i = 0; i < nLen; i++)
{ {
Reference<XPersistObject> xObj(m_aItems[i], UNO_QUERY); Reference<XPersistObject> xObj(m_aItems[i], UNO_QUERY);
@@ -537,7 +537,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
while (getCount()) while (getCount())
removeByIndex(0); removeByIndex(0);
// Schreibt nur in Abhaengigkeit der Laenge // Only writes depending on the length
sal_Int32 nLen = _rxInStream->readLong(); sal_Int32 nLen = _rxInStream->readLong();
if (nLen) if (nLen)
@@ -545,7 +545,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
// 1. Version // 1. Version
sal_uInt16 nVersion = _rxInStream->readShort(); (void)nVersion; sal_uInt16 nVersion = _rxInStream->readShort(); (void)nVersion;
// 2. Objekte // 2. Objects
for (sal_Int32 i = 0; i < nLen; i++) for (sal_Int32 i = 0; i < nLen; i++)
{ {
Reference<XPersistObject> xObj; Reference<XPersistObject> xObj;
@@ -564,11 +564,11 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
} }
catch(const Exception&) catch(const Exception&)
{ {
// unsere Map leeren // Clear the map
while (!m_aItems.empty()) while (!m_aItems.empty())
removeElementsNoEvents(0); removeElementsNoEvents(0);
// und die Exception nach aussen // Rethrow the exception
throw; throw;
} }
@@ -580,9 +580,9 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
implInsert( implInsert(
m_aItems.size(), // position m_aItems.size(), // position
xElement, // element to insert xElement, // element to insert
false, // no event attacher manager handling false, // no event attacher manager handling
NULL, // not yet approved - let implInsert do it NULL, // not yet approved - let implInsert do it
true // fire the event true // fire the event
); );
} }
catch( const Exception& ) catch( const Exception& )
@@ -829,7 +829,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
_rxElement->addPropertyChangeListener(PROPERTY_NAME, this); _rxElement->addPropertyChangeListener(PROPERTY_NAME, this);
// insert the object into our internal structures // insert the object into our internal structures
if (_nIndex > (sal_Int32)m_aItems.size()) // ermitteln des tatsaechlichen Indexs if (_nIndex > (sal_Int32)m_aItems.size()) // Calculate the actual index
{ {
_nIndex = m_aItems.size(); _nIndex = m_aItems.size();
m_aItems.push_back( pElementMetaData->xInterface ); m_aItems.push_back( pElementMetaData->xInterface );

12
forms/source/misc/services.cxx
View File

@@ -29,17 +29,17 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry; using namespace ::com::sun::star::registry;
static Sequence< OUString > s_aClassImplementationNames; static Sequence< OUString > s_aClassImplementationNames;
static Sequence<Sequence< OUString > > s_aClassServiceNames; static Sequence<Sequence< OUString > > s_aClassServiceNames;
static Sequence<sal_Int64> s_aFactories;
// need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
// it can't be used with sequences
// need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
// it can't be used with sequences
static Sequence<sal_Int64> s_aFactories;
void registerClassInfo( void registerClassInfo(
const OUString& _rClassImplName, // the ImplName of the class const OUString& _rClassImplName, // the ImplName of the class
const Sequence< OUString >& _rServiceNames, // the services supported by this class const Sequence< OUString >& _rServiceNames, // the services supported by this class
::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class
) )
{ {
sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength(); sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength();