Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
avmedia/source/framework/mediacontrol.cxx
connectivity/source/commontools/DateConversion.cxx
desktop/source/deployment/registry/component/dp_component.cxx
editeng/inc/editeng/numitem.hxx
editeng/inc/editeng/txtrange.hxx
editeng/source/editeng/editobj.cxx
editeng/source/editeng/editview.cxx
editeng/source/editeng/eehtml.cxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/misc/txtrange.cxx
editeng/source/outliner/outlin2.cxx
editeng/source/outliner/outlvw.cxx
framework/source/layoutmanager/layoutmanager.cxx
linguistic/source/lngsvcmgr.hxx
sfx2/source/appl/app.cxx
sfx2/source/appl/app.src
sfx2/source/appl/appbas.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appdde.cxx
sfx2/source/appl/appmain.cxx
sfx2/source/appl/appopen.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/appl/appserv.cxx
sfx2/source/appl/childwin.cxx
sfx2/source/appl/fileobj.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/workwin.cxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/macro.cxx
sfx2/source/control/objface.cxx
sfx2/source/control/request.cxx
sfx2/source/control/shell.cxx
sfx2/source/control/statcach.cxx
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/mailmodel.cxx
sfx2/source/dialog/mailmodelapi.cxx
sfx2/source/dialog/mgetempl.cxx
sfx2/source/dialog/splitwin.cxx
sfx2/source/dialog/styledlg.cxx
sfx2/source/dialog/tabdlg.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/dialog/tplcitem.cxx
sfx2/source/dialog/tplpitem.cxx
sfx2/source/doc/doctempl.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/new.cxx
sfx2/source/doc/objcont.cxx
sfx2/source/doc/objserv.cxx
sfx2/source/doc/objxtor.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/inc/helpid.hrc
sfx2/source/inc/sfxlocal.hrc
sfx2/source/inc/statcach.hxx
sfx2/source/inc/templdgi.hxx
sfx2/source/inc/virtmenu.hxx
sfx2/source/inc/workwin.hxx
sfx2/source/menu/mnumgr.cxx
sfx2/source/menu/virtmenu.cxx
sfx2/source/statbar/stbitem.cxx
sfx2/source/view/frame.cxx
sfx2/source/view/frame2.cxx
sfx2/source/view/orgmgr.cxx
sfx2/source/view/printer.cxx
sfx2/source/view/prnmon.cxx
sfx2/source/view/sfxbasecontroller.cxx
sfx2/source/view/viewfrm.cxx
sfx2/source/view/viewfrm2.cxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
svx/inc/svx/svditer.hxx
svx/source/dialog/sdstring.src
svx/source/form/fmpage.cxx
svx/source/form/formcontroller.cxx
svx/source/svdraw/svdcrtv.cxx
svx/source/svdraw/svditer.cxx
svx/source/svdraw/svdview.cxx
xmloff/source/forms/elementimport.cxx

25 files changed, 180 insertions, 139 deletions

diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index de223c446765..50632bf89d95 100644..100755
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <tools/urlobj.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -201,37 +202,36 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView )
+    void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView )
     {
-        String sHelpURL( _rURL );
-        if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
-        {
-            String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
-            sal_Int32 nHelpId = sID.ToInt32();
+        rtl::OUString sHelpID( sHelpURL );
+        INetURLObject aHID( sHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+              sHelpID = aHID.GetURLPath();
 
-            if ( _bFileView )
-                // the file view "overloaded" the SetHelpId
-                static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId );
-            else
-                _pControl->SetHelpId( nHelpId );
-        }
+        // URLs should always be UTF8 encoded and escaped
+        rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
+        if ( _bFileView )
+            // the file view "overloaded" the SetHelpId
+            static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
         else
-        {
-            DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" );
-        }
+            _pControl->SetHelpId( sID );
     }
 
     //---------------------------------------------------------------------
     ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
     {
-        sal_Int32 nHelpId = _pControl->GetHelpId();
+        rtl::OString aHelpId = _pControl->GetHelpId();
         if ( _bFileView )
             // the file view "overloaded" the SetHelpId
-            nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
-
-        ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
-        sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId );
-
+            aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
+
+        ::rtl::OUString sHelpURL;
+        ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+        INetURLObject aHID( aTmp );
+        if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+            sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME );
+        sHelpURL += aTmp;
         return sHelpURL;
     }
 
@@ -539,7 +539,7 @@ namespace svt
             {
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
-                    _pListbox->RemoveEntry( (USHORT) nPos );
+                    _pListbox->RemoveEntry( (sal_uInt16) nPos );
             }
             break;
 
