Attachment #34909 for issue #61139

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

Lines 81-90 ImpPDFTabDialog::ImpPDFTabDialog( Window Link Here

(-)filter/source/pdf/impdialog.cxx (-5 / +17 lines)
81	maFlPages( this, ResId( 1 ) ),	81	maFlPages( this, ResId( 1 ) ),
82		82
83	maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/PDF/Export/" ) ), &rFilterData ),	83	maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/PDF/Export/" ) ), &rFilterData ),
		84	maConfigI18N( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/I18N/CTL/" ) ) ),
84	mbIsPresentation( sal_False ),	85	mbIsPresentation( sal_False ),
85	mbIsWriter( sal_False ),	86	mbIsWriter( sal_False ),
86		87
87	mbSelectionPresent( sal_False ),	88	mbSelectionPresent( sal_False ),
		89	mbUseCTLFont( sal_False ),
88	mbUseLosslessCompression( sal_True ),	90	mbUseLosslessCompression( sal_True ),
89	mnQuality( 90 ),	91	mnQuality( 90 ),
90	mbReduceImageResolution( sal_False ),	92	mbReduceImageResolution( sal_False ),
Lines 167-172 ImpPDFTabDialog::ImpPDFTabDialog( Window Link Here
167	{	169	{
168	}	170	}
169		171
		172	//get the CTL (Complex Text Layout) from general options, returns TRUE if we have a CTL font on our hands.
		173	mbUseCTLFont = maConfigI18N.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CTLFont" ) ), sal_False );
		174
170	mbUseLosslessCompression = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), sal_False );	175	mbUseLosslessCompression = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), sal_False );
171	mnQuality = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 90 );	176	mnQuality = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 90 );
172	mbReduceImageResolution = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), sal_False );	177	mbReduceImageResolution = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), sal_False );
Lines 495-501 ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage Link Here
495	maRbPgLySinglePage( this, ResId( RB_PGLY_SINGPG, paResMgr ) ),	500	maRbPgLySinglePage( this, ResId( RB_PGLY_SINGPG, paResMgr ) ),
496	maRbPgLyContinue( this, ResId( RB_PGLY_CONT, paResMgr ) ),	501	maRbPgLyContinue( this, ResId( RB_PGLY_CONT, paResMgr ) ),
497	maRbPgLyContinueFacing( this, ResId( RB_PGLY_CONTFAC, paResMgr ) ),	502	maRbPgLyContinueFacing( this, ResId( RB_PGLY_CONTFAC, paResMgr ) ),
498	maCbPgLyFirstOnLeft( this, ResId( CB_PGLY_FIRSTLEFT, paResMgr ) )	503	maCbPgLyFirstOnLeft( this, ResId( CB_PGLY_FIRSTLEFT, paResMgr ) ),
		504	mbUseCTLFont( sal_False )
499	{	505	{
500	mpaResMgr = paResMgr;	506	mpaResMgr = paResMgr;
501	FreeResource();	507	FreeResource();
Lines 542-553 void ImpPDFTabOpnFtrPage::GetFilterConfi Link Here
542	else if( maRbPgLyContinueFacing.IsChecked() )	548	else if( maRbPgLyContinueFacing.IsChecked() )
543	paParent->mnPageLayout = 3;	549	paParent->mnPageLayout = 3;
544		550
545	paParent->mbFirstPageLeft = maCbPgLyFirstOnLeft.IsChecked();	551	paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? maCbPgLyFirstOnLeft.IsChecked() : sal_False;
546	}	552	}
547		553
548	// -----------------------------------------------------------------------------	554	// -----------------------------------------------------------------------------
549	void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )	555	void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
550	{	556	{
		557	mbUseCTLFont = paParent->mbUseCTLFont;
551	switch( paParent->mnPageLayout )	558	switch( paParent->mnPageLayout )
552	{	559	{
553	default:	560	default:
Lines 596-604 void ImpPDFTabOpnFtrPage::SetFilterConfi Link Here
596	break;	603	break;
597	};	604	};
598		605
599	maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) );	606	if( !mbUseCTLFont )
600	maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );	607	maCbPgLyFirstOnLeft.Hide( );
601	ToggleRbPgLyContinueFacingHdl( NULL );	608	else
		609	{
		610	maRbPgLyContinueFacing.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) );
		611	maCbPgLyFirstOnLeft.Check( paParent->mbFirstPageLeft );
		612	ToggleRbPgLyContinueFacingHdl( NULL );
		613	}
