Update from master repository (DEV300_m98).

7 files changed, 171 insertions, 18 deletions

diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 583e14c06caa..d91ebea0c73d 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -152,6 +152,20 @@ void PADialog::Init()
         m_aFontsPB.Enable( FALSE );
         m_aFontsPB.Show( FALSE );
     }
+
+    // at this point no actual changes will be  written
+    // but the write will have checked whether any writeable config exists
+    if( ! m_rPIManager.writePrinterConfig() )
+    {
+        m_aAddPB.Enable( FALSE );
+        m_aRemPB.Enable( FALSE );
+        m_aConfPB.Enable( FALSE );
+        m_aRenamePB.Enable( FALSE );
+        m_aStdPB.Enable( FALSE );
+        m_aCUPSCB.Enable( FALSE );
+        ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) );
+        aBox.Execute();
+    }
 }
 
 PADialog::~PADialog()
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 8834bba3226c..09ce29a2c682 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -29,6 +29,7 @@
 
 ModalDialog RID_FONTIMPORT_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 230 , 185 );
@@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     ListBox RID_FIMP_BOX_NEWFONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS";
         Border = TRUE;
         Sort=TRUE;
         AutoHScroll = TRUE;
@@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     Edit RID_FIMP_EDT_FROM
     {
+        HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 97 );
         Size = MAP_APPFONT( 130, 12 );
     };
     PushButton RID_FIMP_BTN_FROM
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM";
         Pos = MAP_APPFONT( 145, 97 );
         Size = MAP_APPFONT( 15, 12 );
         Text = "...";
     };
     CheckBox RID_FIMP_BOX_SUBDIRS
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS";
         Pos = MAP_APPFONT( 10, 115 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Sea~rch Subdirectories";
@@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     CheckBox RID_FIMP_BOX_LINKONLY
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY";
         Pos = MAP_APPFONT( 10, 140 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Create ~soft links only";
@@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     PushButton RID_FIMP_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL";
         Pos = MAP_APPFONT( 175, 44 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
 ModalDialog RID_PADIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_PADIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 198 ) ;
@@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG
     };
     CheckBox RID_PA_CB_CUPSUSAGE
     {
+        HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE";
         Pos = MAP_APPFONT( 12, 158 );
         Size = MAP_APPFONT( 168, 8 );
         Text [ en-US ] = "Disable CUPS Support";
@@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG
     };
     ListBox RID_PA_LB_DEV
     {
+        HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV";
         Pos = MAP_APPFONT( 12, 15 );
         Size = MAP_APPFONT( 168, 80 );
         Border = TRUE;
@@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG
     };
     PushButton RID_PA_BTN_CONF
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF";
         Pos = MAP_APPFONT( 190, 15 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Properties...";
     };
     PushButton RID_PA_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME";
         Pos = MAP_APPFONT( 190, 32 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "R~ename...";
     };
     PushButton RID_PA_BTN_STD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD";
         Pos = MAP_APPFONT( 190, 49 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "~Default";
     };
     PushButton RID_PA_BTN_DEL
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL";
         Pos = MAP_APPFONT( 190, 66 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Remo~ve...";
     };
     PushButton RID_PA_TESTPAGE
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE";
         Pos = MAP_APPFONT( 190, 83 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Test ~Page";
@@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG
 
     PushButton RID_PA_BTN_FONTS
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS";
         Pos = MAP_APPFONT( 80, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "Fon~ts...";
     };
     PushButton RID_PA_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD";
         Pos = MAP_APPFONT( 5, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "New Printer...";
@@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG
 
 ModalDialog RID_STRINGQUERYDLG
 {
+    HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG
     };
     Edit RID_STRQRY_EDT_NEWNAME
     {
+        HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
         Size = MAP_APPFONT ( 130 , 12 ) ;
     };
     ComboBox RID_STRQRY_BOX_NEWNAME
     {
+        HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME";
         Border = TRUE ;
         DropDown = TRUE;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
@@ -340,6 +360,11 @@ String RID_PA_TXT_TESTPAGE_PRINTED
     Text [ en-US ] = "The test page was printed succesfully. Please check the result.";
 };
 
+String RID_ERR_NOWRITE
+{
+    Text [en-US] = "No printers can be installed, because the file system is read-only.\nPlease contact your system administrator.";
+};
+
 String RID_QRY_PRTNAME
 {
     Text [ en-US ] = "~New printer name";
@@ -378,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME
 
 ModalDialog RID_FONTNAMEDIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 255 , 110 ) ;
@@ -392,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG
     };
     PushButton RID_FNTNM_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME";
         Pos = MAP_APPFONT( 196, 31 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "Re~name...";
     };
     PushButton RID_FNTNM_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE";
         Pos = MAP_APPFONT ( 196 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Remove...";
     };
     PushButton RID_FNTNM_BTN_IMPORT
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT";
         Pos = MAP_APPFONT ( 196 , 65 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Add...";
     };
     ListBox RID_FNTNM_LB_FONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS";
         Border = TRUE ;
         Sort = TRUE ;
         AutoHScroll = TRUE;
@@ -536,6 +566,7 @@ String RID_AFMERROR_BOX_TXT
 
 ModelessDialog RID_PROGRESS_DLG
 {
+    HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -581,6 +612,7 @@ String RID_OPERATION_CONVERTMETRIC
 
 ModalDialog RID_PPDIMPORT_DLG
 {
+    HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 225 ) ;
@@ -601,6 +633,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     ComboBox RID_PPDIMP_LB_PATH
     {
+        HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH";
         Dropdown = TRUE;
         Border = TRUE;
         Sort = TRUE;
@@ -610,6 +643,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     PushButton RID_PPDIMP_BTN_SEARCH
     {
+        HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH";
         Pos = MAP_APPFONT( 145, 15 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "Browse...";
@@ -623,6 +657,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     MultiListBox RID_PPDIMP_LB_DRIVER
     {
+        HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER";
         Border = TRUE;
         Sort = TRUE;
         SimpleMode = TRUE;
@@ -718,6 +753,7 @@ String RID_TXT_PRINTERADDFAILED
 
 ModalDialog RID_ADD_PRINTER_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 240 , 172 ) ;
@@ -747,12 +783,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG
     };
     PushButton RID_ADDP_BTN_NEXT
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT";
         Pos = MAP_APPFONT( 130, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Next >>";
     };
     PushButton RID_ADDP_BTN_PREV
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV";
         Pos = MAP_APPFONT( 75, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "<< ~Back";
@@ -762,6 +800,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG
 
 TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -777,6 +816,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     ListBox RID_ADDP_CHDRV_BOX_DRIVER
     {
+        HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER";
         Pos = MAP_APPFONT( 5, 15 );
         Size = MAP_APPFONT( 175, 100 );
         Border = TRUE;
@@ -784,12 +824,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     PushButton RID_ADDP_CHDRV_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD";
         Pos = MAP_APPFONT( 185, 15 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Import...";
     };
     PushButton RID_ADDP_CHDRV_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE";
         Pos = MAP_APPFONT( 185, 32 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Delete";
@@ -802,6 +844,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 
 TabPage RID_ADDP_PAGE_CHOOSEDEV
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -817,24 +860,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
     };
     RadioButton RID_ADDP_CHDEV_BTN_PRINTER
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER";
         Pos = MAP_APPFONT ( 40, 40 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Add a ~printer";
     };
     RadioButton RID_ADDP_CHDEV_BTN_FAX
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX";
         Pos = MAP_APPFONT ( 40, 50 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a fa~x device";
     };
     RadioButton RID_ADDP_CHDEV_BTN_PDF
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF";
         Pos = MAP_APPFONT ( 40, 60 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
     };
     RadioButton RID_ADDP_CHDEV_BTN_OLD
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD";
         Pos = MAP_APPFONT ( 40, 70 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "~Import printers from a StarOffice installation";
@@ -843,6 +890,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
 
 TabPage RID_ADDP_PAGE_NAME
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -870,12 +918,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_NAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
     };
     Edit RID_ADDP_NAME_EDT_FAXNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -883,6 +933,7 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_PDFNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -890,12 +941,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     CheckBox RID_ADDP_NAME_BOX_DEFAULT
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "~Use as default printer";
     };
     CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "Remo~ve fax number from output";
@@ -904,6 +957,7 @@ TabPage RID_ADDP_PAGE_NAME
 
 TabPage RID_ADDP_PAGE_COMMAND
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -920,12 +974,14 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     ComboBox RID_ADDP_CMD_BOX_COMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 85 );
         Border = TRUE;
     };
     ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 60 );
         Border = TRUE;
@@ -938,18 +994,21 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     Edit RID_ADDP_CMD_EDT_PDFDIR
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 104 );
         Size = MAP_APPFONT( 190, 12 );
     };
     PushButton RID_ADDP_CMD_BTN_PDFDIR
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR";
         Pos = MAP_APPFONT( 205, 104 );
         Size = MAP_APPFONT( 25, 12 );
         Text = "~...";
     };
     PushButton RID_ADDP_CMD_BTN_HELP
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP";
         Pos = MAP_APPFONT( 180, 2 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Help";
@@ -966,6 +1025,7 @@ TabPage RID_ADDP_PAGE_COMMAND
 
 TabPage RID_ADDP_PAGE_OLDPRINTERS
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -982,12 +1042,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
     };
     MultiListBox RID_ADDP_OLD_BOX_PRINTERS
     {
+        HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS";
         Pos = MAP_APPFONT( 10, 35 );
         Size = MAP_APPFONT( 165, 80 );
         Border = TRUE;
     };
     PushButton RID_ADDP_OLD_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL";
         Pos = MAP_APPFONT( 180, 35 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -996,6 +1058,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
 
 TabPage RID_ADDP_PAGE_FAXDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1012,12 +1075,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
     };
     RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40,40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_FAXDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160,24 );
         Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer";
