impressdefaults1: merge

73 files changed, 3186 insertions, 2534 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 68cf316e813b..53c2a5ac86f6 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -613,13 +613,6 @@ void BrowseBox::Resize()
     if (IsZoom())
         nSBSize = (ULONG)(nSBSize * (double)GetZoom());
 
-    long nSize = pDataWin->GetPosPixel().Y();
-    if( !getDataWindow()->bNoHScroll )
-        nSize += aHScroll.GetSizePixel().Height();
-
-    if ( GetOutputSizePixel().Height() < nSize )
-        return;
-
     DoHideCursor( "Resize" );
     USHORT nOldVisibleRows =
         (USHORT)(pDataWin->GetOutputSizePixel().Height() / GetDataRowHeight() + 1);
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index af19379d8b8f..7c1dd8362e86 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1443,16 +1443,16 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt32 SvtFileView::GetHelpId( ) const
+const rtl::OString& SvtFileView::GetHelpId( ) const
 {
     return mpImp->mpView->GetHelpId( );
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFileView::SetHelpId( sal_uInt32 nHelpId )
+void SvtFileView::SetHelpId( const rtl::OString& rHelpId )
 {
-    mpImp->mpView->SetHelpId( nHelpId );
+    mpImp->mpView->SetHelpId( rHelpId );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index f40530c10347..bcb282f44615 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -110,6 +110,7 @@ Menu RID_FILEVIEW_CONTEXTMENU
 
 ModalDialog DLG_SVT_QUERYDELETE
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -142,6 +143,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_YES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES";
         Pos = MAP_APPFONT ( 6 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -151,6 +153,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_ALL
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL";
         Pos = MAP_APPFONT ( 59 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -160,6 +163,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_NO
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO";
         Pos = MAP_APPFONT ( 112 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index b16cd67d12a5..6fd0f5bf0c9c 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.cxx
@@ -50,7 +50,6 @@ SvIcnVwDataEntry::~SvIcnVwDataEntry()
 SvIconView::SvIconView( Window* pParent, WinBits nWinStyle ) :
     SvLBox( pParent, nWinStyle | WB_BORDER )
 {
-    nWinBits = nWinStyle;
     nIcnVwFlags = 0;
     pImp = new SvImpIconView( this, GetModel(), nWinStyle | WB_ICON );
     pImp->mpViewData = 0;
@@ -72,8 +71,6 @@ SvIconView::SvIconView( Window* pParent , const ResId& rResId ) :
     SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
     SetDefaultFont();
     pImp->SetSelectionMode( GetSelectionMode() );
-    pImp->SetWindowBits( nWindowStyle );
-    nWinBits = nWindowStyle;
 }
 
 SvIconView::~SvIconView()
@@ -403,10 +400,11 @@ SvLBoxEntry* SvIconView::GetEntryFromLogicPos( const Point& rDocPos ) const
 }
 
 
-void SvIconView::SetWindowBits( WinBits nWinStyle )
+void SvIconView::StateChanged( StateChangedType i_nStateChange )
 {
-    nWinBits = nWinStyle;
-    pImp->SetWindowBits( nWinStyle );
+    SvLBox::StateChanged( i_nStateChange );
+    if ( i_nStateChange == STATE_CHANGE_STYLE )
+        pImp->SetStyle( GetStyle() );
 }
 
 void SvIconView::PaintEntry( SvLBoxEntry* pEntry )
@@ -469,6 +467,7 @@ void SvIconView::SelectAll( BOOL bSelect, BOOL )
 void SvIconView::SetCurEntry( SvLBoxEntry* _pEntry )
 {
     pImp->SetCursor( _pEntry );
+    OnCurrentEntryChanged();
 }
 
 SvLBoxEntry* SvIconView::GetCurEntry() const
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 484584828b9f..c251903d02bd 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -45,6 +45,7 @@
 #include <svimpbox.hxx>
 #include <rtl/instance.hxx>
 #include <svtools/svtdata.hxx>
+#include <tools/wintypes.hxx>
 
 #ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
@@ -83,7 +84,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     pTree = pLBTree;
     aSelEng.SetFunctionSet( (FunctionSet*)&aFctSet );
     aSelEng.ExpandSelectionOnMouseMove( FALSE );
-    SetWindowBits( nWinStyle );
+    SetStyle( nWinStyle );
     SetSelectionMode( SINGLE_SELECTION );
     SetDragDropMode( 0 );
 
@@ -253,10 +254,10 @@ void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect )
     }
 }
 
-void SvImpLBox::SetWindowBits( WinBits nWinStyle )
+void SvImpLBox::SetStyle( WinBits i_nWinStyle )
 {
-    nWinBits = nWinStyle;
-    if((nWinStyle & WB_SIMPLEMODE) && aSelEng.GetSelectionMode()==MULTIPLE_SELECTION)
+    m_nStyle = i_nWinStyle;
+    if ( ( m_nStyle & WB_SIMPLEMODE) && ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) )
         aSelEng.AddAlways( TRUE );
 }
 
@@ -683,6 +684,8 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect )
         }
     }
     nFlags &= (~F_DESEL_ALL);
+
+    pView->OnCurrentEntryChanged();
 }
 
 void SvImpLBox::ShowCursor( BOOL bShow )
@@ -952,7 +955,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
 
     // erst die Linien Zeichnen, dann clippen!
     pView->SetClipRegion();
-    if( nWinBits & ( WB_HASLINES | WB_HASLINESATROOT ) )
+    if( m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT ) )
         DrawNet();
 
     pView->SetClipRegion( aClipRegion );
@@ -969,7 +972,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
     {
         // do not select if multiselection or explicit set
         BOOL bNotSelect = ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION )
-                || ( ( nWinBits & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION );
+                || ( ( m_nStyle & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION );
         SetCursor( pStartEntry, bNotSelect );
     }
 
@@ -994,7 +997,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop )
     if( bInView && (!bMoveToTop || pStartEntry == pEntry) )
         return;  // ist schon sichtbar
 
-    if( pStartEntry || (nWinBits & WB_FORCE_MAKEVISIBLE) )
+    if( pStartEntry || (m_nStyle & WB_FORCE_MAKEVISIBLE) )
         nFlags &= (~F_FILLING);
     if( !bInView )
     {
@@ -1132,7 +1135,7 @@ void SvImpLBox::DrawNet()
             pView->DrawLine( aPos1, aPos2 );
         }
         // Sichtbar im Control ?
-        if( n>= nOffs && ((nWinBits & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry)))
+        if( n>= nOffs && ((m_nStyle & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry)))
         {
             // kann aPos1 recyclet werden ?
             if( !pView->IsExpanded(pEntry) )
@@ -1154,7 +1157,7 @@ void SvImpLBox::DrawNet()
         nY += nEntryHeight;
         pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
     }
-    if( nWinBits & WB_HASLINESATROOT )
+    if( m_nStyle & WB_HASLINESATROOT )
     {
         pEntry = pView->First();
         aPos1.X() = pView->GetTabPos( pEntry, pFirstDynamicTab);
@@ -1248,7 +1251,8 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
 
     Size aOSize( pView->Control::GetOutputSizePixel() );
 
-    BOOL bVerSBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0;
+    const WinBits nWindowStyle = pView->GetStyle();
+    BOOL bVerSBar = ( nWindowStyle & WB_VSCROLL ) != 0;
     BOOL bHorBar = FALSE;
     long nMaxRight = aOSize.Width(); //GetOutputSize().Width();
     Point aOrigin( pView->GetMapMode().GetOrigin() );
@@ -1256,7 +1260,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
     nMaxRight += aOrigin.X() - 1;
     long nVis = nMostRight - aOrigin.X();
     if( pTabBar || (
-        (pView->nWindowStyle & WB_HSCROLL) &&
+        (nWindowStyle & WB_HSCROLL) &&
         (nVis < nMostRight || nMaxRight < nMostRight) ))
         bHorBar = TRUE;
 
@@ -1274,7 +1278,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
         nMaxRight -= nVerSBarWidth;
         if( !bHorBar )
         {
-            if( (pView->nWindowStyle & WB_HSCROLL) &&
+            if( (nWindowStyle & WB_HSCROLL) &&
                 (nVis < nMostRight || nMaxRight < nMostRight) )
                 bHorBar = TRUE;
         }
@@ -1439,7 +1443,7 @@ void SvImpLBox::FillView()
 
 void SvImpLBox::ShowVerSBar()
 {
-    BOOL bVerBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0;
+    BOOL bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0;
     ULONG nVis = 0;
     if( !bVerBar )
         nVis = pView->GetVisibleCount();
@@ -1681,7 +1685,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect )
         return;
 
     /*
-    if( (nWinBits & WB_HIDESELECTION) && pEntry && !pView->HasFocus() )
+    if( (m_nStyle & WB_HIDESELECTION) && pEntry && !pView->HasFocus() )
     {
         SvViewData* pViewData = pView->GetViewData( pEntry );
         pViewData->SetCursored( bSelect );
@@ -1943,7 +1947,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
         // die Linien invalidieren
         /*
         if( (bEntryVisible || bPrevEntryVisible) &&
-            (nWinBits & ( WB_HASLINES | WB_HASLINESATROOT )) )
+            (m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT )) )
         {
             SvLBoxTab* pTab = pView->GetFirstDynamicTab();
             if( pTab )
@@ -2172,14 +2176,6 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
                     SelAllDestrAnch( FALSE, TRUE ); // DeselectAll();
                 SetCursor( pEntry );
 
-                DBG_ERROR( "Please report what you did to get this assertion to FS!" );
-                    // The entry which has been double-clicked changed - and we select it, again.
-                    // I have situations where this behaviour does not make any sense at all - even more, it
-                    // leads to hacks to revert it's results.
-                    // So I'm not sure if this behaviour here is nonsense (which I believe at the moment),
-                    // or if there are really scenarious where it dones make sense ....
-                    // 07.12.2001 - 95727 - fs@openoffice.org
-
                 return;
             }
             if( pEntry->HasChilds() || pEntry->HasChildsOnDemand() )
@@ -2273,6 +2269,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
     SvLBoxEntry* pNewCursor;
 
+    const WinBits nWindowStyle = pView->GetStyle();
     switch( aCode )
     {
         case KEY_UP:
@@ -2356,7 +2353,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                     CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
                 }
             }
-            else if( pView->nWindowStyle & WB_HSCROLL )
+            else if( nWindowStyle & WB_HSCROLL )
             {
                 long    nThumb = aHorSBar.GetThumbPos();
                 nThumb += aHorSBar.GetLineSize();
@@ -2387,7 +2384,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                     CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
                 }
             }
-            else if ( pView->nWindowStyle & WB_HSCROLL )
+            else if ( nWindowStyle & WB_HSCROLL )
             {
                 long    nThumb = aHorSBar.GetThumbPos();
                 nThumb -= aHorSBar.GetLineSize();
@@ -2489,13 +2486,17 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                 else if ( !bShift /*&& !bMod1*/ )
                 {
                     if ( aSelEng.IsAddMode() )
+                    {
                         // toggle selection
                         pView->Select( pCursor, !pView->IsSelected( pCursor ) );
-                    else
+                    }
+                    else if ( !pView->IsSelected( pCursor ) )
                     {
                         SelAllDestrAnch( FALSE );
                         pView->Select( pCursor, TRUE );
                     }
+                    else
+                        bKeyUsed = FALSE;
                 }
                 else
                     bKeyUsed = FALSE;
@@ -2528,7 +2529,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
         case KEY_F8:
             if( bShift && pView->GetSelectionMode()==MULTIPLE_SELECTION &&
-                !(nWinBits & WB_SIMPLEMODE))
+                !(m_nStyle & WB_SIMPLEMODE))
             {
                 if( aSelEng.IsAlwaysAdding() )
                     aSelEng.AddAlways( FALSE );
@@ -2576,8 +2577,8 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
         case KEY_A:
             if( bMod1 )
                 SelAllDestrAnch( TRUE );
-//          else
-//              bKeyUsed = FALSE;   #105907# assume user wants to use quicksearch with key "a", so key is handled!
+            else
+                bKeyUsed = FALSE;
             break;
 
         case KEY_SUBTRACT:
@@ -2688,10 +2689,15 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         default:
-            if( bMod1 || rKeyCode.GetGroup() == KEYGROUP_FKEYS )
-                // #105907# CTRL or Function key is pressed, assume user don't want to use quicksearch...
-                // if there are groups of keys which should not be handled, they can be added here
-                bKeyUsed = FALSE;
+            // is there any reason why we should eat the events here? The only place where this is called
+            // is from SvTreeListBox::KeyInput. If we set bKeyUsed to TRUE here, then the key input
+            // is just silenced. However, we want SvLBox::KeyInput to get a chance, to do the QuickSelection
+            // handling.
+            // (The old code here which intentionally set bKeyUsed to TRUE said this was because of "quick search"
+            // handling, but actually there was no quick search handling anymore. We just re-implemented it.)
+            // #i31275# / 2009-06-16 / frank.schoenheit@sun.com
+            bKeyUsed = FALSE;
+            break;
     }
     return bKeyUsed;
 }
@@ -2706,7 +2712,7 @@ void __EXPORT SvImpLBox::GetFocus()
 //      if( bSimpleTravel && !pView->IsSelected(pCursor) )
 //          pView->Select( pCursor, TRUE );
     }
-    if( nWinBits & WB_HIDESELECTION )
+    if( m_nStyle & WB_HIDESELECTION )
     {
         SvLBoxEntry* pEntry = pView->FirstSelected();
         while( pEntry )
@@ -2739,7 +2745,7 @@ void __EXPORT SvImpLBox::LoseFocus()
         pView->SetEntryFocus( pCursor,FALSE );
     ShowCursor( FALSE );
 
-    if( nWinBits & WB_HIDESELECTION )
+    if( m_nStyle & WB_HIDESELECTION )
     {
         SvLBoxEntry* pEntry = pView->FirstSelected();
         while( pEntry )
@@ -3037,7 +3043,7 @@ void SvImpLBox::SetSelectionMode( SelectionMode eSelMode  )
         bSimpleTravel = TRUE;
     else
         bSimpleTravel = FALSE;
-    if( (nWinBits & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) )
+    if( (m_nStyle & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) )
         aSelEng.AddAlways( TRUE );
 }
 
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index d1e471953663..0d335429d564 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -708,7 +708,7 @@ public:
 
 
 SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree,
-    WinBits nWinStyle ) :
+    WinBits i_nWinStyle ) :
     aVerSBar( pCurView, WB_DRAG | WB_VSCROLL ),
     aHorSBar( pCurView, WB_DRAG | WB_HSCROLL )
 {
@@ -716,7 +716,7 @@ SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree,
     pModel = pTree;
     pCurParent = 0;
     pZOrderList = new SvPtrarr;
-    SetWindowBits( nWinStyle );
+    SetStyle( i_nWinStyle );
     nHorDist = 0;
     nVerDist = 0;
     nFlags = 0;
@@ -785,13 +785,12 @@ void SvImpIconView::Clear( BOOL bInCtor )
     AdjustScrollBars();
 }
 
-void SvImpIconView::SetWindowBits( WinBits nWinStyle )
+void SvImpIconView::SetStyle( const WinBits i_nWinStyle )
 {
-    nWinBits = nWinStyle;
     nViewMode = VIEWMODE_TEXT;
-    if( nWinStyle & WB_NAME )
+    if( i_nWinStyle & WB_NAME )
         nViewMode = VIEWMODE_NAME;
-    if( nWinStyle & WB_ICON )
+    if( i_nWinStyle & WB_ICON )
         nViewMode = VIEWMODE_ICON;
 }
 
@@ -1754,8 +1753,8 @@ void SvImpIconView::AdjustScrollBars()
     else
         nVisibleHeight = nRealHeight;
 
-    bool bVerSBar = (pView->nWindowStyle & WB_VSCROLL) ? true : false;
-    bool bHorSBar = (pView->nWindowStyle & WB_HSCROLL) ? true : false;
+    bool bVerSBar = (pView->GetStyle() & WB_VSCROLL) ? true : false;
+    bool bHorSBar = (pView->GetStyle() & WB_HSCROLL) ? true : false;
 
     USHORT nResult = 0;
     if( nVirtHeight )
@@ -1903,7 +1902,7 @@ BOOL SvImpIconView::CheckHorScrollBar()
         return FALSE;
     const MapMode& rMapMode = pView->GetMapMode();
     Point aOrigin( rMapMode.GetOrigin() );
-    if(!(pView->nWindowStyle & WB_HSCROLL) && !aOrigin.X() )
+    if(!(pView->GetStyle() & WB_HSCROLL) && !aOrigin.X() )
     {
         long nWidth = aOutputSize.Width();
         USHORT nCount = pZOrderList->Count();
@@ -1941,7 +1940,7 @@ BOOL SvImpIconView::CheckVerScrollBar()
         return FALSE;
     const MapMode& rMapMode = pView->GetMapMode();
     Point aOrigin( rMapMode.GetOrigin() );
-    if(!(pView->nWindowStyle & WB_VSCROLL) && !aOrigin.Y() )
+    if(!(pView->GetStyle() & WB_VSCROLL) && !aOrigin.Y() )
     {
         long nDeepest = 0;
         long nHeight = aOutputSize.Height();
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index a69253c69629..11e19c6bab3c 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -685,6 +685,7 @@ SvLBox_Impl::SvLBox_Impl( SvLBox& _rBox )
     ,m_bEntryMnemonicsEnabled( false )
     ,m_pLink( NULL )
     ,m_aMnemonicEngine( _rBox )
+    ,m_aQuickSelectionEngine( _rBox )
 {
 }
 
@@ -699,7 +700,6 @@ SvLBox::SvLBox( Window* pParent, WinBits nWinStyle  ) :
     DropTargetHelper( this ), DragSourceHelper( this ), eSelMode( NO_SELECTION )
 {
     DBG_CTOR(SvLBox,0);
-    nWindowStyle = nWinStyle;
     nDragOptions =  DND_ACTION_COPYMOVE | DND_ACTION_LINK;
     nImpFlags = 0;
     pTargetEntry = 0;
@@ -724,7 +724,6 @@ SvLBox::SvLBox( Window* pParent, const ResId& rResId ) :
     DBG_CTOR(SvLBox,0);
     pTargetEntry = 0;
     nImpFlags = 0;
-    nWindowStyle = 0;
     pLBoxImpl = new SvLBox_Impl( *this );
     nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
     nDragDropMode = 0;
@@ -1251,6 +1250,12 @@ ULONG SvLBox::SelectChilds( SvLBoxEntry* , BOOL  )
     return 0;
 }
 
+void SvLBox::OnCurrentEntryChanged()
+{
+    if ( !pLBoxImpl->m_bDoingQuickSelection )
+        pLBoxImpl->m_aQuickSelectionEngine.Reset();
+}
+
 void SvLBox::SelectAll( BOOL /* bSelect */ , BOOL /* bPaint */ )
 {
     DBG_CHKTHIS(SvLBox,0);
@@ -1535,15 +1540,14 @@ void SvLBox::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-const void* SvLBox::FirstSearchEntry( String& _rEntryText )
+const void* SvLBox::FirstSearchEntry( String& _rEntryText ) const
 {
     SvLBoxEntry* pEntry = GetCurEntry();
     if ( pEntry )
         pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) );
     else
     {
-        if ( !pEntry )
-            pEntry = FirstSelected();
+        pEntry = FirstSelected();
         if ( !pEntry )
             pEntry = First();
     }
@@ -1554,11 +1558,23 @@ const void* SvLBox::FirstSearchEntry( String& _rEntryText )
     return pEntry;
 }
 
-const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText )
+const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const
 {
     SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pCurrentSearchEntry ) );
 
-    pEntry = Next( pEntry );
+    if  (   (   ( GetChildCount( pEntry ) > 0 )
+            ||  ( pEntry->HasChildsOnDemand() )
+            )
+        &&  !IsExpanded( pEntry )
+        )
+    {
+        pEntry = NextSibling( pEntry );
+    }
+    else
+    {
+        pEntry = Next( pEntry );
+    }
+
     if ( !pEntry )
         pEntry = First();
 
@@ -1572,7 +1588,7 @@ void SvLBox::SelectSearchEntry( const void* _pEntry )
 {
     SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
     DBG_ASSERT( pEntry, "SvLBox::SelectSearchEntry: invalid entry!" );
-    if ( pEntry )
+    if ( !pEntry )
         return;
 
     SelectAll( FALSE );
@@ -1580,17 +1596,50 @@ void SvLBox::SelectSearchEntry( const void* _pEntry )
     Select( pEntry );
 }
 
-void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ )
+void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const
 {
     // nothing to do here, we have no "execution"
 }
 
+::vcl::StringEntryIdentifier SvLBox::CurrentEntry( String& _out_entryText ) const
+{
+    // always accept the current entry if there is one
+    SvLBoxEntry* pCurrentEntry( GetCurEntry() );
+    if ( pCurrentEntry )
+    {
+        _out_entryText = GetEntryText( pCurrentEntry );
+        return pCurrentEntry;
+    }
+    return FirstSearchEntry( _out_entryText );
+}
+
+::vcl::StringEntryIdentifier SvLBox::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const
+{
+    return NextSearchEntry( _currentEntry, _out_entryText );
+}
+
+void SvLBox::SelectEntry( ::vcl::StringEntryIdentifier _entry )
+{
+    SelectSearchEntry( _entry );
+}
+
 bool SvLBox::HandleKeyInput( const KeyEvent& _rKEvt )
 {
-    if ( !IsEntryMnemonicsEnabled() )
-        return false;
+    if  (   IsEntryMnemonicsEnabled()
+        &&  pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt )
+        )
+        return true;
+
+    if ( ( GetStyle() & WB_QUICK_SEARCH ) != 0 )
+    {
+        pLBoxImpl->m_bDoingQuickSelection = true;
+        const bool bHandled = pLBoxImpl->m_aQuickSelectionEngine.HandleKeyEvent( _rKEvt );
+        pLBoxImpl->m_bDoingQuickSelection = false;
+        if ( bHandled )
+            return true;
+    }
 
-    return pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt );
+    return false;
 }
 
 SvLBoxEntry* SvLBox::GetEntry( const Point&, BOOL ) const
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index b11a3f12ddf3..f4780fbf08ad 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -65,10 +65,10 @@ DBG_NAME(SvTreeListBox)
 #define SV_LBOX_DEFAULT_INDENT_PIXEL 20
 
 SvTreeListBox::SvTreeListBox( Window* pParent, WinBits nWinStyle )
-    : SvLBox(pParent,nWinStyle )
+    : SvLBox( pParent, nWinStyle )
 {
     DBG_CTOR(SvTreeListBox,0);
-    InitTreeView( nWinStyle );
+    InitTreeView();
 
     SetSublistOpenWithLeftRight();
 }
@@ -78,13 +78,13 @@ SvTreeListBox::SvTreeListBox( Window* pParent , const ResId& rResId )
 {
     DBG_CTOR(SvTreeListBox,0);
 
-    InitTreeView( 0 );
+    InitTreeView();
     Resize();
 
     SetSublistOpenWithLeftRight();
 }
 
-void SvTreeListBox::InitTreeView( WinBits nWinStyle )
+void SvTreeListBox::InitTreeView()
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     pCheckButtonData = NULL;
@@ -102,7 +102,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle )
     nTreeFlags = TREEFLAG_RECALCTABS;
     nIndent = SV_LBOX_DEFAULT_INDENT_PIXEL;
     nEntryHeightOffs = SV_ENTRYHEIGHTOFFS_PIXEL;
-    pImp = new SvImpLBox( this, GetModel(), nWinStyle );
+    pImp = new SvImpLBox( this, GetModel(), GetStyle() );
 
     aContextBmpMode = SVLISTENTRYFLAG_EXPANDED;
     nContextBmpWidthMax = 0;
@@ -110,7 +110,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle )
     SetSpaceBetweenEntries( 0 );
     SetLineColor();
     InitSettings( TRUE, TRUE, TRUE );
-    SetWindowBits( nWinStyle );
+    ImplInitStyle();
     SetTabs();
 }
 
@@ -227,8 +227,9 @@ void SvTreeListBox::SetTabs()
         EndEditing( TRUE );
     nTreeFlags &= (~TREEFLAG_RECALCTABS);
     nFocusWidth = -1;
-    BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0;
-    BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT |
+    const WinBits nStyle( GetStyle() );
+    BOOL bHasButtons = (nStyle & WB_HASBUTTONS)!=0;
+    BOOL bHasButtonsAtRoot = (nStyle & (WB_HASLINESATROOT |
                                               WB_HASBUTTONSATROOT))!=0;
     long nStartPos = TAB_STARTPOS;
     long nNodeWidthPixel = GetExpandedNodeBmp().GetSizePixel().Width();
@@ -1492,12 +1493,14 @@ SvLBoxEntry* SvTreeListBox::GetCurEntry() const
     return pImp->GetCurEntry();
 }
 
-void SvTreeListBox::SetWindowBits( WinBits nWinStyle )
+void SvTreeListBox::ImplInitStyle()
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    nWindowStyle = nWinStyle;
+
+    const WinBits nWindowStyle = GetStyle();
+
     nTreeFlags |= TREEFLAG_RECALCTABS;
-    if( nWinStyle & WB_SORT )
+    if( nWindowStyle & WB_SORT )
     {
         GetModel()->SetSortMode( SortAscending );
         GetModel()->SetCompareHdl( LINK(this,SvTreeListBox,DefaultCompare));
@@ -1508,9 +1511,9 @@ void SvTreeListBox::SetWindowBits( WinBits nWinStyle )
         GetModel()->SetCompareHdl( Link() );
     }
 #ifdef OS2
-    nWinStyle |= WB_VSCROLL;
+    nWindowStyle |= WB_VSCROLL;
 #endif
-    pImp->SetWindowBits( nWinStyle );
+    pImp->SetStyle( nWindowStyle );
     pImp->Resize();
     Invalidate();
 }
@@ -1578,8 +1581,9 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
     BOOL bInUse = pEntry->HasInUseEmphasis();
     // wenn eine ClipRegion von aussen gesetzt wird, dann
     // diese nicht zuruecksetzen
-    BOOL bResetClipRegion = !bHasClipRegion;
-    BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0;
+    const WinBits nWindowStyle = GetStyle();
+    const BOOL bResetClipRegion = !bHasClipRegion;
+    const BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0;
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
 
     Font aHighlightFont( GetFont() );
@@ -2367,6 +2371,7 @@ void SvTreeListBox::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
 long SvTreeListBox::GetTextOffset() const
 {
     DBG_CHKTHIS(SvTreeListBox,0);
+    const WinBits nWindowStyle = GetStyle();
     BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0;
     BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT |
                                               WB_HASBUTTONSATROOT))!=0;
@@ -2516,6 +2521,13 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
         Control::DataChanged( rDCEvt );
 }
 
+void SvTreeListBox::StateChanged( StateChangedType i_nStateChange )
+{
+    SvLBox::StateChanged( i_nStateChange );
+    if ( i_nStateChange == STATE_CHANGE_STYLE )
+        ImplInitStyle();
+}
+
 void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 048d052c18d8..45f9803539a1 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -289,12 +289,14 @@ ModalDialog DLG_DOCTEMPLATE
     };
     PushButton BTN_DOCTEMPLATE_MANAGE
     {
+        HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE";
         Pos = MAP_APPFONT( 6, 230 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "Organi~ze...";
     };
     PushButton BTN_DOCTEMPLATE_EDIT
     {
+        HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT";
         Pos = MAP_APPFONT( 59, 230 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "~Edit";
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 1ae223bebf06..7b1f2ad87108 100644..100755
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -53,7 +53,7 @@ struct ImplHeadItem
     USHORT              mnId;
     HeaderBarItemBits   mnBits;
     long                mnSize;
-    ULONG               mnHelpId;
+    rtl::OString        maHelpId;
     Image               maImage;
     XubString           maOutText;
     XubString           maText;
@@ -1132,13 +1132,13 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
         }
         else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
         {
-            ULONG nHelpId = GetHelpId( nItemId );
-            if ( nHelpId )
+            rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
+            if ( aHelpId.getLength() )
             {
                 // Wenn eine Hilfe existiert, dann ausloesen
                 Help* pHelp = Application::GetHelp();
                 if ( pHelp )
-                    pHelp->Start( nHelpId, this );
+                    pHelp->Start( aHelpId, this );
                 return;
             }
         }
@@ -1266,7 +1266,6 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText,
     pItem->mnId         = nItemId;
     pItem->mnBits       = nBits;
     pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
     pItem->maText       = rText;
     pItem->mpUserData   = 0;
     mpItemList->Insert( pItem, nPos );
@@ -1291,7 +1290,6 @@ void HeaderBar::InsertItem( USHORT nItemId,
     pItem->mnId         = nItemId;
     pItem->mnBits       = nBits;
     pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
     pItem->maImage      = rImage;
     pItem->maText       = rText;
     pItem->mpUserData   = 0;
@@ -1563,11 +1561,11 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
     {
         ImplHeadItem* pItem = mpItemList->GetObject( nPos );
-        if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
+        if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
         {
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
-                pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this );
+                pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
         }
 
         return pItem->maHelpText;
@@ -1578,22 +1576,22 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void HeaderBar::SetHelpId( USHORT nItemId, ULONG nHelpId )
+void HeaderBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId )
 {
     USHORT nPos = GetItemPos( nItemId );
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
-        mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
+        mpItemList->GetObject( nPos )->maHelpId = rHelpId;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG HeaderBar::GetHelpId( USHORT nItemId ) const
+rtl::OString HeaderBar::GetHelpId( USHORT nItemId ) const
 {
     USHORT nPos = GetItemPos( nItemId );
+    rtl::OString aRet;
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
-        return mpItemList->GetObject( nPos )->mnHelpId;
-    else
-        return 0;
+        aRet = mpItemList->GetObject( nPos )->maHelpId;
+    return aRet;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 02a578629039..4aaa55409266 100644..100755
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -41,10 +41,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-
-#ifndef  _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_
-#include <com/sun/star/task/XInteractionHandler.hdl>
-#endif
+#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
@@ -165,7 +162,7 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
     SvtURLBox* pBoxP, const String& rText )
     : aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) )
     , aBaseURL( pBoxP->aBaseURL )
-    , aText(  rText )
+    , aText( rText )
     , pBox( pBoxP )
     , bStop( FALSE )
     , bOnlyDirectories( pBoxP->bOnlyDirectories )
@@ -426,7 +423,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL,
             uno::Reference< XDynamicResultSet > xDynResultSet;
             ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
             if ( bOnlyDirectories )
-                eInclude =  INCLUDE_FOLDERS_ONLY;
+                eInclude = INCLUDE_FOLDERS_ONLY;
 
             xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
 
@@ -654,7 +651,7 @@ void SvtMatchContext_Impl::run()
                 {
                     // if text input is a directory, it must be part of the match list! Until then it is scanned
                     if ( UCBContentHelper::IsFolder( aMainURL ) && aURLObject.hasFinalSlash() )
-                           Insert( aText, aMatch );
+                            Insert( aText, aMatch );
                     else
                         // otherwise the parent folder will be taken
                         aURLObject.removeSegment();
@@ -684,6 +681,7 @@ void SvtMatchContext_Impl::run()
             aCurObj.SetURL( *aPickList.GetObject( nPos ) );
             aCurObj.SetSmartURL( aCurObj.GetURLNoPass());
             aCurMainURL = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
+
             if( eProt != INET_PROT_NOT_VALID && aCurObj.GetProtocol() != eProt )
                 continue;
 
@@ -708,7 +706,7 @@ void SvtMatchContext_Impl::run()
                     {
                         // try if text matches the scheme
                         String aScheme( INetURLObject::GetScheme( aCurObj.GetProtocol() ) );
-                        if ( aText.CompareTo( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() )
+                        if ( aText.CompareIgnoreCaseToAscii( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() )
                         {
                             if( bFull )
                                 aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -727,7 +725,7 @@ void SvtMatchContext_Impl::run()
                         aCurString.Erase( 0, aScheme.Len() );
                     }
 
-                    if( aText.CompareTo( aCurString, aText.Len() )== COMPARE_EQUAL )
+                    if( aText.CompareIgnoreCaseToAscii( aCurString, aText.Len() )== COMPARE_EQUAL )
                     {
                         if( bFull )
                             aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -858,7 +856,8 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
 void SvtURLBox::ImplInit()
 {
     pImp = new SvtURLBox_Impl();
-    SetHelpId( SID_OPENURL );
+
+    SetHelpId( ".uno:OpenURL" );
     EnableAutocomplete( FALSE );
 
     SetText( String() );
@@ -1314,7 +1313,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
                 return sal_False; // no such user
 #else
             pPasswd = getpwnam( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr() );
-             if( pPasswd )
+            if( pPasswd )
                 aParseTilde = String::CreateFromAscii( pPasswd->pw_dir );
             else
                 return sal_False; // no such user
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 6fcbd92597ba..011dd4cd7956 100644..100755
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -468,6 +468,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     BOOL    bNoTicks = FALSE;
 
     // Groessenvorberechnung
+    // Sizes calculation
     BOOL bVertRight = FALSE;
     if ( mnWinStyle & WB_HORZ )
         nTickWidth = aPixSize.Width();
@@ -486,19 +487,21 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
     }
     long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width();
     if ( nMaxWidth < 0 )
-        nMaxWidth *= -1;
+        nMaxWidth = -nMaxWidth;
     nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit;
     UniString aNumStr( UniString::CreateFromInt32( nMaxWidth ) );
     long nTxtWidth = GetTextWidth( aNumStr );
-    if ( (nTxtWidth*2) > nTickWidth )
+
+    const long nTextOff   = 4;
+    if ( nTickWidth < nTxtWidth+nTextOff )
     {
+        // Calculate the scale of the ruler
         long nMulti     = 1;
         long nOrgTick3  = nTick3;
-        long nTextOff   = 2;
         while ( nTickWidth < nTxtWidth+nTextOff )
         {
             long nOldMulti = nMulti;
-            if ( !nTickWidth )
+            if ( !nTickWidth ) //If nTickWidth equals 0
                 nMulti *= 10;
             else if ( nMulti < 10 )
                 nMulti++;
@@ -516,8 +519,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 bNoTicks = TRUE;
                 break;
             }
-            if ( nMulti >= 100 )
-                nTextOff = 4;
+
             nTick3 = nOrgTick3 * nMulti;
             aPixSize = maVirDev.LogicToPixel( Size( nTick3, nTick3 ), maMapMode );
             if ( mnWinStyle & WB_HORZ )
@@ -541,7 +543,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
             {
                 if ( nStart > nMin )
                 {
-                    // Nur 0 malen, wenn Margin1 nicht gleich dem NullPunkt ist
+                    // 0 is only painted when Margin1 is not equal to zero
                     if ( (mpData->nMargin1Style & RULER_STYLE_INVISIBLE) || (mpData->nMargin1 != 0) )
                     {
                         aNumStr = (sal_Unicode)'0';
@@ -564,7 +566,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 else
                     n = aPixSize.Height();
 
-                // Tick3 - Ausgabe (Text)
+                // Tick3 - Output (Text)
                 if ( !(nTick % nTick3) )
                 {
                     aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
@@ -573,7 +575,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                     nX = nStart+n;
                     //different orientation needs a different starting position
                     nY = bVertRight ? nCenter+nTxtHeight2 : nCenter-nTxtHeight2;
-                    if ( nX < nMax )
+
+                    // Check if we can display full number
+                    if ( nX < (nMax-nTxtWidth2) )
                     {
                         if ( mnWinStyle & WB_HORZ )
                             nX -= nTxtWidth2;
@@ -582,7 +586,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                         ImplVDrawText( nX, nY, aNumStr );
                     }
                     nX = nStart-n;
-                    if ( nX > nMin )
+                    if ( nX > (nMin+nTxtWidth2) )
                     {
                         if ( mnWinStyle & WB_HORZ )
                             nX -= nTxtWidth2;
@@ -591,7 +595,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                         ImplVDrawText( nX, nY, aNumStr );
                     }
                 }
-                // Tick/Tick2 - Ausgabe (Striche)
+                // Tick/Tick2 - Output (Strokes)
                 else
                 {
                     if ( !(nTick % aImplRulerUnitTab[mnUnitIndex].nTick2) )
@@ -1258,7 +1262,7 @@ void Ruler::ImplFormat()
     Size    aVirDevSize;
     BOOL    b3DLook = !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO);
 
-    // VirtualDevice initialisieren
+    // VirtualDevice initialize
     if ( mnWinStyle & WB_HORZ )
     {
         aVirDevSize.Width() = mnVirWidth;
@@ -1387,15 +1391,15 @@ void Ruler::ImplFormat()
         if ( nP2 < nVirRight )
             nMax--;
 
-        // Beschriftung ausgeben
+        // Draw captions
         ImplDrawTicks( nMin, nMax, nStart, nCenter );
     }
 
-    // Spalten ausgeben
+    // Draw borders
     if ( mpData->pBorders )
         ImplDrawBorders( nVirLeft, nP2, nVirTop, nVirBottom );
 
-    // Einzuege ausgeben
+    // Draw indents
     if ( mpData->pIndents )
         ImplDrawIndents( nVirLeft, nP2, nVirTop-1, nVirBottom+1 );
 
@@ -2888,7 +2892,7 @@ void Ruler::SetMargin2( long nPos, USHORT nMarginStyle )
 
 void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
 {
-    // Testen, ob sich was geaendert hat
+    // To determine if what has changed
     if ( mpData->nLines == n )
     {
         USHORT           i = n;
@@ -2907,18 +2911,18 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry )
             return;
     }
 
-    // Neue Werte setzen und neu ausgeben
+    // New values and new share issue
     BOOL bMustUpdate;
     if ( IsReallyVisible() && IsUpdateMode() )
         bMustUpdate = TRUE;
     else
         bMustUpdate = FALSE;
 
-    // Alte Linien loeschen
+    // Delete old lines
     if ( bMustUpdate )
         ImplInvertLines();
 
-    // Neue Daten setzen
+    // New data set
     if ( !n || !pLineAry )
     {
         if ( !mpData->pLines )
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2ad81da40716..315e432edd60 100755
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -60,7 +60,7 @@ struct ImplTabBarItem
     XubString       maHelpText;
     Rectangle       maRect;
     long            mnWidth;
-    ULONG           mnHelpId;
+    rtl::OString    maHelpId;
     BOOL            mbShort;
     BOOL            mbSelect;
     BOOL            mbEnable;
@@ -76,7 +76,6 @@ struct ImplTabBarItem
                         mnId     = nItemId;
                         mnBits   = nPageBits;
                         mnWidth  = 0;
-                        mnHelpId = 0;
                         mbShort  = FALSE;
                         mbSelect = FALSE;
                         mbEnable = TRUE;
@@ -1394,13 +1393,13 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt )
         }
         else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
         {
-            ULONG nHelpId = GetHelpId( nItemId );
-            if ( nHelpId )
+            rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
+            if ( aHelpId.getLength() )
             {
                 // Wenn eine Hilfe existiert, dann ausloesen
                 Help* pHelp = Application::GetHelp();
                 if ( pHelp )
-                    pHelp->Start( nHelpId, this );
+                    pHelp->Start( aHelpId, this );
                 return;
             }
         }
@@ -2400,11 +2399,11 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
     if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
-        if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
+        if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
         {
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
-                pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this );
+                pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
         }
 
         return pItem->maHelpText;
@@ -2415,22 +2414,22 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
 
 // -----------------------------------------------------------------------
 
-void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
+void TabBar::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId )
 {
     USHORT nPos = GetPagePos( nPageId );
     if ( nPos != PAGE_NOT_FOUND )
-        mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
+        mpItemList->GetObject( nPos )->maHelpId = rHelpId;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG TabBar::GetHelpId( USHORT nPageId ) const
+rtl::OString TabBar::GetHelpId( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
+    rtl::OString aRet;
     if ( nPos != PAGE_NOT_FOUND )
-        return mpItemList->GetObject( nPos )->mnHelpId;
-    else
-        return 0;
+        aRet = mpItemList->GetObject( nPos )->maHelpId;
+    return aRet;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 2fdab63be37f..ba5e8d53b8b2 100644..100755
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -517,13 +517,13 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt )
         {
             if ( pItem )
             {
-                ULONG nHelpId = pItem->maItem.GetHelpId();
-                if ( nHelpId )
+                rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
+                if ( aHelpId.getLength() )
                 {
                     // Wenn eine Hilfe existiert, dann ausloesen
                     Help* pHelp = Application::GetHelp();
                     if ( pHelp )
-                        pHelp->Start( nHelpId, this );
+                        pHelp->Start( aHelpId, this );
                     return;
                 }
             }
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 0652dfb9d0f5..990dfc98f89b 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -39,6 +39,7 @@
 
 ModalDialog DLG_ADDRESSBOOKSOURCE
 {
+    HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
@@ -64,6 +65,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     ComboBox CB_DATASOURCE
     {
+        HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 105, 13 ) ;
         Size = MAP_APPFONT ( 96, 55 ) ;
@@ -73,6 +75,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     PushButton PB_ADMINISTATE_DATASOURCES
     {
+        HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES";
         Text [ en-US ] = "~Address Data Source...";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 204, 13 ) ;
@@ -90,6 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     ComboBox CB_TABLE
     {
+        HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 105, 30 ) ;
         Size = MAP_APPFONT ( 96, 55 ) ;
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index ad9a5c1aa015..a93642b0bd05 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -29,6 +29,7 @@
 #define DIFF 3
 ModalDialog DLG_COLOR
 {
+    HelpID = "svtools:ModalDialog:DLG_COLOR";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 165 + DIFF ) ;
@@ -93,6 +94,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_CYAN
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_CYAN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 109 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -106,6 +108,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_MAGENTA
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_MAGENTA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -119,6 +122,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_YELLOW
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_YELLOW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -132,6 +136,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_KEY
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_KEY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -163,6 +168,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_RED
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_RED";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -174,6 +180,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_GREEN
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_GREEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -185,6 +192,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_BLUE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_BLUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -202,6 +210,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_HUE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_HUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -219,6 +228,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_SATURATION
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_SATURATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -236,6 +246,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_LUMINANCE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_LUMINANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -247,6 +258,7 @@ ModalDialog DLG_COLOR
     };
     PushButton BTN_1
     {
+        HelpID = "svtools:PushButton:DLG_COLOR:BTN_1";
         Pos = MAP_APPFONT ( 80 , 109 ) ;
         Size = MAP_APPFONT ( 17 , 12 ) ;
         Text = "~<--" ;
@@ -254,6 +266,7 @@ ModalDialog DLG_COLOR
     };
     PushButton BTN_2
     {
+        HelpID = "svtools:PushButton:DLG_COLOR:BTN_2";
         Pos = MAP_APPFONT ( 100 , 109 ) ;
         Size = MAP_APPFONT ( 17 , 12 ) ;
         Text = "--~>" ;
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 798ff87e02ac..67262ba72c1a 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -68,9 +68,9 @@ DECLARE_LIST( UniStringList, UniString* )
 //      #define STD_BTN_WIDTH   90
 //      #define STD_BTN_HEIGHT  35
 
-#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \
+#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \
     p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \
-    p->SetHelpId( nHelpId ); \
+    p->SetHelpId( rHelpId ); \
     p->SetPosSizePixel( aPos, aSize ); \
     p->SetText( aTitel ); \
     p->Show();
@@ -226,10 +226,10 @@ void ImpPathDialog::InitControls()
     aPnt.X() = 2 * a6Siz.Width() + aEDSiz.Width();
     aPnt.Y() = a6Siz.Height();
     INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON,
-                 aPnt, aBtnSiz, aOkStr, 0 );
+                 aPnt, aBtnSiz, aOkStr, "" );
     aPnt.Y() += aBtnSiz.Height() + a3Siz.Height();
     INITCONTROL( pCancelBtn, CancelButton, 0,
-                 aPnt, aBtnSiz, aCancelStr, 0 );
+                 aPnt, aBtnSiz, aCancelStr, "" );
     aPnt.Y() += aBtnSiz.Height() + a3Siz.Height();
     INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON,
                  aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR );
@@ -782,10 +782,10 @@ void ImpFileDialog::InitControls()
     const long nButtonStartX = 2*nW+20+15;
     INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON,
         Point(nButtonStartX, 10), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT),
-        Button::GetStandardText( BUTTON_OK ), 0 );
+        Button::GetStandardText( BUTTON_OK ), "" );
     INITCONTROL( pCancelBtn, CancelButton, 0,
         Point(nButtonStartX, 45 ), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT),
-        Button::GetStandardText( BUTTON_CANCEL ), 0 );
+        Button::GetStandardText( BUTTON_CANCEL ), "" );
 
     pLoadBtn = 0;
 
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 532fd3f61bb2..dba5ed627952 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -28,26 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <tools/debug.hxx>
-#ifndef _SV_APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _VCL_PRINT_HXX
 #include <vcl/print.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <vcl/jobset.hxx>
 #include <tools/urlobj.hxx>
-
 #include "printdlg.hrc"
 #include "controldims.hrc"
 #include <svtools/prnsetup.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
 #include <filedlg.hxx>
-#include "svl/pickerhelper.hxx"
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index 405accc63344..80c6e465d49a 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -31,6 +31,7 @@
 
 ModalDialog DLG_SVT_PRNDLG_PRINTDLG
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -50,6 +51,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     ListBox LB_NAMES
     {
+        HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 13 ) ;
         Size = MAP_APPFONT ( 130 , 80 ) ;
@@ -58,6 +60,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     PushButton BTN_PROPERTIES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES";
         Pos = MAP_APPFONT ( 193 , 12 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Propert~ies..." ;
@@ -114,12 +117,14 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     Edit EDT_FAXNO
     {
+        HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO";
         Border = TRUE;
         Pos = MAP_APPFONT ( 60 , 73 );
         Size = MAP_APPFONT ( 188 , 12 );
     };
     CheckBox CBX_FILEPRINT
     {
+        HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT";
         Pos = MAP_APPFONT ( 12 , 73 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Print to file" ;
@@ -132,6 +137,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     /*!!!
     PushButton BTN_BROWSE
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE";
         Pos = MAP_APPFONT ( 234 , 75 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -146,18 +152,21 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     RadioButton RBT_ALL_SHEETS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS";
         Pos = MAP_APPFONT ( 12 , 102 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "All sheets" ;
     };
     RadioButton RBT_SELECTED_SHEETS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS";
         Pos = MAP_APPFONT ( 12 , 115 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Selected sheets" ;
     };
     RadioButton RBT_SELECTED_CELLS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS";
         Pos = MAP_APPFONT ( 12 , 128 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Selected cells" ;
@@ -170,24 +179,28 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     RadioButton RBT_ALL
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL";
         Pos = MAP_APPFONT ( 12 , 152 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "All pages" ;
     };
     RadioButton RBT_PAGES
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES";
         Pos = MAP_APPFONT ( 12 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Pages" ;
     };
     Edit EDT_PAGES
     {
+        HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 164 ) ;
         Size = MAP_APPFONT ( 52 , 12 ) ;
     };
     RadioButton RBT_SELECTION
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 179 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
@@ -213,6 +226,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     NumericField NUM_COPIES
     {
+        HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 201 , 102 ) ;
         Size = MAP_APPFONT ( 33 , 12 ) ;
@@ -226,6 +240,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     CheckBox CBX_COLLATE
     {
+        HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE";
         Pos = MAP_APPFONT ( 201 , 123 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Co~llate" ;
@@ -249,6 +264,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     PushButton BTN_OPTIONS
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 , 190 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 1443a35e0f39..afdf7d56864e 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.src
@@ -138,6 +138,7 @@ String STR_SVT_PRNDLG_JOBCOUNT
 
 ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -157,6 +158,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     ListBox LB_NAMES
     {
+        HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 12 ) ;
         Size = MAP_APPFONT ( 125 , 80 ) ;
@@ -165,6 +167,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     PushButton BTN_PROPERTIES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES";
         Pos = MAP_APPFONT ( 188 , 12 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Propert~ies..." ;
@@ -220,6 +223,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     PushButton BTN_OPTIONS
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS";
         Pos = MAP_APPFONT ( 5 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Options..." ;
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index c28cfe1d4b18..43b9fcddf91d 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -239,15 +239,15 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    void RoadmapWizard::SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode )
+    void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId )
     {
-        m_pImpl->pRoadmap->SetSmartHelpId( _rId, _aMode );
+        m_pImpl->pRoadmap->SetHelpId( _rId );
     }
 
     //--------------------------------------------------------------------
-    SmartId RoadmapWizard::GetRoadmapSmartHelpId() const
+    const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const
     {
-        return m_pImpl->pRoadmap->GetSmartHelpId();
+        return m_pImpl->pRoadmap->GetHelpId();
     }
 
     //--------------------------------------------------------------------
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 2053da80019d..41e759eda43b 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -197,7 +197,7 @@ namespace svt
         if (_nButtonFlags & WZB_PREVIOUS)
         {
             m_pPrevPage = new PushButton(this, WB_TABSTOP);
-            m_pPrevPage->SetSmartHelpId( SmartId(HID_WIZARD_PREVIOUS) );
+            m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
             m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
             m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS)));
             m_pPrevPage->Show();
@@ -214,7 +214,7 @@ namespace svt
         if (_nButtonFlags & WZB_NEXT)
         {
             m_pNextPage = new PushButton(this, WB_TABSTOP);
-            m_pNextPage->SetSmartHelpId( SmartId(HID_WIZARD_NEXT) );
+            m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
             m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
             m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT)));
             m_pNextPage->Show();
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 01bb7ad41682..af38c444c0f2 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -193,7 +193,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
         GetTextEngine()->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;
         aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-        for ( USHORT i = 0; i < aPortions.Count(); i++ )
+        for ( size_t i = 0; i < aPortions.size(); i++ )
         {
             HighlightPortion& r = aPortions[i];
             GetTextEngine()->SetAttrib( TextAttribFontColor( GetColorValue(r.tokenType) ), nLine, r.nBegin, r.nEnd, TRUE );
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
index 58a63be58f78..8d4da553cb0d 100644
--- a/svtools/source/edit/makefile.mk
+++ b/svtools/source/edit/makefile.mk
@@ -38,25 +38,23 @@ TARGET=edit
 # --- Files --------------------------------------------------------
 
 SLOFILES=   \
+            $(EXCEPTIONSFILES) \
             $(SLO)$/textdata.obj	\
-            $(SLO)$/textdoc.obj		\
-            $(SLO)$/texteng.obj		\
             $(SLO)$/textundo.obj	\
-            $(SLO)$/textview.obj	\
             $(SLO)$/txtattr.obj		\
             $(SLO)$/xtextedt.obj	\
             $(SLO)$/sychconv.obj	\
             $(SLO)$/svmedit.obj		\
             $(SLO)$/svmedit2.obj    \
-            $(SLO)$/textwindowpeer.obj	\
-            $(SLO)$/syntaxhighlight.obj \
         $(SLO)$/editsyntaxhighlighter.obj
 
 EXCEPTIONSFILES=	\
             $(SLO)$/textview.obj	\
             $(SLO)$/textdoc.obj     \
             $(SLO)$/texteng.obj     \
-            $(SLO)$/textwindowpeer.obj
+            $(SLO)$/textwindowpeer.obj \
+            $(SLO)$/syntaxhighlight.obj \
+
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 5729eb712bfe..87585f5b2587 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -34,9 +34,6 @@
 #include <tools/debug.hxx>
 
 
-SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
-
-
 // ##########################################################################
 // ATTENTION: all these words needs to be in small caps
 // ##########################################################################
@@ -849,7 +846,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( UINT32 nParseLine, const String
         portion.nEnd = (UINT16)(pEndPos - mpStringBegin);
         portion.tokenType = eType;
 
-        portions.Insert(portion, portions.Count());
+        portions.push_back(portion);
     }
 }
 
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 32bdfe40a3fb..cb33ea7d50e6 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.cxx
@@ -37,7 +37,7 @@ SV_IMPL_PTRARR( TextLines, TextLinePtr );
 SV_IMPL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo );
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TextSelection
 // -------------------------------------------------------------------------
 
@@ -66,7 +66,7 @@ void TextSelection::Justify()
 }
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TETextPortionList
 // -------------------------------------------------------------------------
 TETextPortionList::TETextPortionList()
@@ -129,7 +129,7 @@ USHORT TETextPortionList::GetPortionStartIndex( USHORT nPortion )
 */
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TEParaPortion
 // -------------------------------------------------------------------------
 TEParaPortion::TEParaPortion( TextNode* pN )
@@ -254,7 +254,7 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedL
     }
 }
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TEParaPortions
 // -------------------------------------------------------------------------
 TEParaPortions::TEParaPortions()
@@ -274,7 +274,7 @@ void TEParaPortions::Reset()
     clear();
 }
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class IdleFormatter
 // -------------------------------------------------------------------------
 IdleFormatter::IdleFormatter()
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 8ca6ba2b124e..1c4eeeff1bbf 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
@@ -36,9 +36,7 @@
 #include <osl/module.hxx>
 #include <svl/solar.hrc>
 #include <svtools/fltcall.hxx>
-#include "dlgexpor.hxx"
-#include "dlgejpg.hxx"
-#include "dlgepng.hxx"
+#include "exportdialog.hxx"
 #include <uno/mapping.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
@@ -49,12 +47,6 @@
 #include <unotools/syslocale.hxx>
 #include "vcl/svapp.hxx"
 
-#if (defined OS2 && !defined ICC)
-#define EXPDLG_FUNCTION_NAME    "_DoExportDialog"
-#else
-#define EXPDLG_FUNCTION_NAME    "DoExportDialog"
-#endif
-
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
@@ -93,9 +85,10 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName
 
 // -----------------------------------------------------------------------------
 
-SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > & xMgr ) :
-    rxMgr       ( xMgr ),
-    eFieldUnit  ( FUNIT_CM )
+SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > xMgr ) :
+    mxMgr               ( xMgr ),
+    meFieldUnit         ( FUNIT_CM ),
+    mbExportSelection   ( sal_False )
 {
 }
 
@@ -148,18 +141,18 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
         throw ( uno::RuntimeException )
 {
     sal_Int32 i, nCount;
-    for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ )
+    for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
+        if ( maMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
             break;
     }
     if ( i == nCount )
-        aMediaDescriptor.realloc( ++nCount );
+        maMediaDescriptor.realloc( ++nCount );
 
     // the "FilterData" Property is an Any that will contain our PropertySequence of Values
