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

Translate German comments, correct some WS

Added accidentally removed {

Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
Reviewed-on: https://gerrit.libreoffice.org/4331Reviewed-by: 's avatarNoel Power <noel.power@suse.com>
Tested-by: 's avatarNoel Power <noel.power@suse.com>
üst 5c346ec8
...@@ -34,15 +34,11 @@ ...@@ -34,15 +34,11 @@
using namespace com::sun::star; using namespace com::sun::star;
//------------------------------------------------------------------------
#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter" #define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter"
#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings" #define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings"
#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats" #define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats"
#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties" #define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties"
//------------------------------------------------------------------------
#define PROPERTYNAME_FMTSTR "FormatString" #define PROPERTYNAME_FMTSTR "FormatString"
#define PROPERTYNAME_LOCALE "Locale" #define PROPERTYNAME_LOCALE "Locale"
#define PROPERTYNAME_TYPE "Type" #define PROPERTYNAME_TYPE "Type"
...@@ -62,9 +58,7 @@ using namespace com::sun::star; ...@@ -62,9 +58,7 @@ using namespace com::sun::star;
#define PROPERTYNAME_STDDEC "StandardDecimals" #define PROPERTYNAME_STDDEC "StandardDecimals"
#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart" #define PROPERTYNAME_TWODIGIT "TwoDigitDateStart"
//------------------------------------------------------------------------ // All without a Which-ID, Map only for PropertySetInfo
// alles ohne Which-ID, Map nur fuer PropertySetInfo
static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
{ {
...@@ -101,8 +95,6 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() ...@@ -101,8 +95,6 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
return aNumberSettingsPropertyMap_Impl; return aNumberSettingsPropertyMap_Impl;
} }
//----------------------------------------------------------------------------------------
static LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) static LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
{ {
// empty language -> LANGUAGE_SYSTEM // empty language -> LANGUAGE_SYSTEM
...@@ -116,8 +108,6 @@ static LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) ...@@ -116,8 +108,6 @@ static LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
return eRet; return eRet;
} }
//----------------------------------------------------------------------------------------
SvNumberFormatterServiceObj::SvNumberFormatterServiceObj() SvNumberFormatterServiceObj::SvNumberFormatterServiceObj()
:m_aMutex() :m_aMutex()
{ {
...@@ -240,7 +230,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 ...@@ -240,7 +230,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
pFormatter->GetOutputString(fValue, nKey, aStr, &pColor); pFormatter->GetOutputString(fValue, nKey, aStr, &pColor);
if (pColor) if (pColor)
nRet = pColor->GetColor(); nRet = pColor->GetColor();
// sonst Default behalten // Else keep Default
} }
else else
throw uno::RuntimeException(); throw uno::RuntimeException();
...@@ -288,7 +278,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 ...@@ -288,7 +278,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32
{ {
nRet = pColor->GetColor(); nRet = pColor->GetColor();
} }
// sonst Default behalten // Else keep Default
} }
else else
{ {
...@@ -372,7 +362,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co ...@@ -372,7 +362,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
{ {
if (pColor) if (pColor)
nRet = pColor->GetColor(); nRet = pColor->GetColor();
// sonst Default behalten // Else keep Default
} }
else else
throw util::MalformedNumberFormatException(); throw util::MalformedNumberFormatException();
...@@ -406,8 +396,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedServic ...@@ -406,8 +396,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedServic
return aRet; return aRet;
} }
//------------------------------------------------------------------------
SvNumberFormatsObj::SvNumberFormatsObj( SvNumberFormatsSupplierObj& _rParent, ::comphelper::SharedMutex& _rMutex ) SvNumberFormatsObj::SvNumberFormatsObj( SvNumberFormatsSupplierObj& _rParent, ::comphelper::SharedMutex& _rMutex )
:rSupplier( _rParent ) :rSupplier( _rParent )
,m_aMutex( _rMutex ) ,m_aMutex( _rMutex )
...@@ -477,7 +465,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat, ...@@ -477,7 +465,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat,
LanguageType eLang = lcl_GetLanguage( nLocale ); LanguageType eLang = lcl_GetLanguage( nLocale );
if (bScan) if (bScan)
{ {
//! irgendwas muss hier noch passieren... //! FIXME: Something still needs to happen here ...
} }
nRet = pFormatter->GetEntryKey( aFormat, eLang ); nRet = pFormatter->GetEntryKey( aFormat, eLang );
} }
...@@ -507,10 +495,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat, ...@@ -507,10 +495,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat,
nRet = nKey; nRet = nKey;
else if (nCheckPos) else if (nCheckPos)
{ {
throw util::MalformedNumberFormatException(); // ungueltiges Format throw util::MalformedNumberFormatException(); // Invalid Format
} }
else else
throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) throw uno::RuntimeException(); // Other error (e.g. already added)
} }
else else
throw uno::RuntimeException(); throw uno::RuntimeException();
...@@ -540,10 +528,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat, ...@@ -540,10 +528,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat,
nRet = nKey; nRet = nKey;
else if (nCheckPos) else if (nCheckPos)
{ {
throw util::MalformedNumberFormatException(); // ungueltiges Format throw util::MalformedNumberFormatException(); // Invalid format
} }
else else
throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) throw uno::RuntimeException(); // Other error (e.g. already added)
} }
else else
throw uno::RuntimeException(); throw uno::RuntimeException();
...@@ -559,7 +547,7 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti ...@@ -559,7 +547,7 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti
if (pFormatter) if (pFormatter)
{ {
pFormatter->DeleteEntry(nKey); pFormatter->DeleteEntry(nKey);
rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument rSupplier.NumberFormatDeleted(nKey); // Notification for the Document
} }
} }
...@@ -615,7 +603,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const ...@@ -615,7 +603,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const
if (pFormatter) if (pFormatter)
{ {
LanguageType eLang = lcl_GetLanguage( nLocale ); LanguageType eLang = lcl_GetLanguage( nLocale );
// mask out "defined" bit, so type from an existing number format // Mask out "defined" bit, so type from an existing number format
// can directly be used for getStandardFormat // can directly be used for getStandardFormat
nType &= ~NUMBERFORMAT_DEFINED; nType &= ~NUMBERFORMAT_DEFINED;
nRet = pFormatter->GetStandardFormat(nType, eLang); nRet = pFormatter->GetStandardFormat(nType, eLang);
...@@ -700,8 +688,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNames() ...@@ -700,8 +688,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNames()
return aRet; return aRet;
} }
//------------------------------------------------------------------------
SvNumberFormatObj::SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK, const ::comphelper::SharedMutex& _rMutex ) SvNumberFormatObj::SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK, const ::comphelper::SharedMutex& _rMutex )
:rSupplier( rParent ) :rSupplier( rParent )
,nKey( nK ) ,nKey( nK )
...@@ -732,7 +718,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const OUString&, ...@@ -732,7 +718,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const OUString&,
lang::IllegalArgumentException, lang::WrappedTargetException, lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
throw beans::UnknownPropertyException(); // everything is read-only throw beans::UnknownPropertyException(); // Everything is read-only
} }
uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName ) uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName )
...@@ -768,7 +754,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty ...@@ -768,7 +754,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
} }
else if (aPropertyName.equalsAscii( PROPERTYNAME_STDFORM )) else if (aPropertyName.equalsAscii( PROPERTYNAME_STDFORM ))
{ {
//! SvNumberformat Member bStandard rausreichen? //! Pass through SvNumberformat Member bStandard?
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
aRet.setValue( &bStandard, getBooleanCppuType() ); aRet.setValue( &bStandard, getBooleanCppuType() );
} }
...@@ -885,7 +871,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue ...@@ -885,7 +871,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
OUString aFmtStr = pFormat->GetFormatstring(); OUString aFmtStr = pFormat->GetFormatstring();
OUString aComment = pFormat->GetComment(); OUString aComment = pFormat->GetComment();
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
//! SvNumberformat Member bStandard rausreichen? //! Pass through SvNumberformat Member bStandard?
sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 ); sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 );
bool bThousand, bRed; bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading; sal_uInt16 nDecimals, nLeading;
...@@ -933,7 +919,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P ...@@ -933,7 +919,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
lang::IllegalArgumentException, lang::WrappedTargetException, lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
throw beans::UnknownPropertyException(); // everything is read-only throw beans::UnknownPropertyException(); // Everything is read-only
} }
// XServiceInfo // XServiceInfo
...@@ -959,8 +945,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceNames() ...@@ -959,8 +945,6 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceNames()
return aRet; return aRet;
} }
//------------------------------------------------------------------------
SvNumberFormatSettingsObj::SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const ::comphelper::SharedMutex& _rMutex ) SvNumberFormatSettingsObj::SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const ::comphelper::SharedMutex& _rMutex )
:rSupplier( rParent ) :rSupplier( rParent )
,m_aMutex( _rMutex ) ,m_aMutex( _rMutex )
...@@ -1120,5 +1104,4 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceN ...@@ -1120,5 +1104,4 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceN
return aRet; return aRet;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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