RTL_CONSTASCII_USTRINGPARAM removals

All RTL_CONSTASCII_USTRINGPARAM removed from filter/source/pdf

Change-Id: Ic4a5ae8ca8476a1498e7fca5a06c4f465d45749b
Reviewed-on: https://gerrit.libreoffice.org/2284
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

5 files changed, 169 insertions, 171 deletions

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e9e16e2f6bac..b95f3419a6f3 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -67,8 +67,8 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
                                   ) :
     SfxTabDialog( pParent, PDFFilterResId( RID_PDF_EXPORT_DLG ), 0, sal_False, 0 ),
     mxMSF( xFact ),
-    maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/PDF/Export/" ) ), &rFilterData ),
-    maConfigI18N( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/I18N/CTL/" ) ) ),
+    maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ),
+    maConfigI18N( "Office.Common/I18N/CTL/" ),
     mbIsPresentation( sal_False ),
     mbIsWriter( sal_False ),
 
@@ -169,9 +169,9 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
         Reference< XServiceInfo > xInfo( rxDoc, UNO_QUERY );
         if ( xInfo.is() )
         {
-            if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) )
+            if ( xInfo->supportsService( "com.sun.star.presentation.PresentationDocument" ) )
                 mbIsPresentation = sal_True;
-            if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GenericTextDocument" ) ) ) )
+            if ( xInfo->supportsService( "com.sun.star.text.GenericTextDocument" ) )
                 mbIsWriter = sal_True;
         }
     }
@@ -180,68 +180,68 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
     }
 
 //get the CTL (Complex Text Layout) from general options, returns sal_True if we have a CTL font on our hands.
-    mbUseCTLFont = maConfigI18N.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CTLFont" ) ), sal_False );
+    mbUseCTLFont = maConfigI18N.ReadBool( "CTLFont", sal_False );
 
-    mbUseLosslessCompression = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), sal_False );
-    mnQuality = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 90 );
-    mbReduceImageResolution = maConfigItem.ReadBool(  OUString( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), sal_False );
-    mnMaxImageResolution = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxImageResolution" ) ), 300 );
+    mbUseLosslessCompression = maConfigItem.ReadBool( "UseLosslessCompression", sal_False );
+    mnQuality = maConfigItem.ReadInt32( "Quality", 90 );
+    mbReduceImageResolution = maConfigItem.ReadBool( "ReduceImageResolution", sal_False );
+    mnMaxImageResolution = maConfigItem.ReadInt32( "MaxImageResolution", 300 );
 
-    mbUseTaggedPDF = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTaggedPDF" ) ), sal_False );
-    mnPDFTypeSelection =  maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), 0 );
+    mbUseTaggedPDF = maConfigItem.ReadBool( "UseTaggedPDF", sal_False );
+    mnPDFTypeSelection =  maConfigItem.ReadInt32( "SelectPdfVersion", 0 );
     if ( mbIsPresentation )
-        mbExportNotesPages = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages"  ) ), sal_False );
-    mbExportNotes = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes"  ) ), sal_False );
+        mbExportNotesPages = maConfigItem.ReadBool( "ExportNotesPages", sal_False );
+    mbExportNotes = maConfigItem.ReadBool( "ExportNotes", sal_False );
 
-    mbExportBookmarks = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarks" ) ), sal_True );
+    mbExportBookmarks = maConfigItem.ReadBool( "ExportBookmarks", sal_True );
     if ( mbIsPresentation )
-        mbExportHiddenSlides = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportHiddenSlides" ) ), sal_False );
-    mnOpenBookmarkLevels = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenBookmarkLevels" ) ), -1 );
-    mbUseTransitionEffects = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTransitionEffects"  ) ), sal_True );
-    mbIsSkipEmptyPages = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages"  ) ), sal_False );
-    mbAddStream = maConfigItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "IsAddStream" ) ), sal_False );
-    mbEmbedStandardFonts = maConfigItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "EmbedStandardFonts" ) ), sal_False );
-
-    mnFormsType = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "FormsType" ) ), 0 );
-    mbExportFormFields = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportFormFields" ) ), sal_True );
+        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( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowDuplicateFieldNames" ) ), sal_False );
+    mbAllowDuplicateFieldNames = maConfigItem.ReadBool( "AllowDuplicateFieldNames", sal_False );
 
 //prepare values for the Viewer tab page
-    mbHideViewerToolbar = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerToolbar" ) ), sal_False );
-    mbHideViewerMenubar = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerMenubar" ) ), sal_False );
-    mbHideViewerWindowControls = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerWindowControls" ) ), sal_False );
-    mbResizeWinToInit = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ResizeWindowToInitialPage" ) ), sal_False );
-    mbCenterWindow = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CenterWindow" ) ), sal_False );
-    mbOpenInFullScreenMode = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenInFullScreenMode" ) ), sal_False );
-    mbDisplayPDFDocumentTitle = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), sal_True );
-
-    mnInitialView = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ), 0 );
-    mnMagnification = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ), 0 );
-    mnZoom = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ) ), 100 );
-    mnPageLayout = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ), 0 );
-    mbFirstPageLeft = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), sal_False );
-    mnInitialPage = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialPage" ) ), 1 );
+    mbHideViewerToolbar = maConfigItem.ReadBool( "HideViewerToolbar", sal_False );
+    mbHideViewerMenubar = maConfigItem.ReadBool( "HideViewerMenubar", sal_False );
+    mbHideViewerWindowControls = maConfigItem.ReadBool( "HideViewerWindowControls", sal_False );
+    mbResizeWinToInit = maConfigItem.ReadBool( "ResizeWindowToInitialPage", sal_False );
+    mbCenterWindow = maConfigItem.ReadBool( "CenterWindow", sal_False );
+    mbOpenInFullScreenMode = maConfigItem.ReadBool( "OpenInFullScreenMode", sal_False );
+    mbDisplayPDFDocumentTitle = maConfigItem.ReadBool( "DisplayPDFDocumentTitle", sal_True );
+
+    mnInitialView = maConfigItem.ReadInt32( "InitialView", 0 );
+    mnMagnification = maConfigItem.ReadInt32( "Magnification", 0 );
+    mnZoom = maConfigItem.ReadInt32( "Zoom", 100 );
+    mnPageLayout = maConfigItem.ReadInt32( "PageLayout", 0 );
+    mbFirstPageLeft = maConfigItem.ReadBool( "FirstPageOnLeft", sal_False );
+    mnInitialPage = maConfigItem.ReadInt32( "InitialPage", 1 );
     if( mnInitialPage < 1 )
         mnInitialPage = 1;
 
 //prepare values for the security tab page
-    mnPrint = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Printing" ) ), 2 );
-    mnChangesAllowed = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Changes" ) ), 4 );
-    mbCanCopyOrExtract = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableCopyingOfContent" ) ), sal_True );
-    mbCanExtractForAccessibility = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableTextAccessForAccessibilityTools" ) ), sal_True );
+    mnPrint = maConfigItem.ReadInt32( "Printing", 2 );
+    mnChangesAllowed = maConfigItem.ReadInt32( "Changes", 4 );
+    mbCanCopyOrExtract = maConfigItem.ReadBool( "EnableCopyingOfContent", sal_True );
+    mbCanExtractForAccessibility = maConfigItem.ReadBool( "EnableTextAccessForAccessibilityTools", sal_True );
 
 //prepare values for relative links
-    mbExportRelativeFsysLinks = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportLinksRelativeFsys" ) ), sal_False );
+    mbExportRelativeFsysLinks = maConfigItem.ReadBool( "ExportLinksRelativeFsys", sal_False );
 
-    mnViewPDFMode = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PDFViewSelection" ) ), 0 );
+    mnViewPDFMode = maConfigItem.ReadInt32( "PDFViewSelection", 0 );
 
-    mbConvertOOoTargets = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ), sal_False );
-    mbExportBmkToPDFDestination = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarksToPDFDestination" ) ), sal_False );
+    mbConvertOOoTargets = maConfigItem.ReadBool( "ConvertOOoTargetToPDFTarget", sal_False );
+    mbExportBmkToPDFDestination = maConfigItem.ReadBool( "ExportBookmarksToPDFDestination", sal_False );
 
 //prepare values for digital signatures
-    mbSignPDF = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "SignPDF" ) ), sal_False );
+    mbSignPDF = maConfigItem.ReadBool( "SignPDF", sal_False );
 
 //queue the tab pages for later creation (created when first shown)
     AddTabPage( RID_PDF_TAB_SIGNING, ImpPDFTabSigningPage::Create, 0 );
@@ -259,7 +259,7 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
     AddTabPage( RID_PDF_TAB_GENER, ImpPDFTabGeneralPage::Create, 0 );
 
 //get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button
-    ::rtl::OUString sOkButtonText = maConfigItem.ReadString( OUString( RTL_CONSTASCII_USTRINGPARAM( "_OkButtonString" ) ), OUString() );
+    OUString sOkButtonText = maConfigItem.ReadString( "_OkButtonString", OUString() );
 
 //change text on the Ok button: get the relevant string from resources, update it on the button
 //according to the exported pdf file destination: send as e-mail or write to file?
@@ -349,60 +349,60 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
         ( ( ImpPDFTabSigningPage* )GetTabPage( RID_PDF_TAB_SIGNING ) )->GetFilterConfigItem( this );
 
 //prepare the items to be returned
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), mbUseLosslessCompression );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), mnQuality );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), mbReduceImageResolution );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxImageResolution" ) ), mnMaxImageResolution );
+    maConfigItem.WriteBool( "UseLosslessCompression", mbUseLosslessCompression );
+    maConfigItem.WriteInt32("Quality", mnQuality );
+    maConfigItem.WriteBool( "ReduceImageResolution", mbReduceImageResolution );
+    maConfigItem.WriteInt32("MaxImageResolution", mnMaxImageResolution );
 
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTaggedPDF" ) ), mbUseTaggedPDF );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), mnPDFTypeSelection );
+    maConfigItem.WriteBool( "UseTaggedPDF", mbUseTaggedPDF );
+    maConfigItem.WriteInt32("SelectPdfVersion", mnPDFTypeSelection );
 
     if ( mbIsPresentation )
-        maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), mbExportNotesPages );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), mbExportNotes );
+        maConfigItem.WriteBool( "ExportNotesPages", mbExportNotesPages );
+    maConfigItem.WriteBool( "ExportNotes", mbExportNotes );
 
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarks" ) ), mbExportBookmarks );
+    maConfigItem.WriteBool( "ExportBookmarks", mbExportBookmarks );
     if ( mbIsPresentation )
