summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2011-08-21 21:50:13 +0200
committerXisco Fauli <anistenis@gmail.com>2011-08-21 21:50:13 +0200
commit6c76e4db034fd2c43884698b1a30225fd00b3bfd (patch)
tree1937cb9be81cd2b9f3d0ad27adcc7a7531b8f29d /xmlsecurity/inc
parente9440fb5a0579096423c081b0f0a2185b628e896 (diff)
parent36703ca1de68cd62782d0d425123521a5bc6732b (diff)
Merge branch 'master' into feature/gsoc2011_wizards
Conflicts: automation/source/inc/cmdbasestream.hxx automation/source/server/cmdbasestream.cxx automation/source/server/retstrm.hxx automation/source/testtool/cmdstrm.cxx automation/source/testtool/cmdstrm.hxx automation/source/testtool/tcommuni.cxx basctl/prj/d.lst basctl/uiconfig/basicide/toolbar/findbar.xml cui/source/dialogs/about.cxx cui/source/dialogs/about.src cui/source/inc/about.hxx extensions/source/abpilot/abpservices.cxx extensions/source/dbpilots/dbpservices.cxx extensions/source/propctrlr/pcrservices.cxx extensions/source/svg/makefile.mk forms/Library_frm.mk lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx lingucomponent/source/spellcheck/spell/sspellimp.cxx package/prj/d.lst package/source/zipapi/XMemoryStream.cxx package/source/zipapi/XMemoryStream.hxx setup_native/prj/d.lst setup_native/source/win32/customactions/relnotes/makefile.mk tools/test/export.map wizards/com/sun/star/wizards/common/ConfigGroup.py wizards/com/sun/star/wizards/common/ConfigNode.py wizards/com/sun/star/wizards/common/Configuration.py wizards/com/sun/star/wizards/common/Desktop.py wizards/com/sun/star/wizards/common/FileAccess.py wizards/com/sun/star/wizards/common/Helper.py wizards/com/sun/star/wizards/common/SystemDialog.py wizards/com/sun/star/wizards/document/OfficeDocument.py wizards/com/sun/star/wizards/fax/FaxDocument.py wizards/com/sun/star/wizards/fax/FaxWizardDialog.py wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py wizards/com/sun/star/wizards/letter/LetterDocument.py wizards/com/sun/star/wizards/letter/LetterWizardDialog.py wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py wizards/com/sun/star/wizards/text/TextDocument.py wizards/com/sun/star/wizards/text/TextFieldHandler.py wizards/com/sun/star/wizards/text/TextSectionHandler.py wizards/com/sun/star/wizards/text/ViewHandler.py wizards/com/sun/star/wizards/ui/UnoDialog.py wizards/com/sun/star/wizards/ui/UnoDialog2.py wizards/com/sun/star/wizards/ui/WizardDialog.py wizards/com/sun/star/wizards/ui/event/CommonListener.py wizards/com/sun/star/wizards/ui/event/DataAware.py wizards/com/sun/star/wizards/ui/event/RadioDataAware.py wizards/com/sun/star/wizards/ui/event/UnoDataAware.py wizards/util/helpids.h wizards/util/hidother.src xmlsecurity/prj/build.lst xmlsecurity/prj/d.lst xmlsecurity/qa/certext/SanCertExt.cxx
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificatechooser.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificateviewer.hxx3
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx3
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx3
4 files changed, 8 insertions, 5 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 867eee8997b1..65c69f691aff 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -61,7 +61,8 @@ private:
SignatureInformations maCertsToIgnore;
FixedText maHintFT;
- SvxSimpleTable maCertLB; // #i48648 now SvHeaderTabListBox
+ SvxSimpleTableContainer m_aCertLBContainer;
+ SvxSimpleTable maCertLB;
PushButton maViewBtn;
@@ -73,7 +74,6 @@ private:
sal_Bool mbInitialized;
sal_uInt16 GetSelectedEntryPos( void ) const;
-// DECL_LINK( Initialize, void* );
DECL_LINK( ViewButtonHdl, Button* );
DECL_LINK( CertificateHighlightHdl, void* );
DECL_LINK( CertificateSelectHdl, void* );
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 1734d69aeb4a..fa0ca5963353 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -114,7 +114,8 @@ public:
class CertificateViewerDetailsTP : public CertificateViewerTP
{
private:
- SvxSimpleTable maElementsLB; // #i48648 now SvHeaderTabListBox
+ SvxSimpleTableContainer m_aElementsLBContainer;
+ SvxSimpleTable maElementsLB;
MultiLineEdit maElementML;
Font maStdFont;
Font maFixedWidthFont;
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 7b3514a850ef..dc9e4d454a22 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -80,7 +80,8 @@ private:
FixedText maHintDocFT;
FixedText maHintBasicFT;
FixedText maHintPackageFT;
- SvxSimpleTable maSignaturesLB; // #i48648 now SvHeaderTabListBox
+ SvxSimpleTableContainer maSignaturesLBContainer;
+ SvxSimpleTable maSignaturesLB;
FixedImage maSigsValidImg;
FixedInfo maSigsValidFI;
FixedImage maSigsInvalidImg;
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index da4a43e5cf60..178d44555f9b 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -138,7 +138,8 @@ class MacroSecurityTrustedSourcesTP : public MacroSecurityTP
private:
FixedLine maTrustCertFL;
ReadOnlyImage maTrustCertROFI;
- SvxSimpleTable maTrustCertLB; // #i48648 now SvHeaderTabListBox
+ SvxSimpleTableContainer m_aTrustCertLBContainer;
+ SvxSimpleTable maTrustCertLB;
PushButton maAddCertPB;
PushButton maViewCertPB;
PushButton maRemoveCertPB;