[Libreoffice-commits] core.git: svtools/source svtools/uiconfig

[Caolán McNamara]

 svtools/source/filter/exportdialog.cxx |    4 ++--
 svtools/source/filter/exportdialog.hxx |    6 +++---
 svtools/uiconfig/ui/graphicexport.ui   |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d31e13efa8eca0997f02bceadff659f06d4dc9a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 09:59:12 2016 +0100

    Resolves: tdf#59570 scrollbar used instead of slider
    
    Change-Id: I14241c8a4418e8356a590a32b661f283b606f9fa

diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 88f3df5..2e927d8 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -621,7 +621,7 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
     mpLbSizeX->SetSelectHdl( LINK( this, ExportDialog, SelectListBoxHdl ) );
 
     if (mpSbCompression)
-        mpSbCompression->SetScrollHdl(LINK(this, ExportDialog, SbCompressionUpdateHdl));
+        mpSbCompression->SetSlideHdl(LINK(this, ExportDialog, SbCompressionUpdateHdl));
     if (mpNfCompression)
         mpNfCompression->SetModifyHdl(LINK(this, ExportDialog, SelectHdl));
 
@@ -1067,7 +1067,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlNfResolution, Edit&, void)
     updateControls();
 }
 
-IMPL_LINK_NOARG_TYPED(ExportDialog, SbCompressionUpdateHdl, ScrollBar*, void)
+IMPL_LINK_NOARG_TYPED(ExportDialog, SbCompressionUpdateHdl, Slider*, void)
 {
     mpNfCompression->SetValue( mpSbCompression->GetThumbPos() );
     updateControls();
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 29dd689..03d8e6f 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -29,7 +29,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/slider.hxx>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
@@ -66,7 +66,7 @@ private:
     VclPtr<VclContainer>       mpJPGQuality;
     VclPtr<VclContainer>       mpPNGCompression;
 
-    VclPtr<ScrollBar>          mpSbCompression;
+    VclPtr<Slider>             mpSbCompression;
     VclPtr<NumericField>       mpNfCompression;
 
     VclPtr<VclContainer>       mpMode;
@@ -144,7 +144,7 @@ private:
                         DECL_LINK_TYPED( UpdateHdlMtfSizeX, Edit&, void );
                         DECL_LINK_TYPED( UpdateHdlMtfSizeY, Edit&, void );
                         DECL_LINK_TYPED( UpdateHdlNfResolution, Edit&, void );
-                        DECL_LINK_TYPED( SbCompressionUpdateHdl, ScrollBar*, void );
+                        DECL_LINK_TYPED( SbCompressionUpdateHdl, Slider*, void );
 
                         DECL_LINK_TYPED( OK, Button*, void );
 
diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui
index 4a5a50e..5f8c459 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -347,7 +347,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkScrollbar" id="compressionjpgsb">
+                          <object class="GtkScale" id="compressionjpgsb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
@@ -410,7 +410,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkScrollbar" id="compressionpngsb">
+                          <object class="GtkScale" id="compressionpngsb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>