add a status bar icon to fit slide to window

Change-Id: I2c1d1fc7425b0aaad2a2445e0ac71ddc38410fdb

3 files changed, 51 insertions, 15 deletions

diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 15bc693e0762..63d50fde27c7 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -136,10 +136,6 @@ void SvxModifyControl::_repaint()
         GetStatusBar().SetItemData( GetId(), 0 );    // force repaint
 }
 
-
-
-namespace {
-
 /**
  * Given a bounding rectangle and an image, determine the top-left position
  * of the image so that the image would look centered both horizontally and
@@ -161,9 +157,6 @@ Point centerImage(const Rectangle& rBoundingRect, const Image& rImg)
     return aPt;
 }
 
-}
-
-
 void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt )
 {
     OutputDevice*       pDev =  rUsrEvt.GetDevice();
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index cb868bd041f3..c4908e383e7b 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -116,6 +116,11 @@ String RID_SVXSTR_DOC_LOAD
     Text [ en-US ] = "Loading document...";
 };
 
+String RID_SVXSTR_FIT_SLIDE
+{
+    Text [ en-US ] = "Fit slide to current window.";
+};
+
  // PopupMenu -------------------------------------------------------------
 Menu RID_SVXMNU_ZOOM
 {
@@ -333,5 +338,13 @@ Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
     };
     MaskColor = STD_MASKCOLOR;
 };
+Image RID_SVXBMP_ZOOM_PAGE
+{
+    ImageBitmap = Bitmap
+    {
+        File = "zoom_page_statusbar.png" ;
+    };
+    MaskColor = STD_MASKCOLOR;
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 1a10bc839d3f..cd711eba9a18 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -28,7 +28,8 @@
 
 #include <svx/dialogs.hrc>
 
-#include "svx/zoomctrl.hxx"
+#include <svx/zoomctrl.hxx>
+#include <svx/zoomslideritem.hxx>
 #include <sfx2/zoomitem.hxx>
 #include "stbctrls.h"
 #include <svx/dialmgr.hxx>
@@ -97,7 +98,6 @@ void ZoomPopup_Impl::Select()
 }
 
 // class SvxZoomStatusBarControl ------------------------------------------
-
 SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
                                                   sal_uInt16 _nId,
                                                   StatusBar& rStb ) :
@@ -108,8 +108,6 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
 {
 }
 
-
-
 void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
@@ -138,16 +136,12 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
     }
 }
 
-
-
 void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
 {
     OUString aStr(unicode::formatPercent(nZoom, Application::GetSettings().GetUILanguageTag()));
     GetStatusBar().SetItemText( GetId(), aStr );
 }
 
-
-
 void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     if ( COMMAND_CONTEXTMENU & rCEvt.GetCommand() && 0 != nValueSet )
@@ -184,5 +178,41 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
         SfxStatusBarControl::Command( rCEvt );
 }
 
+SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
+
+SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
+    sal_uInt16 _nId, StatusBar& rStb)
+    : SfxStatusBarControl(_nSlotId, _nId, rStb)
+    , maImage(SVX_RES(RID_SVXBMP_ZOOM_PAGE))
+{
+    GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE));
+}
+
+extern Point centerImage(const Rectangle& rBoundingRect, const Image& rImg);
+
+void SvxZoomPageStatusBarControl::Paint(const UserDrawEvent& rUsrEvt)
+{
+    OutputDevice* pDev = rUsrEvt.GetDevice();
+    Rectangle aRect = rUsrEvt.GetRect();
+    Point aPt = centerImage(aRect, maImage);
+    pDev->DrawImage(aPt, maImage);
+}
+
+bool SvxZoomPageStatusBarControl::MouseButtonDown(const MouseEvent&)
+{
+    SvxZoomItem aZoom( SVX_ZOOM_WHOLEPAGE, 0, GetId() );
+
+    ::com::sun::star::uno::Any a;
+    INetURLObject aObj( m_aCommandURL );
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
+    aArgs[0].Name  = aObj.GetURLPath();
+    aZoom.QueryValue( a );
+    aArgs[0].Value = a;
+
+    execute( aArgs );
+
+    return true;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */