[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Caolán McNamara]

 include/sfx2/sfx.hrc                   |    2 +-
 sfx2/source/view/sfxbasecontroller.cxx |    8 +++++---
 sfx2/source/view/view.src              |    4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d1e02bd3c6918f90562bb4e963866fd3a16a4f73
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 10 15:26:57 2016 +0100

    de-src another standalone PushButton
    
    Change-Id: I5e38e8877d70efd3b6413a14c0c121a8babb44f8

diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 89a7f6d..5d6faa5 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -143,7 +143,7 @@
 #define STR_PASSWD_EMPTY                    (RID_SFX_START+123)
 #define STR_PASSWD_MIN_LEN                  (RID_SFX_START+124)
 #define STR_NONCHECKEDOUT_DOCUMENT          (RID_SFX_START+125)
-#define BT_CHECKOUT                         (RID_SFX_START+126)
+#define STR_CHECKOUT                        (RID_SFX_START+126)
 #define STR_READONLY_EDIT                   (RID_SFX_START+127)
 #define STR_READONLY_DOCUMENT               (RID_SFX_START+128)
 #define STR_PASSWD_MIN_LEN1                 (RID_SFX_START+129)
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index b2c58be..2c2ec74 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1467,9 +1467,11 @@ void SfxBaseController::ShowInfoBars( )
                     SfxInfoBarWindow* pInfoBar = pViewFrame->AppendInfoBar( "checkout", SfxResId( STR_NONCHECKEDOUT_DOCUMENT ) );
                     if (pInfoBar)
                     {
-                        VclPtrInstance<PushButton> pBtn( &pViewFrame->GetWindow(), SfxResId( BT_CHECKOUT ) );
-                        pBtn->SetClickHdl( LINK( this, SfxBaseController, CheckOutHandler ) );
-                        pInfoBar->addButton(pBtn);
+                        VclPtrInstance<PushButton> xBtn(&pViewFrame->GetWindow());
+                        xBtn->SetText(SfxResId(STR_CHECKOUT));
+                        xBtn->SetSizePixel(xBtn->GetOptimalSize());
+                        xBtn->SetClickHdl(LINK(this, SfxBaseController, CheckOutHandler));
+                        pInfoBar->addButton(xBtn);
                     }
                 }
             }
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 845510a..8384544 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -121,10 +121,8 @@ String STR_CLASSIFIED_EXPORT_CONTROL
     Text [ en-US ] = "Export Control:" ;
 };
 
-PushButton BT_CHECKOUT
+String STR_CHECKOUT
 {
-    Pos = MAP_APPFONT( 0 , 0 );
-    Size = MAP_APPFONT( 30 , 0 );
     Text[ en-US ] = "Check Out";
 };