@@ -677,7 +677,7 @@ namespace svt
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
                 {
-                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (USHORT) nPos );
+                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (sal_uInt16) nPos );
                 }
                 else if ( !_bIgnoreIllegalArgument )
                 {
@@ -739,7 +739,7 @@ namespace svt
 
                 Sequence< ::rtl::OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
                 ::rtl::OUString* pItems = aItems.getArray();
-                for ( USHORT i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
+                for ( sal_uInt16 i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
                     *pItems++ = static_cast< ListBox* >( _pControl )->GetEntry( i );
 
                 aReturn <<= aItems;
@@ -751,7 +751,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 ::rtl::OUString sSelected;
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     sSelected = static_cast< ListBox* >( _pControl )->GetSelectEntry();
@@ -764,7 +764,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     aReturn <<= (sal_Int32)static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 else
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 44bd416f60c1..44bd416f60c1 100644..100755
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 47d774bc4d78..a14fc476aca8 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -476,7 +476,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
 
     prepareExecute();
 
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     // now we are ready to execute the dialog
     sal_Int16 nRet = getDialog()->Execute();
 
@@ -548,7 +548,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta
     m_xDlgClosedListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) );
 }
 
@@ -624,8 +624,8 @@ Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeExcep
     // files first and then the list of the selected entries
 
     SvStringsDtor* pPathList = getDialog()->GetPathList();
-    USHORT i, nCount = pPathList->Count();
-    USHORT nTotal = nCount > 1 ? nCount+1: nCount;
+    sal_uInt16 i, nCount = pPathList->Count();
+    sal_uInt16 nTotal = nCount > 1 ? nCount+1: nCount;
 
     Sequence< rtl::OUString > aPath( nTotal );
 
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 360e497090b0..d0218461f8f2 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "commonpicker.hxx"
 #include "pickercallbacks.hxx"
 
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index 8fbbc35a40e5..8fbbc35a40e5 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 945616b5ec4a..337f85c02581 100644..100755
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -109,7 +109,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s
     m_xListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) );
 }
 
@@ -125,7 +125,7 @@ sal_Int16 SvtFolderPicker::implExecutePicker( )
     prepareExecute();
 
     // now we are ready to execute the dialog
-    getDialog()->EnableAutocompletion( FALSE );
+    getDialog()->EnableAutocompletion( sal_False );
     sal_Int16 nRet = getDialog()->Execute();
 
     return nRet;
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 273f971edb5a..273f971edb5a 100644..100755
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 9062a18d577e..9062a18d577e 100644..100755
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 4ec9be11ec31..4ec9be11ec31 100644..100755
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index f360770dea4b..f360770dea4b 100644..100755
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 6422019affa5..6422019affa5 100644..100755
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 4f5d906737af..4f5d906737af 100644..100755
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 88a2590384cf..88a2590384cf 100644..100755
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
new file mode 100755
index 000000000000..3e49f68a49db
--- /dev/null
+++ b/fpicker/source/office/fps_office.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.svtools.OfficeFilePicker">
+    <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
+  </implementation>
+  <implementation name="com.sun.star.svtools.OfficeFolderPicker">
+    <service name="com.sun.star.ui.dialogs.OfficeFolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 77160e4a8253..29eb084335fc 100644..100755
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -62,13 +62,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return cppu::component_writeInfoHelper (
-        pServiceManager, pRegistryKey, g_entries);
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index b66cd8ac05a6..b66cd8ac05a6 100644..100755
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index e16c288678b1..e16c288678b1 100644..100755
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 478d4c9ac405..bda16353eb34 100644..100755
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -398,7 +398,7 @@ struct ControlChain_Impl
 {
     Window*            _pControl;
     ControlChain_Impl* _pNext;
-    BOOL               _bHasOwnerShip;
+    sal_Bool               _bHasOwnerShip;
 
     ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
     ~ControlChain_Impl();
@@ -413,7 +413,7 @@ ControlChain_Impl::ControlChain_Impl
 )
     : _pControl( pControl ),
       _pNext( pNext ),
-      _bHasOwnerShip( TRUE )
+      _bHasOwnerShip( sal_True )
 {
 }
 
