Kaydet (Commit) e8a6c5a2 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

CWS-TOOLING: integrate CWS os146

...@@ -608,6 +608,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) ...@@ -608,6 +608,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
ResStringArray aPaperAry( CUI_RES( nAryId ) ); ResStringArray aPaperAry( CUI_RES( nAryId ) );
sal_uInt32 nCnt = aPaperAry.Count(); sal_uInt32 nCnt = aPaperAry.Count();
sal_uInt16 nUserPos = LISTBOX_ENTRY_NOTFOUND;
for ( sal_uInt32 i = 0; i < nCnt; ++i ) for ( sal_uInt32 i = 0; i < nCnt; ++i )
{ {
String aStr = aPaperAry.GetString(i); String aStr = aPaperAry.GetString(i);
...@@ -617,9 +618,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) ...@@ -617,9 +618,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
if ( eSize == ePaper ) if ( eSize == ePaper )
nActPos = nPos; nActPos = nPos;
if( eSize == PAPER_USER )
nUserPos = nPos;
} }
// aktuelles Papierformat selektieren // preselect current paper format - #115915#: ePaper might not be in aPaperSizeBox so use PAPER_USER instead
aPaperSizeBox.SelectEntryPos( nActPos ); aPaperSizeBox.SelectEntryPos( nActPos != LISTBOX_ENTRY_NOTFOUND ? nActPos : nUserPos );
// Applikationsspezifisch // Applikationsspezifisch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment