Kaydet (Commit) 55343abd authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher Kaydeden (comit) Noel Power

Translate German comments, correct some WS

Change-Id: Ia0ecca3dbaa1d44a7175ef6c454cd13c98bab030
Reviewed-on: https://gerrit.libreoffice.org/4320Reviewed-by: 's avatarNoel Power <noel.power@suse.com>
Tested-by: 's avatarNoel Power <noel.power@suse.com>
üst 2ffd3122
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#include "numhead.hxx" #include "numhead.hxx"
// ID's fuer Dateien: // ID's for files:
#define SV_NUMID_SIZES 0x4200 #define SV_NUMID_SIZES 0x4200
//#pragma SEG_FUNCDEF(numhead_06) //#pragma SEG_FUNCDEF(numhead_06)
//! mit Skip() synchron //! Synchronous with Skip()
ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
rStream( rNewStream ) rStream( rNewStream )
{ {
...@@ -40,7 +40,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : ...@@ -40,7 +40,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
rStream >> nID; rStream >> nID;
if (nID != SV_NUMID_SIZES) if (nID != SV_NUMID_SIZES)
{ {
OSL_FAIL("SV_NUMID_SIZES nicht gefunden"); OSL_FAIL("SV_NUMID_SIZES not found");
} }
sal_uInt32 nSizeTableLen; sal_uInt32 nSizeTableLen;
rStream >> nSizeTableLen; rStream >> nSizeTableLen;
...@@ -57,7 +57,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : ...@@ -57,7 +57,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader() ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader()
{ {
DBG_ASSERT( pMemStream->Tell() == pMemStream->GetEndOfData(), DBG_ASSERT( pMemStream->Tell() == pMemStream->GetEndOfData(),
"Sizes nicht vollstaendig gelesen" ); "Sizes not completely read" );
delete pMemStream; delete pMemStream;
delete [] pBuf; delete [] pBuf;
...@@ -69,9 +69,9 @@ ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader() ...@@ -69,9 +69,9 @@ ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader()
void ImpSvNumMultipleReadHeader::EndEntry() void ImpSvNumMultipleReadHeader::EndEntry()
{ {
sal_uLong nPos = rStream.Tell(); sal_uLong nPos = rStream.Tell();
DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" ); DBG_ASSERT( nPos <= nEntryEnd, "Read too much" );
if ( nPos != nEntryEnd ) if ( nPos != nEntryEnd )
rStream.Seek( nEntryEnd ); // Rest ueberspringen rStream.Seek( nEntryEnd ); // Skip the rest
} }
//#pragma SEG_FUNCDEF(numhead_0d) //#pragma SEG_FUNCDEF(numhead_0d)
...@@ -93,11 +93,10 @@ sal_uLong ImpSvNumMultipleReadHeader::BytesLeft() const ...@@ -93,11 +93,10 @@ sal_uLong ImpSvNumMultipleReadHeader::BytesLeft() const
if (nReadEnd <= nEntryEnd) if (nReadEnd <= nEntryEnd)
return nEntryEnd-nReadEnd; return nEntryEnd-nReadEnd;
OSL_FAIL("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft"); OSL_FAIL("Error in ImpSvNumMultipleReadHeader::BytesLeft");
return 0; return 0;
} }
// -----------------------------------------------------------------------
//#pragma SEG_FUNCDEF(numhead_0a) //#pragma SEG_FUNCDEF(numhead_0a)
...@@ -123,12 +122,12 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() ...@@ -123,12 +122,12 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
rStream << static_cast<sal_uInt32>(aMemStream.Tell()); rStream << static_cast<sal_uInt32>(aMemStream.Tell());
rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? if ( nDataEnd - nDataPos != nDataSize ) // Hit Default?
{ {
nDataSize = nDataEnd - nDataPos; nDataSize = nDataEnd - nDataPos;
sal_uLong nPos = rStream.Tell(); sal_uLong nPos = rStream.Tell();
rStream.Seek(nDataPos-sizeof(sal_uInt32)); rStream.Seek(nDataPos-sizeof(sal_uInt32));
rStream << nDataSize; // Groesse am Anfang eintragen rStream << nDataSize; // Add size at the start
rStream.Seek(nPos); rStream.Seek(nPos);
} }
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <tools/stream.hxx> #include <tools/stream.hxx>
// Header mit Groessenangaben fuer mehrere Objekte // This header contains size measures for various objects
class ImpSvNumMultipleReadHeader class ImpSvNumMultipleReadHeader
{ {
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
using namespace com::sun::star; using namespace com::sun::star;
//------------------------------------------------------------------------
class SvNumFmtSuppl_Impl class SvNumFmtSuppl_Impl
{ {
...@@ -38,9 +37,8 @@ public: ...@@ -38,9 +37,8 @@ public:
pFormatter(p) {} pFormatter(p) {}
}; };
//------------------------------------------------------------------------
// Default-ctor fuer getReflection // Default ctor for getReflection
SvNumberFormatsSupplierObj::SvNumberFormatsSupplierObj() SvNumberFormatsSupplierObj::SvNumberFormatsSupplierObj()
{ {
pImpl = new SvNumFmtSuppl_Impl(NULL); pImpl = new SvNumFmtSuppl_Impl(NULL);
...@@ -68,18 +66,18 @@ SvNumberFormatter* SvNumberFormatsSupplierObj::GetNumberFormatter() const ...@@ -68,18 +66,18 @@ SvNumberFormatter* SvNumberFormatsSupplierObj::GetNumberFormatter() const
void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew) void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew)
{ {
// der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen! // The old Numberformatter has been retired, do not access it anymore!
pImpl->pFormatter = pNew; pImpl->pFormatter = pNew;
} }
void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32) void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32)
{ {
// Basis-Implementierung tut nix... // Base implementation; does nothing
} }
void SvNumberFormatsSupplierObj::SettingsChanged() void SvNumberFormatsSupplierObj::SettingsChanged()
{ {
// Basis-Implementierung tut nix... // Base implementation; does nothing
} }
// XNumberFormatsSupplier // XNumberFormatsSupplier
...@@ -136,9 +134,4 @@ SvNumberFormatsSupplierObj* SvNumberFormatsSupplierObj::getImplementation( ...@@ -136,9 +134,4 @@ SvNumberFormatsSupplierObj* SvNumberFormatsSupplierObj::getImplementation(
return pRet; return pRet;
} }
//------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -36,20 +36,17 @@ using namespace ::utl; ...@@ -36,20 +36,17 @@ using namespace ::utl;
#define PERSISTENT_SERVICE_NAME OUString("com.sun.star.util.NumberFormatsSupplier"); #define PERSISTENT_SERVICE_NAME OUString("com.sun.star.util.NumberFormatsSupplier");
//-------------------------------------------------------------------------
Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
{ {
return static_cast< ::cppu::OWeakObject* >(new SvNumberFormatsSupplierServiceObject( comphelper::getComponentContext(_rxFactory) )); return static_cast< ::cppu::OWeakObject* >(new SvNumberFormatsSupplierServiceObject( comphelper::getComponentContext(_rxFactory) ));
} }
//-------------------------------------------------------------------------
SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB)
:m_pOwnFormatter(NULL) :m_pOwnFormatter(NULL)
,m_xORB(_rxORB) ,m_xORB(_rxORB)
{ {
} }
//-------------------------------------------------------------------------
SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject() SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject()
{ {
if (m_pOwnFormatter) if (m_pOwnFormatter)
...@@ -59,7 +56,6 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject() ...@@ -59,7 +56,6 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject()
} }
} }
//-------------------------------------------------------------------------
Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException) Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException)
{ {
Any aReturn = ::cppu::queryInterface(_rType, Any aReturn = ::cppu::queryInterface(_rType,
...@@ -74,7 +70,6 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& ...@@ -74,7 +70,6 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type&
return aReturn; return aReturn;
} }
//-------------------------------------------------------------------------
void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException) void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException)
{ {
::osl::MutexGuard aGuard( getSharedMutex() ); ::osl::MutexGuard aGuard( getSharedMutex() );
...@@ -116,13 +111,11 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< ...@@ -116,13 +111,11 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
SetNumberFormatter(m_pOwnFormatter); SetNumberFormatter(m_pOwnFormatter);
} }
//-------------------------------------------------------------------------
OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException)
{ {
return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
} }
//-------------------------------------------------------------------------
sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException) sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
{ {
Sequence< OUString > aServices = getSupportedServiceNames(); Sequence< OUString > aServices = getSupportedServiceNames();
...@@ -134,7 +127,6 @@ sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const O ...@@ -134,7 +127,6 @@ sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const O
return sal_False; return sal_False;
} }
//-------------------------------------------------------------------------
Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException) Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException)
{ {
Sequence< OUString > aSupported(1); Sequence< OUString > aSupported(1);
...@@ -142,13 +134,11 @@ Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupported ...@@ -142,13 +134,11 @@ Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupported
return aSupported; return aSupported;
} }
//-------------------------------------------------------------------------
OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException) OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException)
{ {
return PERSISTENT_SERVICE_NAME; return PERSISTENT_SERVICE_NAME;
} }
//-------------------------------------------------------------------------
void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException) void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException)
{ {
::osl::MutexGuard aGuard( getSharedMutex() ); ::osl::MutexGuard aGuard( getSharedMutex() );
...@@ -161,7 +151,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObj ...@@ -161,7 +151,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObj
m_pOwnFormatter->Save(aSvOutputSteam); m_pOwnFormatter->Save(aSvOutputSteam);
} }
//-------------------------------------------------------------------------
void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException) void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException)
{ {
::osl::MutexGuard aGuard( getSharedMutex() ); ::osl::MutexGuard aGuard( getSharedMutex() );
...@@ -173,7 +162,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObje ...@@ -173,7 +162,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObje
m_pOwnFormatter->Load(aSvInputSteam); m_pOwnFormatter->Load(aSvInputSteam);
} }
//-------------------------------------------------------------------------
Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException) Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException)
{ {
::osl::MutexGuard aGuard( getSharedMutex() ); ::osl::MutexGuard aGuard( getSharedMutex() );
...@@ -181,7 +169,6 @@ Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumb ...@@ -181,7 +169,6 @@ Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumb
return SvNumberFormatsSupplierObj::getNumberFormatSettings(); return SvNumberFormatsSupplierObj::getNumberFormatSettings();
} }
//-------------------------------------------------------------------------
Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException) Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException)
{ {
::osl::MutexGuard aGuard( getSharedMutex() ); ::osl::MutexGuard aGuard( getSharedMutex() );
...@@ -189,7 +176,6 @@ Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNu ...@@ -189,7 +176,6 @@ Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNu
return SvNumberFormatsSupplierObj::getNumberFormats(); return SvNumberFormatsSupplierObj::getNumberFormats();
} }
//-------------------------------------------------------------------------
sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException) sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException)
{ {
sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier ); sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier );
...@@ -199,7 +185,6 @@ sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Seq ...@@ -199,7 +185,6 @@ sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Seq
return nReturn; return nReturn;
} }
//-------------------------------------------------------------------------
void SvNumberFormatsSupplierServiceObject::implEnsureFormatter() void SvNumberFormatsSupplierServiceObject::implEnsureFormatter()
{ {
if (!m_pOwnFormatter) if (!m_pOwnFormatter)
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/io/XPersistObject.hpp>
//========================================================================= /**
//= SvNumberFormatsSupplierServiceObject - a number formats supplier which * SvNumberFormatsSupplierServiceObject - a number formats supplier which
//= - can be instantiated as an service * - can be instantiated as an service
//= - supports the ::com::sun::star::io::XPersistObject interface * - supports the ::com::sun::star::io::XPersistObject interface
//= - works with it's own SvNumberFormatter instance * - works with it's own SvNumberFormatter instance
//= - can be initialized (::com::sun::star::lang::XInitialization) * - can be initialized (::com::sun::star::lang::XInitialization)
//= with a specific language (i.e. ::com::sun::star::lang::Locale) * with a specific language (i.e. ::com::sun::star::lang::Locale)
//========================================================================= */
class SvNumberFormatsSupplierServiceObject class SvNumberFormatsSupplierServiceObject
:protected SvNumberFormatsSupplierObj :protected SvNumberFormatsSupplierObj
,public ::com::sun::star::lang::XInitialization ,public ::com::sun::star::lang::XInitialization
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment