diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:58 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:58 +0100 |
| commit | 99ea2c07b814880930c7e04c4e0a846865b715e6 (patch) | |
| tree | 02d3f8544c177b1b69d51f8877a668e83cff8163 /cui/source/options/optgdlg.cxx | |
| parent | 92af49f10a88ec1bf8aea1a5f17b8821e9d8abc7 (diff) | |
| parent | b67926ba6bd659390b18351cf0795198ea7cdfd0 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index cb7a171f9..9839f13b4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -221,6 +221,11 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : { FreeResource(); +#if not ENABLE_HELP_FORMATTING + aHelpFormatFT.Hide(); + aHelpFormatLB.Hide(); +#endif + if (!lcl_HasSystemFilePicker()) { aFileDlgFL.Hide(); @@ -238,6 +243,27 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aODMADlgCB.Hide(); #endif + if (!aODMADlgCB.IsVisible()) + { + // rearrange the following controls + Point aNewPos = aPrintDlgFL.GetPosPixel(); + long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y(); + + Window* pWins[] = + { + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB + }; + Window** pCurrent = pWins; + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); + for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) + { + aNewPos = (*pCurrent)->GetPosPixel(); + aNewPos.Y() -= nDelta; + (*pCurrent)->SetPosPixel( aNewPos ); + } + } + if ( !aFileDlgCB.IsVisible() ) { // rearrange the following controls |