[Libreoffice-commits] core.git: 2 commits - fpicker/source xmlsecurity/source

[Noel Grandin]

 fpicker/source/office/OfficeFilePicker.hrc       |    2 --
 fpicker/source/office/iodlg.hrc                  |    1 -
 fpicker/source/office/iodlg.src                  |    4 ----
 xmlsecurity/source/dialogs/certificateviewer.cxx |    2 ++
 xmlsecurity/source/dialogs/certificateviewer.src |    5 -----
 xmlsecurity/source/dialogs/dialogs.hrc           |   11 -----------
 6 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit e6541c1abe67a8e13fcbf9d8d8938ac686e7a48d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Mar 16 15:19:26 2017 +0200

    remove unused defines from HRC files in xmlsecurity
    
    Change-Id: I1a0cfa86708e054ecced54052085e65e847097ba
    Reviewed-on: https://gerrit.libreoffice.org/35270
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 57b558c61c80..81f07defeef6 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -245,6 +245,8 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C
 
     m_aFixedWidthFont.SetFontHeight( m_aStdFont.GetFontHeight() );
 
+    constexpr int DLGS_WIDTH = 287;
+    constexpr int CS_LB_WIDTH = (DLGS_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT) - RSC_SP_DLG_INNERBORDER_LEFT;
     static long nTabs[] = { 2, 0, 30*CS_LB_WIDTH/100 };
     m_pElementsLB->SetTabs( &nTabs[ 0 ] );
     m_pElementsLB->InsertHeaderEntry( XMLSEC_RES( STR_HEADERBAR ) );
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index bd48618b05bd..7259be1ed334 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -44,11 +44,6 @@ String STR_SERIALNUM
     Text [ en-US ] = "Serial Number";
 };
 
-String STR_SIGALGORITHM
-{
-    Text [ en-US ] = "Signature Algorithm";
-};
-
 String STR_ISSUER
 {
     Text [ en-US ] = "Issuer";
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index b6299a9578a8..d81d923fc0ac 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -32,22 +32,11 @@
 #define STR_SUBJECT                     262
 #define STR_SUBJECT_PUBKEY_ALGO         263
 #define STR_SUBJECT_PUBKEY_VAL          264
-#define STR_SIGALGORITHM                265
 #define STR_SIGNATURE_ALGO              266
 #define STR_THUMBPRINT_SHA1             267
 #define STR_THUMBPRINT_MD5              268
 #define STR_USE                         271
 
-// --------- general metrics ---------
-#define DLGS_WIDTH                      287
-
-// --------- tab dialog Certificate viewer ---------
-
-// still used by certificateviewer.cxx
-#define CS_COL_0                        RSC_SP_DLG_INNERBORDER_LEFT
-#define CS_COL_2                        (DLGS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define CS_LB_WIDTH                     (CS_COL_2-CS_COL_0)
-
 // --------- tab page Certificate viewer - General ---------
 #define STR_CERTIFICATE_NOT_VALIDATED   269
 #define BMP_STATE_NOT_VALIDATED         270
commit 7f554d0dc46590f5b2f7247e4450b8a1904bb3a9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Mar 16 15:13:04 2017 +0200

    remove unused defines from HRC files in fpicker
    
    Change-Id: If3ee3225524b745c6a337b1c4e9e963678622c7b
    Reviewed-on: https://gerrit.libreoffice.org/35269
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc
index 4a6e5e358d24..c61593f4193f 100644
--- a/fpicker/source/office/OfficeFilePicker.hrc
+++ b/fpicker/source/office/OfficeFilePicker.hrc
@@ -11,8 +11,6 @@
 
 #include <vcl/fpicker.hrc>
 
-#define DLG_FPICKER_PLACE_EDIT                      (RID_FPICKER_START+16)
-
 #define STR_SVT_NEW_FOLDER                          (RID_FPICKER_START+19)
 #define RID_FILEOPEN_NOTEXISTENTFILE                (RID_FPICKER_START+24)
 #define STR_SVT_NOREMOVABLEDEVICE                   (RID_FPICKER_START+25)
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 4b403265332c..9b0859212075 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -29,7 +29,6 @@
 #define STR_PATHNAME                        (RID_FPICKER_START+34)
 #define STR_PATHSELECT                      (RID_FPICKER_START+35)
 #define STR_BUTTONSELECT                    (RID_FPICKER_START+36)
-#define STR_ACTUALVERSION                   (RID_FPICKER_START+37)
 #define STR_PREVIEW                         (RID_FPICKER_START+38)
 #define STR_DEFAULT_DIRECTORY               (RID_FPICKER_START+39)
 #define STR_PLACES_TITLE                    (RID_FPICKER_START+40)
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 176f94e8578c..4c3140e9e0df 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -68,10 +68,6 @@ String STR_BUTTONSELECT
 {
     Text [ en-US ] = "~Select";
 };
-String STR_ACTUALVERSION
-{
-    Text [ en-US ] = "Current version";
-};
 String STR_PREVIEW
 {
     Text [ en-US ] = "File Preview";