@@ -1026,6 +1091,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
 
 TabPage RID_ADDP_PAGE_PDFDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1042,18 +1108,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40, 40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DIST
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST";
         Pos = MAP_APPFONT( 40,50 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "The Adobe D~istiller(tm) driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 60 );
         Size = MAP_APPFONT( 160, 24 );
         Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer";
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 17d28515e540..8165b8015403 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -198,6 +198,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
             m_aJobData.m_nColorDepth    = m_pDevicePage->getDepth();
             m_aJobData.m_nColorDevice   = m_pDevicePage->getColorDevice();
             m_aJobData.m_nPSLevel       = m_pDevicePage->getLevel();
+            m_aJobData.m_nPDFDevice     = m_pDevicePage->getPDFDevice();
         }
         if( m_pOtherPage )
             // write other settings
@@ -363,8 +364,8 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         m_aPPDKeyBox( this, PaResId( RID_RTS_DEVICE_PPDKEY_BOX ) ),
         m_aPPDValueText( this, PaResId( RID_RTS_DEVICE_PPDVALUE_TXT ) ),
         m_aPPDValueBox( this, PaResId( RID_RTS_DEVICE_PPDVALUE_BOX ) ),
-        m_aLevelText( this, PaResId( RID_RTS_DEVICE_LEVEL_TXT ) ),
-        m_aLevelBox( this, PaResId( RID_RTS_DEVICE_LEVEL_BOX ) ),
+        m_aLevelText( this, PaResId( RID_RTS_DEVICE_PRINTLANG_TXT ) ),
+        m_aLevelBox( this, PaResId( RID_RTS_DEVICE_PRINTLANG_BOX ) ),
         m_aSpaceText( this, PaResId( RID_RTS_DEVICE_SPACE_TXT ) ),
         m_aSpaceBox( this, PaResId( RID_RTS_DEVICE_SPACE_BOX ) ),
         m_aDepthText( this, PaResId( RID_RTS_DEVICE_DEPTH_TXT ) ),
