diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-07 17:31:32 +0100 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-07 17:31:32 +0100 |
commit | e8a6c5a27713a2bbc378ca999beb272e7cdd63ef (patch) | |
tree | 7b67fee104d8a38aa0a02b28d949c5ca20b1a93f /cui | |
parent | 736d7a0dafbbe39f7e0eea7d7d4521720c3c0441 (diff) | |
parent | 883e2b11250a7bd9b97b20a5ef1d4d87fab42bdd (diff) |
CWS-TOOLING: integrate CWS os146
Notes
split repo tag: components_ooo/DEV300_m102
Diffstat (limited to 'cui')
-rwxr-xr-x[-rw-r--r--] | cui/source/tabpages/page.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5bc52b99f3a9..0000fe6e1714 100644..100755 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -608,6 +608,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) ResStringArray aPaperAry( CUI_RES( nAryId ) ); sal_uInt32 nCnt = aPaperAry.Count(); + sal_uInt16 nUserPos = LISTBOX_ENTRY_NOTFOUND; for ( sal_uInt32 i = 0; i < nCnt; ++i ) { String aStr = aPaperAry.GetString(i); @@ -617,9 +618,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( eSize == ePaper ) nActPos = nPos; + if( eSize == PAPER_USER ) + nUserPos = nPos; } - // aktuelles Papierformat selektieren - aPaperSizeBox.SelectEntryPos( nActPos ); + // preselect current paper format - #115915#: ePaper might not be in aPaperSizeBox so use PAPER_USER instead + aPaperSizeBox.SelectEntryPos( nActPos != LISTBOX_ENTRY_NOTFOUND ? nActPos : nUserPos ); // Applikationsspezifisch |