@@ -451,7 +451,7 @@ namespace
 
     struct SvtResId : public ResId
     {
-        SvtResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -478,7 +478,7 @@ SvtFileDialog::SvtFileDialog
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( nExtraBits )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bInExecuteAsync( false )
     ,m_bHasFilename( false )
 {
@@ -501,7 +501,7 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( 0L )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bHasFilename( false )
 {
     Init_Impl( nBits );
@@ -626,7 +626,7 @@ void SvtFileDialog::Init_Impl
     _pImp->_pBtnStandard->SetAccessibleName( _pImp->_pBtnStandard->GetQuickHelpText() );
 
     if ( ( nStyle & SFXWB_MULTISELECTION ) == SFXWB_MULTISELECTION )
-        _pImp->_bMultiSelection = TRUE;
+        _pImp->_bMultiSelection = sal_True;
 
     _pFileView = new SvtFileView( this, SvtResId( CTL_EXPLORERFILE_FILELIST ),
                                        FILEDLG_TYPE_PATHDLG == _pImp->_eDlgType,
@@ -655,7 +655,7 @@ void SvtFileDialog::Init_Impl
             LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
 
     // calculate the length of all buttons
-    const USHORT nBtnCount = 3; // "previous level", "new folder" and "standard dir"
+    const sal_uInt16 nBtnCount = 3; // "previous level", "new folder" and "standard dir"
     long nDelta = n6AppFontInPixel; // right border
     nDelta += ( nBtnCount * aSize.Width() ); // button count * button width
     nDelta += ( n3AppFontInPixel + n3AppFontInPixel / 2 ); // spacing 1*big 1*small
@@ -745,8 +745,8 @@ void SvtFileDialog::Init_Impl
     SetSizePixel( aSize );
 
     // adjust the labels to the mode
-    USHORT nResId = STR_EXPLORERFILE_OPEN;
-    USHORT nButtonResId = 0;
+    sal_uInt16 nResId = STR_EXPLORERFILE_OPEN;
+    sal_uInt16 nButtonResId = 0;
 
     if ( nStyle & WB_SAVEAS )
     {
@@ -924,7 +924,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
         sal_Bool bFilterChanged = sal_True;
 
         // search for a corresponding filter
-        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, FALSE, bFilterChanged );
+        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, sal_False, bFilterChanged );
 
 #ifdef AUTOSELECT_USERFILTER
         // if we found a filter which without allowing multi-extensions -> select it
@@ -937,7 +937,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
 
         // look for multi-ext filters if necessary
         if ( !pFilter )
-            pFilter = FindFilter_Impl( _rFilter, TRUE, bFilterChanged );
+            pFilter = FindFilter_Impl( _rFilter, sal_True, bFilterChanged );
 
         if ( bFilterChanged )
             nReturn |= FLT_CHANGED;
@@ -986,7 +986,7 @@ IMPL_LINK( SvtFileDialog, CancelHdl_Impl, void*, EMPTYARG )
     }
     else
     {
-        EndDialog( FALSE );
+        EndDialog( sal_False );
     }
     return 1L;
 }
@@ -1063,7 +1063,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
         return 0;
     }
 
-    USHORT nLen = aFileName.Len();
+    sal_uInt16 nLen = aFileName.Len();
     if ( !nLen )
     {
         // if the dialog was opened to select a folder, the last selected folder should be selected
@@ -1105,7 +1105,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     }
 
     // check if it is a folder
-    BOOL bIsFolder = FALSE;
+    sal_Bool bIsFolder = sal_False;
 
     // first thing before doing anyhing with the content: Reset it. When the user presses "open" (or "save" or "export",
     // for that matter), s/he wants the complete handling, including all possible error messages, even if s/he
@@ -1172,7 +1172,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                                pThis->_pImp->GetCurFilter()->GetType());
     }
 
