diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-06-05 13:08:32 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-06-05 13:08:32 +0000 |
commit | f06a4979f9e2474d1b0e446121cdec03eaf070cf (patch) | |
tree | ab976250ee7a42db1c93fbed9e78416b04ae73ee /svtools | |
parent | 048e7daec45c04ebd2ed4506a585f1719efc7f56 (diff) |
CWS-TOOLING: integrate CWS c06v7_DEV300
2009-05-13 14:39:35 +0200 obo r271861 : #158157# resync to OOO310_m11
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/templwin.cxx | 17 | ||||
-rw-r--r-- | svtools/source/contnr/templwin.src | 14 |
2 files changed, 21 insertions, 10 deletions
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 042088d317bb..2b212fdcffeb 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -35,6 +35,7 @@ #include <svtools/svtdata.hxx> #include <svtools/pathoptions.hxx> #include <svtools/dynamicmenuoptions.hxx> +#include <svtools/extendedsecurityoptions.hxx> #include <svtools/xtextedt.hxx> #include <svtools/inettype.hxx> #include "imagemgr.hxx" @@ -1742,9 +1743,16 @@ void SvtDocumentTemplateDialog::InitImpl( ) pImpl = new SvtTmplDlg_Impl( this ); pImpl->aTitle = GetText(); + bool bHideLink = ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() + == SvtExtendedSecurityOptions::OPEN_NEVER ); + if ( !bHideLink ) + { aMoreTemplatesLink.SetURL( String( RTL_CONSTASCII_STRINGPARAM( "http://templates.services.openoffice.org/?cid=923508" ) ) ); aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) ); + } + else + aMoreTemplatesLink.Hide(); aManageBtn.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OrganizerHdl_Impl ) ); Link aLink = LINK( this, SvtDocumentTemplateDialog, OKHdl_Impl ); @@ -1762,14 +1770,17 @@ void SvtDocumentTemplateDialog::InitImpl( ) Size aSize = GetOutputSizePixel(); Point aPos = aMoreTemplatesLink.GetPosPixel(); Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); - aPos.Y() -= a6Size.Height(); + if ( bHideLink ) + aPos.Y() += aMoreTemplatesLink.GetSizePixel().Height(); + else + aPos.Y() -= a6Size.Height(); long nDelta = aPos.Y() - nHeight; aSize.Height() -= nDelta; SetOutputSizePixel( aSize ); aSize.Height() = nHeight; - aSize.Width() -= a6Size.Width(); - pImpl->pWin->SetPosSizePixel( Point( a6Size.Width() / 2, 0 ), aSize ); + aSize.Width() -= ( a6Size.Width() * 2 ); + pImpl->pWin->SetPosSizePixel( Point( a6Size.Width(), 0 ), aSize ); aPos = aMoreTemplatesLink.GetPosPixel(); aPos.Y() -= nDelta; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index c8b9c4d58123..30149de4da14 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -275,7 +275,7 @@ ModalDialog DLG_DOCTEMPLATE HelpId = HID_TEMPLATEDLG_DIALOG ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT( 320, 245 ); + Size = MAP_APPFONT( 320, 250 ); Text [ en-US ] = "Templates and Documents" ; Moveable = TRUE ; FixedText FT_DOCTEMPLATE_LINK @@ -288,35 +288,35 @@ ModalDialog DLG_DOCTEMPLATE FixedLine FL_DOCTEMPLATE { Pos = MAP_APPFONT( 0, 219 ); - Size = MAP_APPFONT( 320, 1 ); + Size = MAP_APPFONT( 320, 8 ); }; PushButton BTN_DOCTEMPLATE_MANAGE { - Pos = MAP_APPFONT( 3, 225 ); + Pos = MAP_APPFONT( 6, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Organi~ze..."; }; PushButton BTN_DOCTEMPLATE_EDIT { - Pos = MAP_APPFONT( 56, 225 ); + Pos = MAP_APPFONT( 59, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "~Edit"; }; OKButton BTN_DOCTEMPLATE_OPEN { - Pos = MAP_APPFONT( 158, 225 ); + Pos = MAP_APPFONT( 155, 230 ); Size = MAP_APPFONT( 50, 14 ); DefButton = TRUE; Text [ en-US ] = "~Open"; }; CancelButton BTN_DOCTEMPLATE_CANCEL { - Pos = MAP_APPFONT( 211, 225 ); + Pos = MAP_APPFONT( 208, 230 ); Size = MAP_APPFONT( 50, 14 ); }; HelpButton BTN_DOCTEMPLATE_HELP { - Pos = MAP_APPFONT( 267, 225 ); + Pos = MAP_APPFONT( 264, 230 ); Size = MAP_APPFONT( 50, 14 ); }; }; |