diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:17:16 +0200 |
commit | e71dd58cbb6cbcf4d032db73982239badeeabf22 (patch) | |
tree | b21dfedc3f13ef0ba966efd13da05ff38523e698 /svl/source/numbers/numfmuno.cxx | |
parent | 510e316a6f128161e6454fe35053231bd24b5a03 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 0fce58acaa20c2e3cd99690e41da991380a0a1a9 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:20 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Jan 18 16:25:52 2011 +0200
Avoid GetHelpText() call which can be quite heavy
GetHelpText() can cause a quite heavy sequence of file and directory
lookups. See fdo#33088. As its return value here was just passed on to
ShowHelpStatusText() which doesn't do anything at all, it was
completely unnecessary. The GetHelpText() calls here caused the
noticeable slowdown in highlighting menu items on Windows with lots of
localised help files for some bundled extensions.
Signed-off-by: Caolan McNamara <caolanm@redhat.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
Signed-off-by: fstrba@novell.com
vcl/source/window/menu.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 3c2e3b6efc81c5e34c56f0f11723ed848801be35
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Tue Jan 18 13:11:00 2011 +0100
do not mix unrelated X11 Visuals (fdo#33108)
Do not assume that there is just one generic Visual, as today's XServers are
ARGB-capable and cases of both the default depth and 32bit visuals can happen.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
Signed-off-by: Radek Doulik <rodo@novell.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
vcl/unx/inc/salgdi.h | 2 +-
vcl/unx/source/gdi/salgdi.cxx | 17 ++++++++---------
vcl/unx/source/gdi/salgdi3.cxx | 8 --------
3 files changed, 9 insertions(+), 18 deletions(-)
commit 1c9c9180b4105626e9242e5499b67180abf4a53c
Author: Andre Fischer <andre.f.fischer@oracle.com>
Date: Tue Jan 18 10:41:22 2011 +0100
calc65: #i116318# Fixed the painting of axial gradients.
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
(cherry picked from commit ea29f32bd5bc1a937a747bd5a1f5b37f570ed25f)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Radek Doulik <rodo@novell.com>
cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
commit 94ba0c5b10f8089dc549e9fc4f3085622cff65c4
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Wed Nov 3 15:17:33 2010 +0100
use sane scrollbar sizes when drawing
bnc#619772 leads to a crash because maximum = minimum = 0, and this
strange (but for whatever reason needed) '- mnVisibleSize' hack
makes maximum be -1, eventually leading to a crash
vcl/unx/kde4/KDESalGraphics.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 4831d49751fd5aa81901cfc0402311ff2d700056
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: libs-gui_libreoffice-3.3.0.4
Diffstat (limited to 'svl/source/numbers/numfmuno.cxx')
-rw-r--r-- | svl/source/numbers/numfmuno.cxx | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index cf026acb8a71..12d59785ebbd 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,52 +48,52 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter" -#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings" -#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats" -#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties" +#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter" +#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings" +#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats" +#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties" //------------------------------------------------------------------------ -#define PROPERTYNAME_FMTSTR "FormatString" -#define PROPERTYNAME_LOCALE "Locale" -#define PROPERTYNAME_TYPE "Type" -#define PROPERTYNAME_COMMENT "Comment" -#define PROPERTYNAME_CURREXT "CurrencyExtension" -#define PROPERTYNAME_CURRSYM "CurrencySymbol" -#define PROPERTYNAME_CURRABB "CurrencyAbbreviation" -#define PROPERTYNAME_DECIMALS "Decimals" -#define PROPERTYNAME_LEADING "LeadingZeros" -#define PROPERTYNAME_NEGRED "NegativeRed" -#define PROPERTYNAME_STDFORM "StandardFormat" -#define PROPERTYNAME_THOUS "ThousandsSeparator" -#define PROPERTYNAME_USERDEF "UserDefined" - -#define PROPERTYNAME_NOZERO "NoZero" -#define PROPERTYNAME_NULLDATE "NullDate" -#define PROPERTYNAME_STDDEC "StandardDecimals" -#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart" +#define PROPERTYNAME_FMTSTR "FormatString" +#define PROPERTYNAME_LOCALE "Locale" +#define PROPERTYNAME_TYPE "Type" +#define PROPERTYNAME_COMMENT "Comment" +#define PROPERTYNAME_CURREXT "CurrencyExtension" +#define PROPERTYNAME_CURRSYM "CurrencySymbol" +#define PROPERTYNAME_CURRABB "CurrencyAbbreviation" +#define PROPERTYNAME_DECIMALS "Decimals" +#define PROPERTYNAME_LEADING "LeadingZeros" +#define PROPERTYNAME_NEGRED "NegativeRed" +#define PROPERTYNAME_STDFORM "StandardFormat" +#define PROPERTYNAME_THOUS "ThousandsSeparator" +#define PROPERTYNAME_USERDEF "UserDefined" + +#define PROPERTYNAME_NOZERO "NoZero" +#define PROPERTYNAME_NULLDATE "NullDate" +#define PROPERTYNAME_STDDEC "StandardDecimals" +#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart" //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() { static SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { - {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_LOCALE), 0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_TYPE), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_LOCALE), 0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_TYPE), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_COMMENT), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURREXT), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURRSYM), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_LEADING), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_NEGRED), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_STDFORM), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_THOUS), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_USERDEF), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_LEADING), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NEGRED), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_STDFORM), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_THOUS), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_USERDEF), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURRABB), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {0,0,0,0,0,0} }; @@ -104,10 +104,10 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() { static SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(PROPERTYNAME_NOZERO), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_STDDEC), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NOZERO), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_STDDEC), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, {0,0,0,0,0,0} }; return aNumberSettingsPropertyMap_Impl; @@ -117,13 +117,13 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) { - // empty language -> LANGUAGE_SYSTEM + // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); if ( eRet == LANGUAGE_NONE ) - eRet = LANGUAGE_SYSTEM; //! or throw an exception? + eRet = LANGUAGE_SYSTEM; //! or throw an exception? return eRet; } @@ -156,9 +156,9 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier ); + SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier ); if (!pNew) - throw uno::RuntimeException(); // wrong object + throw uno::RuntimeException(); // wrong object xAutoReleaseOld = xSupplier; @@ -248,7 +248,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -290,7 +290,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -368,7 +368,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const rtl::OUString& aFormat, LanguageType eLang = lcl_GetLanguage( nLocale ); if (bScan) { - //! irgendwas muss hier noch passieren... + //! irgendwas muss hier noch passieren... } nRet = pFormatter->GetEntryKey( aFormat, eLang ); } @@ -522,10 +522,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const rtl::OUString& aFormat, nRet = nKey; else if (nCheckPos) { - throw util::MalformedNumberFormatException(); // ungueltiges Format + throw util::MalformedNumberFormatException(); // ungueltiges Format } else - throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) + throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) } else throw uno::RuntimeException(); @@ -554,10 +554,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const rtl::OUString& aFo nRet = nKey; else if (nCheckPos) { - throw util::MalformedNumberFormatException(); // ungueltiges Format + throw util::MalformedNumberFormatException(); // ungueltiges Format } else - throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) + throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) } else throw uno::RuntimeException(); @@ -573,7 +573,7 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti if (pFormatter) { pFormatter->DeleteEntry(nKey); - rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument + rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument } } @@ -627,8 +627,8 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const if (pFormatter) { LanguageType eLang = lcl_GetLanguage( nLocale ); - // mask out "defined" bit, so type from an existing number format - // can directly be used for getStandardFormat + // mask out "defined" bit, so type from an existing number format + // can directly be used for getStandardFormat nType &= ~NUMBERFORMAT_DEFINED; nRet = pFormatter->GetStandardFormat(nType, eLang); } @@ -744,7 +744,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const rtl::OUString&, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - throw beans::UnknownPropertyException(); // everything is read-only + throw beans::UnknownPropertyException(); // everything is read-only } uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPropertyName ) @@ -782,7 +782,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro } else if (aString.EqualsAscii( PROPERTYNAME_STDFORM )) { - //! SvNumberformat Member bStandard rausreichen? + //! SvNumberformat Member bStandard rausreichen? BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); aRet.setValue( &bStandard, getBooleanCppuType() ); } @@ -898,7 +898,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue String aFmtStr = pFormat->GetFormatstring(); String aComment = pFormat->GetComment(); BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); - //! SvNumberformat Member bStandard rausreichen? + //! SvNumberformat Member bStandard rausreichen? BOOL bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 ); BOOL bThousand, bRed; USHORT nDecimals, nLeading; @@ -947,7 +947,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - throw beans::UnknownPropertyException(); // everything is read-only + throw beans::UnknownPropertyException(); // everything is read-only } // XServiceInfo @@ -1012,7 +1012,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const rtl::OUString& String aString = aPropertyName; if (aString.EqualsAscii( PROPERTYNAME_NOZERO )) { - // operator >>= shouldn't be used for bool (?) + // operator >>= shouldn't be used for bool (?) if ( aValue.getValueTypeClass() == uno::TypeClass_BOOLEAN ) pFormatter->SetNoZero( *(sal_Bool*)aValue.getValue() ); } |