-    aMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) );
-    aMediaDescriptor[ i ].Value <<= aFilterDataSequence;
-    return aMediaDescriptor;
+    maMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) );
+    maMediaDescriptor[ i ].Value <<= maFilterDataSequence;
+    return maMediaDescriptor;
 }
 
 void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps )
@@ -167,15 +160,18 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
                 lang::IllegalArgumentException, lang::WrappedTargetException,
                 uno::RuntimeException )
 {
-    aMediaDescriptor = aProps;
+    maMediaDescriptor = aProps;
 
     sal_Int32 i, nCount;
-    for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ )
+    for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
+        if ( maMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
         {
-            aMediaDescriptor[ i ].Value >>= aFilterDataSequence;
-            break;
+            maMediaDescriptor[ i ].Value >>= maFilterDataSequence;
+        }
+        else if ( maMediaDescriptor[ i ].Name.equalsAscii( "SelectionOnly" ) )
+        {
+            maMediaDescriptor[ i ].Value >>= mbExportSelection;
         }
     }
 }
@@ -184,7 +180,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
 void SvFilterOptionsDialog::setTitle( const OUString& aTitle )
     throw ( uno::RuntimeException )
 {
-    aDialogTitle = aTitle;
+    maDialogTitle = aTitle;
 }
 
 sal_Int16 SvFilterOptionsDialog::execute()
@@ -194,13 +190,13 @@ sal_Int16 SvFilterOptionsDialog::execute()
 
     String aFilterNameStr( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
     String aInternalFilterName;
-    sal_Int32 j, nCount = aMediaDescriptor.getLength();
+    sal_Int32 j, nCount = maMediaDescriptor.getLength();
     for ( j = 0; j < nCount; j++ )
     {
-        if ( aMediaDescriptor[ j ].Name.equals( aFilterNameStr ) )
+        if ( maMediaDescriptor[ j ].Name.equals( aFilterNameStr ) )
         {
             OUString aStr;
-            aMediaDescriptor[ j ].Value >>= aStr;
+            maMediaDescriptor[ j ].Value >>= aStr;
             aInternalFilterName = aStr;
             aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "draw_" ) ), String(), 0 );
             aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "impress_" ) ), String(), 0 );
@@ -219,79 +215,24 @@ sal_Int16 SvFilterOptionsDialog::execute()
         }
         if ( nFormat < nFilterCount )
         {
-            FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, eFieldUnit );
-            aFltCallDlgPara.aFilterData = aFilterDataSequence;
-
-            String  aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) );
-            if ( aGraphicFilter.pConfig->IsExportInternalFilter( nFormat ) )
-            {
-                // Export-Dialog fuer Bitmap's, SVM's und WMF's
-                if( ( aFilterName.EqualsIgnoreCaseAscii( EXP_BMP ) ) ||
-                    ( aFilterName.EqualsIgnoreCaseAscii( EXP_SVMETAFILE ) ) ||
-                    ( aFilterName.EqualsIgnoreCaseAscii( EXP_WMF ) ) ||
-                    ( aFilterName.EqualsIgnoreCaseAscii( EXP_EMF ) ) ||
-                    ( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )||
-                    ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) )
-                {
-                    ByteString  aResMgrName( "svt", 3 );
-                    ResMgr*     pResMgr;
-
-                    pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-                    aFltCallDlgPara.pResMgr = pResMgr;
-                    // JPEG-Dialog
-                    if( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )
-                    {
-                        if ( DlgExportEJPG( aFltCallDlgPara ).Execute() == RET_OK )
-                            nRet = ui::dialogs::ExecutableDialogResults::OK;
-                    }
-                    else if ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) )
-                    {
-                        if ( DlgExportEPNG( aFltCallDlgPara ).Execute() == RET_OK )
-                            nRet = ui::dialogs::ExecutableDialogResults::OK;
-                    }
-                    else if( aFilterName.EqualsIgnoreCaseAscii( EXP_BMP ) )
-                    {
-                        // Fuer Vektorformate nehmen wir den Vektor-Dialog
-                        aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
-                        if ( DlgExportPix( aFltCallDlgPara ).Execute() == RET_OK )
-                            nRet = ui::dialogs::ExecutableDialogResults::OK;
-                    }
-                    else
-                    {
-                        aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
-                        if ( DlgExportVec( aFltCallDlgPara ).Execute() == RET_OK )
-                            nRet = ui::dialogs::ExecutableDialogResults::OK;
-                    }
-                    delete pResMgr;
-                }
-            }
-            else    // ladbare Filter
-            {
-                xub_StrLen i, nTokenCount = aGraphicFilter.aFilterPath.GetTokenCount( ';' );
-                for ( i = 0; i < nTokenCount; i++ )
-                {
-
-                    OUString aPathURL;
-
-                    ::osl::FileBase::getFileURLFromSystemPath( aGraphicFilter.aFilterPath.GetToken( i ), aPathURL );
-                    aPathURL += String( '/' );
-
-                    OUString aSystemPath;
-                    ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath );
-                    aSystemPath += OUString( aFilterName );
-
-                    osl::Module aLibrary( aSystemPath );
-                    PFilterDlgCall  pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) );
-                    // Dialog in DLL ausfuehren
-                    if( pFunc )
-                    {
-                        if ( (*pFunc)( aFltCallDlgPara ) )
-                            nRet = ui::dialogs::ExecutableDialogResults::OK;
-                    }
-                }
-            }
+            FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit );
+            aFltCallDlgPara.aFilterData = maFilterDataSequence;
+
+            ByteString  aResMgrName( "svt", 3 );
+            ResMgr*     pResMgr;
+
+            pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+            aFltCallDlgPara.pResMgr = pResMgr;
+
+            aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
+            sal_Bool bIsPixelFormat( aGraphicFilter.pConfig->IsExportPixelFormat( nFormat ) );
+            if ( ExportDialog( aFltCallDlgPara, mxMgr, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK )
+                nRet = ui::dialogs::ExecutableDialogResults::OK;
+
+            delete pResMgr;
+
             // taking the out parameter from the dialog
-            aFilterDataSequence = aFltCallDlgPara.aFilterData;
+            maFilterDataSequence = aFltCallDlgPara.aFilterData;
         }
     }
     return nRet;
@@ -301,6 +242,8 @@ sal_Int16 SvFilterOptionsDialog::execute()
 void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
         throw ( lang::IllegalArgumentException, uno::RuntimeException )
 {
+    mxSourceDocument = xDoc;
+
     // try to set the corresponding metric unit
     String aConfigPath;
     uno::Reference< lang::XServiceInfo > xServiceInfo
@@ -320,7 +263,7 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp
                 aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) );
             else
                 aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "NonMetric" ) );
-            eFieldUnit = (FieldUnit)aConfigItem.ReadInt32( aPropertyName, FUNIT_CM );
+            meFieldUnit = (FieldUnit)aConfigItem.ReadInt32( aPropertyName, FUNIT_CM );
         }
     }
 }
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
index a55fc4c84520..16592bac8df7 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
@@ -46,18 +46,22 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5
     com::sun::star::lang::XServiceInfo
 >
 {
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &
-        rxMgr;
+    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+        mxMgr;
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
-        aMediaDescriptor;
+        maMediaDescriptor;
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
-        aFilterDataSequence;
-    rtl::OUString   aDialogTitle;
-    FieldUnit       eFieldUnit;
+        maFilterDataSequence;
+    com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+        mxSourceDocument;
+
+    rtl::OUString   maDialogTitle;
+    FieldUnit       meFieldUnit;
+    sal_Bool        mbExportSelection;
 
 public:
 
-    SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
+    SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB );
     ~SvFilterOptionsDialog();
 
     // XInterface
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx
deleted file mode 100644
index 377697023de3..000000000000
--- a/svtools/source/filter.vcl/filter/dlgejpg.cxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include "dlgejpg.hxx"
-#include "dlgejpg.hrc"
-#include "strings.hrc"
-#include <svtools/FilterConfigItem.hxx>
-
-#define KEY_QUALITY     "Quality"
-#define KEY_GRAYSCALES  "ColorMode"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_JPG, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aFiDescr            ( this, ResId( FI_DESCR, *rPara.pResMgr ) ),
-                aNumFldQuality      ( this, ResId( NUM_FLD_QUALITY, *rPara.pResMgr ) ),
-                aGrpQuality         ( this, ResId( GRP_QUALITY, *rPara.pResMgr ) ),
-                aRbGray             ( this, ResId( RB_GRAY, *rPara.pResMgr ) ),
-                aRbRGB              ( this, ResId( RB_RGB, *rPara.pResMgr ) ),
-                aGrpColors          ( this, ResId( GRP_COLORS, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) )
-{
-    FreeResource();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    // reading filter options
-    sal_Int32 nQuality = pConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 );
-    sal_Int32 nColorMode = pConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_GRAYSCALES ) ), 0 );
-    aNumFldQuality.SetValue( nQuality );
-
-    if ( nColorMode  )
-        aRbGray.Check( sal_True );
-    else
-        aRbRGB.Check( sal_True );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEJPG, OK ) );
-}
-
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEJPG, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    pConfigItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), (sal_Int32)aNumFldQuality.GetValue() );
-    pConfigItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_GRAYSCALES ) ), aRbGray.IsChecked() ? 1 : 0 );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-    return 0;
-}
-
-DlgExportEJPG::~DlgExportEJPG()
-{
-    delete pConfigItem;
-}
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc
deleted file mode 100644
index 90a3c1d162be..000000000000
--- a/svtools/source/filter.vcl/filter/dlgejpg.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#include <svtools/svtools.hrc>
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define FI_DESCR 1
-#define NUM_FLD_QUALITY 1
-#define GRP_QUALITY 1
-#define GRP_COLORS 2
-#define RB_GRAY 1
-#define RB_RGB 2
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx
deleted file mode 100644
index d80682574a54..000000000000
--- a/svtools/source/filter.vcl/filter/dlgejpg.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEJPG_HXX_
-#define _DLGEJPG_HXX_
-
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/stdctrl.hxx>
-#include <svtools/fltcall.hxx>
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-class FilterConfigItem;
-class DlgExportEJPG : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    FixedInfo           aFiDescr;
-    NumericField        aNumFldQuality;
-    FixedLine           aGrpQuality;
-    RadioButton         aRbGray;
-    RadioButton         aRbRGB;
-    FixedLine           aGrpColors;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-    FilterConfigItem*   pConfigItem;
-
-    DECL_LINK( OK, void * );
-
-public:
-            DlgExportEJPG( FltCallDialogParameter& rDlgPara );
-            ~DlgExportEJPG();
-};
-
-#endif // _DLGEJPG_HXX_
-
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src
deleted file mode 100644
index fd224f22c409..000000000000
--- a/svtools/source/filter.vcl/filter/dlgejpg.src
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "dlgejpg.hrc"
-ModalDialog DLG_EXPORT_JPG
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 159 , 92 ) ;
-    Text [ en-US ] = "JPEG Options" ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 103 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 103 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 103 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_QUALITY
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
-        Text [ en-US ] = "Quality" ;
-    };
-    FixedText FI_DESCR
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 81 , 16 ) ;
-        Text [ en-US ] = "1: min. quality\n100: max. quality" ;
-    };
-    NumericField NUM_FLD_QUALITY
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 33 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Last = 100 ;
-        Repeat = TRUE ;
-    };
-    FixedLine GRP_COLORS
-    {
-        Pos = MAP_APPFONT ( 6 , 51 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
-        Text [ en-US ] = "Color resolution" ;
-    };
-    RadioButton RB_GRAY
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 81 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Grayscale" ;
-    };
-    RadioButton RB_RGB
-    {
-        Pos = MAP_APPFONT ( 12 , 76 ) ;
-        Size = MAP_APPFONT ( 81 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "True Colors" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx
deleted file mode 100644
index bd551e9a4bda..000000000000
--- a/svtools/source/filter.vcl/filter/dlgepng.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <tools/ref.hxx>
-#include <vcl/msgbox.hxx>
-#include "dlgepng.hxx"
-#include "dlgepng.hrc"
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPNG, *rPara.pResMgr ) ),
-                FilterConfigItem    ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ),
-                rFltCallPara        ( rPara ),
-                aGrpCompression     ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ),
-                aFiCompression      ( this, ResId( FI_COMPRESSION, *rPara.pResMgr ) ),
-                aNumCompression     ( this, ResId( NUM_COMPRESSION, *rPara.pResMgr ) ),
-                aCbxInterlaced      ( this, ResId( CBX_INTERLACED, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    // Config-Parameter lesen
-    sal_Int32   nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 );
-    if ( ( nCompression < 0 ) || ( nCompression > 9 ) )
-        nCompression = 6;
-    aNumCompression.SetValue( nCompression );
-
-    sal_Int32   nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 );
-    sal_Bool    bInterlaced = nInterlaced != 0;
-    aCbxInterlaced.Check( bInterlaced );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPNG, OK ) );
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPNG, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), static_cast<sal_Int32>(aNumCompression.GetValue()) );
-    sal_Int32 nInterlace = 0;
-    if ( aCbxInterlaced.IsChecked() )
-        nInterlace++;
-    WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace );
-    rFltCallPara.aFilterData = GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc
deleted file mode 100644
index b3ffaab3ab1e..000000000000
--- a/svtools/source/filter.vcl/filter/dlgepng.hrc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#include <svtools/svtools.hrc>
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define GRP_COMPRESSION 1
-#define FI_COMPRESSION 1
-#define NUM_COMPRESSION 1
-#define CBX_INTERLACED 1
diff --git a/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx
deleted file mode 100644
index 469985afee59..000000000000
--- a/svtools/source/filter.vcl/filter/dlgepng.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEPNG_HXX_
-#define _DLGEPNG_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
-#include <svtools/FilterConfigItem.hxx>
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class ResMgr;
-
-class DlgExportEPNG : public ModalDialog, FilterConfigItem
-{
-
-    private:
-
-        FltCallDialogParameter& rFltCallPara;
-
-        FixedLine           aGrpCompression;
-        FixedInfo           aFiCompression;
-        NumericField        aNumCompression;
-        CheckBox            aCbxInterlaced;
-        OKButton            aBtnOK;
-        CancelButton        aBtnCancel;
-        HelpButton          aBtnHelp;
-        ResMgr*             pMgr;
-
-        DECL_LINK( OK, void * );
-
-    public:
-
-            DlgExportEPNG( FltCallDialogParameter& rPara );
-};
-
-#endif // _DLGEPNG_HXX_
diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src
deleted file mode 100644
index aa778842dc48..000000000000
--- a/svtools/source/filter.vcl/filter/dlgepng.src
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "dlgepng.hrc"
-ModalDialog DLG_EXPORT_EPNG
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 169 , 64 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "PNG Options" ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 113 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 113 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 113 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_COMPRESSION
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text[ en-US ] = "Mode";
-    };
-    FixedText FI_COMPRESSION
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text[ en-US ] = "~Compression 0..9";
-    };
-    NumericField NUM_COMPRESSION
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 25 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9 ;
-        First = 0 ;
-        Last = 9 ;
-        StrictFormat = TRUE ;
-        Repeat = TRUE ;
-    };
-    CheckBox CBX_INTERLACED
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 80 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Interlaced" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx
deleted file mode 100644
index b4b7c0fc949d..000000000000
--- a/svtools/source/filter.vcl/filter/dlgexpor.cxx
+++ /dev/null
@@ -1,442 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-
-#ifndef GCC
-#   pragma hdrstop
-#endif
-
-#include <tools/ref.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include <vcl/msgbox.hxx>
-#include "dlgexpor.hxx"
-#include "dlgexpor.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_PIX, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aBtnOK              ( this, ResId( BTN_OK_PIX, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL_PIX, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP_PIX, *rPara.pResMgr ) ),
-                aLbColors           ( this, ResId( LB_COLORS, *rPara.pResMgr ) ),
-                aCbxRLE             ( this, ResId( CBX_RLE, *rPara.pResMgr ) ),
-                aGrpColors          ( this, ResId( GRP_COLORS, *rPara.pResMgr ) ),
-                aRbOriginal         ( this, ResId( RB_ORIGINAL_PIX, *rPara.pResMgr ) ),
-                aRbRes              ( this, ResId( RB_RES_PIX, *rPara.pResMgr ) ),
-                aRbSize             ( this, ResId( RB_SIZE_PIX, *rPara.pResMgr ) ),
-                aFtSizeX            ( this, ResId( FT_SIZEX_PIX, *rPara.pResMgr ) ),
-                aMtfSizeX           ( this, ResId( MTF_SIZEX_PIX, *rPara.pResMgr ) ),
-                aFtSizeY            ( this, ResId( FT_SIZEY_PIX, *rPara.pResMgr ) ),
-                aMtfSizeY           ( this, ResId( MTF_SIZEY_PIX, *rPara.pResMgr ) ),
-                aGrpMode            ( this, ResId( GRP_MODE_PIX, *rPara.pResMgr ) ),
-                aCbbRes             ( this, ResId( CBB_RES_PIX, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr ),
-                aExt                ( rPara.aFilterExt )
-{
-    aExt.ToUpperAscii();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
-    aFilterConfigPath.Append( aExt );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    String  aTitle( aExt );
-    FreeResource();
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportPix, OK ) );
-    aRbOriginal.SetClickHdl( LINK( this, DlgExportPix, ClickRbOriginal ) );
-    aRbRes.SetClickHdl( LINK( this, DlgExportPix, ClickRbRes ) );
-    aRbSize.SetClickHdl( LINK( this, DlgExportPix, ClickRbSize ) );
-    aLbColors.SetSelectHdl( LINK( this, DlgExportPix, SelectLbColors ) );
-
-    aTitle.ToUpperAscii();
-    aTitle += String( ResId( EXPORT_DIALOG_TITLE, *pMgr ) );
-    SetText( aTitle );
-
-    // Config-Parameter lesen
-    sal_Int32   nColors = pConfigItem->ReadInt32( String( ResId( KEY_COLORS, *pMgr ) ), 0 );
-    sal_Int32   nMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 );
-    sal_Int32   nRes = pConfigItem->ReadInt32( String( ResId( KEY_RES, *pMgr ) ), 75 );
-    sal_Bool    bRleCoding = pConfigItem->ReadBool( String( ResId( KEY_RLE_CODING, *pMgr ) ), sal_True );
-
-    aLbColors.SelectEntryPos( Min( (sal_uInt16) 7, (sal_uInt16)nColors ) );
-
-    String aStrRes( String::CreateFromInt32( nRes ) );
-    aStrRes.Append( String( RTL_CONSTASCII_USTRINGPARAM( " DPI" ) ) );
-    aCbbRes.SetText( aStrRes );
-
-    ::com::sun::star::awt::Size aDefault( 10000, 10000 );
-    ::com::sun::star::awt::Size aSize;
-    aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault );
-
-    aCbxRLE.Check( bRleCoding );
-
-    aMtfSizeX.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeY.SetDefaultUnit( FUNIT_MM );
-
-    aMtfSizeX.SetValue( aSize.Width );
-    aMtfSizeY.SetValue( aSize.Height );
-
-    switch ( rPara.eFieldUnit )
-    {
-//      case FUNIT_NONE :
-//      case FUNIT_KM :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
-//      case FUNIT_MILE :
-//      case FUNIT_FOOT :
-//      case FUNIT_M :
-        case FUNIT_MM :
-        case FUNIT_CM :
-        case FUNIT_TWIP :
-        case FUNIT_POINT :
-        case FUNIT_PICA :
-        case FUNIT_INCH :
-        case FUNIT_100TH_MM :
-        {
-            aMtfSizeX.SetUnit( rPara.eFieldUnit );
-            aMtfSizeY.SetUnit( rPara.eFieldUnit );
-        }
-        break;
-
-        default:
-        break;      // -Wall  multiple values not handled.
-    }
-
-    switch ( nMode )
-    {
-        case 2 :
-        {
-            aRbSize.Check( TRUE );
-            ClickRbSize( NULL );
-        }
-        break;
-        case 1 :
-        {
-            aRbRes.Check( TRUE );
-            ClickRbRes( NULL );
-        }
-        break;
-        default :
-        {
-            aRbOriginal.Check( TRUE );
-            ClickRbOriginal( NULL );
-        }
-        break;
-    }
-    SelectLbColors( &aLbColors );
-}
-
-DlgExportPix::~DlgExportPix()
-{
-    delete pConfigItem;
-}
-
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportPix, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-
-    sal_Int32   nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) );
-    ::com::sun::star::awt::Size aSize(
-        static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )),
-            static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) );
-
-    sal_Int32 nMode;
-    if ( aRbRes.IsChecked() )
-        nMode = 1;
-    else if ( aRbSize.IsChecked() )
-        nMode = 2;
-    else
-        nMode = 0;
-
-    pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nMode );
-    pConfigItem->WriteInt32( String( ResId( KEY_RES, *pMgr ) ), nRes );
-    pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize );
-    pConfigItem->WriteInt32( String( ResId( KEY_COLORS, *pMgr ) ), (sal_Int32)aLbColors.GetSelectEntryPos() );
-    pConfigItem->WriteBool( String( ResId( KEY_RLE_CODING, *pMgr ) ), aCbxRLE.IsChecked() );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportPix, ClickRbOriginal, void*, EMPTYARG )
-{
-    aCbbRes.Disable();
-
-    aFtSizeX.Disable();
-    aMtfSizeX.Disable();
-    aFtSizeY.Disable();
-    aMtfSizeY.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportPix, ClickRbRes, void*, EMPTYARG )
-{
-    aCbbRes.Enable();
-
-    aFtSizeX.Disable();
-    aMtfSizeX.Disable();
-    aFtSizeY.Disable();
-    aMtfSizeY.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportPix, ClickRbSize, void*, EMPTYARG )
-{
-    aFtSizeX.Enable();
-    aMtfSizeX.Enable();
-    aFtSizeY.Enable();
-    aMtfSizeY.Enable();
-
-    aCbbRes.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportPix, SelectLbColors, void*, EMPTYARG )
-{
-    const USHORT nLbPos = aLbColors.GetSelectEntryPos();
-
-    if ( ( nLbPos >= 3 ) && ( nLbPos <= 6 ) )
-        aCbxRLE.Enable();
-    else
-        aCbxRLE.Disable();
-
-    return 0L;
-}
-
-
-/******************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_VEC, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aBtnOK              ( this, ResId( BTN_OK_VEC, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL_VEC, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP_VEC, *rPara.pResMgr ) ),
-                aRbOriginal         ( this, ResId( RB_ORIGINAL_VEC, *rPara.pResMgr ) ),
-                aRbSize             ( this, ResId( RB_SIZE_VEC, *rPara.pResMgr ) ),
-                aGrpMode            ( this, ResId( GRP_MODE_VEC, *rPara.pResMgr ) ),
-                aFtSizeX            ( this, ResId( FT_SIZEX_VEC, *rPara.pResMgr ) ),
-                aMtfSizeX           ( this, ResId( MTF_SIZEX_VEC, *rPara.pResMgr ) ),
-                aFtSizeY            ( this, ResId( FT_SIZEY_VEC, *rPara.pResMgr ) ),
-                aMtfSizeY           ( this, ResId( MTF_SIZEY_VEC, *rPara.pResMgr ) ),
-                aGrpSize            ( this, ResId( GRP_SIZE_VEC, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr ),
-                aExt                ( rPara.aFilterExt )
-{
-    aExt.ToUpperAscii();
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
-    aFilterConfigPath.Append( aExt );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    String  aTitle( aExt );
-    FreeResource();
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportVec, OK ) );
-    aRbOriginal.SetClickHdl( LINK( this, DlgExportVec, ClickRbOriginal ) );
-    aRbSize.SetClickHdl( LINK( this, DlgExportVec, ClickRbSize ) );
-
-    aTitle.ToUpperAscii();
-    aTitle += String( ResId( EXPORT_DIALOG_TITLE, *pMgr ) );
-    SetText( aTitle );
-
-    // reading config-parameter
-    sal_Int32   nMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 );
-
-    ::com::sun::star::awt::Size aDefault( 10000, 10000 );
-    ::com::sun::star::awt::Size aSize;
-    aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault );
-
-    aMtfSizeX.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeY.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeX.SetValue( aSize.Width );
-    aMtfSizeY.SetValue( aSize.Height );
-
-    switch ( rPara.eFieldUnit )
-    {
-//      case FUNIT_NONE :
-//      case FUNIT_KM :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
-//      case FUNIT_MILE :
-//      case FUNIT_FOOT :
-        case FUNIT_MM :
-        case FUNIT_CM :
-        case FUNIT_M :
-        case FUNIT_TWIP :
-        case FUNIT_POINT :
-        case FUNIT_PICA :
-        case FUNIT_INCH :
-        case FUNIT_100TH_MM :
-        {
-            aMtfSizeX.SetUnit( rPara.eFieldUnit );
-            aMtfSizeY.SetUnit( rPara.eFieldUnit );
-        }
-        break;
-        default:
-            break;  // -Wall Multiple values not handled.
-    }
-
-    switch ( nMode )
-    {
-        case 1 :
-        {
-            aRbSize.Check( TRUE );
-            ClickRbSize( NULL );
-        }
-        break;
-
-        default :
-        {
-            aRbOriginal.Check( TRUE );
-            ClickRbOriginal( NULL );
-        }
-        break;
-    }
-}
-
-DlgExportVec::~DlgExportVec()
-{
-    delete pConfigItem;
-}
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportVec, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    ::com::sun::star::awt::Size aSize(
-        static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )),
-            static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) );
-
-    sal_Int32 nMode;
-    if ( aRbSize.IsChecked() )
-        nMode = 1;
-    else
-        nMode = 0;
-
-    pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nMode );
-    pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportVec, ClickRbOriginal, void*, EMPTYARG )
-{
-    aGrpSize.Disable();
-    aFtSizeX.Disable();
-    aMtfSizeX.Disable();
-    aFtSizeY.Disable();
-    aMtfSizeY.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportVec, ClickRbSize, void*, EMPTYARG )
-{
-    aGrpSize.Enable();
-    aFtSizeX.Enable();
-    aMtfSizeX.Enable();
-    aFtSizeY.Enable();
-    aMtfSizeY.Enable();
-
-    return 0;
-}
-
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc
deleted file mode 100644
index 69870c9b00b0..000000000000
--- a/svtools/source/filter.vcl/filter/dlgexpor.hrc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#include <svtools/svtools.hrc>
-
-#define BTN_OK_PIX 1
-#define BTN_CANCEL_PIX 1
-#define BTN_HELP_PIX 1
-#define CBX_RES_PIX 1
-#define CBX_SIZE_PIX 2
-#define CBX_RLE 3
-#define CBB_RES_PIX 1
-#define LB_COLORS 1
-#define MTF_SIZEX_PIX 1
-#define MTF_SIZEY_PIX 2
-#define FT_SIZEX_PIX 1
-#define FT_SIZEY_PIX 2
-#define GRP_MODE_PIX 1
-#define GRP_COLORS 4
-#define RB_ORIGINAL_PIX 1
-#define RB_RES_PIX 2
-#define RB_SIZE_PIX 3
-
-#define BTN_OK_VEC 1
-#define BTN_CANCEL_VEC 1
-#define BTN_HELP_VEC 1
-#define CBX_SIZE_VEC 2
-#define MTF_SIZEX_VEC 1
-#define MTF_SIZEY_VEC 2
-#define FT_SIZEX_VEC 1
-#define FT_SIZEY_VEC 2
-#define GRP_SIZE_VEC 1
-#define GRP_MODE_VEC 2
-#define RB_ORIGINAL_VEC 1
-#define RB_SIZE_VEC 2
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx
deleted file mode 100644
index 8c7b2d462e70..000000000000
--- a/svtools/source/filter.vcl/filter/dlgexpor.hxx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEXPOR_HXX_
-#define _DLGEXPOR_HXX_
-
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen bei Pixelformaten
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class DlgExportPix : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    ListBox             aLbColors;
-    CheckBox            aCbxRLE;
-    FixedLine           aGrpColors;
-
-    RadioButton         aRbOriginal;
-    RadioButton         aRbRes;
-    RadioButton         aRbSize;
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpMode;
-    ComboBox            aCbbRes;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    String              aExt;
-
-                        DECL_LINK( OK, void* p );
-                        DECL_LINK( ClickRbOriginal,void* p );
-                        DECL_LINK( ClickRbRes,void* p );
-                        DECL_LINK( ClickRbSize,void* p );
-                        DECL_LINK( SelectLbColors, void* p );
-
-public:
-                        DlgExportPix( FltCallDialogParameter& rPara );
-                        ~DlgExportPix();
-};
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen bei Vektorformaten
-|*
-\************************************************************************/
-class DlgExportVec : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    RadioButton         aRbOriginal;
-    RadioButton         aRbSize;
-    FixedLine           aGrpMode;
-
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpSize;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    String              aExt;
-
-    DECL_LINK( OK, void* p );
-    DECL_LINK( ClickRbOriginal,void* p );
-    DECL_LINK( ClickRbSize,void* p );
-
-public:
-            DlgExportVec( FltCallDialogParameter& rPara );
-            ~DlgExportVec();
-};
-
-#endif // _DLGEXPOR_HXX_
-
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src
deleted file mode 100644
index 7573b394d72f..000000000000
--- a/svtools/source/filter.vcl/filter/dlgexpor.src
+++ /dev/null
@@ -1,315 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-#include "dlgexpor.hrc"
-
-ModalDialog DLG_EXPORT_PIX
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 178 , 135 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    FixedLine GRP_COLORS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Color resolution" ;
-    };
-    ListBox LB_COLORS
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 98 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        AutoHScroll = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Original" ; Default ; > ;
-            < "1 Bit - Threshold Value" ; Default ; > ;
-            < "1 Bit - Dithering" ; Default ; > ;
-            < "4 Bit - Grayscale" ; Default ; > ;
-            < "4 Bit - Color Palette" ; Default ; > ;
-            < "8 Bit - Grayscales" ; Default ; > ;
-            < "8 Bit - Color Palette" ; Default ; > ;
-            < "24 Bit - True Colors" ; Default ; > ;
-        };
-    };
-    CheckBox CBX_RLE
-    {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
-        Size = MAP_APPFONT ( 98 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "RLE coding" ;
-    };
-    FixedLine GRP_MODE_PIX
-    {
-        Pos = MAP_APPFONT ( 6 , 48 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-    RadioButton RB_ORIGINAL_PIX
-    {
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Original" ;
-    };
-    RadioButton RB_RES_PIX
-    {
-        Pos = MAP_APPFONT ( 12 , 73 ) ;
-        Size = MAP_APPFONT ( 55 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Resolution" ;
-    };
-    ComboBox CBB_RES_PIX
-    {
-        Pos = MAP_APPFONT ( 70 , 73 ) ;
-        Size = MAP_APPFONT ( 40 , 50 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList =
-        {
-            "75 DPI" ;
-            "150 DPI" ;
-            "300 DPI" ;
-            "600 DPI" ;
-        };
-    };
-    RadioButton RB_SIZE_PIX
-    {
-        Pos = MAP_APPFONT ( 12 , 87 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Size" ;
-    };
-    MetricField MTF_SIZEX_PIX
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 101 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    FixedText FT_SIZEX_PIX
-    {
-        Pos = MAP_APPFONT ( 18 , 102 ) ;
-        Size = MAP_APPFONT ( 41 , 10 ) ;
-        Text [ en-US ] = "Width" ;
-    };
-    MetricField MTF_SIZEY_PIX
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 117 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    FixedText FT_SIZEY_PIX
-    {
-        Pos = MAP_APPFONT ( 18 , 118 ) ;
-        Size = MAP_APPFONT ( 41 , 10 ) ;
-        Text [ en-US ] = "Height" ;
-    };
-    OKButton BTN_OK_PIX
-    {
-        Pos = MAP_APPFONT ( 122 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL_PIX
-    {
-        Pos = MAP_APPFONT ( 122 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP_PIX
-    {
-        Pos = MAP_APPFONT ( 122 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-ModalDialog DLG_EXPORT_VEC
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 178 , 89 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-
-    FixedLine GRP_MODE_VEC
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-    RadioButton RB_ORIGINAL_VEC
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Original" ;
-    };
-    RadioButton RB_SIZE_VEC
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Size" ;
-    };
-    FixedLine GRP_SIZE_VEC
-    {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Size" ;
-    };
-    FixedText FT_SIZEX_VEC
-    {
-        Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text [ en-US ] = "Width" ;
-    };
-    MetricField MTF_SIZEX_VEC
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 55 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    FixedText FT_SIZEY_VEC
-    {
-        Pos = MAP_APPFONT ( 12 , 72 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text [ en-US ] = "Height" ;
-    };
-    MetricField MTF_SIZEY_VEC
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 71 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    OKButton BTN_OK_VEC
-    {
-        Pos = MAP_APPFONT ( 122 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL_VEC
-    {
-        Pos = MAP_APPFONT ( 122 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP_VEC
-    {
-        Pos = MAP_APPFONT ( 122 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx
new file mode 100644
index 000000000000..20cc46a30ab5
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/exportdialog.cxx
@@ -0,0 +1,1513 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
+#ifndef GCC
+#   pragma hdrstop
+#endif
+
+#include <tools/ref.hxx>
+#include <tools/stream.hxx>
+#include <svtools/filter.hxx>
+#include <svtools/FilterConfigItem.hxx>
+#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/drawing/XDrawView.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/document/XFilter.hpp>
+#include <unotools/streamwrap.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/graph.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include "exportdialog.hxx"
+#include "exportdialog.hrc"
+
+#define FORMAT_UNKNOWN  0
+#define FORMAT_JPG      1
+#define FORMAT_PNG      2
+#define FORMAT_BMP      3
+#define FORMAT_GIF      4
+#define FORMAT_PBM      5
+#define FORMAT_PGM      6
+#define FORMAT_PPM      7
+#define FORMAT_PCT      8
+#define FORMAT_RAS      9
+#define FORMAT_TIF      10
+#define FORMAT_XPM      11
+#define FORMAT_WMF      12
+#define FORMAT_EMF      13
+#define FORMAT_EPS      14
+#define FORMAT_MET      15
+#define FORMAT_SVG      16
+#define FORMAT_SVM      17
+
+#define UNIT_DEFAULT    -1
+#define UNIT_INCH       0
+#define UNIT_CM         1
+#define UNIT_MM         2
+#define UNIT_POINT      3
+#define UNIT_PIXEL      4
+#define UNIT_MAX_ID     UNIT_PIXEL
+
+using namespace ::com::sun::star;
+
+static sal_Int16 GetFilterFormat( String& rExt )
+{
+    sal_Int16 nFormat = FORMAT_UNKNOWN;
+    ByteString aExt( rExt, RTL_TEXTENCODING_UTF8 );
+    if ( aExt.Equals( "JPG" ) )
+        nFormat = FORMAT_JPG;
+    else if ( aExt.Equals( "PNG" ) )
+        nFormat = FORMAT_PNG;
+    else if ( aExt.Equals( "BMP" ) )
+        nFormat = FORMAT_BMP;
+    else if ( aExt.Equals( "GIF" ) )
+        nFormat = FORMAT_GIF;
+    else if ( aExt.Equals( "PBM" ) )
+        nFormat = FORMAT_PBM;
+    else if ( aExt.Equals( "PGM" ) )
+        nFormat = FORMAT_PGM;
+    else if ( aExt.Equals( "PPM" ) )
+        nFormat = FORMAT_PPM;
+    else if ( aExt.Equals( "PCT" ) )
+        nFormat = FORMAT_PCT;
+    else if ( aExt.Equals( "RAS" ) )
+        nFormat = FORMAT_RAS;
+    else if ( aExt.Equals( "TIF" ) )
+        nFormat = FORMAT_TIF;
+    else if ( aExt.Equals( "XPM" ) )
+        nFormat = FORMAT_XPM;
+    else if ( aExt.Equals( "WMF" ) )
+        nFormat = FORMAT_WMF;
+    else if ( aExt.Equals( "EMF" ) )
+        nFormat = FORMAT_EMF;
+    else if ( aExt.Equals( "EPS" ) )
+        nFormat = FORMAT_EPS;
+    else if ( aExt.Equals( "MET" ) )
+        nFormat = FORMAT_MET;
+    else if ( aExt.Equals( "SVG" ) )
+        nFormat = FORMAT_SVG;
+    else if ( aExt.Equals( "SVM" ) )
+        nFormat = FORMAT_SVM;
+    return nFormat;
+}
+
+static MapUnit GetMapUnit( sal_Int32 nUnit )
+{
+    MapUnit aMapUnit( MAP_PIXEL );
+    switch( nUnit )
+    {
+        case UNIT_INCH  :   aMapUnit = MAP_INCH; break;
+        case UNIT_CM    :   aMapUnit = MAP_CM; break;
+        case UNIT_MM    :   aMapUnit = MAP_MM; break;
+        case UNIT_POINT :   aMapUnit = MAP_POINT; break;
+        case UNIT_PIXEL :   aMapUnit = MAP_PIXEL; break;
+    }
+    return aMapUnit;
+}
+
+sal_Int32 ExportDialog::GetDefaultUnit()
+{
+    sal_Int32 nDefaultUnit = UNIT_CM;
+    switch( mrFltCallPara.eFieldUnit )
+    {
+//      case FUNIT_NONE :
+//      case FUNIT_PERCENT :
+//      case FUNIT_CUSTOM :
+        default:                nDefaultUnit = UNIT_CM; break;
+
+        case FUNIT_MILE :       // PASSTHROUGH INTENDED
+        case FUNIT_FOOT :
+        case FUNIT_TWIP :
+        case FUNIT_PICA :       nDefaultUnit = UNIT_INCH; break;
+
+        case FUNIT_KM :         // PASSTHROUGH INTENDED
+        case FUNIT_M :
+        case FUNIT_100TH_MM :   nDefaultUnit = UNIT_CM; break;
+
+        case FUNIT_INCH :       nDefaultUnit = UNIT_INCH; break;
+        case FUNIT_CM :         nDefaultUnit = UNIT_CM; break;
+        case FUNIT_MM :         nDefaultUnit = UNIT_MM; break;
+        case FUNIT_POINT :      nDefaultUnit = UNIT_POINT; break;
+    }
+    return nDefaultUnit;
+}
+
+static basegfx::B2DRange GetShapeRangeForXShape( const uno::Reference< drawing::XShape >& rxShape,
+    const uno::Reference< graphic::XPrimitiveFactory2D >& rxPrimitiveFactory2D, const uno::Sequence< beans::PropertyValue >& rViewInformation )
+{
+    basegfx::B2DRange aShapeRange;
+
+    const uno::Sequence< beans::PropertyValue > aParams;
+    const uno::Sequence< uno::Reference< graphic::XPrimitive2D > > aPrimitiveSequence( rxPrimitiveFactory2D->createPrimitivesFromXShape( rxShape, aParams ) );
+
+    const sal_Int32 nCount = aPrimitiveSequence.getLength();
+    for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
+    {
+        const geometry::RealRectangle2D aRect( aPrimitiveSequence[ nIndex ]->getRange( rViewInformation ) );
+        aShapeRange.expand( basegfx::B2DTuple( aRect.X1, aRect.Y1 ) );
+        aShapeRange.expand( basegfx::B2DTuple( aRect.X2, aRect.Y2 ) );
+    }
+    return aShapeRange;
+}
+
+uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpdateConfig )
+{
+    if ( bUpdateConfig )
+    {
+        sal_Int32 nUnit = maLbSizeX.GetSelectEntryPos();
+        if ( nUnit < 0 )
+            nUnit = UNIT_CM;
+
+        if ( ( mnInitialResolutionUnit == UNIT_DEFAULT ) && ( nUnit == GetDefaultUnit() ) )
+            nUnit = UNIT_DEFAULT;
+
+        // updating ui configuration
+        if ( mbIsPixelFormat )
+        {
+            if ( nUnit > UNIT_MAX_ID )
+                nUnit = UNIT_PIXEL;
+
+            sal_Int32 nResolution = maNfResolution.GetValue();
+            if ( nResolution < 1 )
+                nResolution = 96;
+
+            mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), nUnit );
+            mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), nResolution );
+            mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), maLbResolution.GetSelectEntryPos() );
+        }
+        else
+        {
+            if ( nUnit >= UNIT_PIXEL )
+                nUnit = UNIT_CM;
+
+            mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), nUnit );
+        }
+    }
+
+    FilterConfigItem* pFilterOptions;
+    if ( bUpdateConfig )
+         pFilterOptions = mpFilterOptionsItem;
+    else
+    {
+        uno::Sequence< beans::PropertyValue > aFilterData( mpFilterOptionsItem->GetFilterData() );
+        pFilterOptions = new FilterConfigItem( &aFilterData );
+    }
+
+    const String sLogicalWidth( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ) );
+    const String sLogicalHeight( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ) );
+    if ( mbIsPixelFormat )
+    {
+        pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) ), static_cast< sal_Int32 >( maSize.Width ) );
+        pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) ), static_cast< sal_Int32 >( maSize.Height ) );
+        if ( maResolution.Width && maResolution.Height )
+        {
+            const double f100thmmPerPixelX = 100000.0 / maResolution.Width;
+            const double f100thmmPerPixelY = 100000.0 / maResolution.Height;
+            sal_Int32 nLogicalWidth = static_cast< sal_Int32 >( f100thmmPerPixelX * maSize.Width );
+            sal_Int32 nLogicalHeight= static_cast< sal_Int32 >( f100thmmPerPixelY * maSize.Height );
+            if ( nLogicalWidth && nLogicalHeight )
+            {
+                pFilterOptions->WriteInt32( sLogicalWidth, nLogicalWidth );
+                pFilterOptions->WriteInt32( sLogicalHeight, nLogicalHeight );
+            }
+        }
+    }
+    else
+    {
+        pFilterOptions->WriteInt32( sLogicalWidth, static_cast< sal_Int32 >( maSize.Width ) );
+        pFilterOptions->WriteInt32( sLogicalHeight, static_cast< sal_Int32 >( maSize.Height ) );
+    }
+    switch ( mnFormat )
+    {
+        case FORMAT_JPG :
+        {
+            sal_Int32 nColor = maLbColorDepth.GetSelectEntryPos();
+            if ( nColor == 1 )
+                nColor = 0;
+            else
+                nColor = 1;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), nColor );
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) );
+        }
+        break;
+
+        case FORMAT_PNG :
+        {
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) );
+            sal_Int32 nInterlace = 0;
+            if ( maCbInterlaced.IsChecked() )
+                nInterlace++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace );
+        }
+        break;
+
+        case FORMAT_BMP :
+        {
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), maLbColorDepth.GetSelectEntryPos() + 1 );
+            pFilterOptions->WriteBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), maCbRLEEncoding.IsChecked() );
+        }
+        break;
+
+        case FORMAT_GIF :
+        {
+            sal_Int32 nValue = 0;
+            if ( maCbInterlaced.IsChecked() )
+                nValue++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nValue );
+
+            nValue = 0;
+            if ( maCbSaveTransparency.IsChecked() )
+                nValue++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), nValue );
+        }
+        break;
+
+        case FORMAT_PBM :
+        case FORMAT_PGM :
+        case FORMAT_PPM :
+        {
+            sal_Int32 nFormat = 0;
+            if ( maRbText.IsChecked() )
+                nFormat++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), nFormat );
+        }
+        break;
+
+        case FORMAT_EPS :
+        {
+            sal_Int32 nCheck = 0;
+            if ( maCbEPSPreviewTIFF.IsChecked() )
+                nCheck++;
+            if ( maCbEPSPreviewEPSI.IsChecked() )
+                nCheck += 2;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), nCheck );
+
+            nCheck = 1;
+            if ( maRbEPSLevel2.IsChecked() )
+                nCheck++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), nCheck );
+
+            nCheck = 1;
+            if ( maRbEPSColorFormat2.IsChecked() )
+                nCheck++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), nCheck );
+
+            nCheck = 1;
+            if ( maRbEPSCompressionNone.IsChecked() )
+                nCheck++;
+            pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), nCheck );
+        }
+        break;
+    }
+
+    uno::Sequence< beans::PropertyValue > aRet( pFilterOptions->GetFilterData() );
+    if ( bUpdateConfig == sal_False )
+        delete pFilterOptions;
+    return aRet;
+}
+
+//
+awt::Size ExportDialog::GetOriginalSize()
+{
+    basegfx::B2DRange aShapesRange;
+
+    if ( mxPage.is () )
+    {
+        uno::Reference< beans::XPropertySet > xPagePropSet( mxPage, uno::UNO_QUERY );
+        if ( xPagePropSet.is() )
+        {
+            sal_Int32 nWidth = 0;
+            sal_Int32 nHeight= 0;
+            com::sun::star::uno::Any aAny;
+            aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) );
+            aAny >>= nWidth;
+            aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) );
+            aAny >>= nHeight;
+            aShapesRange = basegfx::B2DRange( 0, 0, nWidth, nHeight );
+        }
+    }
+    else
+    {
+        uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory(
+            mxMgr->createInstance( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.PrimitiveFactory2D" ) ) ), uno::UNO_QUERY );
+        if ( xPrimitiveFactory.is() )
+        {
+            basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() );
+            com::sun::star::geometry::AffineMatrix2D aTransformation;
+            aTransformation.m00 = aViewTransformation.get(0,0);
+            aTransformation.m01 = aViewTransformation.get(0,1);
+            aTransformation.m02 = aViewTransformation.get(0,2);
+            aTransformation.m10 = aViewTransformation.get(1,0);
+            aTransformation.m11 = aViewTransformation.get(1,1);
+            aTransformation.m12 = aViewTransformation.get(1,2);
+
+            const rtl::OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) );
+            uno::Sequence< beans::PropertyValue > aViewInformation( 1 );
+            aViewInformation[ 0 ].Value <<= aTransformation;
+            aViewInformation[ 0 ].Name  = sViewTransformation;
+
+            if ( mxShape.is() )
+                aShapesRange = GetShapeRangeForXShape( mxShape, xPrimitiveFactory, aViewInformation );
+            else if ( mxShapes.is() )
+            {
+                const sal_Int32 nCount = mxShapes->getCount();
+                for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
+                {
+                    uno::Reference< drawing::XShape > xShape;
+                    mxShapes->getByIndex( nIndex ) >>= xShape;
+                    aShapesRange.expand( GetShapeRangeForXShape( xShape, xPrimitiveFactory, aViewInformation ) );
+                }
+            }
+        }
+    }
+    return awt::Size( static_cast<sal_Int32>(aShapesRange.getWidth()), static_cast<sal_Int32>(aShapesRange.getHeight()) );
+}
+
+void ExportDialog::GetGraphicSource()
+{
+    if ( mxSourceDocument.is() )
+    {
+        uno::Reference< frame::XModel > xModel( mxSourceDocument, uno::UNO_QUERY );
+        if ( xModel.is() )
+        {
+            uno::Reference< frame::XController > xController( xModel->getCurrentController() );
+            if ( xController.is() )
+            {
+                if ( mbExportSelection )                // check if there is a selection
+                {
+                    uno::Reference< view::XSelectionSupplier > xSelectionSupplier( xController, uno::UNO_QUERY );
+                    if ( xSelectionSupplier.is() )
+                    {
+                        uno::Any aAny( xSelectionSupplier->getSelection() );
+                        if ( ! ( aAny >>= mxShapes ) )
+                            aAny >>= mxShape;
+                    }
+                }
+                if ( !mxShape.is() && !mxShapes.is() )
+                {
+                    uno::Reference< drawing::XDrawView > xDrawView( xController, uno::UNO_QUERY );
+                    if ( xDrawView.is() )
+                    {
+                        uno::Reference< drawing::XDrawPage > xCurrentPage( xDrawView->getCurrentPage() );
+                        if ( xCurrentPage.is() )
+                        {
+                            mxPage = xCurrentPage;      // exporting whole page
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+sal_Bool ExportDialog::GetGraphicStream()
+{
+    sal_Bool bRet = sal_False;
+
+    if ( !IsTempExportAvailable() )
+    {
+        delete mpTempStream, mpTempStream = new SvMemoryStream();
+        maBitmap = Bitmap();
+        return bRet;
+    }
+
+    sal_Bool bRecreateOutputStream = mpTempStream->Tell() == 0;
+
+    static uno::Sequence< beans::PropertyValue > aOldFilterData;
+    uno::Sequence< beans::PropertyValue > aNewFilterData( GetFilterData( sal_False ) );
+    if ( aOldFilterData != aNewFilterData )
+    {
+        aOldFilterData = aNewFilterData;
+        bRecreateOutputStream = sal_True;
+    }
+    try
+    {
+        if ( bRecreateOutputStream )
+        {
+            delete mpTempStream, mpTempStream = new SvMemoryStream();
+            maBitmap = Bitmap();
+
+            uno::Reference < io::XStream > xStream( new utl::OStreamWrapper( *mpTempStream ) );
+            uno::Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() );
+
+            uno::Reference< document::XExporter > xGraphicExporter(
+                mxMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ), uno::UNO_QUERY_THROW );
+            uno::Reference< document::XFilter > xFilter( xGraphicExporter, uno::UNO_QUERY_THROW );
+
+            sal_Int32 nProperties = 2;
+            uno::Sequence< beans::PropertyValue > aFilterData( nProperties );
+
+
+            rtl::OUString sFormat( maExt );
+            uno::Sequence< beans::PropertyValue > aDescriptor( 3 );
+            aDescriptor[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OutputStream") );
+            aDescriptor[0].Value <<= xOutputStream;
+            aDescriptor[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") );
+            aDescriptor[1].Value <<= sFormat;
+            aDescriptor[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
+            aDescriptor[2].Value <<= aNewFilterData;
+
+            uno::Reference< lang::XComponent > xSourceDoc;
+            if ( mxPage.is() )
+                xSourceDoc = uno::Reference< lang::XComponent >( mxPage, uno::UNO_QUERY_THROW );
+            else if ( mxShapes.is() )
+                xSourceDoc = uno::Reference< lang::XComponent >( mxShapes, uno::UNO_QUERY_THROW );
+            else if ( mxShape.is() )
+                xSourceDoc = uno::Reference< lang::XComponent >( mxShape, uno::UNO_QUERY_THROW );;
+            if ( xSourceDoc.is() )
+            {
+                xGraphicExporter->setSourceDocument( xSourceDoc );
+                xFilter->filter( aDescriptor );
+                bRet = sal_True;
+
+                if ( mnFormat == FORMAT_JPG )
+                {
+                    mpTempStream->Seek( STREAM_SEEK_TO_BEGIN );
+                    maBitmap = GetGraphicBitmap( *mpTempStream );
+                    mpTempStream->Seek( STREAM_SEEK_TO_END );
+                }
+            }
+        }
+        else
+            bRet = sal_True;
+    }
+    catch( uno::Exception& )
+    {
+
+        // ups
+
+    }
+    return bRet;
+}
+
+Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream )
+{
+    Bitmap aRet;
+    Graphic aGraphic;
+    GraphicFilter aFilter( sal_False );
+    if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, NULL ) == GRFILTER_OK )
+    {
+        aRet = aGraphic.GetBitmap();
+    }
+    return aRet;
+}
+
+sal_uInt32 ExportDialog::GetRawFileSize() const
+{
+    sal_uInt64 nRawFileSize = 0;
+    if ( mbIsPixelFormat )
+    {
+        sal_Int32 nBitsPerPixel = 24;
+        String aEntry( maLbColorDepth.GetSelectEntry() );
+        if ( ms1BitTreshold == aEntry )
+            nBitsPerPixel = 1;
+        else if ( ms1BitDithered == aEntry )
+            nBitsPerPixel = 1;
+        else if ( ms4BitGrayscale == aEntry )
+            nBitsPerPixel = 4;
+        else if ( ms4BitColorPalette == aEntry )
+            nBitsPerPixel = 8;
+        else if ( ms8BitGrayscale == aEntry )
+            nBitsPerPixel = 8;
+        else if ( ms8BitColorPalette == aEntry )
+            nBitsPerPixel = 8;
+        else if ( ms24BitColor == aEntry )
+            nBitsPerPixel = 24;
+
+        if ( mbIsPixelFormat )
+        {
+            nRawFileSize = ( maSize.Width * nBitsPerPixel + 7 ) &~ 7;   // rounding up to 8 bits
+            nRawFileSize /= 8;                                          // in bytes
+            nRawFileSize *= maSize.Height;
+        }
+        if ( nRawFileSize > SAL_MAX_UINT32 )
+            nRawFileSize = 0;
+    }
+    return static_cast< sal_uInt32 >( nRawFileSize );
+}
+
+// checks if the source dimension/resolution is not too big
+// to determine the exact graphic output size and preview for jpg
+sal_Bool ExportDialog::IsTempExportAvailable() const
+{
+    return GetRawFileSize() < static_cast< sal_uInt32 >( mnMaxFilesizeForRealtimePreview );
+}
+
+ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
+    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr,
+        const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
+            sal_Bool bExportSelection, sal_Bool bIsPixelFormat ) :
+                ModalDialog             ( rPara.pWindow, ResId( DLG_EXPORT, *rPara.pResMgr ) ),
+                mrFltCallPara           ( rPara ),
+                mpMgr                   ( rPara.pResMgr ),
+                mxMgr                   ( rxMgr ),
+                mxSourceDocument        ( rxSourceDocument ),
+                maFlExportSize          ( this, ResId( FL_EXPORT_SIZE, *rPara.pResMgr ) ),
+                maFtSizeX               ( this, ResId( FT_SIZEX, *rPara.pResMgr ) ),
+                maMfSizeX               ( this, ResId( MF_SIZEX, *rPara.pResMgr ) ),
+                maLbSizeX               ( this, ResId( LB_SIZEX, *rPara.pResMgr ) ),
+                maFtSizeY               ( this, ResId( FT_SIZEY, *rPara.pResMgr ) ),
+                maMfSizeY               ( this, ResId( MF_SIZEY, *rPara.pResMgr ) ),
+                maLbSizeY               ( this, ResId( LB_SIZEY, *rPara.pResMgr ) ),
+                maFtResolution          ( this, ResId( FT_RESOLUTION, *rPara.pResMgr ) ),
+                maNfResolution          ( this, ResId( NF_RESOLUTION, *rPara.pResMgr ) ),
+                maLbResolution          ( this, ResId( LB_RESOLUTION, *rPara.pResMgr ) ),
+                maFlColorDepth          ( this, ResId( FL_COLOR_DEPTH, *rPara.pResMgr ) ),
+                maLbColorDepth          ( this, ResId( LB_COLOR_DEPTH, *rPara.pResMgr ) ),
+                maFlJPGQuality          ( this, ResId( FL_JPG_QUALITY, *rPara.pResMgr ) ),
+                maFlMode                ( this, ResId( FL_MODE, *rPara.pResMgr ) ),
+                maFlPBMOptions          ( this, ResId( FL_PBM_OPTIONS, *rPara.pResMgr ) ),
+                maSbCompression         ( this, ResId( SB_COMPRESSION, *rPara.pResMgr ) ),
+                maNfCompression         ( this, ResId( NF_COMPRESSION, *rPara.pResMgr ) ),
+                maFtJPGMin              ( this, ResId( FT_JPG_MIN, *rPara.pResMgr ) ),
+                maFtJPGMax              ( this, ResId( FT_JPG_MAX, *rPara.pResMgr ) ),
+                maFtPNGMin              ( this, ResId( FT_PNG_MIN, *rPara.pResMgr ) ),
+                maFtPNGMax              ( this, ResId( FT_PNG_MAX, *rPara.pResMgr ) ),
+                maCbJPGPreview          ( this, ResId( CB_JPG_PREVIEW, *rPara.pResMgr ) ),
+                maCbInterlaced          ( this, ResId( CB_INTERLACED, *rPara.pResMgr ) ),
+                maCbRLEEncoding         ( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ),
+                maFlGIFDrawingObjects   ( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ),
+                maCbSaveTransparency    ( this, ResId( CB_SAVE_TRANSPARENCY, *rPara.pResMgr ) ),
+                maRbBinary              ( this, ResId( RB_BINARY, *rPara.pResMgr ) ),
+                maRbText                ( this, ResId( RB_TEXT, *rPara.pResMgr ) ),
+                maFlEPSPreview          ( this, ResId( FL_EPS_PREVIEW, *rPara.pResMgr ) ),
+                maCbEPSPreviewTIFF      ( this, ResId( CB_EPS_PREVIEW_TIFF, *rPara.pResMgr ) ),
+                maCbEPSPreviewEPSI      ( this, ResId( CB_EPS_PREVIEW_EPSI, *rPara.pResMgr ) ),
+                maFlEPSVersion          ( this, ResId( FL_EPS_VERSION, *rPara.pResMgr ) ),
+                maRbEPSLevel1           ( this, ResId( RB_EPS_LEVEL1, *rPara.pResMgr ) ),
+                maRbEPSLevel2           ( this, ResId( RB_EPS_LEVEL2, *rPara.pResMgr ) ),
+                maFlEPSColorFormat      ( this, ResId( FL_EPS_COLOR_FORMAT, *rPara.pResMgr ) ),
+                maRbEPSColorFormat1     ( this, ResId( RB_EPS_COLOR_FORMAT1, *rPara.pResMgr ) ),
+                maRbEPSColorFormat2     ( this, ResId( RB_EPS_COLOR_FORMAT2, *rPara.pResMgr ) ),
+                maFlCompression         ( this, ResId( FL_COMPRESSION, *rPara.pResMgr ) ),
+                maRbEPSCompressionLZW   ( this, ResId( RB_EPS_COMPRESSION_LZW, *rPara.pResMgr ) ),
+                maRbEPSCompressionNone  ( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ),
+                maFlEstimatedSize       ( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ),
+                maFtEstimatedSize       ( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ),
+                msEstimatedSizePix1     ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ) ),
+                msEstimatedSizePix2     ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ) ),
+                msEstimatedSizeVec      ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ) ),
+                maFlButtons             ( this, ResId( FL_BUTTONS, *rPara.pResMgr ) ),
+                maFbJPGPreview          ( this, ResId( FB_JPG_PREVIEW, *rPara.pResMgr ) ),
+                maSbZoom                ( this, ResId( SB_ZOOM, *rPara.pResMgr ) ),
+                maNfZoom                ( this, ResId( NF_ZOOM, *rPara.pResMgr ) ),
+                maSbJPGPreviewHorz      ( this, ResId( SB_JPG_PREVIEW_HORZ, *rPara.pResMgr ) ),
+                maSbJPGPreviewVert      ( this, ResId( SB_JPG_PREVIEW_VERT, *rPara.pResMgr ) ),
+                maBtnOK                 ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
+                maBtnCancel             ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
+                maBtnHelp               ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
+                ms1BitTreshold          ( ResId( STR_1BIT_THRESHOLD, *rPara.pResMgr ) ),
+                ms1BitDithered          ( ResId( STR_1BIT_DITHERED, *rPara.pResMgr ) ),
+                ms4BitGrayscale         ( ResId( STR_4BIT_GRAYSCALE, *rPara.pResMgr ) ),
+                ms4BitColorPalette      ( ResId( STR_4BIT_COLOR_PALETTE, *rPara.pResMgr ) ),
+                ms8BitGrayscale         ( ResId( STR_8BIT_GRAYSCALE, *rPara.pResMgr ) ),
+                ms8BitColorPalette      ( ResId( STR_8BIT_COLOR_PALETTE, *rPara.pResMgr ) ),
+                ms24BitColor            ( ResId( STR_24BIT_TRUE_COLOR, *rPara.pResMgr ) ),
+                maExt                   ( rPara.aFilterExt ),
+                mnFormat                ( FORMAT_UNKNOWN ),
+                mnMaxFilesizeForRealtimePreview( 0 ),
+                mpTempStream            ( new SvMemoryStream() ),
+                maOriginalSize          ( awt::Size( 0, 0 ) ),
+                mbPreview               ( sal_False ),
+                mbIsPixelFormat         ( bIsPixelFormat ),
+                mbExportSelection       ( bExportSelection ),
+                mbPreserveAspectRatio   ( sal_True )
+{
+    GetGraphicSource();
+
+    maExt.ToUpperAscii();
+
+    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) );
+    mpOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
+    aFilterConfigPath.Append( maExt );
+    mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
+
+    mnInitialResolutionUnit = mbIsPixelFormat
+        ? mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), UNIT_DEFAULT )
+        : mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), UNIT_DEFAULT );
+
+    mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxFilesizeForRealtimePreview" ) ), 0 );
+    maFtEstimatedSize.SetText( String( RTL_CONSTASCII_USTRINGPARAM( " \n " ) ) );
+
+    String  aTitle( maExt );
+    aTitle += String( ResId( DLG_EXPORT_TITLE, *mpMgr ) );
+    SetText( aTitle );
+
+    mnFormat = GetFilterFormat( maExt );
+
+    Size aResolution( Application::GetDefaultDevice()->LogicToPixel( Size( 100, 100 ), MAP_CM ) );
+    maResolution.Width = aResolution.Width();
+    maResolution.Height= aResolution.Height();
+    maOriginalSize = GetOriginalSize();
+    if ( bIsPixelFormat )
+    {
+        double fPixelsPer100thmm = static_cast< double >( maResolution.Width ) / 100000.0;
+        maSize = awt::Size( static_cast< sal_Int32 >( ( fPixelsPer100thmm * maOriginalSize.Width ) + 0.5 ),
+            static_cast< sal_Int32 >( ( fPixelsPer100thmm * maOriginalSize.Height ) + 0.5 ) );
+    }
+    else
+    {
+        maSize = maOriginalSize;
+    }
+
+    // Size
+    maLbSizeX.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maSbCompression.SetScrollHdl( LINK( this, ExportDialog, SbCompressionUpdateHdl ) );
+    maNfCompression.SetModifyHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maMfSizeX.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeX ) );
+    maMfSizeY.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeY ) );
+
+    maNfResolution.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlNfResolution ) );
+    maLbResolution.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maLbColorDepth.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maCbInterlaced.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maCbSaveTransparency.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maCbEPSPreviewTIFF.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maCbEPSPreviewEPSI.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maRbEPSCompressionLZW.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maRbEPSCompressionNone.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maRbBinary.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maRbText.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+
+    // JPG Preview
+//  maCbJPGPreview.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+maCbJPGPreview.Enable( sal_False );
+
+    maSbJPGPreviewVert.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maSbJPGPreviewHorz.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maSbZoom.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    // BMP
+    maCbRLEEncoding.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    // EPS
+    maRbEPSLevel1.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+    maRbEPSLevel2.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) );
+
+    maBtnOK.SetClickHdl( LINK( this, ExportDialog, OK ) );
+
+    setupLayout();
+    updateControls();
+
+    FreeResource();
+}
+
+void ExportDialog::createSizeControls( vcl::RowOrColumn& rLayout )
+{
+    size_t nIndex;
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+    long nIndent = aBorder.Width();
+
+    // Size controls
+    rLayout.addWindow( &maFlExportSize );
+
+    Size aLbMax( maLbSizeX.GetSizePixel() );
+    aLbMax.Width() = Max( aLbMax.Width(), maLbResolution.GetSizePixel().Width() );
+
+    boost::shared_ptr< vcl::LabelColumn > xSizeColumns( new vcl::LabelColumn( &rLayout ) );
+    rLayout.addChild( xSizeColumns );
+
+    // row 1
+    boost::shared_ptr< vcl::RowOrColumn > xColumn( new vcl::RowOrColumn( xSizeColumns.get(), false ) );
+    xSizeColumns->addRow( &maFtSizeX, xColumn, nIndent );
+    Size aMinSize( maMfSizeX.GetSizePixel() );
+    nIndex = xColumn->addWindow( &maMfSizeX );
+    xColumn->setMinimumSize( nIndex, aMinSize );
+    nIndex = xColumn->addWindow( &maLbSizeX );
+    xColumn->setMinimumSize( nIndex, aLbMax );
+
+    // row 2
+    xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) );
+    xSizeColumns->addRow( &maFtSizeY, xColumn, nIndent );
+    nIndex = xColumn->addWindow( &maMfSizeY );
+    xColumn->setMinimumSize( nIndex, aMinSize );
+    nIndex = xColumn->addWindow( &maLbSizeY );
+    xColumn->setMinimumSize( nIndex, aLbMax );
+
+    // row 3
+    if ( mbIsPixelFormat )      // TODO: (metafileresolutionsupport)
+    {
+        xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) );
+        xSizeColumns->addRow( &maFtResolution, xColumn, nIndent );
+        nIndex = xColumn->addWindow( &maNfResolution );
+        xColumn->setMinimumSize( nIndex, aMinSize );
+        nIndex = xColumn->addWindow( &maLbResolution );
+        xColumn->setMinimumSize( nIndex, aLbMax );
+    }
+
+    sal_Int32 nUnit = mnInitialResolutionUnit;
+    if ( nUnit == UNIT_DEFAULT )
+        nUnit = GetDefaultUnit();
+
+    if ( !mbIsPixelFormat )
+    {
+        maLbSizeX.RemoveEntry( UNIT_PIXEL );        // removing pixel
+        if ( nUnit >= UNIT_PIXEL )
+            nUnit = UNIT_CM;
+    }
+    else if ( nUnit > UNIT_MAX_ID )
+        nUnit = UNIT_PIXEL;
+    if ( nUnit < 0 )
+        nUnit = UNIT_CM;
+    maLbSizeX.SelectEntryPos( static_cast< USHORT >( nUnit ) );
+
+    if ( mbIsPixelFormat )      // TODO: (metafileresolutionsupport) should be supported for vector formats also... this makes
+    {                           // sense eg for bitmap fillings in metafiles, to preserve high dpi output
+                                // (atm without special vector support the bitmaps are rendered with 96dpi)
+        sal_Int32 nResolution = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), 96 );
+        if ( nResolution < 1 )
+            nResolution = 96;
+        maNfResolution.SetValue( nResolution );
+
+        sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), 1 );
+        if ( ( nResolutionUnit < 0 ) || ( nResolutionUnit > 2 ) )
+            nResolutionUnit = 1;
+        maLbResolution.SelectEntryPos( static_cast< USHORT >( nResolutionUnit ) );
+    }
+
+    boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+    rLayout.addChild( xSpacer );
+}
+
+void ExportDialog::createColorDepthControls( vcl::RowOrColumn& rLayout )
+{
+    // Color Depth
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+    long nIndent = aBorder.Width();
+
+    boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) );
+    rLayout.addChild( xRow );
+    xRow->addWindow( &maFlColorDepth );
+
+    xRow = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, false ) );
+    rLayout.addChild( xRow );
+    boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+    xRow->addChild( xIndenter );
+    boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+    xIndenter->setChild( xRows );
+    xRows->addWindow( &maLbColorDepth );
+
+    boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+    rLayout.addChild( xSpacer );
+}
+
+void ExportDialog::createScrollBar( vcl::RowOrColumn& rLayout )
+{
+    boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) );
+    rLayout.addChild( xRow );
+
+    Size aMinSize( maSbCompression.GetSizePixel() );
+    size_t nIndex = xRow->addWindow( &maSbCompression );
+    xRow->setMinimumSize( nIndex, aMinSize );
+    aMinSize = maNfCompression.GetSizePixel();
+    nIndex = xRow->addWindow( &maNfCompression );
+    xRow->setMinimumSize( nIndex, aMinSize );
+}
+
+void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout )
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+    long nIndent = aBorder.Width();
+
+    switch( mnFormat )
+    {
+        case FORMAT_JPG :
+        {
+            sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), 0 );
+            if ( nColor == 1 )
+                nColor = 0;
+            else
+                nColor = 1;
+            maLbColorDepth.InsertEntry( ms8BitGrayscale );
+            maLbColorDepth.InsertEntry( ms24BitColor );
+            maLbColorDepth.SelectEntryPos( nColor );
+            createColorDepthControls( maLayout );
+
+            rLayout.addWindow( &maFlJPGQuality );
+
+            // Quality
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            createScrollBar( *xRows.get() );
+            xRows->addWindow( &maFtJPGMin );
+            xRows->addWindow( &maFtJPGMax );
+            if ( maCbJPGPreview.IsEnabled() )
+                xRows->addWindow( &maCbJPGPreview );
+
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 75 );
+            if ( ( nQuality < 1 ) || ( nQuality > 100 ) )
+                nQuality = 75;
+
+            maSbCompression.SetRangeMin( 1 );
+            maSbCompression.SetRangeMax( 100 );
+            maNfCompression.SetMin( 1 );
+            maNfCompression.SetMax( 100 );
+            maNfCompression.SetValue( nQuality );
+            maNfCompression.SetStrictFormat( sal_True );
+            if ( maCbJPGPreview.IsEnabled() )
+                maCbJPGPreview.Check( sal_False );
+        }
+        break;
+        case FORMAT_PNG :
+        {
+            rLayout.addWindow( &maFlCompression );
+
+            // Compression 1..9
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            createScrollBar( *xRows.get() );
+            xRows->addWindow( &maFtPNGMin );
+            xRows->addWindow( &maFtPNGMax );
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            // Interlaced
+            rLayout.addWindow( &maFlMode );
+            xIndenter.reset( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            xRows.reset( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maCbInterlaced );
+
+            xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 );
+            if ( ( nCompression < 1 ) || ( nCompression > 9 ) )
+                nCompression = 6;
+            maSbCompression.SetRangeMin( 1 );
+            maSbCompression.SetRangeMax( 9 );
+            maNfCompression.SetMin( 1 );
+            maNfCompression.SetMax( 9 );
+            maNfCompression.SetValue( 9 );
+            maNfCompression.SetStrictFormat( sal_True );
+
+            maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ) != 0 );
+        }
+        break;
+        case FORMAT_BMP :
+        {
+            sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), 0 );
+            if ( nColor == 0 )
+                nColor = 6;
+            else
+                nColor--;
+            maLbColorDepth.InsertEntry( ms1BitTreshold );
+            maLbColorDepth.InsertEntry( ms1BitDithered );
+            maLbColorDepth.InsertEntry( ms4BitGrayscale );
+            maLbColorDepth.InsertEntry( ms4BitColorPalette );
+            maLbColorDepth.InsertEntry( ms8BitGrayscale );
+            maLbColorDepth.InsertEntry( ms8BitColorPalette );
+            maLbColorDepth.InsertEntry( ms24BitColor );
+            maLbColorDepth.SelectEntryPos( nColor );
+            createColorDepthControls( maLayout );
+
+            rLayout.addWindow( &maFlCompression );
+            // RLE coding
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maCbRLEEncoding );
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            maCbRLEEncoding.Check( mpFilterOptionsItem->ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), sal_True ) );
+        }
+        break;
+        case FORMAT_GIF :
+        {
+            rLayout.addWindow( &maFlMode );
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maCbInterlaced );
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            rLayout.addWindow( &maFlGIFDrawingObjects );
+            xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maCbSaveTransparency );
+            xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 1 ) != 0 );
+            maCbSaveTransparency.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), 1 ) != 0 );
+        }
+        break;
+        case FORMAT_PBM :
+        case FORMAT_PGM :
+        case FORMAT_PPM :
+        {
+            rLayout.addWindow( &maFlJPGQuality );
+
+            // RB Binary / Text
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) );
+            rLayout.addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maRbBinary );
+            xRows->addWindow( &maRbText );
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 1 );
+            maRbBinary.Check( nFormat == 0 );
+            maRbText.Check( nFormat != 0 );
+        }
+        break;
+        case FORMAT_EPS :
+        {
+            boost::shared_ptr< vcl::RowOrColumn > xColumns( new vcl::RowOrColumn( &rLayout, false ) );
+            rLayout.addChild( xColumns );
+            boost::shared_ptr< vcl::RowOrColumn > xLeft( new vcl::RowOrColumn( &rLayout, true ) );
+            xColumns->addChild( xLeft );
+
+            xLeft->addWindow( &maFlEPSPreview );
+            boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( xLeft.get(), nIndent ) );
+            xLeft->addChild( xIndenter );
+            boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( xLeft.get(), true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maCbEPSPreviewTIFF );
+            xRows->addWindow( &maCbEPSPreviewEPSI );
+            boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( xLeft.get(), 2 ) );
+            xLeft->addChild( xSpacer );
+
+            xLeft->addWindow( &maFlEPSVersion );
+            xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xLeft.get(), nIndent ) );
+            xLeft->addChild( xIndenter );
+            xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xLeft.get(), true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maRbEPSLevel1 );
+            xRows->addWindow( &maRbEPSLevel2 );
+            xSpacer.reset( new vcl::Spacer( xLeft.get(), 2 ) );
+            xLeft->addChild( xSpacer );
+
+            boost::shared_ptr< vcl::RowOrColumn > xRight( new vcl::RowOrColumn( &rLayout, true ) );
+            xColumns->addChild( xRight );
+
+            xRight->addWindow( &maFlEPSColorFormat );
+            xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) );
+            xRight->addChild( xIndenter );
+            xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maRbEPSColorFormat1 );
+            xRows->addWindow( &maRbEPSColorFormat2 );
+            xSpacer.reset( new vcl::Spacer( xRight.get(), 2 ) );
+            xRight->addChild( xSpacer );
+
+            xRight->addWindow( &maFlCompression );
+            xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) );
+            xRight->addChild( xIndenter );
+            xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) );
+            xIndenter->setChild( xRows );
+            xRows->addWindow( &maRbEPSCompressionLZW );
+            xRows->addWindow( &maRbEPSCompressionNone );
+
+            xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) );
+            rLayout.addChild( xSpacer );
+
+            sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), 0 );
+            sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 2 );
+            sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), 0 );
+            sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), 2 );
+
+            mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) ), 0 );
+
+            maCbEPSPreviewTIFF.Check( ( nPreview & 1 ) != 0 );
+            maCbEPSPreviewEPSI.Check( ( nPreview & 2 ) != 0 );
+
+            maRbEPSLevel1.Check( nVersion == 1 );
+            maRbEPSLevel2.Check( nVersion == 2 );
+
+            maRbEPSColorFormat1.Check( nColor == 1 );
+            maRbEPSColorFormat2.Check( nColor != 1 );
+
+            maRbEPSCompressionLZW.Check( nCompr == 1 );
+            maRbEPSCompressionNone.Check( nCompr != 1 );
+        }
+        break;
+    }
+}
+
+void ExportDialog::createButtons( vcl::RowOrColumn& rLayout )
+{
+    rLayout.addWindow( &maFlButtons );
+    boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) );
+    rLayout.addChild( xSpacer );
+
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+
+    boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &rLayout, false ) );
+    size_t nIndex = rLayout.addChild( xButtons );
+    rLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() );
+
+    Size aMinSize( maBtnCancel.GetSizePixel() );
+    // insert help button
+    xButtons->setMinimumSize( xButtons->addWindow( &maBtnHelp ), aMinSize );
+
+    // insert a spacer, cancel and OK buttons are right aligned
+
+    xSpacer.reset( new vcl::Spacer( xButtons.get(), 2 ) );
+    xButtons->addChild( xSpacer );
+    xButtons->setMinimumSize( xButtons->addWindow( &maBtnOK ), aMinSize );
+    xButtons->setMinimumSize( xButtons->addWindow( &maBtnCancel ), aMinSize );
+}
+
+void ExportDialog::setupLayout()
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+    maLayout.setParentWindow( this );
+    maLayout.setOuterBorder( aBorder.Width() );
+
+    createSizeControls( maLayout );
+    createFilterOptions( maLayout );
+
+    if ( mnMaxFilesizeForRealtimePreview || mbIsPixelFormat )
+    {
+        maLayout.addWindow( &maFlEstimatedSize );
+        maLayout.addWindow( &maFtEstimatedSize );
+    }
+    createButtons( maLayout );
+
+    maLayout.show();
+    maDialogSize = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED );
+    maLayout.setManagedArea( Rectangle( Point(), maDialogSize ) );
+    SetOutputSizePixel( Size( mbPreview ? maDialogSize.Width() * 2 : maDialogSize.Width(), maDialogSize.Height() ) );
+
+    maRectFlButtons = Rectangle( maFlButtons.GetPosPixel(), maFlButtons.GetSizePixel() );
+    maRectBtnHelp   = Rectangle( maBtnHelp.GetPosPixel(), maBtnHelp.GetSizePixel() );
+    maRectBtnOK     = Rectangle( maBtnOK.GetPosPixel(), maBtnOK.GetSizePixel() );
+    maRectBtnCancel = Rectangle( maBtnCancel.GetPosPixel(), maBtnOK.GetSizePixel() );
+
+    maLbSizeY.Hide();
+}
+
+static rtl::OUString ImpValueOfInKB( const sal_Int64& rVal )
+{
+    double fVal( static_cast<double>( rVal ) );
+    fVal /= ( 1 << 10 );
+    fVal += 0.05;
+    rtl::OUStringBuffer aVal( rtl::OUString::valueOf( fVal ) );
+    sal_Int32 nX( rtl::OUString( aVal.getStr() ).indexOf( '.', 0 ) );
+    if ( nX > 0 )
+        aVal.setLength( nX + 2 );
+    return aVal.makeStringAndClear();
+}
+
+sal_Int32 static GetZoomValueFromThumbPos( sal_Int32 nThumbPos )
+{
+    sal_Int32 nProz = 0;
+    if ( nThumbPos <= 50 )
+        nProz = nThumbPos * 2;                  // so a range of 50 represents 100%
+    else
+        nProz = ( ( nThumbPos - 50 ) * 60 ) + 100;  // we want to scale up to 3000%
+    return nProz;
+}
+
+void ExportDialog::updatePreview()
+{
+    // JPG
+//  maCbJPGPreview.Enable( IsTempExportAvailable() );
+
+//  if ( maCbJPGPreview.IsEnabled() && maCbJPGPreview.IsChecked() )
+    if ( mbPreview )
+    {
+        long nScrollBarSize = Application::GetSettings().GetStyleSettings().GetScrollBarSize();
+
+        Point   aPreviewPos( maDialogSize.Width(), 0 );
+        Size    aPreviewSize( maDialogSize.Width(), maFlButtons.GetPosPixel().Y() );
+
+        Point   aFixedBitmapPos( aPreviewPos );
+        Size    aFixedBitmapSize( aPreviewSize );
+
+        maSbZoom.Show( sal_False );
+        maSbZoom.SetPosPixel( Point( aPreviewPos.X(), aPreviewPos.Y() ) );
+        maSbZoom.SetSizePixel( Size( aPreviewSize.Width() / 4, nScrollBarSize ) );
+        maNfZoom.Show( sal_False );
+        maNfZoom.SetPosPixel( Point( aPreviewPos.X() + aPreviewSize.Width() / 4, aPreviewPos.Y() ) );
+        maNfZoom.SetSizePixel( Size( aPreviewSize.Width() / 6, nScrollBarSize ) );
+        maNfZoom.SetValue( GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() ) );
+        maFbJPGPreview.Show( sal_True );
+
+        sal_Int32 nZoom = GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() );
+        double fSizePixelX = static_cast< double >( maSize.Width * nZoom ) / 100.0;
+        double fSizePixelY = static_cast< double >( maSize.Height * nZoom ) / 100.0;
+
+        double fXRatio = fSizePixelX / maSize.Width;        // the size of each pixel
+        double fYRatio = fSizePixelY / maSize.Height;
+
+        sal_Bool bHorzSb = fSizePixelX > aFixedBitmapSize.Width();
+        sal_Bool bVertSb = fSizePixelY > aFixedBitmapSize.Height();
+        if ( bHorzSb )
+        {
+            aFixedBitmapSize.Height() -= nScrollBarSize;
+
+            maSbJPGPreviewHorz.Show( sal_True );
+            maSbJPGPreviewHorz.SetPosPixel( Point( aFixedBitmapPos.X(), aFixedBitmapPos.Y() + aFixedBitmapSize.Height() ) );
+            maSbJPGPreviewHorz.SetSizePixel( Size( aFixedBitmapSize.Width(), nScrollBarSize ) );
+        }
+        else
+        {
+            maSbJPGPreviewHorz.Show( sal_False );
+        }
+
+
+        if ( bVertSb )
+        {
+            aFixedBitmapSize.Width() -= nScrollBarSize;
+
+            maSbJPGPreviewVert.Show( sal_True );
+            maSbJPGPreviewVert.SetPosPixel( Point( aFixedBitmapPos.X() + aFixedBitmapSize.Width(), aFixedBitmapPos.Y() ) );
+            maSbJPGPreviewVert.SetSizePixel( Size( nScrollBarSize, aFixedBitmapSize.Height() ) );
+        }
+        else
+        {
+            maSbJPGPreviewVert.Show( sal_False );
+        }
+
+        Point aPos( 0, 0 );
+        Size aSize;
+        if ( fXRatio > 1.0 )
+        {
+            aSize.Width() =  maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width();
+            aSize.Width() /= static_cast<long int>(fXRatio);
+        }
+        else
+        {
+            aSize.Width() =  maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width();
+            aSize.Width() /= static_cast<long int>(fXRatio);
+        }
+
+        if ( fYRatio > 1.0 )
+        {
+            aSize.Height() =  maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height();
+            aSize.Height() /= static_cast<long int>(fYRatio);
+        }
+        else
+        {
+            aSize.Height() =  maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height();
+            aSize.Height() /= static_cast<long int>(fYRatio);
+        }
+
+        if ( aSize.Width() < maSize.Width )
+        {
+            sal_Int32 nXDiff = static_cast< sal_Int32 >( ( ( ( maSize.Width - aSize.Width() ) * maSbJPGPreviewHorz.GetThumbPos() ) / 100.0 ) );
+            aPos.X() += nXDiff;
+        }
+        if ( aSize.Height() < maSize.Height )
+        {
+            sal_Int32 nYDiff = static_cast< sal_Int32 >( ( ( ( maSize.Height - aSize.Height() ) * maSbJPGPreviewVert.GetThumbPos() ) / 100.0 ) );
+            aPos.Y() += nYDiff;
+        }
+
+        Bitmap aCroppedBitmap( maBitmap );
+        aCroppedBitmap.Crop( Rectangle( aPos, aSize ) );
+        aSize = aCroppedBitmap.GetSizePixel();
+        aSize = Size( static_cast<long int>(aSize.Width() * fXRatio), static_cast<long int>(aSize.Height() * fYRatio) );
+        aCroppedBitmap.Scale( aSize );
+
+        if ( aSize.Width() > aFixedBitmapSize.Width() )
+            aSize.Width() = aFixedBitmapSize.Width();
+        if ( aSize.Height() > aFixedBitmapSize.Height() )
+            aSize.Height() = aFixedBitmapSize.Height();
+        Point aPoint( aFixedBitmapPos );
+        if ( aSize.Width() < aFixedBitmapSize.Width() )
+            aPoint.X() += ( aFixedBitmapSize.Width() - aSize.Width() ) / 2;
+        if ( aSize.Height() < aFixedBitmapSize.Height() )
+            aPoint.Y() += ( aFixedBitmapSize.Height() - aSize.Height() ) / 2;
+
+        maFbJPGPreview.SetPosPixel( aPoint );
+        maFbJPGPreview.SetSizePixel( aSize );
+        maFbJPGPreview.SetBitmap( aCroppedBitmap );
+
+        SetOutputSizePixel( Size( maDialogSize.Width() * 2, maDialogSize.Height() ) );
+
+        maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth() * 2, maRectFlButtons.GetHeight() ) );
+        maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left() + maDialogSize.Width(), maRectBtnHelp.Top() ) );
+        maBtnOK.SetPosPixel( Point( maRectBtnOK.Left() + maDialogSize.Width(), maRectBtnOK.Top() ) );
+        maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left() + maDialogSize.Width(), maRectBtnCancel.Top() ) );
+    }
+    else
+    {
+        maSbZoom.Show( sal_False );
+        maNfZoom.Show( sal_False );
+        maFbJPGPreview.Show( sal_False );
+        maSbJPGPreviewHorz.Show( sal_False );
+        maSbJPGPreviewVert.Show( sal_False );
+
+        SetOutputSizePixel( maDialogSize );
+
+        maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth(), maRectFlButtons.GetHeight() ) );
+        maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left(), maRectBtnHelp.Top() ) );
+        maBtnOK.SetPosPixel( Point( maRectBtnOK.Left(), maRectBtnOK.Top() ) );
+        maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left(), maRectBtnCancel.Top() ) );
+    }
+}
+
+void ExportDialog::updateControls()
+{
+    GetGraphicStream();
+
+    // Size Controls
+    if ( !mbIsPixelFormat )
+    {
+        awt::Size aSize100thmm( maSize );
+        Size aSize( LogicToLogic( Size( aSize100thmm.Width * 100, aSize100thmm.Height * 100 ), MAP_100TH_MM,
+            MapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) ) );
+        maMfSizeX.SetValue( aSize.Width() );
+        maMfSizeY.SetValue( aSize.Height() );
+    }
+    else
+    {
+        MapUnit aMapUnit( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) );
+        if ( aMapUnit == MAP_PIXEL )
+        {   // calculating pixel count via resolution and original graphic size
+            maMfSizeX.SetDecimalDigits( 0 );
+            maMfSizeY.SetDecimalDigits( 0 );
+            maMfSizeX.SetValue( maSize.Width );
+            maMfSizeY.SetValue( maSize.Height );
+        }
+        else
+        {
+            maMfSizeX.SetDecimalDigits( 2 );
+            maMfSizeY.SetDecimalDigits( 2 );
+            double fRatio;
+            switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) )
+            {
+                case MAP_INCH : fRatio = static_cast< double >( maResolution.Width ) * 0.0254; break;
+                case MAP_MM :   fRatio = static_cast< double >( maResolution.Width ) * 0.001; break;
+                case MAP_POINT :fRatio = ( static_cast< double >( maResolution.Width ) * 0.0254 ) / 72.0; break;
+                default:
+                case MAP_CM :   fRatio = static_cast< double >( maResolution.Width ) * 0.01; break;
+            }
+            maMfSizeX.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Width * 100 ) / fRatio ) + 0.5 ) );
+            maMfSizeY.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Height * 100 ) / fRatio ) + 0.5 ) );
+        }
+    }
+    sal_Int32 nResolution = 0;
+    switch( maLbResolution.GetSelectEntryPos() )
+    {
+        case 0 : nResolution = maResolution.Width / 100; break;     // pixels / cm
+        case 2 : nResolution = maResolution.Width; break;           // pixels / meter
+        default:
+        case 1 : nResolution = static_cast< sal_Int32 >(maResolution.Width * 0.0254); break;    // pixels / inch
+    }
+    maNfResolution.SetValue( nResolution );
+
+    if ( maSbCompression.IsVisible() )
+        maSbCompression.SetThumbPos( maNfCompression.GetValue() );
+
+    // updating estimated size
+    sal_Int64 nRealFileSize( mpTempStream->Tell() );
+    if ( mbIsPixelFormat )
+    {
+        String aEst( nRealFileSize ? msEstimatedSizePix2 : msEstimatedSizePix1 );
+        sal_Int64 nRawFileSize( GetRawFileSize() );
+        xub_StrLen nInd = aEst.Search( '%' );
+        aEst.Replace( nInd, 2, ImpValueOfInKB( nRawFileSize ) );
+
+        if ( nRealFileSize )
+        {
+            nInd = aEst.Search( '%', nInd );
+            aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) );
+        }
+        maFtEstimatedSize.SetText( aEst );
+    }
+    else
+    {
+        if ( mnMaxFilesizeForRealtimePreview )
+        {
+            String aEst( msEstimatedSizeVec );
+            xub_StrLen nInd = aEst.Search( '%', 0 );
+            aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) );
+            maFtEstimatedSize.SetText( aEst );
+        }
+    }
+    updatePreview();
+
+    // EPS
+    if ( maRbEPSLevel1.IsVisible() )
+    {
+        sal_Bool bEnabled = maRbEPSLevel1.IsChecked() == sal_False;
+        maRbEPSColorFormat1.Enable( bEnabled );
+        maRbEPSColorFormat2.Enable( bEnabled );
+        maRbEPSCompressionLZW.Enable( bEnabled );
+        maRbEPSCompressionNone.Enable( bEnabled );
+    }
+}
+
+ExportDialog::~ExportDialog()
+{
+    delete mpFilterOptionsItem;
+    delete mpOptionsItem;
+}
+
+
+/*************************************************************************
+|*
+|* Speichert eingestellte Werte in ini-Datei
+|*
+\************************************************************************/
+IMPL_LINK( ExportDialog, UpdateHdl, void *, EMPTYARG )
+{
+    updateControls();
+    return 0;
+}
+
+IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG )
+{
+    double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width;
+
+    if ( mbIsPixelFormat )
+    {
+        switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) )
+        {
+            case MAP_INCH :     maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_CM :       maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_MM :       maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_POINT :    maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 * 72 + 0.5 ); break;
+            default:
+            case MAP_PIXEL :    maSize.Width = maMfSizeX.GetValue(); break;
+        }
+        maSize.Height = static_cast< sal_Int32 >( fRatio * maSize.Width + 0.5 );
+    }
+    else
+    {
+        Fraction aFract( 1, 100 );
+        sal_Int32 nWidth = maMfSizeX.GetValue();
+        sal_Int32 nHeight= static_cast< sal_Int32 >( nWidth * fRatio );
+        const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) );
+        MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract );
+        Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) );
+
+        maSize.Width = aDest.Width();
+        if ( mbPreserveAspectRatio )
+            maSize.Height = aDest.Height();
+    }
+    updateControls();
+    return 0;
+}
+
+IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG )
+{
+    double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height;
+
+    if ( mbIsPixelFormat )
+    {
+        switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) )
+        {
+            case MAP_INCH :     maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_CM :       maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_MM :       maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break;
+            case MAP_POINT :    maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 * 72 + 0.5 ); break;
+            default:
+            case MAP_PIXEL :    maSize.Height = maMfSizeY.GetValue(); break;
+        }
+        maSize.Width = static_cast< sal_Int32 >( fRatio * maSize.Height + 0.5 );
+    }
+    else
+    {
+        Fraction aFract( 1, 100 );
+        sal_Int32 nHeight= maMfSizeY.GetValue();
+        sal_Int32 nWidth = static_cast< sal_Int32 >( nHeight * fRatio );
+        const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) );
+        MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract );
+        Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) );
+
+        maSize.Height = aDest.Height();
+        if ( mbPreserveAspectRatio )
+            maSize.Width = aDest.Width();
+    }
+    updateControls();
+    return 0;
+}
+
+IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG )
+{
+    sal_Int32 nResolution = maNfResolution.GetValue();
+    if ( maLbResolution.GetSelectEntryPos() == 0 )      // pixels / cm
+        nResolution *= 100;
+    else if ( maLbResolution.GetSelectEntryPos() == 1 ) // pixels / inch
+        nResolution = static_cast< sal_Int32 >( ( ( static_cast< double >( nResolution ) + 0.5 ) / 0.0254 ) );
+    maResolution.Width = nResolution;
+    maResolution.Height= nResolution;
+
+    updateControls();
+    return 0;
+}
+
+IMPL_LINK( ExportDialog, SbCompressionUpdateHdl, void *, EMPTYARG )
+{
+    maNfCompression.SetValue( maSbCompression.GetThumbPos() );
+    updateControls();
+    return 0;
+}
+
+IMPL_LINK( ExportDialog, OK, void *, EMPTYARG )
+{
+    // writing config parameter
+
+
+    mrFltCallPara.aFilterData = GetFilterData( sal_True );
+    EndDialog( RET_OK );
+
+    return 0;
+}
+
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hrc b/svtools/source/filter.vcl/filter/exportdialog.hrc
new file mode 100644
index 000000000000..e230bcd2c5c3
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/exportdialog.hrc
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#include <svtools/svtools.hrc>
+
+#define BTN_OK                  1
+#define BTN_CANCEL              1
+#define BTN_HELP                1
+
+#define FL_EXPORT_SIZE          1
+#define FL_COLOR_DEPTH          2
+#define FL_JPG_QUALITY          3
+#define FL_COMPRESSION          4
+#define FL_MODE                 5
+#define FL_GIF_DRAWING_OBJECTS  6
+#define FL_PBM_OPTIONS          7
+#define FL_EPS_PREVIEW          8
+#define FL_EPS_VERSION          9
+#define FL_EPS_COLOR_FORMAT     10
+#define FL_ESTIMATED_SIZE       11
+#define FL_BUTTONS              12
+
+#define FT_SIZEX                1
+#define FT_SIZEY                2
+#define FT_RESOLUTION           3
+#define FT_JPG_MIN              4
+#define FT_JPG_MAX              5
+#define FT_PNG_MIN              6
+#define FT_PNG_MAX              7
+#define FT_ESTIMATED_SIZE       8
+
+#define NF_RESOLUTION           1
+#define NF_COMPRESSION          2
+#define NF_ZOOM                 3
+
+#define MF_SIZEX                1
+#define MF_SIZEY                2
+
+#define LB_SIZEX                1
+#define LB_SIZEY                2
+#define LB_RESOLUTION           3
+#define LB_COLOR_DEPTH          4
+
+#define RB_BINARY               1
+#define RB_TEXT                 2
+#define RB_EPS_LEVEL1           3
+#define RB_EPS_LEVEL2           4
+#define RB_EPS_COLOR_FORMAT1    5
+#define RB_EPS_COLOR_FORMAT2    6
+#define RB_EPS_COMPRESSION_LZW  7
+#define RB_EPS_COMPRESSION_NONE 8
+
+#define CB_JPG_PREVIEW          1
+#define CB_INTERLACED           2
+#define CB_RLE_ENCODING         3
+#define CB_SAVE_TRANSPARENCY    4
+#define CB_EPS_PREVIEW_TIFF     5
+#define CB_EPS_PREVIEW_EPSI     6
+
+#define FB_JPG_PREVIEW          1
+
+#define SB_COMPRESSION          1
+#define SB_JPG_PREVIEW_HORZ     2
+#define SB_JPG_PREVIEW_VERT     3
+#define SB_ZOOM                 4
+
+#define STR_1BIT_THRESHOLD      1
+#define STR_1BIT_DITHERED       2
+#define STR_4BIT_GRAYSCALE      3
+#define STR_4BIT_COLOR_PALETTE  4
+#define STR_8BIT_GRAYSCALE      5
+#define STR_8BIT_COLOR_PALETTE  6
+#define STR_24BIT_TRUE_COLOR    7
+#define STR_ESTIMATED_SIZE_PIX_1 8
+#define STR_ESTIMATED_SIZE_PIX_2 9
+#define STR_ESTIMATED_SIZE_VEC   10
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter.vcl/filter/exportdialog.hxx
new file mode 100644
index 000000000000..20a9ac3ea832
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/exportdialog.hxx
@@ -0,0 +1,216 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+
+#ifndef _EXPORTDIALOG_HXX_
+#define _EXPORTDIALOG_HXX_
+
+#include <svtools/fltcall.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/arrange.hxx>
+#include <vcl/scrbar.hxx>
+#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
+
+/*************************************************************************
+|*
+|* Dialog zum Einstellen von Filteroptionen bei Pixelformaten
+|*
+\************************************************************************/
+
+class FilterConfigItem;
+class ExportDialog : public ModalDialog
+{
+private:
+
+    FltCallDialogParameter&
+        mrFltCallPara;
+
+    ResMgr*             mpMgr;
+
+    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+        mxMgr;
+    const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
+        mxSourceDocument;
+
+    FixedLine           maFlExportSize;
+    FixedText           maFtSizeX;
+    MetricField         maMfSizeX;
+    ListBox             maLbSizeX;
+    FixedText           maFtSizeY;
+    MetricField         maMfSizeY;
+    ListBox             maLbSizeY;
+    FixedText           maFtResolution;
+    NumericField        maNfResolution;
+    ListBox             maLbResolution;
+    FixedLine           maFlColorDepth;
+    ListBox             maLbColorDepth;
+    FixedLine           maFlJPGQuality;
+    FixedLine           maFlMode;
+    FixedLine           maFlPBMOptions;
+    ScrollBar           maSbCompression;
+    NumericField        maNfCompression;
+    FixedText           maFtJPGMin;
+    FixedText           maFtJPGMax;
+    FixedText           maFtPNGMin;
+    FixedText           maFtPNGMax;
+    CheckBox            maCbJPGPreview;
+    CheckBox            maCbInterlaced;
+    CheckBox            maCbRLEEncoding;
+    FixedLine           maFlGIFDrawingObjects;
+    CheckBox            maCbSaveTransparency;
+    RadioButton         maRbBinary;
+    RadioButton         maRbText;
+    FixedLine           maFlEPSPreview;
+    CheckBox            maCbEPSPreviewTIFF;
+    CheckBox            maCbEPSPreviewEPSI;
+    FixedLine           maFlEPSVersion;
+    RadioButton         maRbEPSLevel1;
+    RadioButton         maRbEPSLevel2;
+    FixedLine           maFlEPSColorFormat;
+    RadioButton         maRbEPSColorFormat1;
+    RadioButton         maRbEPSColorFormat2;
+    FixedLine           maFlCompression;
+    RadioButton         maRbEPSCompressionLZW;
+    RadioButton         maRbEPSCompressionNone;
+    FixedLine           maFlEstimatedSize;
+    FixedText           maFtEstimatedSize;
+    String              msEstimatedSizePix1;
+    String              msEstimatedSizePix2;
+    String              msEstimatedSizeVec;
+    FixedLine           maFlButtons;
+    FixedBitmap         maFbJPGPreview;
+    ScrollBar           maSbZoom;
+    NumericField        maNfZoom;
+    ScrollBar           maSbJPGPreviewHorz;
+    ScrollBar           maSbJPGPreviewVert;
+    OKButton            maBtnOK;
+    CancelButton        maBtnCancel;
+    HelpButton          maBtnHelp;
+
+    String              ms1BitTreshold;
+    String              ms1BitDithered;
+    String              ms4BitGrayscale;
+    String              ms4BitColorPalette;
+    String              ms8BitGrayscale;
+    String              ms8BitColorPalette;
+    String              ms24BitColor;
+
+    vcl::RowOrColumn    maLayout;
+    Size                maDialogSize;
+
+    FilterConfigItem*   mpOptionsItem;
+    FilterConfigItem*   mpFilterOptionsItem;
+
+    String              maExt;
+    String              maEstimatedSizeText;
+    sal_Int16           mnFormat;
+    sal_Int32           mnMaxFilesizeForRealtimePreview;
+
+    Rectangle           maRectFlButtons;
+    Rectangle           maRectBtnHelp;
+    Rectangle           maRectBtnOK;
+    Rectangle           maRectBtnCancel;
+
+    SvStream*           mpTempStream;
+    Bitmap              maBitmap;
+
+    com::sun::star::awt::Size
+                        maOriginalSize;     // the original graphic size in 1/100mm
+    com::sun::star::awt::Size
+                        maSize;             // for vector graphics it always contains the logical size in 1/100mm
+
+    sal_Bool            mbPreview;
+    sal_Bool            mbIsPixelFormat;
+    sal_Bool            mbExportSelection;
+    sal_Bool            mbPreserveAspectRatio;
+
+    sal_Int32           mnInitialResolutionUnit;
+
+    // for pixel graphics it always contains the pixel count
+    com::sun::star::awt::Size
+                        maResolution;       // it always contains the number of pixels per meter
+
+    com::sun::star::uno::Reference< com::sun::star::drawing::XShape >
+                        mxShape;
+    com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >
+                        mxShapes;
+    com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >
+                        mxPage;
+
+
+                        DECL_LINK( UpdateHdl,void* p );
+                        DECL_LINK( UpdateHdlMtfSizeX,void* p );
+                        DECL_LINK( UpdateHdlMtfSizeY,void* p );
+                        DECL_LINK( UpdateHdlNfResolution,void* p );
+                        DECL_LINK( SbCompressionUpdateHdl,void* p );
+                        DECL_LINK( NfCompressionUpdateHdlX,void* p );
+
+                        DECL_LINK( OK, void* p );
+
+                        void createSizeControls( vcl::RowOrColumn& );
+                        void createColorDepthControls( vcl::RowOrColumn& );
+                        void createFilterOptions( vcl::RowOrColumn& );
+                        void createButtons( vcl::RowOrColumn& );
+                        void createScrollBar( vcl::RowOrColumn& );
+                        void setupLayout();
+                        void updatePreview();
+                        void updateControls();
+
+                        void GetGraphicSource();
+                        sal_Bool GetGraphicStream();
+                        Bitmap GetGraphicBitmap( SvStream& rStream );
+                        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+                            GetFilterData( sal_Bool bUpdateConfig );
+
+                        sal_uInt32 GetRawFileSize() const;
+                        sal_Bool IsTempExportAvailable() const;
+
+                        com::sun::star::awt::Size
+                            GetOriginalSize();
+
+                        sal_Int32 GetDefaultUnit();
+
+public:
+                        ExportDialog( FltCallDialogParameter& rPara,
+                            const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr,
+                                const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument,
+                                    sal_Bool bExportSelection, sal_Bool bIsExportVectorFormat );
+                        ~ExportDialog();
+};
+
+
+
+#endif // _EXPORTDIALOG_HXX_
+
diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src
new file mode 100644
index 000000000000..c9e87989a314
--- /dev/null
+++ b/svtools/source/filter.vcl/filter/exportdialog.src
@@ -0,0 +1,529 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "exportdialog.hrc"
+
+String DLG_EXPORT_TITLE
+{
+    Text [ en-US ] = " Options" ;
+};
+
+ModalDialog DLG_EXPORT
+{
+    HelpID = "svtools:ModalDialog:DLG_EXPORT";
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 178 , 135 ) ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+
+    FixedLine FL_EXPORT_SIZE
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Size" ;
+    };
+    FixedText FT_SIZEX
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "Width:" ;
+    };
+    MetricField MF_SIZEX
+    {
+        HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX";
+        Hide = TRUE;
+        Border = TRUE;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        TabStop = TRUE;
+        Repeat = TRUE;
+        Spin = FALSE;
+        StrictFormat = TRUE;
+        DecimalDigits = 2;
+        Unit = FUNIT_NONE;
+        Maximum = 99999;
+        Last = 255;
+    };
+    ListBox LB_SIZEX
+    {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 60, 80 ) ;
+        DropDown = TRUE ;
+        Sort = FALSE ;
+        StringList [ en-US ] =
+        {
+            < "inches" ; > ;
+            < "cm" ; Default ; > ;
+            < "mm" ; > ;
+            < "points" ; > ;
+            < "pixels" ; > ;
+        };
+    };
+    FixedText FT_SIZEY
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "Height:" ;
+    };
+    MetricField MF_SIZEY
+    {
+        HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY";
+        Hide = TRUE;
+        Border = TRUE;
+        Size = MAP_APPFONT ( 30, 12 );
+        TabStop = TRUE;
+        Repeat = TRUE;
+        Spin = FALSE;
+        StrictFormat = TRUE;
+        DecimalDigits = 2;
+        Unit = FUNIT_NONE;
+        Maximum = 99999;
+        Last = 255 ;
+    };
+    ListBox LB_SIZEY
+    {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 60, 80 ) ;
+        DropDown = TRUE ;
+        Sort = FALSE ;
+        StringList [ en-US ] =
+        {
+            < "inches" ; > ;
+            < "cm" ; Default ; > ;
+            < "mm" ; > ;
+            < "points" ; > ;
+            < "pixels" ; > ;
+        };
+    };
+    FixedText FT_RESOLUTION
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "Resolution:" ;
+    };
+    NumericField NF_RESOLUTION
+    {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = FALSE ;
+        Maximum = 99999;
+        Last = 255 ;
+    };
+    ListBox LB_RESOLUTION
+    {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 60, 80 ) ;
+        DropDown = TRUE ;
+        Sort = FALSE ;
+        StringList [ en-US ] =
+        {
+            < "pixels/cm" ; > ;
+            < "pixels/inch" ; Default ; > ;
+            < "pixels/meter" ; > ;
+        };
+    };
+    FixedLine FL_COLOR_DEPTH
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Color Depth" ;
+    };
+    ListBox LB_COLOR_DEPTH
+    {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 60, 80 ) ;
+        DropDown = TRUE ;
+        Sort = FALSE ;
+    };
+    String STR_1BIT_THRESHOLD
+    {
+        Text [ en-US ] = "1 bit threshold";
+    };
+    String STR_1BIT_DITHERED
+    {
+        Text [ en-US ] = "1 bit dithered";
+    };
+    String STR_4BIT_GRAYSCALE
+    {
+        Text [ en-US ] = "4 bit grayscale";
+    };
+    String STR_4BIT_COLOR_PALETTE
+    {
+        Text [ en-US ] = "4 bit color";
+    };
+    String STR_8BIT_GRAYSCALE
+    {
+        Text [ en-US ] = "8 bit grayscale";
+    };
+    String STR_8BIT_COLOR_PALETTE
+    {
+        Text [ en-US ] = "8 bit color";
+    };
+    String STR_24BIT_TRUE_COLOR
+    {
+        Text [ en-US ] = "24 bit true color";
+    };
+    FixedLine FL_JPG_QUALITY
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Quality" ;
+    };
+    FixedLine FL_COMPRESSION
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Compression" ;
+    };
+    FixedLine FL_MODE
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Mode" ;
+    };
+    FixedLine FL_PBM_OPTIONS
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "File Format" ;
+    };
+    ScrollBar SB_COMPRESSION
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 48, 10 ) ;
+        VScroll = FALSE ;
+        HScroll = TRUE;
+        Drag = TRUE ;
+    };
+    NumericField NF_COMPRESSION
+    {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = FALSE ;
+        Maximum = 99999;
+        Last = 255 ;
+    };
+    FixedText FT_JPG_MIN
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "1 is minimum Quality and smallest file size." ;
+    };
+    FixedText FT_JPG_MAX
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "100 is maximum Quality and biggest file size." ;
+    };
+    FixedText FT_PNG_MIN
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "0 is biggest file size and fastest loading." ;
+    };
+    FixedText FT_PNG_MAX
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "9 is smallest file size and slowest loading." ;
+    };
+    CheckBox CB_JPG_PREVIEW
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "Preview" ;
+    };
+    CheckBox CB_INTERLACED
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "Interlaced" ;
+    };
+    CheckBox CB_RLE_ENCODING
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "RLE encoding" ;
+    };
+    FixedLine FL_GIF_DRAWING_OBJECTS
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Drawing Objects" ;
+    };
+    CheckBox CB_SAVE_TRANSPARENCY
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "Save transparency" ;
+    };
+    RadioButton RB_BINARY
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Binary" ;
+    };
+    RadioButton RB_TEXT
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Text" ;
+    };
+    FixedLine FL_EPS_PREVIEW
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 110 , 8 ) ;
+        Text [ en-US ] = "Preview" ;
+    };
+    CheckBox CB_EPS_PREVIEW_TIFF
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "Image Preview (TIFF)" ;
+    };
+    CheckBox CB_EPS_PREVIEW_EPSI
+    {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Text [ en-US ] = "Interchange (EPSI)" ;
+    };
+    FixedLine FL_EPS_VERSION
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "Version" ;
+    };
+    RadioButton RB_EPS_LEVEL1
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Level 1" ;
+    };
+    RadioButton RB_EPS_LEVEL2
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Level 2" ;
+    };
+    FixedLine FL_EPS_COLOR_FORMAT
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+        Text [ en-US ] = "Color format" ;
+    };
+    RadioButton RB_EPS_COLOR_FORMAT1
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Color" ;
+    };
+    RadioButton RB_EPS_COLOR_FORMAT2
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "Grayscale" ;
+    };
+    RadioButton RB_EPS_COMPRESSION_LZW
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "LZW encoding" ;
+    };
+    RadioButton RB_EPS_COMPRESSION_NONE
+    {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE";
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text [ en-US ] = "None" ;
+    };
+    FixedLine FL_ESTIMATED_SIZE
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+    };
+    FixedText FT_ESTIMATED_SIZE
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+    };
+    String STR_ESTIMATED_SIZE_PIX_1
+    {
+        Text [ en-US ] = "The picture needs about %1 KB of memory.";
+    };
+    String STR_ESTIMATED_SIZE_PIX_2
+    {
+        Text [ en-US ] = "The picture needs about %1 KB of memory,\n the file size is %2 KB.";
+    };
+    String STR_ESTIMATED_SIZE_VEC
+    {
+        Text [ en-US ] = "The file size is %1 KB.";
+    };
+    FixedLine FL_BUTTONS
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 41 , 10 ) ;
+    };
+    FixedBitmap FB_JPG_PREVIEW
+    {
+        Hide = TRUE;
+        OutputSize = TRUE ;
+        Scale = TRUE;
+        Border = TRUE;
+    };
+    ScrollBar SB_ZOOM
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 48, 10 );
+        VScroll = FALSE;
+        HScroll = TRUE;
+        Drag = TRUE;
+        MinPos = 5;
+        MaxPos = 100;
+        ThumbPos = 50;
+    };
+    NumericField NF_ZOOM
+    {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM";
+        Hide = TRUE;
+        Border = TRUE ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = FALSE ;
+        Maximum = 3000;
+        Last = 255 ;
+    };
+    ScrollBar SB_JPG_PREVIEW_HORZ
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 48, 10 );
+        VScroll = FALSE;
+        HScroll = TRUE;
+        Drag = TRUE;
+        MinPos = 0;
+        MaxPos = 100;
+        ThumbPos = 50;
+    };
+    ScrollBar SB_JPG_PREVIEW_VERT
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 48, 10 );
+        VScroll = TRUE;
+        HScroll = FALSE;
+        Drag = TRUE;
+        MinPos = 0;
+        MaxPos = 100;
+        ThumbPos = 50;
+    };
+    OKButton BTN_OK
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        DefButton = TRUE ;
+    };
+    CancelButton BTN_CANCEL
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+    HelpButton BTN_HELP
+    {
+        Hide = TRUE;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+    };
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index db1f4c11cf94..9c754a947fcd 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -52,7 +52,7 @@
 #include "xbmread.hxx"
 #include "xpmread.hxx"
 #include <svl/solar.hrc>
-#include "strings.hrc"
+#include <svtools/svtools.hrc>
 #include "sgffilt.hxx"
 #include "osl/module.hxx"
 #include <com/sun/star/uno/Reference.h>
@@ -552,16 +552,48 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B
     if( !bTest || ( rFormatExtension.CompareToAscii( "PCT", 3 ) == COMPARE_EQUAL ) )
     {
         bSomethingTested = TRUE;
-        BYTE sBuf[4];
+        BYTE sBuf[3];
+        // store number format
+        sal_uInt16 oldNumberFormat = rStream.GetNumberFormatInt();
         sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes
-        for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 )
+        for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 )
         {
-            rStream.Seek( nStreamPos + nOffset );
+            short y1,x1,y2,x2;
+            bool bdBoxOk = true;
+
+            rStream.Seek( nStreamPos + nOffset);
+            // size of the pict in version 1 pict ( 2bytes) : ignored
+            rStream.SeekRel(2);
+            // bounding box (bytes 2 -> 9)
+            rStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
+            rStream >> y1 >> x1 >> y2 >> x2;
+            rStream.SetNumberFormatInt(oldNumberFormat); // reset format
+
+            if (x1 > x2 || y1 > y2 || // bad bdbox
+                (x1 == x2 && y1 == y2) || // 1 pixel picture
+                x2-x1 > 2048 || y2-y1 > 2048 ) // picture anormaly big
+              bdBoxOk = false;
+
+            // read version op
             rStream.Read( sBuf,3 );
-            if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && ( sBuf[ 2 ] == 0x01 || sBuf[ 2 ] == 0x02 ) )
+            // see http://developer.apple.com/legacy/mac/library/documentation/mac/pdf/Imaging_With_QuickDraw/Appendix_A.pdf
+            // normal version 2 - page A23 and A24
+            if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x02)
             {
-                rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
-                return TRUE;
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
+            }
+            // normal version 1 - page A25
+            else if (sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 && bdBoxOk) {
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
+            }
+            // previous code kept in order to do not break any compatibility
+            // probably eroneous
+            else if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x01 && bdBoxOk)
+            {
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
             }
         }
     }
@@ -752,7 +784,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
 
     if ( rGraphic.GetType() != GRAPHIC_NONE )
     {
-        sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, *pResMgr ) ), -1 );
+        sal_Int32 nMode = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ExportMode" ) ), -1 );
 
         if ( nMode == -1 )  // the property is not there, this is possible, if the graphic filter
         {                   // is called via UnoGraphicExporter and not from a graphic export Dialog
@@ -782,7 +814,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
                 Bitmap      aBitmap( rGraphic.GetBitmap() );
                 MapMode     aMap( MAP_100TH_INCH );
 
-                sal_Int32   nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, *pResMgr ) ), 75 );
+                sal_Int32   nDPI = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), 75 );
                 Fraction    aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) );
 
                 aMap.SetScaleX( aFrac );
@@ -806,7 +838,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
             else
                 aGraphic = rGraphic;
 
-            sal_Int32 nColors = rConfigItem.ReadInt32( String( ResId( KEY_COLORS, *pResMgr ) ), 0 ); // #92767#
+            sal_Int32 nColors = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), 0 ); // #92767#
             if ( nColors )  // graphic conversion necessary ?
             {
                 BitmapEx aBmpEx( aGraphic.GetBitmapEx() );
@@ -1771,7 +1803,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                         aBmp = aGraphic.GetBitmap();
                 }
                 ResMgr*     pResMgr = CREATERESMGR( svt );
-                sal_Bool    bRleCoding = aConfigItem.ReadBool( String( ResId( KEY_RLE_CODING, *pResMgr ) ), sal_True );
+                sal_Bool    bRleCoding = aConfigItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), sal_True );
                 // Wollen wir RLE-Kodiert speichern?
                 aBmp.Write( rOStm, bRleCoding );
                 delete pResMgr;
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index 6abab2626516..d91ec1a19772 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.cxx
@@ -42,29 +42,6 @@
 
 BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG  );
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-GraphicDescriptor::GraphicDescriptor( const String* pPath ) :
-    pFileStm        ( NULL )
-{
-    ImpConstruct();
-
-    if ( pPath )
-    {
-        INetURLObject aURL( *pPath, INET_PROT_FILE );
-        aPathExt = aURL.GetFileExtension().toAsciiLowerCase();
-    }
-    bLinked = TRUE;
-    bLinkChanged = FALSE;
-    bWideSearch = FALSE;
-}
-
-
 /*************************************************************************
 |*
 |*
@@ -73,19 +50,10 @@ GraphicDescriptor::GraphicDescriptor( const String* pPath ) :
 
 GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
     pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ),
-    aPathExt( rPath.GetFileExtension().toAsciiLowerCase() )
+    aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ),
+    bOwnStream( TRUE )
 {
-    if ( pFileStm )
-    {
-        nStmPos = 0;
-        pFileStm->Seek( nStmPos );
-        bDataReady = TRUE;
-    }
-
     ImpConstruct();
-
-    if ( pFileStm && !pFileStm->GetError() )
-        bDataReady = TRUE;
 }
 
 /*************************************************************************
@@ -95,7 +63,8 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
 \************************************************************************/
 
 GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) :
-    pFileStm    ( NULL )
+    pFileStm    ( &rInStream ),
+    bOwnStream  ( FALSE )
 {
     ImpConstruct();
 
@@ -104,15 +73,8 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath)
         INetURLObject aURL( *pPath );
         aPathExt = aURL.GetFileExtension().toAsciiLowerCase();
     }
-    nStmPos = rInStream.Tell();
-    pBaseStm = &rInStream;
-    bBaseStm = TRUE;
-
-    if ( !pBaseStm->GetError() )
-        bDataReady = TRUE;
 }
 
-
 /*************************************************************************
 |*
 |*
@@ -121,10 +83,10 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath)
 
 GraphicDescriptor::~GraphicDescriptor()
 {
-    delete pFileStm;
+    if ( bOwnStream )
+        delete pFileStm;
 }
 
-
 /*************************************************************************
 |*
 |*
@@ -134,22 +96,9 @@ GraphicDescriptor::~GraphicDescriptor()
 BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo )
 {
     BOOL bRet = FALSE;
-
-    // Link-Status ueberpruefen
-    if ( bLinked && bLinkChanged )
-    {
-        DBG_ASSERT( aReqLink.IsSet(), "Wo ist der RequestHandler???" );
-        pMemStm = (SvStream*) aReqLink.Call( this );
-        if ( pMemStm )
-        {
-            nStmPos = pMemStm->Tell();
-            bDataReady = TRUE;
-        }
-    }
-
-    if ( bDataReady )
+    if ( pFileStm && !pFileStm->GetError() )
     {
-        SvStream&   rStm = GetSearchStream();
+        SvStream&   rStm = *pFileStm;
         UINT16      nOldFormat = rStm.GetNumberFormatInt();
 
         if      ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE;
@@ -175,96 +124,13 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo )
         else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE;
         else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE;
         else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE;
-
-        // diese Formate lassen sich nur bei WideSearch im gesamten
-        // Stream ermitteln
-        else if ( bWideSearch )
-        {
-            if ( ImpDetectPCD( rStm, bExtendedInfo ) )
-                bRet = TRUE;
-        }
+        else if ( ImpDetectPCD( rStm, bExtendedInfo ) ) bRet = TRUE;
 
         rStm.SetNumberFormatInt( nOldFormat );
-        rStm.Seek( nStmPos );
     }
-
     return bRet;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-BOOL GraphicDescriptor::IsDataReady() const
-{
-    return bDataReady;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-BOOL GraphicDescriptor::IsWideSearch() const
-{
-    return bWideSearch;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-SvStream& GraphicDescriptor::GetSearchStream() const
-{
-    DBG_ASSERT( bDataReady, "Was laeuft hier falsch???" );
-
-    if ( bLinked )
-        return *pMemStm;
-    else if ( bBaseStm )
-        return *pBaseStm;
-    else
-        return *pFileStm;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-void GraphicDescriptor::SetRequestHdl( const Link& rRequestLink )
-{
-    aReqLink = rRequestLink;
-    bLinkChanged = TRUE;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-ULONG GraphicDescriptor::GetRequestedByteCount() const
-{
-    return DATA_SIZE;
-}
-
-
-/******************************************************************************/
-/*                               IMP-Methoden                                 */
-/*                                                                            */
-
-
 /*************************************************************************
 |*
 |*
@@ -273,17 +139,10 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const
 
 void GraphicDescriptor::ImpConstruct()
 {
-    if ( !pFileStm )
-        pFileStm = new SvStream();
     nFormat = GFF_NOT;
     nBitsPerPixel = 0;
     nPlanes = 0;
     bCompressed = FALSE;
-    bDataReady = FALSE;
-    bLinked = FALSE;
-    bWideSearch = TRUE;
-    bBaseStm = FALSE;
-    pMemStm = NULL;
 }
 
 
@@ -297,10 +156,9 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
 {
     UINT16  nTemp16;
     BOOL    bRet = FALSE;
+    sal_Int32 nStmPos = rStm.Tell();
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> nTemp16;
 
     // OS/2-BitmapArray
@@ -364,7 +222,7 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -382,10 +240,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> n32;
+
     if ( n32 == 0x38464947 )
     {
         rStm >> n16;
@@ -412,7 +270,7 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -423,125 +281,188 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
 |*
 \************************************************************************/
 
+// returns the next jpeg marker, a return value of 0 represents an error
+sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm )
+{
+    sal_uInt8 nByte;
+    do
+    {
+        do
+        {
+            rStm >> nByte;
+            if ( rStm.IsEof() || rStm.GetError() )  // as 0 is not allowed as marker,
+                return 0;                           // we can use it as errorcode
+        }
+        while ( nByte != 0xff );
+        do
+        {
+            rStm >> nByte;
+            if ( rStm.IsEof() || rStm.GetError() )
+                return 0;
+        }
+        while( nByte == 0xff );
+    }
+    while( nByte == 0 );        // 0xff00 represents 0xff and not a marker,
+                                // the marker detection has to be restartet.
+    return nByte;
+}
+
 BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
 {
     UINT32  nTemp32;
     BOOL    bRet = FALSE;
-    BYTE    cByte = 0;
-    BOOL    bM_COM;
 
-    rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
 
+    rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nTemp32;
 
-    // compare upper 28 bits
+    // compare upper 24 bits
     if( 0xffd8ff00 == ( nTemp32 & 0xffffff00 ) )
     {
         nFormat = GFF_JPG;
-        return TRUE;
-    }
-
-    bM_COM = ( nTemp32 == 0xffd8fffe );
-    if ( ( nTemp32 == 0xffd8ffe0 ) || bM_COM )
-    {
-        if( !bM_COM )
-        {
-            rStm.SeekRel( 2 );
-            rStm >> nTemp32;
-        }
+        bRet = TRUE;
 
-        if( bM_COM || ( nTemp32 == 0x4a464946 ) )
+        if ( bExtendedInfo )
         {
-            nFormat = GFF_JPG;
-            bRet = TRUE;
+            rStm.SeekRel( -2 );
 
-            if( bExtendedInfo )
-            {
-                MapMode aMap;
-                UINT16  nTemp16;
-                ULONG   nCount = 9;
-                ULONG   nMax;
-                ULONG   nResX;
-                ULONG   nResY;
-                BYTE    cUnit;
-
-                // Groesse des verbleibenden Puffers ermitteln
-                if ( bLinked )
-                    nMax = static_cast< SvMemoryStream& >(rStm).GetEndOfData()
-                                - 16;
-                else
-                    nMax = DATA_SIZE - 16;
-
-                // max. 8K
-                nMax = Min( nMax, (ULONG) 8192 );
+            sal_uInt32 nError( rStm.GetError() );
 
-                // Res-Unit ermitteln
-                rStm.SeekRel( 3 );
-                rStm >> cUnit;
-
-                // ResX ermitteln
-                rStm >> nTemp16;
-                nResX = nTemp16;
+            sal_Bool bScanFailure = sal_False;
+            sal_Bool bScanFinished = sal_False;
 
-                // ResY ermitteln
-                rStm >> nTemp16;
-                nResY = nTemp16;
-
-                // SOF0/1-Marker finden, aber dabei
-                // nicht mehr als DATA_SIZE Pixel lesen, falls
-                // kein WideSearch
-                do
+            while( !bScanFailure && !bScanFinished && !rStm.IsEof() && !rStm.GetError() )
+            {
+                sal_uInt8 nMarker = ImpDetectJPG_GetNextMarker( rStm );
+                switch( nMarker )
                 {
-                    while ( ( cByte != 0xff ) &&
-                            ( bWideSearch || ( nCount++ < nMax ) ) )
+                    // fixed size marker, not having a two byte length parameter
+                    case 0xd0 :     // RST0
+                    case 0xd1 :
+                    case 0xd2 :
+                    case 0xd3 :
+                    case 0xd4 :
+                    case 0xd5 :
+                    case 0xd6 :
+                    case 0xd7 :     // RST7
+                    case 0x01 :     // TEM
+                    break;
+
+                    case 0xd8 :     // SOI (has already been checked, there should not be a second one)
+                    case 0x00 :     // marker is invalid, we should stop now
+                        bScanFailure = sal_True;
+                    break;
+
+                    case 0xd9 :     // EOI
+                        bScanFinished = sal_True;
+                    break;
+
+                    // per default we assume marker segments conaining a length parameter
+                    default :
                     {
-                        rStm >> cByte;
-                    }
-
-                    while ( ( cByte == 0xff ) &&
-                            ( bWideSearch || ( nCount++ < nMax ) ) )
-                    {
-                        rStm >> cByte;
-                    }
-                }
-                while ( ( cByte != 0xc0 ) &&
-                        ( cByte != 0xc1 ) &&
-                        ( bWideSearch || ( nCount < nMax ) ) );
-
-                // wir haben den SOF0/1-Marker
-                if ( ( cByte == 0xc0 ) || ( cByte == 0xc1 ) )
-                {
-                    // Hoehe einlesen
-                    rStm.SeekRel( 3 );
-                    rStm >> nTemp16;
-                    aPixSize.Height() = nTemp16;
+                        sal_uInt16 nLength;
+                        rStm >> nLength;
 
-                    // Breite einlesen
-                    rStm >> nTemp16;
-                    aPixSize.Width() = nTemp16;
-
-                    // Bit/Pixel einlesen
-                    rStm >> cByte;
-                    nBitsPerPixel = ( cByte == 3 ? 24 : cByte == 1 ? 8 : 0 );
+                        if ( nLength < 2 )
+                            bScanFailure = sal_True;
+                        else
+                        {
+                            sal_uInt32 nNextMarkerPos = rStm.Tell() + nLength - 2;
+                            switch( nMarker )
+                            {
+                                case 0xe0 : // APP0 Marker
+                                {
+                                    if ( nLength == 16 )
+                                    {
+                                        sal_Int32 nIdentifier;
+                                        rStm >> nIdentifier;
+                                        if ( nIdentifier == 0x4a464946 )    // JFIF Identifier
+                                        {
+                                            sal_uInt8   nStringTerminator;
+                                            sal_uInt8   nMajorRevision;
+                                            sal_uInt8   nMinorRevision;
+                                            sal_uInt8   nUnits;
+                                            sal_uInt16  nHorizontalResolution;
+                                            sal_uInt16  nVerticalResolution;
+                                            sal_uInt8   nHorzThumbnailPixelCount;
+                                            sal_uInt8   nVertThumbnailPixelCount;
+
+                                            rStm >> nStringTerminator
+                                                 >> nMajorRevision
+                                                 >> nMinorRevision
+                                                 >> nUnits
+                                                 >> nHorizontalResolution
+                                                 >> nVerticalResolution
+                                                 >> nHorzThumbnailPixelCount
+                                                 >> nVertThumbnailPixelCount;
+
+                                            // setting the logical size
+                                            if ( nUnits && nHorizontalResolution && nVerticalResolution )
+                                            {
+                                                MapMode aMap;
+                                                aMap.SetMapUnit( nUnits == 1 ? MAP_INCH : MAP_CM );
+                                                aMap.SetScaleX( Fraction( 1, nHorizontalResolution ) );
+                                                aMap.SetScaleY( Fraction( 1, nVerticalResolution ) );
+                                                aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) );
+                                            }
+                                        }
+                                    }
+                                }
+                                break;
 
-                    // logische Groesse setzen
-                    if ( cUnit && nResX && nResY )
-                    {
-                        aMap.SetMapUnit( cUnit == 1 ? MAP_INCH : MAP_CM );
-                        aMap.SetScaleX( Fraction( 1, nResX ) );
-                        aMap.SetScaleY( Fraction( 1, nResY ) );
-                        aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap,
-                                                               MapMode( MAP_100TH_MM ) );
+                                // Start of Frame Markers
+                                case 0xc0 : // SOF0
+                                case 0xc1 : // SOF1
+                                case 0xc2 : // SOF2
+                                case 0xc3 : // SOF3
+                                case 0xc5 : // SOF5
+                                case 0xc6 : // SOF6
+                                case 0xc7 : // SOF7
+                                case 0xc9 : // SOF9
+                                case 0xca : // SOF10
+                                case 0xcb : // SOF11
+                                case 0xcd : // SOF13
+                                case 0xce : // SOF14
+                                case 0xcf : // SOF15
+                                {
+                                    sal_uInt8   nSamplePrecision;
+                                    sal_uInt16  nNumberOfLines;
+                                    sal_uInt16  nSamplesPerLine;
+                                    sal_uInt8   nNumberOfImageComponents;
+                                    sal_uInt8   nComponentsIdentifier;
+                                    sal_uInt8   nHorizontalSamplingFactor;
+                                    sal_uInt8   nVerticalSamplingFactor;
+                                    sal_uInt8   nQuantizationTableDestinationSelector;
+                                    rStm >> nSamplePrecision
+                                         >> nNumberOfLines
+                                         >> nSamplesPerLine
+                                         >> nNumberOfImageComponents
+                                         >> nComponentsIdentifier
+                                         >> nHorizontalSamplingFactor
+                                         >> nQuantizationTableDestinationSelector;
+                                    nVerticalSamplingFactor = nHorizontalSamplingFactor & 0xf;
+                                    nHorizontalSamplingFactor >>= 4;
+
+                                    aPixSize.Height() = nNumberOfLines;
+                                    aPixSize.Width() = nSamplesPerLine;
+                                    nBitsPerPixel = ( nNumberOfImageComponents == 3 ? 24 : nNumberOfImageComponents == 1 ? 8 : 0 );
+                                    nPlanes = 1;
+
+                                    bScanFinished = sal_True;
+                                }
+                                break;
+                            }
+                            rStm.Seek( nNextMarkerPos );
+                        }
                     }
-
-                    // Planes immer 1
-                    nPlanes = 1;
+                    break;
                 }
             }
+            rStm.SetError( nError );
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -556,37 +477,26 @@ BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL )
 {
     BOOL    bRet = FALSE;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
 
-    if ( bWideSearch )
-    {
-        UINT32  nTemp32;
-        UINT16  nTemp16;
-        BYTE    cByte;
+    UINT32  nTemp32;
+    UINT16  nTemp16;
+    BYTE    cByte;
 
-        rStm.SeekRel( 2048 );
-        rStm >> nTemp32;
-        rStm >> nTemp16;
-        rStm >> cByte;
+    rStm.SeekRel( 2048 );
+    rStm >> nTemp32;
+    rStm >> nTemp16;
+    rStm >> cByte;
 
-        if ( ( nTemp32 == 0x5f444350 ) &&
-             ( nTemp16 == 0x5049 ) &&
-             ( cByte == 0x49 ) )
-        {
-            nFormat = GFF_PCD;
-            bRet = TRUE;
-        }
-    }
-    else
+    if ( ( nTemp32 == 0x5f444350 ) &&
+         ( nTemp16 == 0x5049 ) &&
+         ( cByte == 0x49 ) )
     {
-        bRet = aPathExt.CompareToAscii( "pcd", 3 ) == COMPARE_EQUAL;
-        if ( bRet )
-        {
-            nFormat = GFF_PCD;
-        }
+        nFormat = GFF_PCD;
+        bRet = TRUE;
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -608,10 +518,10 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> cByte;
+
     if ( cByte == 0x0a )
     {
         nFormat = GFF_PCX;
@@ -675,6 +585,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
         }
     }
 
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -690,10 +601,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
     UINT32  nTemp32;
     BOOL    bRet = FALSE;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> nTemp32;
+
     if ( nTemp32 == 0x89504e47 )
     {
         rStm >> nTemp32;
@@ -726,55 +637,52 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
                 nPlanes = 1;
                 bCompressed = TRUE;
 
-                if ( bWideSearch )
-                {
-                    UINT32  nLen32;
+                UINT32  nLen32;
 
-                    rStm.SeekRel( 8 );
+                rStm.SeekRel( 8 );
 
-                    // so lange ueberlesen, bis wir den pHYs-Chunk haben oder
-                    // den Anfang der Bilddaten
+                // so lange ueberlesen, bis wir den pHYs-Chunk haben oder
+                // den Anfang der Bilddaten
+                rStm >> nLen32;
+                rStm >> nTemp32;
+                while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) )
+                {
+                    rStm.SeekRel( 4 + nLen32 );
                     rStm >> nLen32;
                     rStm >> nTemp32;
-                    while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) )
-                    {
-                        rStm.SeekRel( 4 + nLen32 );
-                        rStm >> nLen32;
-                        rStm >> nTemp32;
-                    }
+                }
 
