diff options
| author | sj <sj@openoffice.org> | 2010-08-13 15:02:26 +0200 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-08-13 15:02:26 +0200 |
| commit | e91eb75f9e7f7788e648a0d270f2166222ed54ab (patch) | |
| tree | 1d3724109b0dd67b4f0a7930fd4f6bc03b6cd353 /sfx2/source/dialog/dinfdlg.cxx | |
| parent | e316ce7a8f784231ff39bb069ec6eac0aefca9ce (diff) | |
| parent | 0e6f37318dd855bd04e3281435d1af751398c98f (diff) | |
impress186: merge with DEV300m86
Diffstat (limited to 'sfx2/source/dialog/dinfdlg.cxx')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 81c2da0ce78d..0ad62ae1eec1 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -27,12 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" + #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/localedatawrapper.hxx> +#include <unotools/cmdoptions.hxx> #include <comphelper/processfactory.hxx> #include <svl/urihelper.hxx> #include <unotools/useroptions.hxx> @@ -58,7 +60,8 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <vcl/timer.hxx> -#include <sfx2/dinfdlg.hxx> +#include "sfx2/dinfdlg.hxx" +#include "sfx2/securitypage.hxx" #include "sfxresid.hxx" #include "dinfedt.hxx" #include <sfx2/frame.hxx> @@ -119,6 +122,8 @@ const USHORT HI_TYPE = 2; const USHORT HI_VALUE = 3; const USHORT HI_ACTION = 4; +static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature"; + //------------------------------------------------------------------------ String CreateSizeText( ULONG nSize, BOOL bExtraBytes = TRUE, BOOL bSmartExtraBytes = FALSE ); String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes ) @@ -858,6 +863,13 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet ) aNewSize.Width() -= nDelta; aUseUserDataCB.SetSizePixel( aNewSize ); } + // See i96288 + // Check if the document signature command is enabled + // on the main list enable/disable the pushbutton accordingly + SvtCommandOptions aCmdOptions; + if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) ) + aSignatureBtn.Disable(); } //------------------------------------------------------------------------ @@ -1554,6 +1566,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, AddTabPage(TP_DOCINFODOC, SfxDocumentPage::Create, 0); AddTabPage(TP_CUSTOMPROPERTIES, SfxCustomPropertiesPage::Create, 0); AddTabPage(TP_DOCINFORELOAD, SfxInternetPage::Create, 0); + AddTabPage(TP_DOCINFOSECURITY, SfxSecurityPage::Create, 0); } // ----------------------------------------------------------------------- |