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

Noel Grandin noel.grandin at collabora.co.uk
Thu Mar 16 08:57:38 UTC 2017


 vcl/inc/svids.hrc           |   17 ------------
 vcl/inc/win/salids.hrc      |    2 -
 vcl/source/src/helptext.src |   55 ----------------------------------------
 vcl/source/src/images.src   |   60 --------------------------------------------
 vcl/source/src/stdtext.src  |    5 ---
 5 files changed, 139 deletions(-)

New commits:
commit 9b1190225b9d39706594ebe9bf2fb0f32c89cdbd
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Mar 15 15:32:51 2017 +0200

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

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 9752f00..156402c 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -96,8 +96,6 @@
 #define SV_HELPTEXT_SCREENSHOT                      10007
 #define SV_HELPTEXT_FADEIN                          10008
 #define SV_HELPTEXT_FADEOUT                         10009
-#define SV_HELPTEXT_SPLITFLOATING                   10010
-#define SV_HELPTEXT_SPLITFIXED                      10011
 #define SV_HELPTEXT_CLOSEDOCUMENT                   10012
 
 #define SV_BUTTONTEXT_OK                            10100
@@ -141,7 +139,6 @@
 #define SV_STDTEXT_DONTWARNAGAIN                    10213
 #define SV_STDTEXT_ABOUT                            10214
 #define SV_STDTEXT_PREFERENCES                      10215
-#define SV_MAC_SCREENNNAME                          10216
 #define SV_STDTEXT_ALLFILETYPES                     10217
 
 #define STR_FPICKER_AUTO_EXTENSION                  10300
@@ -166,16 +163,6 @@
 
 #define SV_ACCESSERROR_NO_FONTS                     10510
 
-#define SV_SHORTCUT_HELP                            10600
-#define SV_SHORTCUT_CONTEXTHELP                     10601
-#define SV_SHORTCUT_ACTIVEHELP                      10602
-#define SV_SHORTCUT_DOCKUNDOCK                      10603
-#define SV_SHORTCUT_NEXTSUBWINDOW                   10604
-#define SV_SHORTCUT_PREVSUBWINDOW                   10605
-#define SV_SHORTCUT_TODOCUMENT                      10606
-#define SV_SHORTCUT_MENUBAR                         10607
-#define SV_SHORTCUT_SPLITTER                        10608
-
 #define SV_PRINT_NOPAGES                            10609
 #define SV_PRINT_TOFILE_TXT                         10610
 #define SV_PRINT_DEFPRT_TXT                         10611
@@ -201,14 +188,10 @@
 #define SV_ICON_SIZE32_START                        21000
 #define SV_ICON_SIZE16_START                        23000
 
-#define SV_ICON_ID_OFFICE                               1
 #define SV_ICON_ID_TEXT                                 2
-#define SV_ICON_ID_TEXT_TEMPLATE                        3
 #define SV_ICON_ID_SPREADSHEET                          4
-#define SV_ICON_ID_SPREADSHEET_TEMPLATE                 5
 #define SV_ICON_ID_DRAWING                              6
 #define SV_ICON_ID_PRESENTATION                         8
-#define SV_ICON_ID_MASTER_DOCUMENT                     10
 #define SV_ICON_ID_TEMPLATE                            11
 #define SV_ICON_ID_DATABASE                            12
 #define SV_ICON_ID_FORMULA                             13
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 0170b21..e1d85b0 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -22,8 +22,6 @@
 
 // Cursor
 #define SAL_RESID_POINTER_NULL                      10000
-#define SAL_RESID_POINTER_VSPLIT                    10009
-#define SAL_RESID_POINTER_VSIZEBAR                  10011
 #define SAL_RESID_POINTER_MAGNIFY                   10015
 #define SAL_RESID_POINTER_FILL                      10016
 #define SAL_RESID_POINTER_ROTATE                    10017
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index 99b443a..2dcb27a 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -72,59 +72,4 @@ String SV_HELPTEXT_FADEOUT
     Text [ en-US ] = "Hide";
 };
 
-String SV_HELPTEXT_SPLITFLOATING
-{
-    Text [ en-US ] = "Floating";
-};
-
-String SV_HELPTEXT_SPLITFIXED
-{
-    Text [ en-US ] = "Stick";
-};
-
-String SV_SHORTCUT_HELP
-{
-    Text [ en-US ] = "Help" ;
-};
-
-String SV_SHORTCUT_CONTEXTHELP
-{
-    Text [ en-US ] = "Context Help";
-};
-
-String SV_SHORTCUT_ACTIVEHELP
-{
-    Text [ en-US ] = "Extended Tips";
-};
-
-String SV_SHORTCUT_DOCKUNDOCK
-{
-    Text [ en-US ] = "Dock/Undock Windows";
-};
-
-String SV_SHORTCUT_NEXTSUBWINDOW
-{
-    Text [ en-US ] = "To Next Toolbar/Window";
-};
-
-String SV_SHORTCUT_PREVSUBWINDOW
-{
-    Text [ en-US ] = "To Previous Toolbar/Window";
-};
-
-String SV_SHORTCUT_TODOCUMENT
-{
-    Text [ en-US ] = "To Document";
-};
-
-String SV_SHORTCUT_MENUBAR
-{
-    Text [ en-US ] = "To Menu Bar";
-};
-
-String SV_SHORTCUT_SPLITTER
-{
-    Text [ en-US ] = "Split window separator" ;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 10b0eb7..ec3141e 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -254,21 +254,6 @@ Bitmap (SV_ICON_SIZE16_START)
     File = "mainapp_16_8.png" ;
 };
 
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_16_8.png" ;
-};
-
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT)
 {
     File = "odt_48_8.png" ;
@@ -284,21 +269,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT)
     File = "odt_16_8.png" ;
 };
 
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_16_8.png" ;
-};
-
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET)
 {
     File = "ods_48_8.png" ;
@@ -314,21 +284,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET)
     File = "ods_16_8.png" ;
 };
 
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_16_8.png" ;
-};
-
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DRAWING)
 {
     File = "odg_48_8.png" ;
@@ -359,21 +314,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION)
     File = "odp_16_8.png" ;
 };
 
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_16_8.png" ;
-};
-
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
 {
     File = "odb_48_8.png" ;
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 7e48859..1189f85 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -54,11 +54,6 @@ String SV_EDIT_WARNING_STR
     Text [en-US] = "The inserted text exceeded the maximum length of this text field. The text was truncated.";
 };
 
-String SV_MAC_SCREENNNAME
-{
-    Text [en-US] = "Screen %d";
-};
-
 String SV_STDTEXT_ALLFILETYPES
 {
     Text [en-US] = "Any type";


More information about the Libreoffice-commits mailing list