[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/filter/exportdialog.cxx |   14 --------------
 svtools/source/filter/exportdialog.hrc |    1 -
 svtools/source/filter/exportdialog.hxx |    1 -
 svtools/source/filter/exportdialog.src |    7 -------
 4 files changed, 23 deletions(-)

New commits:
commit e8624cc0e2777ffcc7d06bd76ff7372921125589
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 9 09:05:23 2012 +0100

    maCbJPGPreview is never enabled, remove it
    
    Change-Id: I765185bf2c51f37ab7d7209098fa0dcb1ba60b7c

diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index ef226f9..dafa648 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -596,7 +596,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
                 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 ) ),
@@ -710,11 +709,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
     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 ) );
@@ -875,8 +869,6 @@ void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout )
             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 );
@@ -891,8 +883,6 @@ void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout )
             maNfCompression.SetMax( 100 );
             maNfCompression.SetValue( nQuality );
             maNfCompression.SetStrictFormat( sal_True );
-            if ( maCbJPGPreview.IsEnabled() )
-                maCbJPGPreview.Check( sal_False );
         }
         break;
         case FORMAT_PNG :
@@ -1160,10 +1150,6 @@ sal_Int32 static GetZoomValueFromThumbPos( sal_Int32 nThumbPos )
 
 void ExportDialog::updatePreview()
 {
-    // JPG
-//  maCbJPGPreview.Enable( IsTempExportAvailable() );
-
-//  if ( maCbJPGPreview.IsEnabled() && maCbJPGPreview.IsChecked() )
     if ( mbPreview )
     {
         long nScrollBarSize = Application::GetSettings().GetStyleSettings().GetScrollBarSize();
diff --git a/svtools/source/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc
index abe2515..3e6aa98 100644
--- a/svtools/source/filter/exportdialog.hrc
+++ b/svtools/source/filter/exportdialog.hrc
@@ -64,7 +64,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
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 388cb94..784d01c 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -77,7 +77,6 @@ private:
     FixedText           maFtJPGMax;
     FixedText           maFtPNGMin;
     FixedText           maFtPNGMax;
-    CheckBox            maCbJPGPreview;
     CheckBox            maCbInterlaced;
     CheckBox            maCbRLEEncoding;
     FixedLine           maFlGIFDrawingObjects;
diff --git a/svtools/source/filter/exportdialog.src b/svtools/source/filter/exportdialog.src
index 2d1dfc7..eba4251 100644
--- a/svtools/source/filter/exportdialog.src
+++ b/svtools/source/filter/exportdialog.src
@@ -258,13 +258,6 @@ ModalDialog DLG_EXPORT
         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";