Attachment #75818 for issue #114356

View | Details | Raw Unified | Return to issue 114356
Collapse All | Expand All

Lines 191-197 Link Here

(-)a/sw/inc/printdata.hxx (-1 / +1 lines)
191	const SwPrintData & m_rDefaultPrintData;	191	const SwPrintData & m_rDefaultPrintData;
192		192
193	public:	193	public:
194	SwPrintUIOptions( bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const SwPrintData &rDefaultPrintData );	194	SwPrintUIOptions( bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const rtl::OUString& rPrintRangeStr, const SwPrintData &rDefaultPrintData );
195	virtual ~SwPrintUIOptions();	195	virtual ~SwPrintUIOptions();
196		196
197	bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp );	197	bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp );

Lines 192-197 Link Here

(-)a/sw/source/core/view/printdata.cxx (-1 / +2 lines)
192	bool bSwSrcView,	192	bool bSwSrcView,
193	bool bHasSelection,	193	bool bHasSelection,
194	bool bHasPostIts,	194	bool bHasPostIts,
		195	const rtl::OUString& rPageRangeStr,
195	const SwPrintData &rDefaultPrintData ) :	196	const SwPrintData &rDefaultPrintData ) :
196	m_pLast( NULL ),	197	m_pLast( NULL ),
197	m_rDefaultPrintData( rDefaultPrintData )	198	m_rDefaultPrintData( rDefaultPrintData )
Lines 338-344 Link Here
338	m_aUIProperties[nIdx++].Value = getEditControlOpt( rtl::OUString(),	339	m_aUIProperties[nIdx++].Value = getEditControlOpt( rtl::OUString(),
339	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ),	340	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ),
340	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),	341	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
341	rtl::OUString(),	342	rPageRangeStr,
342	aPageRangeOpt	343	aPageRangeOpt
343	);	344	);
344	// print content selection	345	// print content selection




    const bool bHasSelection    = pSwView ? pSwView->HasSelection( sal_False ) : false;  // check for any selection, not just text selection
    const bool bHasPostIts      = lcl_GetPostIts( pDocShell->GetDoc(), 0 );
    
    rtl::OUString aPageRangeStr;
    if( pSwView )
    {
        SwWrtShell& rShell( pSwView->GetWrtShell() );
        sal_Int32 nPg = rShell.GetPhyPageNum();
        aPageRangeStr = rtl::OUString::valueOf( nPg );
    }
    
    // get default values to use in dialog from documents SwPrintData
    const SwPrintData *pPrintData = pDocShell->GetDoc()->getPrintData();
    DBG_ASSERT( pPrintData, "failed to get SwPrintData from document" );
    
    return new SwPrintUIOptions( bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, aPageRangeStr, *pPrintData );
}

////////////////////////////////////////////////////////////

Return to issue 114356

Lines 197-207 Link Here

(-)a/sw/source/ui/uno/unotxdoc.cxx (-1 / +9 lines)
197	const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection	197	const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection
198	const bool bHasPostIts = lcl_GetPostIts( pDocShell->GetDoc(), 0 );	198	const bool bHasPostIts = lcl_GetPostIts( pDocShell->GetDoc(), 0 );
199		199
		200	rtl::OUString aPageRangeStr;
		201	if( pSwView )
		202	{
		203	SwWrtShell& rShell( pSwView->GetWrtShell() );
		204	sal_Int32 nPg = rShell.GetPhyPageNum();
		205	aPageRangeStr = rtl::OUString::valueOf( nPg );
		206	}
		207
200	// get default values to use in dialog from documents SwPrintData	208	// get default values to use in dialog from documents SwPrintData
201	const SwPrintData *pPrintData = pDocShell->GetDoc()->getPrintData();	209	const SwPrintData *pPrintData = pDocShell->GetDoc()->getPrintData();
202	DBG_ASSERT( pPrintData, "failed to get SwPrintData from document" );	210	DBG_ASSERT( pPrintData, "failed to get SwPrintData from document" );
203		211
204	return new SwPrintUIOptions( bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, *pPrintData );	212	return new SwPrintUIOptions( bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, aPageRangeStr, *pPrintData );
205	}	213	}
206		214
207	////////////////////////////////////////////////////////////	215	////////////////////////////////////////////////////////////