You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/03/24 14:20:40 UTC
svn commit: r1460352 - in /openoffice/trunk/main:
filter/source/pdf/impdialog.cxx filter/source/pdf/impdialog.src
helpcontent2/source/text/shared/01/ref_pdf_export.xhp
Author: arielch
Date: Sun Mar 24 13:20:40 2013
New Revision: 1460352
URL: http://svn.apache.org/r1460352
Log:
i121899 - Enable "hybrid" PDF export by default
Now it is enabled, even if the PDF import extension is not installed.
Modified:
openoffice/trunk/main/filter/source/pdf/impdialog.cxx
openoffice/trunk/main/filter/source/pdf/impdialog.src
openoffice/trunk/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
Modified: openoffice/trunk/main/filter/source/pdf/impdialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/pdf/impdialog.cxx?rev=1460352&r1=1460351&r2=1460352&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/pdf/impdialog.cxx (original)
+++ openoffice/trunk/main/filter/source/pdf/impdialog.cxx Sun Mar 24 13:20:40 2013
@@ -576,22 +576,7 @@ void ImpPDFTabGeneralPage::SetFilterConf
maCbExportEmptyPages.Check( !paParent->mbIsSkipEmptyPages );
- Reference< XMultiServiceFactory > xFactory = paParent->getServiceFactory();
- Reference< XInterface > xIfc;
- if( xFactory.is() )
- {
- xIfc = xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.documents.PDFDetector" ) ) );
- }
- if( xIfc.is() )
- {
- maCbAddStream.Show( sal_True );
- maCbAddStream.Check( paParent->mbAddStream );
- }
- else
- {
- maCbAddStream.Show( sal_False );
- maCbAddStream.Check( sal_False );
- }
+ maCbAddStream.Check( paParent->mbAddStream );
maCbAddStream.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleAddStreamHdl ) );
// init addstream dependencies
ToggleAddStreamHdl( NULL );
@@ -611,7 +596,7 @@ void ImpPDFTabGeneralPage::GetFilterConf
paParent->mbExportBookmarks = maCbExportBookmarks.IsChecked();
paParent->mbIsSkipEmptyPages = !maCbExportEmptyPages.IsChecked();
- paParent->mbAddStream = maCbAddStream.IsVisible() && maCbAddStream.IsChecked();
+ paParent->mbAddStream = maCbAddStream.IsChecked();
paParent->mbIsRangeChecked = sal_False;
if( maRbRange.IsChecked() )
@@ -688,25 +673,21 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleR
// -----------------------------------------------------------------------------
IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG )
{
- if( maCbAddStream.IsVisible() )
+ if( maCbAddStream.IsChecked() )
{
- if( maCbAddStream.IsChecked() )
- {
- maRbAll.Check();
- maRbRange.Enable( sal_False );
- maRbSelection.Enable( sal_False );
- maEdPages.Enable( sal_False );
- //Sym2_5805, When the control is disabled, it is also readonly. So here, it is not necessary to set it as readonly.
- //maEdPages.SetReadOnly( sal_True );
- maRbAll.Enable( sal_False );
- }
- else
- {
- maRbAll.Enable( sal_True );
- maRbRange.Enable( sal_True );
- maRbSelection.Enable( sal_True );
- }
+ maRbAll.Check();
+ maRbRange.Enable( sal_False );
+ maRbSelection.Enable( sal_False );
+ maEdPages.Enable( sal_False );
+ maRbAll.Enable( sal_False );
}
+ else
+ {
+ maRbAll.Enable( sal_True );
+ maRbRange.Enable( sal_True );
+ maRbSelection.Enable( sal_True );
+ }
+
return 0;
}
Modified: openoffice/trunk/main/filter/source/pdf/impdialog.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/pdf/impdialog.src?rev=1460352&r1=1460351&r2=1460352&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/pdf/impdialog.src (original)
+++ openoffice/trunk/main/filter/source/pdf/impdialog.src Sun Mar 24 13:20:40 2013
@@ -257,7 +257,7 @@ TabPage RID_PDF_TAB_GENER
Pos = MAP_APPFONT ( 12 , 261 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
- Text[ en-US ] = "Create ~hybrid file";
+ Text[ en-US ] = "Embed this document ~inside the PDF";
};
};
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp?rev=1460352&r1=1460351&r2=1460352&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp Sun Mar 24 13:20:40 2013
@@ -127,8 +127,8 @@
<paragraph xml-lang="en-US" id="hd_id3954548" role="heading" level="2" l10n="NEW">Embed standard fonts</paragraph>
<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
- <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Embed this document inside the PDF</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">The document being exported will be embedded inside the PDF file.</ahelp> Some PDF tools or %PRODUCTNAME extensions may allow to extract the file from the PDF and save it; in this way, the orignal %PRODUCTNAME document can be edited back without the need of a PDF editing application.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
<paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" l10n="NEW">Panes</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>