@@ -385,13 +386,19 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         case  1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
     }
 
-    m_aLevelBox.InsertEntry( m_pParent->m_aFromDriverString );
-    m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "1" ) ) );
-    m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "2" ) ) );
-    if( m_pParent->m_aJobData.m_nPSLevel == 0 )
-        m_aLevelBox.SelectEntry( m_pParent->m_aFromDriverString );
+    ULONG nLevelEntryData = 0;
+    if( m_pParent->m_aJobData.m_nPDFDevice > 0 )
+        nLevelEntryData = 10;
     else
-        m_aLevelBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nPSLevel ) );
+        nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
+    for( USHORT i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
+    {
+        if( (ULONG)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
+        {
+            m_aLevelBox.SelectEntryPos( i );
+            break;
+        }
+    }
 
     m_aDepthBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nColorDepth ).AppendAscii( " Bit" ) );
 
@@ -430,6 +437,22 @@ void RTSDevicePage::update()
 
 // ------------------------------------------------------------------
 
+ULONG RTSDevicePage::getLevel()
+{
+    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    return nLevel < 10 ? nLevel-1 : 0;
+}
+
+// ------------------------------------------------------------------
+
+ULONG RTSDevicePage::getPDFDevice()
+{
+    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    return nLevel > 9 ? 1 : 0;
+}
+
+// ------------------------------------------------------------------
+
 IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
 {
     if( pBox == &m_aPPDKeyBox )
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 65288f738482..72e3d81ee8d7 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -147,7 +147,8 @@ public:
 
     void update();
 
-    ULONG getLevel() { return m_aLevelBox.GetSelectEntry().ToInt32(); }
+    ULONG getLevel();
+    ULONG getPDFDevice();
     ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
     ULONG getColorDevice()
     {
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 30439088de8e..7b6677de7ec4 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -48,13 +48,13 @@
 
 #define RID_RTS_DEVICEPAGE                  4003
 #define RID_RTS_DEVICE_COLOR_TXT            1
-#define RID_RTS_DEVICE_GRAY_TXT         2
+#define RID_RTS_DEVICE_GRAY_TXT             2
 #define RID_RTS_DEVICE_PPDKEY_TXT           3
 #define RID_RTS_DEVICE_PPDKEY_BOX           4
-#define RID_RTS_DEVICE_PPDVALUE_TXT     5
-#define RID_RTS_DEVICE_PPDVALUE_BOX     6
-#define RID_RTS_DEVICE_LEVEL_TXT            7
-#define RID_RTS_DEVICE_LEVEL_BOX            8
+#define RID_RTS_DEVICE_PPDVALUE_TXT         5
+#define RID_RTS_DEVICE_PPDVALUE_BOX         6
+#define RID_RTS_DEVICE_PRINTLANG_TXT        7
+#define RID_RTS_DEVICE_PRINTLANG_BOX        8
 #define RID_RTS_DEVICE_SPACE_TXT            9
 #define RID_RTS_DEVICE_SPACE_BOX            10
 #define RID_RTS_DEVICE_DEPTH_TXT            11
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index e04374a72245..38f3bf224a13 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -78,6 +78,7 @@ TabDialog RID_RTS_RTSDIALOG
 
 TabPage RID_RTS_PAPERPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_PAPERPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
     FixedText RID_RTS_PAPER_PAPER_TXT
@@ -88,6 +89,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_PAPER_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 5 );
@@ -101,6 +103,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_ORIENTATION_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 20 );
@@ -114,6 +117,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_DUPLEX_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 35 );
@@ -127,6 +131,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_SLOT_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 50 );
@@ -136,6 +141,7 @@ TabPage RID_RTS_PAPERPAGE
 
 TabPage RID_RTS_DEVICEPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_DEVICEPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
@@ -156,6 +162,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_PPDKEY_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX";
         Border = TRUE;
         Pos = MAP_APPFONT( 5, 14 );
         Size = MAP_APPFONT( 105, 111 );
@@ -168,22 +175,32 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_PPDVALUE_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX";
         Border = TRUE;
         Pos = MAP_APPFONT( 120, 14 );
         Size = MAP_APPFONT( 105, 111 );
     };
 
-    FixedText RID_RTS_DEVICE_LEVEL_TXT
+    FixedText RID_RTS_DEVICE_PRINTLANG_TXT
     {
         Pos = MAP_APPFONT( 5, 130 );
         Size = MAP_APPFONT( 80, 8 );
-        Text [ en-US ] = "PostScript ~Level";
+        Text [ en-US ] = "Printer ~Language type";
     };
-    ListBox RID_RTS_DEVICE_LEVEL_BOX
+    ListBox RID_RTS_DEVICE_PRINTLANG_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_LEVEL_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120, 130 );
         Size = MAP_APPFONT( 105, 200 );
+        StringList [en-US] =
+        {
+            < "PostScript (Level from driver)" ; 1; > ;
+            < "PostScript Level 1" ; 2; > ;
+            < "PostScript Level 2"; 3; > ;
+            < "PostScript Level 3"; 3; > ;
+            < "PDF"; 10; > ;
+        };
     };
     FixedText RID_RTS_DEVICE_SPACE_TXT
     {
@@ -193,6 +210,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_SPACE_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120,  145 );
         Size = MAP_APPFONT( 105, 200 );
@@ -205,6 +223,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_DEPTH_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_DEPTH_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120, 160 );
         Size = MAP_APPFONT( 105, 200 );
