[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Wed Mar 15 10:36:10 UTC 2017


 xmlsecurity/inc/certificateviewer.hxx            |    2 +-
 xmlsecurity/source/dialogs/certificateviewer.cxx |    5 ++++-
 xmlsecurity/uiconfig/ui/certdetails.ui           |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e26b5b4fb7e9146fb142422dbc3061c346935cfc
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Mar 15 10:55:34 2017 +0100

    gpg4libre: Improve certificate details view
    
    * Remove SQL Syntax highlighting
    * Add a vertical scrollbar if neccessary
    
    Change-Id: Ib1de2694761ef650ccef16a5b5773c7be0602682
    Reviewed-on: https://gerrit.libreoffice.org/35210
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index b287207..76174cc 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -99,7 +99,7 @@ class CertificateViewerDetailsTP : public CertificateViewerTP
 private:
     VclPtr<SvSimpleTableContainer> m_pElementsLBContainer;
     VclPtr<SvSimpleTable>          m_pElementsLB;
-    VclPtr<MultiLineEdit>          m_pValueDetails;
+    VclPtr<VclMultiLineEdit>       m_pValueDetails;
     vcl::Font               m_aStdFont;
     vcl::Font               m_aFixedWidthFont;
 
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index a2dfa81..7361e25 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -228,11 +228,14 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C
     ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DefaultFontType::UI_FIXED, LANGUAGE_DONTKNOW, GetDefaultFontFlags::OnlyOne, this ) )
 {
     get( m_pValueDetails, "valuedetails" );
+    WinBits nStyle = m_pValueDetails->GetStyle();
+    nStyle |= WB_AUTOVSCROLL;
+    m_pValueDetails->SetStyle(nStyle);
     get( m_pElementsLBContainer, "tablecontainer" );
     m_pElementsLB = VclPtr<SvSimpleTable>::Create( *m_pElementsLBContainer );
 
     m_aStdFont = m_pValueDetails->GetControlFont();
-    WinBits nStyle = m_pElementsLB->GetStyle();
+    nStyle = m_pElementsLB->GetStyle();
     nStyle &= ~WB_HSCROLL;
     m_pElementsLB->SetStyle( nStyle );
 
diff --git a/xmlsecurity/uiconfig/ui/certdetails.ui b/xmlsecurity/uiconfig/ui/certdetails.ui
index 52a6681..75fec82 100644
--- a/xmlsecurity/uiconfig/ui/certdetails.ui
+++ b/xmlsecurity/uiconfig/ui/certdetails.ui
@@ -24,7 +24,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo-MultiLineEditSyntaxHighlight" id="valuedetails:border">
+      <object class="GtkTextView" id="valuedetails:border">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
       </object>


More information about the Libreoffice-commits mailing list