-    BOOL bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
+    sal_Bool bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
                        !pThis->_pImp->_bDoubleClick && pVoid != pThis->_pImp->_pEdFileName;
     if ( bIsFolder )
     {
@@ -1251,7 +1251,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                     // if content does not exist: at least its path must exist
                     INetURLObject aPathObj = aFileObj;
                     aPathObj.removeSegment();
-                    BOOL bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
+                    sal_Bool bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
                     if ( !bFolder )
                     {
                         ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
@@ -1308,7 +1308,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
     if ( nRet )
     {
-        pThis->EndDialog( TRUE );
+        pThis->EndDialog( sal_True );
     }
 
     return nRet;
@@ -1316,7 +1316,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
 //*****************************************************************************
 
-void SvtFileDialog::EnableAutocompletion( BOOL _bEnable )
+void SvtFileDialog::EnableAutocompletion( sal_Bool _bEnable )
 {
     _pImp->_pEdFileName->EnableAutocompletion( _bEnable );
 }
@@ -1377,7 +1377,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox*, pBox )
 
             // if applicable show extension
             pThis->SetDefaultExt( pSelectedFilter->GetExtension() );
-            USHORT nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+            sal_uInt16 nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
 
             if ( nSepPos != STRING_NOTFOUND )
                 pThis->EraseDefaultExt( nSepPos );
@@ -1443,7 +1443,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 {
     SvtFileDialogFilter_Impl* pFoundFilter = NULL;
     SvtFileDialogFilterList_Impl* pList = _pImp->_pFilter;
-    USHORT nFilter = pList->Count();
+    sal_uInt16 nFilter = pList->Count();
 
     while ( nFilter-- )
     {
@@ -1453,7 +1453,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 
         if ( _bMultiExt )
         {
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             while ( !pFoundFilter && nIdx != STRING_NOTFOUND )
             {
                 aSingleType = rType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nIdx );
@@ -1504,7 +1504,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
 
 {
     String aPath;
-    ULONG nCount = _pFileView->GetSelectionCount();
+    sal_uLong nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( nCount && pEntry )
@@ -1519,7 +1519,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
         nRet = OK();
 
     if ( nRet )
-        EndDialog( TRUE );
+        EndDialog( sal_True );
 }
 
 //*****************************************************************************
@@ -1542,7 +1542,7 @@ void SvtFileDialog::UpdateControls( const String& rURL )
             {
                 // no Fsys path for server file system ( only UCB has mountpoints! )
                 if ( INET_PROT_FILE != aObj.GetProtocol() )
-                    sText = rURL.Copy( static_cast< USHORT >(
+                    sText = rURL.Copy( static_cast< sal_uInt16 >(
                         INetURLObject::GetScheme( aObj.GetProtocol() ).getLength() ) );
             }
 
@@ -1634,9 +1634,9 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
 
 IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG )
 {
-    _pImp->_bDoubleClick = TRUE;
+    _pImp->_bDoubleClick = sal_True;
     OpenHdl_Impl( this, NULL );
-    _pImp->_bDoubleClick = FALSE;
+    _pImp->_bDoubleClick = sal_False;
 
     return 0;
 }
@@ -1738,13 +1738,13 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 */
 
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     long nRet = 0;
 
     if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
     {
         const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nCode = rKeyCode.GetCode();
 
         if ( !rKeyCode.GetModifier() &&
              KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
@@ -1765,7 +1765,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 
 long SvtFileDialog::OK()
 {
-    return TRUE;
+    return sal_True;
 }
 
 //*****************************************************************************
@@ -1842,7 +1842,7 @@ String SvtFileDialog::implGetInitialURL( const String& _rPath, const String& _rF
     INetURLObject aURLParser;
 
     // set the path
-    bool bWasAbsolute = FALSE;
+    bool bWasAbsolute = sal_False;
     aURLParser = aURLParser.smartRel2Abs( _rPath, bWasAbsolute );
 
     // is it a valid folder?
@@ -1894,9 +1894,9 @@ short SvtFileDialog::Execute()
         return 0;
 
     // start the dialog
-    _bIsInExecute = TRUE;
+    _bIsInExecute = sal_True;
     short nResult = ModalDialog::Execute();
-    _bIsInExecute = FALSE;
+    _bIsInExecute = sal_False;
 
     DBG_ASSERT( !m_pCurrentAsyncAction.is(), "SvtFilePicker::Execute: still running an async action!" );
         // the dialog should not be cancellable while an async action is running - first, the action
@@ -1931,16 +1931,16 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationStarted()
 {
-    EnableUI( FALSE );
+    EnableUI( sal_False );
     // the cancel button must be always enabled
-    _pImp->_pBtnCancel->Enable( TRUE );
+    _pImp->_pBtnCancel->Enable( sal_True );
     _pImp->_pBtnCancel->GrabFocus();
 }
 
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationFinished()
 {
-    EnableUI( TRUE );
+    EnableUI( sal_True );
     m_pCurrentAsyncAction = NULL;
     if ( !m_bInExecuteAsync )
         _pImp->_pEdFileName->GrabFocus();
@@ -1992,7 +1992,7 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableUI( BOOL _bEnable )
+void SvtFileDialog::EnableUI( sal_Bool _bEnable )
 {
     Enable( _bEnable );
 
@@ -2003,13 +2003,13 @@ void SvtFileDialog::EnableUI( BOOL _bEnable )
               ++aLoop
             )
         {
-            (*aLoop)->Enable( FALSE );
+            (*aLoop)->Enable( sal_False );
         }
     }
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableControl( Control* _pControl, BOOL _bEnable )
+void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
 {
     if ( !_pControl )
     {
@@ -2126,16 +2126,16 @@ short SvtFileDialog::PrepareExecute()
     _pImp->InitFilterList();
 
     // set up initial filter
-    USHORT nFilterCount = GetFilterCount();
+    sal_uInt16 nFilterCount = GetFilterCount();
     String aAll( SvtResId( STR_FILTERNAME_ALL ) );
-    BOOL bHasAll = _pImp->HasFilterListEntry( aAll );
+    sal_Bool bHasAll = _pImp->HasFilterListEntry( aAll );
     if ( _pImp->GetCurFilter() || nFilterCount == 1 || ( nFilterCount == 2 && bHasAll ) )
     {
         // if applicable set the only filter or the only filter that
         // does not refer to all files, as the current one
         if ( !_pImp->GetCurFilter() )
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if ( 2 == nFilterCount && bHasAll )
             {
                 nPos = nFilterCount;
@@ -2153,7 +2153,7 @@ short SvtFileDialog::PrepareExecute()
         // adjust view
         _pImp->SelectFilterListEntry( _pImp->GetCurFilter()->GetName() );
         SetDefaultExt( _pImp->GetCurFilter()->GetExtension() );
-        USHORT nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
         if ( nSepPos != STRING_NOTFOUND )
             EraseDefaultExt( nSepPos );
     }
@@ -2346,7 +2346,7 @@ void SvtFileDialog::OpenURL_Impl( const String& _rURL )
 SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const String& _rFilter, const String& _rType )
 {
     SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType );
-    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (USHORT)0 );
+    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (sal_uInt16)0 );
 
     if ( !_pImp->GetCurFilter() )
         _pImp->SetCurFilter( pNewFilter, _rFilter );
@@ -2380,7 +2380,7 @@ void SvtFileDialog::SetCurFilter( const String& rFilter )
     DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );
 
     // look for corresponding filter
-    USHORT nPos = _pImp->_pFilter->Count();
+    sal_uInt16 nPos = _pImp->_pFilter->Count();
 
     while ( nPos-- )
     {
@@ -2413,14 +2413,14 @@ String SvtFileDialog::getCurFilter( ) const
 
 //*****************************************************************************
 
-USHORT SvtFileDialog::GetFilterCount() const
+sal_uInt16 SvtFileDialog::GetFilterCount() const
 {
     return _pImp->_pFilter->Count();
 }
 
 //*****************************************************************************
 
-const String& SvtFileDialog::GetFilterName( USHORT nPos ) const
+const String& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < GetFilterCount(), "invalid index" );
     return _pImp->_pFilter->GetObject( nPos )->GetName();
@@ -2463,7 +2463,7 @@ void SvtFileDialog::InitSize()
 SvStringsDtor* SvtFileDialog::GetPathList() const
 {
     SvStringsDtor*  pList = new SvStringsDtor;
-    ULONG           nCount = _pFileView->GetSelectionCount();
+    sal_uLong           nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry*    pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( ! pEntry )
@@ -2538,12 +2538,12 @@ void SvtFileDialog::implArrangeControls()
 
 //*****************************************************************************
 
-BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
+sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
 {
     String aEmpty;
     String aReversePath( rPath );
     aReversePath.Reverse();
-    USHORT nQuestionMarkPos = rPath.Search( '?' );
+    sal_uInt16 nQuestionMarkPos = rPath.Search( '?' );
 
     if ( nQuestionMarkPos != STRING_NOTFOUND )
     {
@@ -2553,12 +2553,12 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt )
             nQuestionMarkPos = STRING_NOTFOUND;
     }
-    USHORT nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
+    sal_uInt16 nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
     rFilter = aEmpty;
 
     if ( nWildCardPos != STRING_NOTFOUND )
     {
-        USHORT nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
+        sal_uInt16 nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
 
         if ( nPathTokenPos == STRING_NOTFOUND )
         {
@@ -2591,7 +2591,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
             if ( nPathTokenPos < (rPath.Len() - nWildCardPos - 1) )
             {
                 ErrorHandler::HandleError( ERRCODE_SFX_INVALIDSYNTAX );
-                return FALSE;
+                return sal_False;
             }
 
             // cut off filter
@@ -2611,7 +2611,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-----------------------------------------------------------------------------
@@ -2945,13 +2945,14 @@ void SvtFileDialog::AddControls_Impl( )
         _pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) );
         _pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) );
         _pPrevBmp->Show();
+        _pPrevBmp->SetAccessibleName(SvtResId(STR_PREVIEW));
     }
 
     if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION )
     {
         _pImp->_pCbAutoExtension = new CheckBox( this, SvtResId( CB_AUTO_EXTENSION ) );
         _pImp->_pCbAutoExtension->SetText( SvtResId( STR_SVT_FILEPICKER_AUTO_EXTENSION ) );
-        _pImp->_pCbAutoExtension->Check( TRUE );
+        _pImp->_pCbAutoExtension->Check( sal_True );
         AddControl( _pImp->_pCbAutoExtension );
         ReleaseOwnerShip( _pImp->_pCbAutoExtension );
         _pImp->_pCbAutoExtension->SetClickHdl( LINK( this, SvtFileDialog, AutoExtensionHdl_Impl ) );
@@ -3134,7 +3135,7 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
     {
         if ( pElement->_pControl == pUserControl )
         {
-            pElement->_bHasOwnerShip = FALSE;
+            pElement->_bHasOwnerShip = sal_False;
             break;
         }
         pElement = pElement->_pNext;
@@ -3143,14 +3144,14 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
 
 //***************************************************************************
 
-BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
+sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine )
 {
     // control already exists
     ControlChain_Impl* pElement = _pUserControls;
     while ( pElement )
     {
         if ( pElement->_pControl == pControl )
-            return FALSE;
+            return sal_False;
         pElement = pElement->_pNext;
     }
 
@@ -3192,7 +3193,7 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     }
     Point aNewControlPos;
     Size* pNewDlgSize = NULL;
-    BOOL bNewRow = bNewLine;
+    sal_Bool bNewRow = bNewLine;
 
     if ( nType == WINDOW_WINDOW )
     {
@@ -3219,12 +3220,12 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
 
         // Check if a new row has to be created.
         if ( aNewControlRange.X() > aDlgSize.Width() )
-            bNewRow = TRUE;
+            bNewRow = sal_True;
     }
     else
     {
         // Create a new row if there was no usercontrol before.
-        bNewRow = TRUE;
+        bNewRow = sal_True;
     }
 
     // Check if a new row has to be created.
@@ -3264,7 +3265,7 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     pControl->Show();
     _pUserControls = new ControlChain_Impl( pControl, _pUserControls );
 
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool SvtFileDialog::ContentHasParentFolder( const rtl::OUString& rURL )
@@ -3312,14 +3313,14 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
 
     if ( ! aType.EqualsAscii(FILEDIALOG_FILTER_ALL) )
     {
-        USHORT nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
-        USHORT nIndex, nPos = 0;
+        sal_uInt16 nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nIndex, nPos = 0;
 
         for ( nIndex = 0; nIndex < nWildCard; nIndex++ )
         {
             String aExt(aType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nPos ));
             // take care of a leading *
-            USHORT nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
+            sal_uInt16 nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
             sal_Unicode* pExt = aExt.GetBufferAccess() + nExtOffset;
             xub_StrLen nExtLen = aExt.Len() - nExtOffset;
             xub_StrLen nOffset = aTemp.Len() - nExtLen;
@@ -3384,12 +3385,12 @@ IMPL_LINK( QueryFolderNameDialog, NameHdl, Edit *, EMPTYARG )
     if ( aName.Len() )
     {
         if ( !aOKBtn.IsEnabled() )
-            aOKBtn.Enable( TRUE );
+            aOKBtn.Enable( sal_True );
     }
     else
     {
         if ( aOKBtn.IsEnabled() )
-            aOKBtn.Enable( FALSE );
+            aOKBtn.Enable( sal_False );
     }
 
     return 0;
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 15f5121b0965..42b235ee31af 100644..100755
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -28,9 +28,8 @@
 #ifndef _SVTOOLS_IODLGIMPL_HRC
 #define _SVTOOLS_IODLGIMPL_HRC
 
-#ifndef _SVTOOLS_HRC
 #include "svtools/svtools.hrc"
-#endif
+#include "svtools/helpid.hrc"
 
 // ModalDialog DLG_SVT_EXPLORERFILE
 
@@ -71,6 +70,7 @@
 #define STR_PATHSELECT                      5
 #define STR_BUTTONSELECT                    6
 #define STR_ACTUALVERSION                   7
+#define STR_PREVIEW             8
 
 // DLG_SVT_QUERYFOLDERNAME -----------------------
 
@@ -86,22 +86,5 @@
 #define SID_SFX_START                       5000
 #define SID_OPENURL                     (SID_SFX_START + 596)
 
-#define HID_FILEDLG_STANDARD            (HID_SFX_START +  27)
-#define HID_FILEDLG_MANAGER             (HID_SFX_START +  28)
-#define HID_FILEDLG_URL                 (HID_SFX_START +  29)
-#define HID_FILEDLG_USE_PASSWD          (HID_SFX_START +  31)
-#define HID_FILEDLG_READ_ONLY           (HID_SFX_START +  32)
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX     (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN            (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME       (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE       (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN          (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN            (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME       (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN          (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME     (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN      (HID_SFX_START + 227)
-
 #endif
 
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c66039e15fa6..b33eeeede9b4 100644..100755
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -107,7 +107,7 @@ private:
     ::svt::IFilePickerListener* _pFileNotifier;
     SvtExpFileDlg_Impl*         _pImp;
     WinBits                     _nExtraBits;
-    BOOL                        _bIsInExecute   :   1;
+    sal_Bool                        _bIsInExecute   :   1;
 
     ImageList                   m_aImages;
     ::svt::SmartContent         m_aContent;
@@ -160,14 +160,14 @@ private:
     DECL_LINK( PlayButtonHdl_Impl, PushButton* );
 
     // removes a filter with wildcards from the path and returns it
-    BOOL IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
+    sal_Bool IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
 
     void    implArrangeControls();
     void    implUpdateImages( );
 
 protected:
     virtual long                Notify( NotifyEvent& rNEvt );
-    void                        EnableInternet( BOOL bInternet );
+    void                        EnableInternet( sal_Bool bInternet );
 
     // originally from VclFileDialog
     Link                        _aOKHdl;
@@ -188,14 +188,14 @@ protected:
         This is under the assumption that you'll use EnableControl. Direct access to the control
         (such as pControl->Enable()) will break this.
     */
-    void                        EnableUI( BOOL _bEnable );
+    void                        EnableUI( sal_Bool _bEnable );
 
     /** enables or disables a control
 
         You are strongly encouraged to prefer this method over pControl->Enable( _bEnable ). See
         <member>EnableUI</member> for details.
     */
-    void                        EnableControl( Control* _pControl, BOOL _bEnable );
+    void                        EnableControl( Control* _pControl, sal_Bool _bEnable );
     short                       PrepareExecute();
 
 public:
@@ -225,8 +225,8 @@ public:
 
             void                SetCurFilter( const String& rFilter );
             String              GetCurFilter() const;
-            USHORT              GetFilterCount() const;
-            const String&       GetFilterName( USHORT nPos ) const;
+            sal_uInt16              GetFilterCount() const;
+            const String&       GetFilterName( sal_uInt16 nPos ) const;
 
     virtual void                Resize();
     virtual void                DataChanged( const DataChangedEvent& _rDCEvt );
@@ -239,7 +239,7 @@ public:
     void                        DisableSaveLastDirectory();
     void                        InitSize();
     void                        UpdateControls( const String& rURL );
-    void                        EnableAutocompletion( BOOL _bEnable = TRUE );
+    void                        EnableAutocompletion( sal_Bool _bEnable = sal_True );
 
     void                        SetFileCallback( ::svt::IFilePickerListener *pNotifier ) { _pFileNotifier = pNotifier; }
 
@@ -264,7 +264,7 @@ public:
     }
 
     // originally from VclFileDialog
-    virtual BOOL                AddControl( Window* pControl, BOOL bNewLine = FALSE );
+    virtual sal_Bool                AddControl( Window* pControl, sal_Bool bNewLine = sal_False );
 
     // inline
     inline void                 SetPath( const String& rNewURL );
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 08ad36f4704c..4a3c2f6736fb 100644..100755
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -72,12 +72,14 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ImageButton BTN_EXPLORERFILE_NEWFOLDER
     {
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 59 , 6 ) ;
         QuickHelpText [ en-US ] = "Create New Directory" ;
     };
     ImageButton BTN_EXPLORERFILE_LISTVIEW
     {
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 109 , 6 ) ;
         ButtonImage = Image
@@ -90,8 +92,10 @@ ModalDialog DLG_SVT_EXPLORERFILE
         };
         QuickHelpText [ en-US ] = "List";
     };
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
     MenuButton BTN_EXPLORERFILE_UP
     {
+        HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 109 , 6 ) ;
         QuickHelpText [ en-US ] = "Up One Level" ;
@@ -99,6 +103,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
 
     MenuButton BTN_EXPLORERFILE_STANDARD
     {
+        HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 59 , 6 ) ;
         QuickHelpText [ en-US ] = "Default Directory" ;
@@ -118,6 +123,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     Edit ED_EXPLORERFILE_FILENAME
     {
+        HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( 59 , 117 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
@@ -131,6 +137,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ListBox LB_EXPLORERFILE_SHARED_LISTBOX
     {
+        HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX";
         Pos = MAP_APPFONT ( 59 , 132 ) ;
         Size = MAP_APPFONT ( 159 , 40 ) ;
         DropDown = TRUE ;
@@ -145,6 +152,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ListBox LB_EXPLORERFILE_FILETYPE
     {
+        HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE";
         Pos = MAP_APPFONT ( 59 , 147 ) ;
         Size = MAP_APPFONT ( 159 , 80 ) ;
         DropDown = TRUE ;
@@ -154,26 +162,31 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     CheckBox CB_EXPLORERFILE_READONLY
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY";
         Size = MAP_APPFONT ( 80 , 10 ) ;
         Text [ en-US ] = "~Read-only" ;
     };
     CheckBox CB_EXPLORERFILE_PASSWORD
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD";
         Size = MAP_APPFONT ( 100, 10 ) ;
         Text [ en-US ] = "Save with password" ;
     };
     CheckBox CB_AUTO_EXTENSION
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION";
         Size = MAP_APPFONT ( 160 , 10 ) ;
         Text [ en-US ] = "~Automatic file name extension" ;
     };
     CheckBox CB_OPTIONS
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS";
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Text [ en-US ] = "Edit ~filter settings";
     };
     PushButton BTN_EXPLORERFILE_OPEN
     {
+        HelpID = "fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN";
         Pos = MAP_APPFONT ( 224 , 117 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
@@ -217,11 +230,16 @@ ModalDialog DLG_SVT_EXPLORERFILE
     {
         Text [ en-US ] = "Current version";
     };
+    String STR_PREVIEW
+    {
+        Text [ en-US ] = "File Preview";
+    };
 };
 
 // QueryFolderNameDialog ----------------------------------------------------------
 ModalDialog DLG_SVT_QUERYFOLDERNAME
 {
+    HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -236,6 +254,7 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME
     };
     Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME
     {
+        HelpID = "fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 138 , 12 ) ;
         Border = TRUE ;
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 2d25ea4b8900..90b00c4bc803 100644..100755
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -121,7 +121,7 @@ namespace
 
     struct SvtSimpleResId : public ResId
     {
-        SvtSimpleResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -312,7 +312,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
 
     _pMenu->Clear();
 
-    USHORT nItemId = 1;
+    sal_uInt16 nItemId = 1;
     String sDisplayName;
 
     ::std::vector< String >::const_iterator aLoop;
@@ -467,7 +467,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
         sName = _pFilterDesc->GetName();
 
     // insert an set user data
-    USHORT nPos = _pLbFilter->InsertEntry( sName );
+    sal_uInt16 nPos = _pLbFilter->InsertEntry( sName );
     _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) );
 }
 
@@ -479,7 +479,7 @@ void SvtExpFileDlg_Impl::InitFilterList( )
     ClearFilterList( );
 
     // reinit it
-    USHORT nPos = _pFilter->Count();
+    sal_uInt16 nPos = _pFilter->Count();
 
     // search for the first entry which is no group separator
     while ( nPos-- && _pFilter->GetObject( nPos ) && _pFilter->GetObject( nPos )->isGroupSeparator() )
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 3b47d52560bf..2cc4f71edcc1 100644..100755
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -261,7 +261,7 @@ public:
     inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const { return _aBlackList; }
     void                    SetStandardDir( const String& _rDir );
     inline const String&    GetStandardDir() const          { return _aStdDir; }
-    inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( FALSE ); }
+    inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( sal_False ); }
 
     // ------------------------------------------
     // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index adc3c30f9a3d..7481fd867ca7 100644..100755
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -86,3 +86,11 @@ RESLIB1SRSFILES=\
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/fps_office.component
+
+$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps_office.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps_office.component
diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index 2140fe5c716d..2140fe5c716d 100644..100755
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx