1 files changed, 0 insertions, 20 deletions

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 21e98aff408b..56534f0abaa3 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -80,13 +80,12 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
     mbExportNotes( sal_True ),
     mbViewPDF( sal_False ),
     mbExportNotesPages( sal_False ),
     mbUseTransitionEffects( sal_False ),
     mbIsSkipEmptyPages( sal_True ),
     mbAddStream( sal_False ),
-    mbEmbedStandardFonts( sal_False ),
     mnFormsType( 0 ),
     mbExportFormFields( sal_True ),
     mbAllowDuplicateFieldNames( sal_False ),
     mbExportBookmarks( sal_True ),
     mbExportHiddenSlides ( sal_False),
     mnOpenBookmarkLevels( -1 ),
@@ -197,13 +196,12 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
     if ( mbIsPresentation )
         mbExportHiddenSlides = maConfigItem.ReadBool( "ExportHiddenSlides", sal_False );
     mnOpenBookmarkLevels = maConfigItem.ReadInt32( "OpenBookmarkLevels", -1 );
     mbUseTransitionEffects = maConfigItem.ReadBool( "UseTransitionEffects", sal_True );
     mbIsSkipEmptyPages = maConfigItem.ReadBool( "IsSkipEmptyPages", sal_False );
     mbAddStream = maConfigItem.ReadBool( "IsAddStream", sal_False );
-    mbEmbedStandardFonts = maConfigItem.ReadBool( "EmbedStandardFonts", sal_False );
 
     mnFormsType = maConfigItem.ReadInt32( "FormsType", 0 );
     mbExportFormFields = maConfigItem.ReadBool( "ExportFormFields", sal_True );
     if ( ( mnFormsType < 0 ) || ( mnFormsType > 3 ) )
         mnFormsType = 0;
     mbAllowDuplicateFieldNames = maConfigItem.ReadBool( "AllowDuplicateFieldNames", sal_False );
@@ -365,13 +363,12 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
     maConfigItem.WriteBool( "ExportBookmarks", mbExportBookmarks );
     if ( mbIsPresentation )
         maConfigItem.WriteBool( "ExportHiddenSlides", mbExportHiddenSlides );
     maConfigItem.WriteBool( "UseTransitionEffects", mbUseTransitionEffects );
     maConfigItem.WriteBool( "IsSkipEmptyPages", mbIsSkipEmptyPages );
     maConfigItem.WriteBool( "IsAddStream", mbAddStream );
-    maConfigItem.WriteBool( "EmbedStandardFonts", mbEmbedStandardFonts );
 
     /*
     * FIXME: the entries are only implicitly defined by the resource file. Should there
     * ever be an additional form submit format this could get invalid.
     */
     maConfigItem.WriteInt32( "FormsType", mnFormsType );
@@ -501,26 +498,24 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
 
     maCbTaggedPDF( this, PDFFilterResId( CB_TAGGEDPDF ) ),
     mbTaggedPDFUserSelection( sal_False ),
 
     maCbExportFormFields( this, PDFFilterResId( CB_EXPORTFORMFIELDS ) ),
     mbExportFormFieldsUserSelection( sal_False ),
-    mbEmbedStandardFontsUserSelection( sal_False ),
     maFtFormsFormat( this, PDFFilterResId( FT_FORMSFORMAT ) ),
     maLbFormsFormat( this, PDFFilterResId( LB_FORMSFORMAT ) ),
     maCbAllowDuplicateFieldNames( this, PDFFilterResId( CB_ALLOWDUPLICATEFIELDNAMES ) ),
 
     maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
     maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
     maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
     maCbViewPDF( this, PDFFilterResId( CB_VIEWPDF ) ),
     maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
     maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
     maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
     maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION ) ),
-    maCbEmbedStandardFonts( this, PDFFilterResId( CB_EMBEDSTANDARDFONTS ) ),
 
     maFlWatermark( this, PDFFilterResId( FL_WATERMARK ) ),
     maCbWatermark( this, PDFFilterResId( CB_WATERMARK ) ),
     maFtWatermark( this, PDFFilterResId(FT_WATERMARK)),
     maEdWatermark( this, PDFFilterResId(ED_WATERMARK)),
     mbIsPresentation( sal_False ),
@@ -532,17 +527,13 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
     // pb: #i91991# maCbExportEmptyPages double-spaced if necessary
     Size aSize = maCbExportEmptyPages.GetSizePixel();
     Size aMinSize = maCbExportEmptyPages.CalcMinimumSize();
     if ( aSize.Width() > aMinSize.Width() )
     {
         Size aNewSize = maCbExportNotes.GetSizePixel();
-        long nDelta = aSize.Height() - aNewSize.Height();
         maCbExportEmptyPages.SetSizePixel( aNewSize );
-        Point aNewPos = maCbEmbedStandardFonts.GetPosPixel();
-        aNewPos.Y() -= nDelta;
-        maCbEmbedStandardFonts.SetPosPixel( aNewPos );
     }
 
     maEdPages.SetAccessibleName(maRbRange.GetText());
     maEdPages.SetAccessibleRelationLabeledBy(&maRbRange);
 
     maCbExportEmptyPages.SetStyle( maCbExportEmptyPages.GetStyle() | WB_VCENTER );
