summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/page.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages/page.cxx')
-rwxr-xr-x[-rw-r--r--]cui/source/tabpages/page.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index aa5d75239b65..ef1fff0de271 100644..100755
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -602,6 +602,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);
@@ -611,9 +612,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