Commits

Anonymous committed 57641e4

#i115915# paper size box needs valid selection

Comments (0)

Files changed (1)

cui/source/tabpages/page.cxx

 	ResStringArray aPaperAry( CUI_RES( nAryId ) );
 	sal_uInt32 nCnt = aPaperAry.Count();
 
+	USHORT nUserPos = LISTBOX_ENTRY_NOTFOUND;
 	for ( sal_uInt32 i = 0; i < nCnt; ++i )
 	{
 		String aStr = aPaperAry.GetString(i);
 
 		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
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.