@@ -606,19 +597,17 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
 
     maCbExportFormFields.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl ) );
 
 // get the form values, for use with PDF/A-1 selection interface
     mbTaggedPDFUserSelection = paParent->mbUseTaggedPDF;
     mbExportFormFieldsUserSelection = paParent->mbExportFormFields;
-    mbEmbedStandardFontsUserSelection = paParent->mbEmbedStandardFonts;
 
     if( !maCbPDFA1b.IsChecked() )
     {// the value for PDF/A set by the ToggleExportPDFAHdl method called before
         maCbTaggedPDF.Check( mbTaggedPDFUserSelection  );
         maCbExportFormFields.Check( mbExportFormFieldsUserSelection );
-        maCbEmbedStandardFonts.Check( mbEmbedStandardFontsUserSelection );
     }
 
     maLbFormsFormat.SelectEntryPos( (sal_uInt16)paParent->mnFormsType );
     maLbFormsFormat.Enable( paParent->mbExportFormFields );
     maCbAllowDuplicateFieldNames.Check( paParent->mbAllowDuplicateFieldNames );
     maCbAllowDuplicateFieldNames.Enable( paParent->mbExportFormFields );
@@ -640,14 +629,12 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
     {
         long nCheckBoxHeight =
             maCbExportNotesPages.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
 
         Point aPos = maCbExportEmptyPages.GetPosPixel();
         maCbExportEmptyPages.SetPosPixel( Point( aPos.X(), aPos.Y() - nCheckBoxHeight ) );
-        aPos = maCbEmbedStandardFonts.GetPosPixel();
-        maCbEmbedStandardFonts.SetPosPixel( Point( aPos.X(), aPos.Y() - nCheckBoxHeight ) );
         maCbExportNotesPages.Show( sal_False );
         maCbExportNotesPages.Check( sal_False );
         maCbExportHiddenSlides.Show( sal_False);
         maCbExportHiddenSlides.Check( sal_False );
     }
 
@@ -695,19 +682,17 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
     paParent->mnPDFTypeSelection = 0;
     if( maCbPDFA1b.IsChecked() )
     {
         paParent->mnPDFTypeSelection = 1;
         paParent->mbUseTaggedPDF =  mbTaggedPDFUserSelection;
         paParent->mbExportFormFields = mbExportFormFieldsUserSelection;
-        paParent->mbEmbedStandardFonts = mbEmbedStandardFontsUserSelection;
     }
     else
     {
         paParent->mbUseTaggedPDF =  maCbTaggedPDF.IsChecked();
         paParent->mbExportFormFields = maCbExportFormFields.IsChecked();
-        paParent->mbEmbedStandardFonts = maCbEmbedStandardFonts.IsChecked();
     }
 
     paParent->maWatermarkText = maEdWatermark.GetText();
 
     /*
     * FIXME: the entries are only implicitly defined by the resource file. Should there
@@ -811,25 +796,20 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
         mbTaggedPDFUserSelection = maCbTaggedPDF.IsChecked();
         maCbTaggedPDF.Check();
         maCbTaggedPDF.Enable( sal_False );
         mbExportFormFieldsUserSelection = maCbExportFormFields.IsChecked();
         maCbExportFormFields.Check( sal_False );
         maCbExportFormFields.Enable( sal_False );
-        mbEmbedStandardFontsUserSelection = maCbEmbedStandardFonts.IsChecked();
-        maCbEmbedStandardFonts.Check( sal_True );
-        maCbEmbedStandardFonts.Enable( sal_False );
     }
     else
     {
 //retrieve the values of subordinate controls
         maCbTaggedPDF.Enable();
         maCbTaggedPDF.Check( mbTaggedPDFUserSelection );
         maCbExportFormFields.Check( mbExportFormFieldsUserSelection );
         maCbExportFormFields.Enable();
-        maCbEmbedStandardFonts.Check( mbEmbedStandardFontsUserSelection );
-        maCbEmbedStandardFonts.Enable();
     }
 // PDF/A-1 doesn't allow launch action, so enable/disable the selection on
 // Link page
     if( mpaParent && mpaParent->GetTabPage( RID_PDF_TAB_LINKS ) )
         ( ( ImpPDFTabLinksPage* )mpaParent->GetTabPage( RID_PDF_TAB_LINKS ) )->ImplPDFALinkControl( !maCbPDFA1b.IsChecked() );