summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-07 21:21:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-07 21:21:06 +0100
commit64a5f3b9835c56b27efd678916ab48ded872ce08 (patch)
tree122d409112fcaf3cefbb7b0d63cd167aaaac4066 /sfx2
parent4b309834ee78236ad9cd3a29901fb6109b5833b3 (diff)
de-src RID_HELP_ONSTARTUP_BOX checkbox
Change-Id: I30ff54c55078333526ad34256f1c81c62fca920c
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/app.hrc1
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/newhelp.src7
3 files changed, 3 insertions, 9 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index c49ec8295d0f..abd8ab25a4a8 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -82,7 +82,6 @@
#define STR_QUICKSTART_STARTCENTER (RID_SFX_APP_START+148)
#define STR_QUICKSTART_RECENTDOC (RID_SFX_APP_START+149)
-#define RID_HELP_ONSTARTUP_BOX (RID_SFX_APP_START+144)
#define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145)
#define IMG_HELP_TOOLBOX_L_INDEX_ON (RID_SFX_APP_START+160)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f0f77e71e5f7..9735cb280471 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1853,7 +1853,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
Window( pParent, WB_CLIPCHILDREN | WB_TABSTOP | WB_DIALOGCONTROL ),
aToolBox ( VclPtr<ToolBox>::Create(this, 0) ),
- aOnStartupCB ( VclPtr<CheckBox>::Create(this, SfxResId( RID_HELP_ONSTARTUP_BOX )) ),
+ aOnStartupCB ( VclPtr<CheckBox>::Create(this, WB_HIDE | WB_TABSTOP) ),
aSelectIdle ( "sfx2 appl SfxHelpTextWindow_Impl Select" ),
aIndexOnImage ( SfxResId( IMG_HELP_TOOLBOX_INDEX_ON ) ),
aIndexOffImage ( SfxResId( IMG_HELP_TOOLBOX_INDEX_OFF ) ),
@@ -1869,6 +1869,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
bIsInClose ( false ),
bIsFullWordSearch ( false )
{
+ aOnStartupCB->SetSizePixel(aOnStartupCB->PixelToLogic(Size(200, 10), MapUnit::MapAppFont));
+
sfx2::AddToTaskPaneList( aToolBox.get() );
xFrame = Frame::create( ::comphelper::getProcessComponentContext() );
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index da4fc1658bb1..bbe6353bcb4d 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -235,13 +235,6 @@ Image IMG_HELP_TOOLBOX_L_COPY
ImageBitmap = Bitmap { File = "lc05711.png" ; };
};
-CheckBox RID_HELP_ONSTARTUP_BOX
-{
- Hide = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT ( 200 , 10 ) ;
-};
-
String RID_HELP_ONSTARTUP_TEXT
{
Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";