602	}	614	}
603		615
604	IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, p )	616	IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, p )




    FixedLine                   maFlPages; //ugly hack: It seems the dialog is not resizable in any way

    FilterConfigItem            maConfigItem;
    FilterConfigItem            maConfigI18N;

    Any                         maSelection;


   	sal_Bool                    mbIsPresentation;
    sal_Bool                    mbIsWriter;
    sal_Bool                    mbSelectionPresent;
    sal_Bool                    mbUseCTLFont;
    sal_Bool                    mbUseLosslessCompression;
    sal_Int32                   mnQuality;
    sal_Bool                    mbReduceImageResolution;

    RadioButton                 maRbPgLyContinueFacing;
    CheckBox                    maCbPgLyFirstOnLeft;

    sal_Bool                    mbUseCTLFont;
    ResMgr*                     mpaResMgr;

    DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );

Lines 348-354 TabPage RID_PDF_TAB_OPNFTR Link Here

(-)filter/source/pdf/impdialog.src (-2 / +2 lines)
348	TabPage RID_PDF_TAB_VPREFER	348	TabPage RID_PDF_TAB_VPREFER
349	{	349	{
350	HelpId = 0 ;	350	HelpId = 0 ;
351	Text[ de ] = "Benutzungsschnittstelle" ;	351	Text[ de ] = "Benutzeroberfläche" ;
352	Text[ en-US ] = "User Interface" ;	352	Text[ en-US ] = "User Interface" ;
353	TAB_PDF_SIZE;	353	TAB_PDF_SIZE;
354		354
Lines 398-404 TabPage RID_PDF_TAB_VPREFER Link Here
398	{	398	{
399	Pos = MAP_APPFONT ( 6 , 64 ) ;	399	Pos = MAP_APPFONT ( 6 , 64 ) ;
400	Size = MAP_APPFONT (162 , 8 ) ;	400	Size = MAP_APPFONT (162 , 8 ) ;
401	Text[ de ] = "Benutzungsoberflächenoptionen" ;	401	Text[ de ] = "Benutzeroberflächenoptionen" ;
402	Text[ en-US ] = "User interface options" ;	402	Text[ en-US ] = "User interface options" ;
403	};	403	};
404	CheckBox CB_UOP_HIDEVMENUBAR	404	CheckBox CB_UOP_HIDEVMENUBAR

Lines 4784-4790 Dymamic border coloring means that when Link Here

(-)officecfg/registry/schema/org/openoffice/Office/Common.xcs (-2 / +2 lines)
4784	</prop>	4784	</prop>
4785	<prop oor:name="MaxImageResolution" oor:type="xs:int">	4785	<prop oor:name="MaxImageResolution" oor:type="xs:int">
4786	<info>	4786	<info>
4787	<desc>If the property ReduceImageResolution is set to true all images will be reduced to the given value. in DPI.</desc>	4787	<desc>If the property ReduceImageResolution is set to true all images will be reduced to the given value in DPI.</desc>
4788	</info>	4788	</info>
4789	<constraints>	4789	<constraints>
4790	<enumeration oor:value="75">	4790	<enumeration oor:value="75">
Lines 4827-4833 Dymamic border coloring means that when Link Here
4827	<author>SJ</author>	4827	<author>SJ</author>
4828	<desc>Specifies if notes are exported to PDF.</desc>	4828	<desc>Specifies if notes are exported to PDF.</desc>
4829	</info>	4829	</info>
4830	<value>true</value>	4830	<value>false</value>
4831	</prop>	4831	</prop>
4832	<prop oor:name="ExportNotesPages" oor:type="xs:boolean">	4832	<prop oor:name="ExportNotesPages" oor:type="xs:boolean">
4833	<info>	4833	<info>





    switch( m_aContext.PDFDocumentAction )
    {
    case PDFWriter::ActionDefault :     //do nothing, this is the Acrobat default
    default:
        aLine.append( "/OpenAction [0 /XYZ null null null" ); //page 0 (first) open Default, leave without it
        break;
    case PDFWriter::FitInWindow :
        aLine.append( "/OpenAction[0 /Fit]\n" ); //Open fit page
        break;
    case PDFWriter::FitWidth :
        aLine.append( "/OpenAction[0 /FitH " );
        aLine.append( m_nInheritedPageHeight );//Open fit width
        aLine.append( "]\n" );
        break;
    case PDFWriter::FitVisible :
        aLine.append( "/OpenAction[0 /FitBH " );
        aLine.append( m_nInheritedPageHeight );//Open fit visible
        aLine.append( "]\n" );
        break;
    }
    aLine.append( "]\n" );
// viewer preferences, if we had some, then emit
    if( m_aContext.HideViewerToolbar ||
        ( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) ||

Return to issue 61139

Lines 4379-4401 bool PDFWriterImpl::emitCatalog() Link Here

(-)vcl/source/gdi/pdfwriter_impl.cxx (-6 / +6 lines)
4379		4379
4380	switch( m_aContext.PDFDocumentAction )	4380	switch( m_aContext.PDFDocumentAction )
4381	{	4381	{
4382	case PDFWriter::ActionDefault :	4382	case PDFWriter::ActionDefault : //do nothing, this is the Acrobat default
4383	default:	4383	default:
4384	aLine.append( "/OpenAction [0 /XYZ null null null" ); //page 0 (first) open Default, leave without it
4385	break;	4384	break;
4386	case PDFWriter::FitInWindow :	4385	case PDFWriter::FitInWindow :
4387	aLine.append( "/OpenAction [0 /Fit" ); //Open fit page	4386	aLine.append( "/OpenAction[0 /Fit]\n" ); //Open fit page
4388	break;	4387	break;
4389	case PDFWriter::FitWidth :	4388	case PDFWriter::FitWidth :
4390	aLine.append( "/OpenAction [0 /FitH " );	4389	aLine.append( "/OpenAction[0 /FitH " );
4391	aLine.append( m_nInheritedPageHeight );//Open fit width	4390	aLine.append( m_nInheritedPageHeight );//Open fit width
		4391	aLine.append( "]\n" );
4392	break;	4392	break;
4393	case PDFWriter::FitVisible :	4393	case PDFWriter::FitVisible :
4394	aLine.append( "/OpenAction [0 /FitBH " );	4394	aLine.append( "/OpenAction[0 /FitBH " );
4395	aLine.append( m_nInheritedPageHeight );//Open fit visible	4395	aLine.append( m_nInheritedPageHeight );//Open fit visible
		4396	aLine.append( "]\n" );
4396	break;	4397	break;
4397	}	4398	}
4398	aLine.append( "]\n" );
4399	// viewer preferences, if we had some, then emit	4399	// viewer preferences, if we had some, then emit
4400	if( m_aContext.HideViewerToolbar \|\|	4400	if( m_aContext.HideViewerToolbar \|\|
4401	( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) \|\|	4401	( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) \|\|

Lines 72-77 private: Link Here

(-)filter/source/pdf/impdialog.hxx (+3 lines)
72	FixedLine maFlPages; //ugly hack: It seems the dialog is not resizable in any way	72	FixedLine maFlPages; //ugly hack: It seems the dialog is not resizable in any way
73		73
74	FilterConfigItem maConfigItem;	74	FilterConfigItem maConfigItem;
		75	FilterConfigItem maConfigI18N;
75		76
76	Any maSelection;	77	Any maSelection;
77		78
Lines 82-87 protected: Link Here
82	sal_Bool mbIsPresentation;	83	sal_Bool mbIsPresentation;
83	sal_Bool mbIsWriter;	84	sal_Bool mbIsWriter;
84	sal_Bool mbSelectionPresent;	85	sal_Bool mbSelectionPresent;
		86	sal_Bool mbUseCTLFont;
85	sal_Bool mbUseLosslessCompression;	87	sal_Bool mbUseLosslessCompression;
86	sal_Int32 mnQuality;	88	sal_Int32 mnQuality;
87	sal_Bool mbReduceImageResolution;	89	sal_Bool mbReduceImageResolution;
Lines 198-203 class ImpPDFTabOpnFtrPage : public SfxTa Link Here
198	RadioButton maRbPgLyContinueFacing;	200	RadioButton maRbPgLyContinueFacing;
199	CheckBox maCbPgLyFirstOnLeft;	201	CheckBox maCbPgLyFirstOnLeft;
200		202
		203	sal_Bool mbUseCTLFont;
201	ResMgr* mpaResMgr;	204	ResMgr* mpaResMgr;
202		205
203	DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );	206	DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );