diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-27 17:18:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-27 17:18:56 +0000 |
| commit | 801268f69c46e8b5f7f25af82806460c9f7b77f2 (patch) | |
| tree | 5de0f547e6c7826a4e1c0231f34d070bee87433f /i18npool/source/paper | |
| parent | cbf10a85ee07cf370a5547e725cce5f193c9362c (diff) | |
CWS-TOOLING: integrate CWS cmcfixes60
2009-07-03 21:56:04 +0200 cmc r273718 : #i103313# org.openoffice.System not org.openoffice.Setup for looking up default locale
2009-07-01 17:15:31 +0200 cmc r273606 : #i102636# extra rounding precision
2009-07-01 11:04:47 +0200 cmc r273556 : #i100000# workaround build issue
2009-06-30 17:27:41 +0200 cmc r273525 : #i102636# extra rounding precision
2009-06-30 09:42:46 +0200 cmc r273491 : #i102634# numbers got mixed up somehow
2009-06-30 09:19:56 +0200 cmc r273490 : CWS-TOOLING: rebase CWS cmcfixes60 to trunk@273468 (milestone: DEV300:m51)
2009-06-22 12:54:45 +0200 cmc r273217 : #i103000# micro-optimization to remove unused symbols from fpicker etc.
2009-06-19 10:06:21 +0200 cmc r273148 : #i102932# put same type into an Any as we take out of that Any, affect 64bit
2009-06-13 17:38:42 +0200 cmc r272957 : #i102742# gcc44 warnings, return of const primitive type doesn't mean anything
2009-06-13 16:22:40 +0200 cmc r272955 : #i102737# keep existing logic and silence new gcc44 warnings
2009-06-13 16:06:25 +0200 cmc r272954 : #i102736# confirm existing logic to be gcc44 warnings free
2009-06-10 19:40:24 +0200 cmc r272837 : #i87461# 64bit color lossage
2009-06-10 19:23:38 +0200 cmc r272836 : #i102636# tidy up UI rounding errors
Diffstat (limited to 'i18npool/source/paper')
| -rw-r--r-- | i18npool/source/paper/paper.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx index a81b9b370b8c..726a4c3bd898 100644 --- a/i18npool/source/paper/paper.cxx +++ b/i18npool/source/paper/paper.cxx @@ -63,7 +63,7 @@ struct PageDesc (long)(((v) * 35.27777778) + 0.5) #define IN2MM100( v ) \ - ((long)((v) * 2540)) + ((long)(((v) * 2540) + 0.5)) #define MM2MM100( v ) \ ((long)((v) * 100)) @@ -362,11 +362,16 @@ PaperInfo PaperInfo::getSystemDefaultPaper() { // if set to "use system", try to get locale from system if( aLocaleStr.getLength() == 0 ) + { + aArgs[ 0 ] <<= CREATE_OUSTRING( "org.openoffice.System/L10N/" ); + xConfigNA.set( xConfigProv->createInstanceWithArguments( + CREATE_OUSTRING( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), + UNO_QUERY_THROW ); xConfigNA->getByName( CREATE_OUSTRING( "Locale" ) ) >>= aLocaleStr; + } } catch( Exception& ) {} - if (aLocaleStr.getLength() == 0) aLocaleStr = CREATE_OUSTRING("en-US"); |