-                    if ( nTemp32 == 0x70485973 )
-                    {
-                        ULONG   nXRes;
-                        ULONG   nYRes;
+                if ( nTemp32 == 0x70485973 )
+                {
+                    ULONG   nXRes;
+                    ULONG   nYRes;
 
-                        // horizontale Aufloesung
-                        rStm >> nTemp32;
-                        nXRes = nTemp32;
+                    // horizontale Aufloesung
+                    rStm >> nTemp32;
+                    nXRes = nTemp32;
 
-                        // vertikale Aufloesung
-                        rStm >> nTemp32;
-                        nYRes = nTemp32;
+                    // vertikale Aufloesung
+                    rStm >> nTemp32;
+                    nYRes = nTemp32;
 
-                        // Unit einlesen
-                        rStm >> cByte;
+                    // Unit einlesen
+                    rStm >> cByte;
 
-                        if ( cByte )
-                        {
-                            if ( nXRes )
-                                aLogSize.Width() = ( aPixSize.Width() * 100000 ) /
-                                                   nTemp32;
+                    if ( cByte )
+                    {
+                        if ( nXRes )
+                            aLogSize.Width() = ( aPixSize.Width() * 100000 ) /
+                                               nTemp32;
 
-                            if ( nYRes )
-                                aLogSize.Height() = ( aPixSize.Height() * 100000 ) /
-                                                    nTemp32;
-                        }
+                        if ( nYRes )
+                            aLogSize.Height() = ( aPixSize.Height() * 100000 ) /
+                                                nTemp32;
                     }
                 }
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -792,7 +700,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
     BYTE    cByte1;
     BYTE    cByte2;
 
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm >> cByte1;
     rStm >> cByte2;
     if ( cByte1 == cByte2 )
@@ -829,14 +737,14 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
                     rStm >> nTemp32;
                     rStm.SeekRel( ( nCount = ( nTemp32 + 2 ) ) - 0x08 );
 
-                    if ( bWideSearch || ( nCount < nMax ) )
+                    if ( nCount < nMax )
                     {
                         // Tag's lesen, bis wir auf Tag256 ( Width ) treffen
                         // nicht mehr Bytes als DATA_SIZE lesen
                         rStm >> nTemp16;
                         while ( nTemp16 != 256 )
                         {
-                            bOk = bWideSearch || ( nCount < nMax );
+                            bOk = nCount < nMax;
                             if ( !bOk )
                             {
                                 break;
@@ -912,7 +820,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -965,11 +873,12 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
+        sal_Int32 nStmPos = rStm.Tell();
         BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -992,11 +901,12 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
-        BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
+        BYTE nFirst, nSecond;
+        sal_Int32 nStmPos = rStm.Tell();
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -1020,10 +930,11 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL )
     else
     {
         BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
+        sal_Int32 nStmPos = rStm.Tell();
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -1041,16 +952,17 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL )
 BOOL GraphicDescriptor::ImpDetectRAS( SvStream& rStm, BOOL )
 {
     UINT32 nMagicNumber;
-    rStm.Seek( nStmPos );
+    BOOL bRet = FALSE;
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nMagicNumber;
     if ( nMagicNumber == 0x59a66a95 )
     {
         nFormat = GFF_RAS;
-        return TRUE;
+        bRet = TRUE;
     }
-    else
-        return FALSE;
+    rStm.Seek( nStmPos );
+    return bRet;
 }
 
 /*************************************************************************
@@ -1079,7 +991,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
     BOOL bRet = FALSE;
 
     UINT32  nMagicNumber;
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nMagicNumber;
     if ( nMagicNumber == 0x38425053 )
@@ -1123,6 +1035,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
 
     if ( bRet )
         nFormat = GFF_PSD;
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -1139,8 +1052,9 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL )
 
     sal_uInt32  nFirstLong;
     sal_uInt8   nFirstBytes[20];
+    BOOL        bRet = FALSE;
 
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nFirstLong;
     rStm.SeekRel( -4 );
@@ -1151,10 +1065,10 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL )
             && ImplSearchEntry( &nFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) )
     {
         nFormat = GFF_EPS;
-        return TRUE;
+        bRet = TRUE;
     }
-    else
-        return FALSE;
+    rStm.Seek( nStmPos );
+    return bRet;
 }
 
 /*************************************************************************
@@ -1201,9 +1115,11 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
         nFormat = GFF_PCT;
     else
     {
-        BYTE sBuf[3]={0};
+        sal_Int32 nStmPos = rStm.Tell();
+
+        BYTE sBuf[4];
 
-        rStm.Seek( nStmPos + 522 );
+        rStm.SeekRel( 522 );
         rStm.Read( sBuf, 3 );
 
         if( !rStm.GetError() )
@@ -1215,6 +1131,7 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
                 nFormat = GFF_PCT;
             }
         }
+        rStm.Seek( nStmPos );
     }
 
     return bRet;
@@ -1230,18 +1147,20 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
 BOOL GraphicDescriptor::ImpDetectSGF( SvStream& rStm, BOOL )
 {
     BOOL bRet = FALSE;
-
     if( aPathExt.CompareToAscii( "sgf", 3 ) == COMPARE_EQUAL )
         bRet = TRUE;
     else
     {
+        sal_Int32 nStmPos = rStm.Tell();
+
         BYTE nFirst, nSecond;
 
-        rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
 
         if( nFirst == 'J' && nSecond == 'J' )
             bRet = TRUE;
+
+        rStm.Seek( nStmPos );
     }
 
     if( bRet )
@@ -1279,9 +1198,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> n32;
     if ( n32 == 0x44475653 )
     {
@@ -1342,7 +1260,7 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -1417,3 +1335,5 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 
     return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
 }
+
+
diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
index 272bb9a76b03..11d35150bda8 100644
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ b/svtools/source/filter.vcl/filter/makefile.mk
@@ -41,16 +41,11 @@ SOLARINC+=-I../../inc
 # --- Files --------------------------------------------------------
 
 SRS1NAME=$(TARGET)
-SRC1FILES= strings.src			\
-          dlgexpor.src			\
-          dlgepng.src			\
-          dlgejpg.src
+SRC1FILES=exportdialog.src
 
 SLOFILES= $(SLO)$/filter.obj				\
           $(SLO)$/filter2.obj				\
-          $(SLO)$/dlgexpor.obj				\
-          $(SLO)$/dlgejpg.obj				\
-          $(SLO)$/dlgepng.obj				\
+          $(SLO)$/exportdialog.obj			\
           $(SLO)$/sgfbram.obj				\
           $(SLO)$/sgvmain.obj				\
           $(SLO)$/sgvtext.obj				\
@@ -59,28 +54,26 @@ SLOFILES= $(SLO)$/filter.obj				\
           $(SLO)$/FilterConfigCache.obj		\
           $(SLO)$/SvFilterOptionsDialog.obj
 
+EXCEPTIONSFILES=		$(SLO)$/exportdialog.obj
+
 EXCEPTIONSNOOPTFILES=	$(SLO)$/filter.obj				\
                         $(SLO)$/FilterConfigItem.obj	\
                         $(SLO)$/FilterConfigCache.obj	\
                         $(SLO)$/SvFilterOptionsDialog.obj
 
 LIB1TARGET=		$(SLB)$/$(TARGET).uno.lib
-LIB1OBJFILES=	\
-          $(SLO)$/dlgexpor.obj				\
-          $(SLO)$/dlgejpg.obj				\
-          $(SLO)$/dlgepng.obj				\
-    $(SLO)$/SvFilterOptionsDialog.obj
+LIB1OBJFILES=	$(SLO)$/exportdialog.obj		\
+                $(SLO)$/SvFilterOptionsDialog.obj
 
 LIB2TARGET=		$(SLB)$/$(TARGET).lib
-LIB2OBJFILES=	\
-    $(SLO)$/filter.obj				\
-    $(SLO)$/filter2.obj				\
-          $(SLO)$/sgfbram.obj				\
-          $(SLO)$/sgvmain.obj				\
-          $(SLO)$/sgvtext.obj				\
-          $(SLO)$/sgvspln.obj				\
-          $(SLO)$/FilterConfigItem.obj		\
-          $(SLO)$/FilterConfigCache.obj
+LIB2OBJFILES=	$(SLO)$/filter.obj				\
+                $(SLO)$/filter2.obj				\
+                $(SLO)$/sgfbram.obj				\
+                $(SLO)$/sgvmain.obj				\
+                $(SLO)$/sgvtext.obj				\
+                $(SLO)$/sgvspln.obj				\
+                $(SLO)$/FilterConfigItem.obj	\
+                $(SLO)$/FilterConfigCache.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc
deleted file mode 100644
index 0eea67fb2338..000000000000
--- a/svtools/source/filter.vcl/filter/strings.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#include <svtools/svtools.hrc>
diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src
deleted file mode 100644
index 60e628ee0b5c..000000000000
--- a/svtools/source/filter.vcl/filter/strings.src
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "strings.hrc"
-
-String EXPORT_DIALOG_TITLE
-{
-    Text [ en-US ] = " Options" ;
-};
-
-String KEY_MODE
-{
-    Text = "ExportMode" ;
-};
-
-String KEY_RES
-{
-    Text = "Resolution" ;
-};
-
-String KEY_SIZE
-{
-    Text = "Size" ;
-};
-
-String KEY_COLORS
-{
-    Text = "Color" ;
-};
-
-String KEY_RLE_CODING
-{
-    Text = "RLE_Coding" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index fbf95406a63a..f1674dcd7d4a 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -231,19 +231,19 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) )
     {
         rtl::OUString sImageName( rResourceURL.copy( nIndex ) );
-        if ( sImageName.compareToAscii( "info" ) )
+        if ( sImageName.equalsAscii( "info" ) )
         {
             xRet = InfoBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "warning" ) )
+        else if ( sImageName.equalsAscii( "warning" ) )
         {
             xRet = WarningBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "error" ) )
+        else if ( sImageName.equalsAscii( "error" ) )
         {
             xRet = ErrorBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.compareToAscii( "query" ) )
+        else if ( sImageName.equalsAscii( "query" ) )
         {
             xRet = QueryBox::GetStandardImage().GetXGraphic();
         }
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.component b/svtools/source/hatchwindow/hatchwindowfactory.component
new file mode 100644
index 000000000000..153fc8796281
--- /dev/null
+++ b/svtools/source/hatchwindow/hatchwindowfactory.component
@@ -0,0 +1,38 @@
+<?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.comp.embed.DocumentCloser">
+    <service name="com.sun.star.embed.DocumentCloser"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.HatchWindowFactory">
+    <service name="com.sun.star.comp.embed.HatchWindowFactory"/>
+    <service name="com.sun.star.embed.HatchWindowFactory"/>
+  </implementation>
+</component>
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index f8dbddff3761..0eec027167c2 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -112,45 +112,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * /* pServiceManager */, void * pRegistryKey)
-{
-    if (pRegistryKey)
-    {
-        uno::Reference< registry::XRegistryKey> xRegistryKey (
-            reinterpret_cast< registry::XRegistryKey* >(pRegistryKey));
-        uno::Reference< registry::XRegistryKey> xNewKey;
-
-        // OHatchWindowFactory registration
-
-        xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-            OHatchWindowFactory::impl_staticGetImplementationName() +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        uno::Sequence< ::rtl::OUString > aServices =
-            OHatchWindowFactory::impl_staticGetSupportedServiceNames();
-        for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-
-        // ODocumentCloser registration
-
-        xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-            ODocumentCloser::impl_staticGetImplementationName() +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = ODocumentCloser::impl_staticGetSupportedServiceNames();
-        for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-
-        return sal_True;
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
index 316e4ab1bfe2..3c736bc4e66a 100644
--- a/svtools/source/hatchwindow/makefile.mk
+++ b/svtools/source/hatchwindow/makefile.mk
@@ -63,3 +63,11 @@ DEF1NAME=	$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/hatchwindowfactory.component
+
+$(MISC)/hatchwindowfactory.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 92b9f960b65c..6919944daef4 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -153,7 +153,7 @@ private:
     USHORT              nFlags;
     USHORT              nCurTabPos;
 
-    WinBits             nWinBits;
+    WinBits             m_nStyle;
     ExtendedWinBits     nExtendedWinBits;
     BOOL                bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION
     BOOL                bUpdateMode : 1;
@@ -264,7 +264,7 @@ public:
     ~SvImpLBox();
 
     void                Clear();
-    void                SetWindowBits( WinBits nWinStyle );
+    void                SetStyle( WinBits i_nWinStyle );
     void                SetExtendedWindowBits( ExtendedWinBits _nBits );
     ExtendedWinBits     GetExtendedWindowBits() const { return nExtendedWinBits; }
     void                SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 20f98d2bcbbd..7d5c2b1b41e3 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -96,7 +96,6 @@ class SvImpIconView
                     nGridDY;
     long            nHorSBarHeight,
                     nVerSBarWidth;
-    WinBits         nWinBits;
     int             nViewMode;
     long            nHorDist;
     long            nVerDist;
@@ -171,7 +170,7 @@ public:
                     ~SvImpIconView();
 
     void            Clear( BOOL bInCtor = FALSE );
-    void            SetWindowBits( WinBits nWinStyle );
+    void            SetStyle( const WinBits i_nWinStyle );
     void            SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent )
                         { pModel = pTree; SetCurParent(pParent); }
     void            EntryInserted( SvLBoxEntry*);
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index dc01de750b06..a7420dbc388f 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -149,10 +149,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bJavaNotFound_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
             String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
-
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
-
         }
         else
         {
@@ -168,7 +166,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bInvalidSettings_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
             String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
-
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
         }
@@ -186,7 +183,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             // Java disabled. Give user a chance to enable Java inside Office.
             QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
             String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
-
             aQueryBox.SetText( aTitle );
             nResult = aQueryBox.Execute();
             if ( nResult == RET_YES )
@@ -211,7 +207,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bVMCreationFailure_Handled = true;
             ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
             String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
-
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
         }
@@ -230,7 +225,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bRestartRequired_Handled = true;
             ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
             String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
-
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
         }
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 9cc52c58f013..e456200943f6 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -104,6 +104,7 @@ Bitmap TT_SHOW2 {
 };
 
 WorkWindow TT_INLINE_TRANSLATION {
+    HelpID = "svtools:WorkWindow:TT_INLINE_TRANSLATION";
     SVLook = TRUE;
     Size = MAP_APPFONT( 2*Control_Border + 4*ButtonWidth + 3*Button_Button, 120 );
     Moveable = TRUE;
@@ -116,6 +117,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "Translation";
     };
     Edit TT_E_NEW {
+        HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_NEW";
             Disable = TRUE;
             Border = TRUE;
             Pos = MAP_APPFONT( 7, 16 );
@@ -134,6 +136,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "Comment";
     };
     Edit TT_E_COMMENT {
+        HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_COMMENT";
             Disable = TRUE;
             Border = TRUE;
             Pos = MAP_APPFONT( 7, 64 );
@@ -142,12 +145,14 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Comment";
     };
     PushButton TT_PB_SELECT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_SELECT";
             Pos = MAP_APPFONT( Control_Border, 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "~Select";
     };
     PushButton TT_PB_RESTORE {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_RESTORE";
             Disable = TRUE;
             Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
@@ -155,6 +160,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Restore";
     };
     PushButton TT_PB_ACCEPT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_ACCEPT";
             Disable = TRUE;
             Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
@@ -162,6 +168,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Accept";
     };
     PushButton TT_PB_NEXT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_NEXT";
             Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
             TabStop = TRUE;
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
index a26e8feca753..b6e119601697 100644
--- a/svtools/source/productregistration/makefile.mk
+++ b/svtools/source/productregistration/makefile.mk
@@ -76,3 +76,11 @@ RESLIB1SRSFILES=\
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/productregistration.uno.component
+
+$(MISC)/productregistration.uno.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 39629f5c3f77..cb3a9b7a7702 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -461,25 +461,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * /* pServiceManager */, void * pRegistryKey)
-{
-    if (pRegistryKey)
-    {
-        Reference< XRegistryKey > xRegistryKey (
-            reinterpret_cast< XRegistryKey* >( pRegistryKey ));
-        Reference< XRegistryKey > xNewKey;
-
-        xNewKey = xRegistryKey->createKey(
-            OUString::createFromAscii( "/" PRODREG_IMPLNAME "/UNO/SERVICES" ));
-        xNewKey->createKey(
-            OUString::createFromAscii( PRODREG_SERVNAME ));
-
-        return sal_True;
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
diff --git a/svtools/source/productregistration/productregistration.uno.component b/svtools/source/productregistration/productregistration.uno.component
new file mode 100644
index 000000000000..da2cfd37c483
--- /dev/null
+++ b/svtools/source/productregistration/productregistration.uno.component
@@ -0,0 +1,34 @@
+<?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.comp.setup.ProductRegistration">
+    <service name="com.sun.star.setup.ProductRegistration"/>
+  </implementation>
+</component>
diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index c4cdcbcbe3ec..64f1063f1ba3 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.src
@@ -72,6 +72,7 @@ ModalDialog DLG_REGISTRATION_REQUEST
 
     RadioButton RB_NOW
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW";
         Pos = MAP_APPFONT ( 33 , 41 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Register now" ;
@@ -79,18 +80,21 @@ ModalDialog DLG_REGISTRATION_REQUEST
 
     RadioButton RB_LATER
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER";
         Pos = MAP_APPFONT ( 33 , 54 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Remind me to register later" ;
     };
     RadioButton RB_NEVER
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER";
         Pos = MAP_APPFONT ( 33 , 67 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Never register" ;
     };
     RadioButton RB_DONE
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE";
         Pos = MAP_APPFONT ( 33 , 80 ) ;
         Size = MAP_APPFONT ( 153 , 20 ) ;
         WordBreak = TRUE;
diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk
index 5ebb0e28c69e..cb76882f5f94 100644
--- a/svtools/source/svrtf/makefile.mk
+++ b/svtools/source/svrtf/makefile.mk
@@ -30,6 +30,8 @@ PRJ=..$/..
 PRJNAME=svtools
 TARGET=svrtf
 
+ENABLE_EXCEPTIONS=TRUE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 1c578d160307..3a775a7fc345 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -44,8 +44,6 @@ const int MAX_TOKEN_LEN = 128;
 #define RTF_ISDIGIT( c ) (c >= '0' && c <= '9')
 #define RTF_ISALPHA( c ) ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') )
 
-SV_IMPL_VARARR( RtfParserStates_Impl, RtfParserState_Impl )
-
 SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize )
     : SvParser( rIn, nStackSize ),
     eUNICodeSet( RTL_TEXTENCODING_MS_1252 ),    // default ist ANSI-CodeSet
@@ -175,14 +173,13 @@ int SvRTFParser::_GetNextToken()
                                 nUCharOverread = (BYTE)nTokenValue;
 #if 1
                                 //cmc: other ifdef breaks #i3584
-                                aParserStates[ aParserStates.Count()-1].
+                                aParserStates.top().
                                     nUCharOverread = nUCharOverread;
 #else
                                 if( !nUCharOverread )
-                                    nUCharOverread = aParserStates[
-                                        aParserStates.Count()-1].nUCharOverread;
+                                    nUCharOverread = aParserStates.top().nUCharOverread;
                                 else
-                                    aParserStates[ aParserStates.Count()-1].
+                                    aParserStates.top().
                                         nUCharOverread = nUCharOverread;
 #endif
                             }
@@ -252,12 +249,12 @@ int SvRTFParser::_GetNextToken()
                 if( 0 <= nOpenBrakets )
                 {
                     RtfParserState_Impl aState( nUCharOverread, GetSrcEncoding() );
-                    aParserStates.Insert(
-                        aState, sal::static_int_cast< USHORT >(nOpenBrakets) );
+                    aParserStates.push( aState );
                 }
                 ++nOpenBrakets;
-                DBG_ASSERT( nOpenBrakets == aParserStates.Count(),
-                            "ParserStateStack unequal to bracket count" );
+                DBG_ASSERT(
+                    static_cast<size_t>(nOpenBrakets) == aParserStates.size(),
+                    "ParserStateStack unequal to bracket count" );
                 nRet = nNextCh;
             }
             break;
@@ -266,12 +263,11 @@ int SvRTFParser::_GetNextToken()
             --nOpenBrakets;
             if( 0 <= nOpenBrakets )
             {
-                aParserStates.Remove(
-                    sal::static_int_cast< USHORT >(nOpenBrakets) );
-                if( aParserStates.Count() )
+                aParserStates.pop();
+                if( !aParserStates.empty() )
                 {
                     const RtfParserState_Impl& rRPS =
-                            aParserStates[ aParserStates.Count() - 1 ];
+                            aParserStates.top();
                     nUCharOverread = rRPS.nUCharOverread;
                     SetSrcEncoding( rRPS.eCodeSet );
                 }
@@ -281,8 +277,9 @@ int SvRTFParser::_GetNextToken()
                     SetSrcEncoding( GetCodeSet() );
                 }
             }
-            DBG_ASSERT( nOpenBrakets == aParserStates.Count(),
-                        "ParserStateStack unequal to bracket count" );
+            DBG_ASSERT(
+                static_cast<size_t>(nOpenBrakets) == aParserStates.size(),
+                "ParserStateStack unequal to bracket count" );
             nRet = nNextCh;
             break;
 
@@ -690,8 +687,8 @@ void SvRTFParser::SetEncoding( rtl_TextEncoding eEnc )
     if (eEnc == RTL_TEXTENCODING_DONTKNOW)
         eEnc = GetCodeSet();
 
-    if (aParserStates.Count())
-        aParserStates[aParserStates.Count() - 1].eCodeSet = eEnc;
+    if (!aParserStates.empty())
+        aParserStates.top().eCodeSet = eEnc;
     SetSrcEncoding(eEnc);
 }
 
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 03a7667f48e2..a4335302f475 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.cxx
@@ -1128,6 +1128,7 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" );
 /*
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 27ce3643f8cf..9b29951ddbbf 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1160,6 +1160,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         */
         {{OOO_STRING_SVTOOLS_RTF_SN},       RTF_SN},
         {{OOO_STRING_SVTOOLS_RTF_SV},       RTF_SV},
+        {{OOO_STRING_SVTOOLS_RTF_SP},       RTF_SP},
 
 // Support for overline attributes
         {{OOO_STRING_SVTOOLS_RTF_OL},           RTF_OL},
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index ad8f7a7562d3..f6a58ad17efe 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -173,6 +173,7 @@ namespace svt { namespace table
             if ( ( pActions->nKeyCode == nKeyCode ) && ( pActions->nKeyModifier == rKeyCode.GetAllModifier() ) )
             {
                 bHandled = _rControl.dispatchAction( pActions->eAction );
+                bHandled = true; // always handled  issue #i114340
                 break;
             }
         }
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index e2e1ce5353fe..bbd7f6829369 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -45,7 +45,6 @@ namespace svt { namespace table
     TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl )
         :Window( &_rTableControl.getAntiImpl() )
         ,m_rTableControl        ( _rTableControl )
-        ,m_nRowAlreadySelected( -1 )
     {
         // by default, use the background as determined by the style settings
         const Color aWindowColor( GetSettings().GetStyleSettings().GetFieldColor() );
@@ -110,15 +109,17 @@ namespace svt { namespace table
     {
         Point aPoint = rMEvt.GetPosPixel();
         RowPos nCurRow = m_rTableControl.getCurrentRow(aPoint);
+        std::vector<RowPos> selectedRows(m_rTableControl.getSelectedRows());
         if ( !m_rTableControl.getInputHandler()->MouseButtonDown( m_rTableControl, rMEvt ) )
             Window::MouseButtonDown( rMEvt );
         else
         {
             if(nCurRow >= 0 && m_rTableControl.getSelEngine()->GetSelectionMode() != NO_SELECTION)
             {
-                if( m_nRowAlreadySelected != nCurRow )
+                bool found = std::find(selectedRows.begin(),selectedRows.end(), nCurRow) != selectedRows.end();
+
+                if( !found )
                 {
-                    m_nRowAlreadySelected = nCurRow;
                     m_aSelectHdl.Call( NULL );
                 }
             }
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 040f33045fff..7fc7d05ea0c9 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -165,7 +165,7 @@ namespace svt
         OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "DrawerDeckLayouter::PanelInserted: inconsistency!" );
 
         PToolPanelDrawer pDrawer( new ToolPanelDrawer( m_rParentWindow, i_pPanel->GetDisplayName() ) );
-        pDrawer->SetSmartHelpId( i_pPanel->GetHelpID() );
+        pDrawer->SetHelpId( i_pPanel->GetHelpID() );
         // proper Z-Order
         if ( i_nPosition == 0 )
         {
diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx
index 20f140a6e610..4de38b7f4bb3 100644
--- a/svtools/source/toolpanel/dummypanel.cxx
+++ b/svtools/source/toolpanel/dummypanel.cxx
@@ -80,9 +80,9 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    SmartId DummyPanel::GetHelpID() const
+    rtl::OString DummyPanel::GetHelpID() const
     {
-        return SmartId();
+        return rtl::OString();
     }
 
     //--------------------------------------------------------------------
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index adb98e52077e..d2ca4480fce5 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -49,7 +49,7 @@ namespace svt
         // IToolPanel
         virtual ::rtl::OUString GetDisplayName() const;
         virtual Image GetImage() const;
-        virtual SmartId GetHelpID() const;
+        virtual rtl::OString GetHelpID() const;
         virtual void Activate( Window& i_rParentWindow );
         virtual void Deactivate();
         virtual void SetSizePixel( const Size& i_rPanelWindowSize );
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index e16a1ecb56dc..34984976bf07 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -101,55 +101,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * pServiceManager, void * _pRegistryKey )
-{
-    if (_pRegistryKey)
-    {
-        Reference< XRegistryKey > xRegistryKey (
-            reinterpret_cast< XRegistryKey* >( _pRegistryKey ));
-        Reference< XRegistryKey > xNewKey;
-        uno::Sequence< ::rtl::OUString >            aServices;
-
-        xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
-        xNewKey->createKey(
-            OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) );
-
-        xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" ) );
-        xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
-
-        // GraphicProvider
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicProvider::getImplementationName_Static() +
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = GraphicProvider::getSupportedServiceNames_Static();
-        int i;
-        for( i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-        // GraphicRendererVCL
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicRendererVCL::getImplementationName_Static() +
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );
-        for( i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-        if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( _pRegistryKey ), serviceDecl ) )
-            return false;
-
-        return ::cppu::component_writeInfoHelper( pServiceManager, _pRegistryKey, s_aServiceEntries );
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 7fb1a007960f..f37d5f80ed68 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1322,6 +1322,21 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
 
     switch( GetPropertyId( PropertyName ) )
     {
+        case BASEPROPERTY_HIDEINACTIVESELECTION:
+        {
+            sal_Bool bEnabled = sal_False;
+            if ( aValue >>= bEnabled )
+            {
+                WinBits nStyle = rTree.GetStyle();
+                if ( bEnabled )
+                    nStyle |= WB_HIDESELECTION;
+                else
+                    nStyle &= ~WB_HIDESELECTION;
+                rTree.SetStyle( nStyle );
+            }
+        }
+        break;
+
         case BASEPROPERTY_TREE_SELECTIONTYPE:
         {
             SelectionType eSelectionType;
@@ -1375,11 +1390,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             sal_Bool bEnabled = false;
             if( aValue >>= bEnabled )
             {
-                WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINES);
+                WinBits nBits = rTree.GetStyle() & (~WB_HASLINES);
                 if( bEnabled )
                     nBits |= WB_HASLINES;
-                if( nBits != rTree.GetWindowBits() )
-                    rTree.SetWindowBits( nBits );
+                if( nBits != rTree.GetStyle() )
+                    rTree.SetStyle( nBits );
             }
             break;
         }
@@ -1388,11 +1403,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             sal_Bool bEnabled = false;
             if( aValue >>= bEnabled )
             {
-                WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINESATROOT);
+                WinBits nBits = rTree.GetStyle() & (~WB_HASLINESATROOT);
                 if( bEnabled )
                     nBits |= WB_HASLINESATROOT;
-                if( nBits != rTree.GetWindowBits() )
-                    rTree.SetWindowBits( nBits );
+                if( nBits != rTree.GetStyle() )
+                    rTree.SetStyle( nBits );
             }
             break;
         }
@@ -1412,6 +1427,9 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
         UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
         switch(nPropId)
         {
+        case BASEPROPERTY_HIDEINACTIVESELECTION:
+            return Any( ( rTree.GetStyle() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False );
+
         case BASEPROPERTY_TREE_SELECTIONTYPE:
         {
             SelectionType eSelectionType;
@@ -1438,9 +1456,9 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
         case BASEPROPERTY_TREE_ROOTDISPLAYED:
             return Any( mbIsRootDisplayed );
         case BASEPROPERTY_TREE_SHOWSHANDLES:
-            return Any( (rTree.GetWindowBits() & WB_HASLINES) != 0 ? sal_True : sal_False );
+            return Any( (rTree.GetStyle() & WB_HASLINES) != 0 ? sal_True : sal_False );
         case BASEPROPERTY_TREE_SHOWSROOTHANDLES:
-            return Any( (rTree.GetWindowBits() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False );
+            return Any( (rTree.GetStyle() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False );
         }
     }
     return VCLXWindow::getProperty( PropertyName );
@@ -1509,7 +1527,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent,
 : SvTreeListBox( pParent, nWinStyle )
 , mxPeer( pPeer )
 {
-    SetWindowBits( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL );
+    SetStyle( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL );
     SetNodeDefaultImages();
     SetSelectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) );
     SetDeselectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) );
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 9440c0e69f26..ea147c5979d3 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -42,6 +42,7 @@
 #include <rtl/strbuf.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/urlobj.hxx>
 
 //......................................................................................................................
 namespace svt { namespace uno
@@ -206,11 +207,32 @@ namespace svt { namespace uno
         m_bInitialized = true;
     }
 
+    static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL )
+    {
+        INetURLObject aHID( _rHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+            return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+        else
+            return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
+    }
+
+    //------------------------------------------------------------------------
+    static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId )
+    {
+        ::rtl::OUStringBuffer aBuffer;
+        ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+        INetURLObject aHID( aTmp );
+        if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+            aBuffer.appendAscii( INET_HID_SCHEME );
+        aBuffer.append( aTmp.getStr() );
+        return aBuffer.makeStringAndClear();
+    }
+
     //--------------------------------------------------------------------
     Dialog* Wizard::createDialog( Window* i_pParent )
     {
         WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
-        pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) );
+        pDialog->SetHelpId(  lcl_getHelpId( m_sHelpURL ) );
         pDialog->setTitleBase( m_sTitle );
         return pDialog;
     }
@@ -219,7 +241,7 @@ namespace svt { namespace uno
     void Wizard::destroyDialog()
     {
         if ( m_pDialog )
-            m_sHelpURL = m_pDialog->GetSmartHelpId().GetStr();
+            m_sHelpURL = lcl_getHelpURL( m_pDialog->GetHelpId() );
 
         Wizard_Base::destroyDialog();
     }
@@ -279,8 +301,7 @@ namespace svt { namespace uno
         if ( !m_pDialog )
             return m_sHelpURL;
 
-        const SmartId aSmartId( m_pDialog->GetSmartHelpId() );
-        return aSmartId.GetStr();
+        return lcl_getHelpURL( m_pDialog->GetHelpId() );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -292,7 +313,7 @@ namespace svt { namespace uno
         if ( !m_pDialog )
             m_sHelpURL = i_HelpURL;
         else
-            m_pDialog->SetSmartHelpId( SmartId( i_HelpURL ) );
+            m_pDialog->SetHelpId( lcl_getHelpId( i_HelpURL ) );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -414,7 +435,7 @@ namespace svt { namespace uno
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
-        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!" );
+        ENSURE_OR_RETURN( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!", Reference< XWizardPage >() );
 
         return pWizardImpl->getCurrentWizardPage();
     }