-        maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportHiddenSlides" ) ), mbExportHiddenSlides );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTransitionEffects" ) ), mbUseTransitionEffects );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages" ) ), mbIsSkipEmptyPages );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAddStream" ) ), mbAddStream );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EmbedStandardFonts" ) ), mbEmbedStandardFonts );
+        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( OUString( RTL_CONSTASCII_USTRINGPARAM( "FormsType" ) ), mnFormsType );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportFormFields" ) ), mbExportFormFields );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowDuplicateFieldNames" ) ), mbAllowDuplicateFieldNames );
-
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerToolbar" ) ), mbHideViewerToolbar );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerMenubar" ) ), mbHideViewerMenubar );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerWindowControls" ) ), mbHideViewerWindowControls );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ResizeWindowToInitialPage" ) ), mbResizeWinToInit );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "CenterWindow" ) ), mbCenterWindow );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenInFullScreenMode" ) ), mbOpenInFullScreenMode );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), mbDisplayPDFDocumentTitle );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ), mnInitialView );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ), mnMagnification);
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ) ), mnZoom );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialPage" ) ), mnInitialPage );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ), mnPageLayout );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), mbFirstPageLeft );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenBookmarkLevels" ) ), mnOpenBookmarkLevels );
-
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportLinksRelativeFsys" ) ), mbExportRelativeFsysLinks );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PDFViewSelection" ) ), mnViewPDFMode );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ), mbConvertOOoTargets );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarksToPDFDestination" ) ), mbExportBmkToPDFDestination );
-
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "SignPDF" ) ), mbSignPDF );
-
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Printing" ) ), mnPrint );
-    maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Changes" ) ), mnChangesAllowed );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableCopyingOfContent" ) ), mbCanCopyOrExtract );
-    maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableTextAccessForAccessibilityTools" ) ), mbCanExtractForAccessibility );
+    maConfigItem.WriteInt32( "FormsType", mnFormsType );
+    maConfigItem.WriteBool( "ExportFormFields", mbExportFormFields );
+    maConfigItem.WriteBool( "AllowDuplicateFieldNames", mbAllowDuplicateFieldNames );
+
+    maConfigItem.WriteBool( "HideViewerToolbar", mbHideViewerToolbar );
+    maConfigItem.WriteBool( "HideViewerMenubar", mbHideViewerMenubar );
+    maConfigItem.WriteBool( "HideViewerWindowControls", mbHideViewerWindowControls );
+    maConfigItem.WriteBool( "ResizeWindowToInitialPage", mbResizeWinToInit );
+    maConfigItem.WriteBool( "CenterWindow", mbCenterWindow );
+    maConfigItem.WriteBool( "OpenInFullScreenMode", mbOpenInFullScreenMode );
+    maConfigItem.WriteBool( "DisplayPDFDocumentTitle", mbDisplayPDFDocumentTitle );
+    maConfigItem.WriteInt32( "InitialView", mnInitialView );
+    maConfigItem.WriteInt32( "Magnification", mnMagnification);
+    maConfigItem.WriteInt32( "Zoom", mnZoom );
+    maConfigItem.WriteInt32( "InitialPage", mnInitialPage );
+    maConfigItem.WriteInt32( "PageLayout", mnPageLayout );
+    maConfigItem.WriteBool( "FirstPageOnLeft", mbFirstPageLeft );
+    maConfigItem.WriteInt32( "OpenBookmarkLevels", mnOpenBookmarkLevels );
+
+    maConfigItem.WriteBool( "ExportLinksRelativeFsys", mbExportRelativeFsysLinks );
+    maConfigItem.WriteInt32("PDFViewSelection", mnViewPDFMode );
+    maConfigItem.WriteBool( "ConvertOOoTargetToPDFTarget", mbConvertOOoTargets );
+    maConfigItem.WriteBool( "ExportBookmarksToPDFDestination", mbExportBmkToPDFDestination );
+
+    maConfigItem.WriteBool( "SignPDF", mbSignPDF );
+
+    maConfigItem.WriteInt32( "Printing", mnPrint );
+    maConfigItem.WriteInt32( "Changes", mnChangesAllowed );
+    maConfigItem.WriteBool( "EnableCopyingOfContent", mbCanCopyOrExtract );
+    maConfigItem.WriteBool( "EnableTextAccessForAccessibilityTools", mbCanExtractForAccessibility );
 
     Sequence< PropertyValue > aRet( maConfigItem.GetFilterData() );
 
@@ -412,61 +412,61 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 
     // add the encryption enable flag
     sal_uInt32 const nLength(aRet.getLength());
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Watermark" ) );
+    aRet[ nLength - nElementAdded ].Name = "Watermark";
     aRet[ nLength - nElementAdded ].Value <<= maWatermarkText;
     nElementAdded--;
 
 // add the encryption enable flag
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptFile" ) );
+    aRet[ nLength - nElementAdded ].Name = "EncryptFile";
     aRet[ nLength - nElementAdded ].Value <<= mbEncrypt;
     nElementAdded--;
 
 // add the open password
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPasswords" ) );
+    aRet[ nLength - nElementAdded ].Name = "PreparedPasswords";
     aRet[ nLength - nElementAdded ].Value <<= mxPreparedPasswords;
     nElementAdded--;
 
 //the restrict permission flag (needed to have the scripting consistent with the dialog)
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "RestrictPermissions" ) );
+    aRet[ nLength - nElementAdded ].Name = "RestrictPermissions";
     aRet[ nLength - nElementAdded ].Value <<= mbRestrictPermissions;
     nElementAdded--;
 
 //add the permission password
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPermissionPassword" ) );
+    aRet[ nLength - nElementAdded ].Name = "PreparedPermissionPassword";
     aRet[ nLength - nElementAdded ].Value <<= maPreparedOwnerPassword;
     nElementAdded--;
 
 // this should be the last added...
     if( mbIsRangeChecked )
     {
-        aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
+        aRet[ nLength - nElementAdded ].Name = "PageRange";
         aRet[ nLength - nElementAdded ].Value <<= msPageRange;
         nElementAdded--;
     }
     else if( mbSelectionIsChecked )
     {
-        aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Selection" ) );
+        aRet[ nLength - nElementAdded ].Name = "Selection";
         aRet[ nLength - nElementAdded ].Value <<= maSelection;
         nElementAdded--;
     }
 
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SignatureLocation" ) );
+    aRet[ nLength - nElementAdded ].Name = "SignatureLocation";
     aRet[ nLength - nElementAdded ].Value <<= msSignLocation;
     nElementAdded--;
 
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SignatureReason" ) );
+    aRet[ nLength - nElementAdded ].Name = "SignatureReason";
     aRet[ nLength - nElementAdded ].Value <<= msSignReason;
     nElementAdded--;
 
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SignatureContactInfo" ) );
+    aRet[ nLength - nElementAdded ].Name = "SignatureContactInfo";
     aRet[ nLength - nElementAdded ].Value <<= msSignContact;
     nElementAdded--;
 
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SignaturePassword" ) );
+    aRet[ nLength - nElementAdded ].Name = "SignaturePassword";
     aRet[ nLength - nElementAdded ].Value <<= msSignPassword;
     nElementAdded--;
 
-    aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SignatureCertificate" ) );
+    aRet[ nLength - nElementAdded ].Name = "SignatureCertificate";
     aRet[ nLength - nElementAdded ].Value <<= maSignCertificate;
     nElementAdded--;
 
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index ffe4f42a2724..2755af0cde83 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::beans;
 OUString PDFDialog_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.PDF.PDFDialog" ) );
+    return OUString ( "com.sun.star.comp.PDF.PDFDialog" );
 }
 
 // -----------------------------------------------------------------------------
@@ -62,7 +62,7 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    pArray[0] = SERVICE_NAME;
     return aRet;
 }
 
@@ -180,7 +180,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
     if( i == nCount )
         maMediaDescriptor.realloc( ++nCount );
 
-    maMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) );
+    maMediaDescriptor[ i ].Name = "FilterData";
     maMediaDescriptor[ i ].Value <<= maFilterData;
 
     return maMediaDescriptor;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 57d538bfbdb1..6eea76df9db0 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -283,19 +283,18 @@ void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
     if( xStore.is() )
     {
         Sequence< beans::PropertyValue > aArgs( 2 + ((m_aPreparedPassword.getLength() > 0) ? 1 : 0) );
-        aArgs.getArray()[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
-        aArgs.getArray()[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
+        aArgs.getArray()[0].Name = "FilterName";
+        aArgs.getArray()[1].Name = "OutputStream";
         aArgs.getArray()[1].Value <<= xStream;
         if( m_aPreparedPassword.getLength() )
         {
-            aArgs.getArray()[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionData" ) );
+            aArgs.getArray()[2].Name = "EncryptionData";
             aArgs.getArray()[2].Value <<= m_aPreparedPassword;
         }
 
         try
         {
-            xStore->storeToURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ),
-                                aArgs );
+            xStore->storeToURL( "private:stream", aArgs );
         }
         catch( const IOException& )
         {
@@ -322,27 +321,26 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                     comphelper::getComponentContext( xFactory ) ) );
             uno::Sequence< uno::Any > aArgs( 1 );
             beans::NamedValue aPathProp;
-            aPathProp.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
-            aPathProp.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Setup/Office/Factories/" ) );
+            aPathProp.Name = "nodepath";
+            aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" );
             aArgs[0] <<= aPathProp;
 
             Reference< container::XNameAccess > xSOFConfig(
                 xConfigProvider->createInstanceWithArguments(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ) ),
-                    aArgs ),
+                    "com.sun.star.configuration.ConfigurationAccess", aArgs ),
                 uno::UNO_QUERY );
 
             Reference< container::XNameAccess > xApplConfig;
             xSOFConfig->getByName( aDocServiceName ) >>= xApplConfig;
             if ( xApplConfig.is() )
             {
-                xApplConfig->getByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "ooSetupFactoryActualFilter" ) ) ) >>= aFilterName;
+                xApplConfig->getByName( "ooSetupFactoryActualFilter" ) >>= aFilterName;
                 if( !aFilterName.isEmpty() )
                 {
                     // find the related type name
                     OUString aTypeName;
                     Reference< container::XNameAccess > xFilterFactory(
-                        xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
+                        xFactory->createInstance( "com.sun.star.document.FilterFactory" ),
                         uno::UNO_QUERY );
 
                     Sequence< beans::PropertyValue > aFilterData;
@@ -355,7 +353,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                     {
                         // find the mediatype
                         Reference< container::XNameAccess > xTypeDetection(
-                            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ),
+                            xFactory->createInstance( "com.sun.star.document.TypeDetection" ),
                             UNO_QUERY );
 
                         Sequence< beans::PropertyValue > aTypeData;
@@ -406,15 +404,15 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
             Reference< XServiceInfo > xInfo( mxSrcDoc, UNO_QUERY );
             if ( xInfo.is() )
             {
-                if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )) ) )
+                if ( xInfo->supportsService( "com.sun.star.presentation.PresentationDocument" ) )
                     aCreator.AppendAscii( "Impress" );
-                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )) ) )
+                else if ( xInfo->supportsService( "com.sun.star.drawing.DrawingDocument" ) )
                     aCreator.AppendAscii( "Draw" );
-                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )) ) )
+                else if ( xInfo->supportsService( "com.sun.star.text.TextDocument" ) )
                     aCreator.AppendAscii( "Writer" );
-                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) ) )
+                else if ( xInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
                     aCreator.AppendAscii( "Calc" );
-                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )) ) )
+                else if ( xInfo->supportsService( "com.sun.star.formula.FormulaProperties"  ) )
                     aCreator.AppendAscii( "Math" );
             }
 
@@ -433,7 +431,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
             // getting the string for the producer
             aContext.DocumentInfo.Producer =
                 utl::ConfigManager::getProductName() +
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) +
+                " " +
                 utl::ConfigManager::getProductVersion();
             aContext.DocumentInfo.Creator = aCreator;
 
@@ -824,18 +822,18 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
                 pPDFExtOutDevData->SetIsExportNamedDestinations( mbExportBmkToDest );
 
                 Sequence< PropertyValue > aRenderOptions( 6 );
-                aRenderOptions[ 0 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) );
+                aRenderOptions[ 0 ].Name = "RenderDevice";
                 aRenderOptions[ 0 ].Value <<= Reference< awt::XDevice >( pXDevice );
-                aRenderOptions[ 1 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) );
+                aRenderOptions[ 1 ].Name = "ExportNotesPages";
                 aRenderOptions[ 1 ].Value <<= sal_False;
                 Any& rExportNotesValue = aRenderOptions[ 1 ].Value;
-                aRenderOptions[ 2 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFirstPage" ) );
+                aRenderOptions[ 2 ].Name = "IsFirstPage";
                 aRenderOptions[ 2 ].Value <<= sal_True;
-                aRenderOptions[ 3 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsLastPage" ) );
+                aRenderOptions[ 3 ].Name = "IsLastPage";
                 aRenderOptions[ 3 ].Value <<= sal_False;
-                aRenderOptions[ 4 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages" ) );
+                aRenderOptions[ 4 ].Name = "IsSkipEmptyPages";
                 aRenderOptions[ 4 ].Value <<= mbSkipEmptyPages;
-                aRenderOptions[ 5 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
+                aRenderOptions[ 5 ].Name = "PageRange";
                 aRenderOptions[ 5 ].Value <<= aPageRange;
 
                 if( !aPageRange.isEmpty() || !aSelection.hasValue() )
@@ -845,7 +843,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
                 }
                 sal_Bool        bSecondPassForImpressNotes = sal_False;
                 bool bReChangeToNormalView = false;
-                  ::rtl::OUString sShowOnlineLayout( RTL_CONSTASCII_USTRINGPARAM( "ShowOnlineLayout"));
+                  OUString sShowOnlineLayout( "ShowOnlineLayout" );
                   uno::Reference< beans::XPropertySet > xViewProperties;
 
                 if ( aCreator.EqualsAscii( "Writer" ) )
@@ -1045,8 +1043,8 @@ sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFEx
 
 void PDFExport::ImplWriteWatermark( PDFWriter& rWriter, const Size& rPageSize )
 {
-    OUString aText( RTL_CONSTASCII_USTRINGPARAM( "Watermark" ) );
-    Font aFont( OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica" ) ), Size( 0, 3*rPageSize.Height()/4 ) );
+    OUString aText( "Watermark" );
+    Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) );
     aFont.SetItalic( ITALIC_NONE );
     aFont.SetWidthType( WIDTH_NORMAL );
     aFont.SetWeight( WEIGHT_NORMAL );
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 9a5c4ea15fd0..9aadfedf207a 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -68,45 +68,45 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
      to pdf, but we have to use the last user settings (especially for the CompressMode) */
     if ( !aFilterData.getLength() )
     {
-        FilterConfigItem aCfgItem( String( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/PDF/Export/" ) ) );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), sal_False );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 90 );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ReduceImageResolution" ) ), sal_False );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxImageResolution" ) ), 300 );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "UseTaggedPDF" ) ), sal_False );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), 0 );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), sal_False );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), sal_False );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "UseTransitionEffects" ) ), sal_True );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages" ) ), sal_False );
-        aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportFormFields" ) ), sal_True );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FormsType" ) ), 0 );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "HideViewerToolbar" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "HideViewerMenubar" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "HideViewerWindowControls" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "ResizeWindowToInitialPage" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "CenterWindow" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "OpenInFullScreenMode" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "DisplayPDFDocumentTitle" ) ), sal_True );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "InitialView" ) ), 0 );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Magnification" ) ), 0 );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PageLayout" ) ), 0 );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), sal_False );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "IsAddStream" ) ), sal_False );
+        FilterConfigItem aCfgItem( "Office.Common/Filter/PDF/Export/" );
+        aCfgItem.ReadBool(  "UseLosslessCompression", sal_False );
+        aCfgItem.ReadInt32( "Quality", 90 );
+        aCfgItem.ReadBool(  "ReduceImageResolution", sal_False );
+        aCfgItem.ReadInt32( "MaxImageResolution", 300 );
+        aCfgItem.ReadBool(  "UseTaggedPDF", sal_False );
+        aCfgItem.ReadInt32( "SelectPdfVersion", 0 );
+        aCfgItem.ReadBool(  "ExportNotes", sal_False );
+        aCfgItem.ReadBool(  "ExportNotesPages", sal_False );
+        aCfgItem.ReadBool(  "UseTransitionEffects", sal_True );
+        aCfgItem.ReadBool(  "IsSkipEmptyPages", sal_False );
+        aCfgItem.ReadBool(  "ExportFormFields", sal_True );
+        aCfgItem.ReadInt32( "FormsType", 0 );
+        aCfgItem.ReadBool(  "HideViewerToolbar", sal_False );
+        aCfgItem.ReadBool(  "HideViewerMenubar", sal_False );
+        aCfgItem.ReadBool(  "HideViewerWindowControls", sal_False );
+        aCfgItem.ReadBool(  "ResizeWindowToInitialPage", sal_False );
+        aCfgItem.ReadBool(  "CenterWindow", sal_False );
+        aCfgItem.ReadBool(  "OpenInFullScreenMode", sal_False );
+        aCfgItem.ReadBool(  "DisplayPDFDocumentTitle", sal_True );
+        aCfgItem.ReadInt32( "InitialView", 0 );
+        aCfgItem.ReadInt32( "Magnification", 0 );
+        aCfgItem.ReadInt32( "PageLayout", 0 );
+        aCfgItem.ReadBool(  "FirstPageOnLeft", sal_False );
+        aCfgItem.ReadBool(  "IsAddStream", sal_False );
 //
 // the encryption is not available when exporting directly, since the encryption is off by default and the selection
 // (encrypt or not) is not persistent; it's available through macro though,
 // provided the correct property values are set, see help
 //
 // now, the relative link stuff