@@ -218,11 +237,13 @@ TabPage RID_RTS_DEVICEPAGE
 
 TabPage RID_RTS_FONTSUBSTPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_FONTSUBSTPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
     CheckBox RID_RTS_FS_ENABLE_BTN
     {
+        HelpID = "padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN";
         Pos = MAP_APPFONT( 5, 5 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "~Enable font replacement";
@@ -236,6 +257,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     MultiListBox RID_RTS_FS_SUBST_BOX
     {
+        HelpID = "padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX";
         AutoHScroll = TRUE;
         Border = TRUE;
         Sort = TRUE;
@@ -245,12 +267,14 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     PushButton RID_RTS_FS_ADD_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN";
         Pos = MAP_APPFONT( 5, 125 );
         Size = MAP_APPFONT( 107, 12 );
         Text [ en-US ] = "~Add";
     };
     PushButton RID_RTS_FS_REMOVE_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN";
         Pos = MAP_APPFONT( 117, 125 );
         Size = MAP_APPFONT( 107, 12 );
         Text [ en-US ] = "~Remove";
@@ -263,6 +287,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     ComboBox RID_RTS_FS_FROM_BOX
     {
+        HelpID = "padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Sort = TRUE;
@@ -277,6 +302,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     ListBox RID_RTS_FS_TO_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Sort = TRUE;
@@ -287,11 +313,13 @@ TabPage RID_RTS_FONTSUBSTPAGE
 
 TabPage RID_RTS_COMMANDPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_COMMANDPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
     ComboBox RID_RTS_CMD_CB_COMMANDS
     {
+        HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS";
         Border = TRUE ;
         Sort = TRUE ;
         Dropdown = TRUE;
@@ -300,6 +328,7 @@ TabPage RID_RTS_COMMANDPAGE
     };
     CheckBox RID_RTS_CMD_CB_EXTERNAL
     {
+        HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_EXTERNAL";
         Pos = MAP_APPFONT( 11, 95 );
         Size = MAP_APPFONT( 220, 10 );
         Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog";
@@ -313,6 +342,7 @@ TabPage RID_RTS_COMMANDPAGE
     };
     ComboBox RIT_RTS_CMD_CB_QUICKCMD
     {
+        HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RIT_RTS_CMD_CB_QUICKCMD";
         Border = TRUE;
         Sort = TRUE;
         Dropdown = TRUE;
@@ -340,6 +370,7 @@ TabPage RID_RTS_COMMANDPAGE
 
     ListBox RID_RTS_CMD_LB_CONFIGURE
     {
+        HelpID = "padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE";
         DropDown = true;
         Border = true;
         Pos = MAP_APPFONT( 101, 56 );
@@ -354,6 +385,7 @@ TabPage RID_RTS_COMMANDPAGE
 
     CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO
     {
+        HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO";
         Pos = MAP_APPFONT( 11, 146 );
         Size = MAP_APPFONT( 130, 8 );
         Text [ en-US ] = "~Fax number will be removed from output";
@@ -366,12 +398,14 @@ TabPage RID_RTS_COMMANDPAGE
     };
     Edit RID_RTS_CMD_EDT_PDFDIR
     {
+        HelpID = "padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR";
         Border = TRUE;
         Pos = MAP_APPFONT( 11, 155 );
         Size = MAP_APPFONT( 130, 12 );
     };
     PushButton RID_RTS_CMD_BTN_PDFDIR
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR";
         Pos = MAP_APPFONT( 146, 155 );
         Size = MAP_APPFONT( 15, 12 );
         Text = "...";
@@ -395,12 +429,14 @@ TabPage RID_RTS_COMMANDPAGE
     };
     PushButton RID_RTS_CMD_BTN_HELP
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP";
         Pos = MAP_APPFONT( 170, 55 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Help";
     };
     PushButton RID_RTS_CMD_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE";
         Pos = MAP_APPFONT( 170, 72 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Remove";
@@ -421,6 +457,7 @@ TabPage RID_RTS_COMMANDPAGE
 
 TabPage RID_RTS_OTHERPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_OTHERPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
@@ -432,6 +469,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_LEFTMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 5 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -448,6 +486,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_TOPMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 20 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -464,6 +503,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_RIGHTMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 35 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -480,6 +520,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_BOTTOMMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -496,12 +537,14 @@ TabPage RID_RTS_OTHERPAGE
     };
     Edit RID_RTS_OTHER_COMMENT_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 5 , 75 ) ;
         Size = MAP_APPFONT ( 220 , 12 ) ;
     };
     PushButton RID_RTS_OTHER_DEFAULT_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN";
         Pos = MAP_APPFONT( 175, 5 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Default";
@@ -515,6 +558,7 @@ String RID_TXT_QUERYFAXNUMBER
 
 ModalDialog RID_RTS_PWDIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG";
     Text [ en-US ] = "Authentication request";
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -537,6 +581,7 @@ ModalDialog RID_RTS_PWDIALOG
     };
     Edit RID_RTS_PWDIALOG_USER_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT";
         Pos = MAP_APPFONT( 70, 29 );
         Size = MAP_APPFONT( 75, 12 );
         Border = TRUE;
@@ -549,6 +594,7 @@ ModalDialog RID_RTS_PWDIALOG
     };
     Edit RID_RTS_PWDIALOG_PASS_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT";
         Pos = MAP_APPFONT( 70, 44 );
         Size = MAP_APPFONT( 75, 12 );
         Border = TRUE;
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index 31ab4382fe52..c831ab7f0919 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -57,7 +57,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
     if [ -n "$my_path" ] ; then
-        LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+        LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     fi
 fi