salprn.cxx (9f62ea84) | salprn.cxx (cd426cce) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 228 unchanged lines hidden (view full) --- 237 238 if( pPaper ) 239 { 240 NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; 241 [mpPrintInfo setPaperName: pPaperName]; 242 } 243 else if( i_nWidth > 0 && i_nHeight > 0 ) 244 { | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 228 unchanged lines hidden (view full) --- 237 238 if( pPaper ) 239 { 240 NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; 241 [mpPrintInfo setPaperName: pPaperName]; 242 } 243 else if( i_nWidth > 0 && i_nHeight > 0 ) 244 { |
245 NSSize aPaperSize = { TenMuToPt(i_nWidth), TenMuToPt(i_nHeight) }; | 245 NSSize aPaperSize = NSMakeSize( TenMuToPt(i_nWidth), TenMuToPt(i_nHeight)); |
246 [mpPrintInfo setPaperSize: aPaperSize]; 247 } 248 // this seems counterintuitive 249 mePageOrientation = i_eSetOrientation; 250} 251 252// ----------------------------------------------------------------------- 253 --- 569 unchanged lines hidden --- | 246 [mpPrintInfo setPaperSize: aPaperSize]; 247 } 248 // this seems counterintuitive 249 mePageOrientation = i_eSetOrientation; 250} 251 252// ----------------------------------------------------------------------- 253 --- 569 unchanged lines hidden --- |