-        aCfgItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportLinksRelativeFsys" ) ), sal_False );
-        aCfgItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PDFViewSelection" ) ), 0 );
-        aCfgItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ), sal_False );
-        aCfgItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarksToPDFDestination" ) ), sal_False );
-
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarks" ) ), sal_True );
-        aCfgItem.ReadBool(  String( RTL_CONSTASCII_USTRINGPARAM( "ExportHiddenSlides" ) ), sal_False );
-        aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "OpenBookmarkLevels" ) ), -1 );
+        aCfgItem.ReadBool( "ExportLinksRelativeFsys", sal_False );
+        aCfgItem.ReadInt32("PDFViewSelection", 0 );
+        aCfgItem.ReadBool( "ConvertOOoTargetToPDFTarget", sal_False );
+        aCfgItem.ReadBool( "ExportBookmarksToPDFDestination", sal_False );
+
+        aCfgItem.ReadBool(  "ExportBookmarks", sal_True );
+        aCfgItem.ReadBool(  "ExportHiddenSlides", sal_False );
+        aCfgItem.ReadInt32( "OpenBookmarkLevels", -1 );
         aFilterData = aCfgItem.GetFilterData();
     }
     if( mxSrcDoc.is() && xOStm.is() )
@@ -205,7 +205,7 @@ void SAL_CALL PDFFilter::initialize( const ::com::sun::star::uno::Sequence< ::co
 OUString PDFFilter_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.PDF.PDFFilter" ) );
+    return OUString ( "com.sun.star.comp.PDF.PDFFilter" );
 }
 
 // -----------------------------------------------------------------------------
@@ -224,7 +224,7 @@ Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames(  ) throw (Runt
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    pArray[0] = SERVICE_NAME;
     return aRet;
 }
 
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index 7e4f3bc8c9f2..8c02825b6060 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -71,7 +71,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
 OUString PDFInteractionHandler_getImplementationName ()
     throw (RuntimeException)
 {
-    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.PDF.PDFExportInteractionHandler" ) );
+    return OUString ( "com.sun.star.comp.PDF.PDFExportInteractionHandler" );
 }
 
 // -----------------------------------------------------------------------------
@@ -90,7 +90,7 @@ Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames(  )
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    pArray[0] = SERVICE_NAME;
     return aRet;
 }