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 | d0fa316883fe71e5125e38302cfe45d2ca86d073 (patch) | |
| tree | 98f23328ebc9e32b8c187eabdfecec057538ce68 | |
| parent | 66c072d89a54989d4c78e64691e1c3e9d35ac66e (diff) | |
| parent | 7dd9f4556b718431a01e888c86a44e07540224e5 (diff) | |
CWS-TOOLING: integrate CWS calc57ooo/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 4ace5a2bf4..9b8573fb89 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 065a9f76a5..38d6e21995 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() ); |