diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-08-11 13:21:33 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-08-11 13:21:33 +0200 |
| commit | 86a7d417019e39f7703a7878d91e322e14e8e65a (patch) | |
| tree | 514641301b3fe580d17641097bbe183e4419139e | |
| parent | a59ecdaecfcb41d1ab89ba22b224c136f4c84eed (diff) | |
| parent | 1d0220bd674b04559dd7f76f4187fabb90c09d85 (diff) | |
CWS-TOOLING: integrate CWS calc57
Notes
split repo tag: libs-gui_ooo/OOO330_m4
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index da9da0ff8646..a03d24e6fcdb 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -373,6 +373,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang ) case LANGUAGE_USER_BODO_INDIA: case LANGUAGE_USER_DOGRI_INDIA: case LANGUAGE_USER_MAITHILI_INDIA: + case LANGUAGE_UIGHUR_CHINA: nScript = ::com::sun::star::i18n::ScriptType::COMPLEX; break; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 52f54db0e50e..d0fae33acf3b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -498,8 +498,10 @@ void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow ) void PrintDialog::NUpTabPage::setupLayout() { - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - long nIndent = 3*aBorder.Width(); + Size aBorder( LogicToPixel( Size( 6, 6 ), MapMode( MAP_APPFONT ) ) ); + /* According to OOo style guide, the horizontal indentation of child + elements to their parent element should always be 6 map units. */ + long nIndent = aBorder.Width(); maLayout.setParentWindow( this ); maLayout.setOuterBorder( aBorder.Width() ); |