summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-25 13:39:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-25 14:54:03 +0000
commit8c041824b67caa53d3f7f96803b7a69ced6614b5 (patch)
tree132a39fb17b2c892f6d564b04034a009c76fd540 /sw
parent83078214196b071cf1d8e5796803b6ebc1bc9de4 (diff)
all these ids and their associated resources were unnecessary
Change-Id: I3f538668c9c5f1727b8cf49ab72fd5879e12f156
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/app/app.src5
-rw-r--r--sw/source/ui/shells/shells.src48
-rw-r--r--sw/source/ui/web/web.src8
-rw-r--r--sw/source/uibase/inc/app.hrc3
-rw-r--r--sw/source/uibase/inc/shells.hrc16
-rw-r--r--sw/source/uibase/inc/web.hrc2
6 files changed, 1 insertions, 81 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c1ec4eb13523..c4fee49aad04 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -31,11 +31,6 @@
#include "shells.hrc"
#include "helpid.h"
-String RID_SW_NAME
-{
- Text = "%PRODUCTNAME Writer" ;
-};
-
String STR_PRINT_MERGE_MACRO
{
Text [ en-US ] = "Print form letters" ;
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 3b2aa6906cfe..4bb18b38311d 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -115,54 +115,6 @@ String STR_PAGE_COUNT_CUSTOM
{
Text [ en-US ] = "Page %1 of %2 (Page %3)" ;
};
-String STR_SHELLNAME_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String STR_SHELLNAME_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String STR_SHELLNAME_FRAME
-{
- Text [ en-US ] = "Frame" ;
-};
-String STR_SHELLNAME_GRAPHIC
-{
- Text [ en-US ] = "Image" ;
-};
-String STR_SHELLNAME_OBJECT
-{
- Text [ en-US ] = "Object" ;
-};
-String STR_SHELLNAME_LIST
-{
- Text [ en-US ] = "List" ;
-};
-String STR_SHELLNAME_DRAW
-{
- Text [ en-US ] = "Drawing" ;
-};
-String STR_SHELLNAME_DRAWFORM
-{
- Text [ en-US ] = "Forms" ;
-};
-String STR_SHELLNAME_BEZIER
-{
- Text [ en-US ] = "Bézier" ;
-};
-String STR_SHELLNAME_DRAW_TEXT
-{
- Text [ en-US ] = "Draw text" ;
-};
-String STR_SHELLNAME_MEDIA
-{
- Text [ en-US ] = "Media" ;
-};
-String STR_SHELLNAME_NAVIGATION
-{
- Text [ en-US ] = "Navigation" ;
-};
//Strings for gallery/background
String STR_SWBG_PARAGRAPH
{
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index a28d30c7669c..21910fdd093d 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -40,14 +40,6 @@ String STR_WRITER_WEBDOC_FULLTYPE
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document";
};
-String STR_SHELLNAME_WEBTEXT
-{
- Text [ en-US ] = "Text/Web" ;
-};
-String STR_SHELLNAME_WEBFRAME
-{
- Text [ en-US ] = "Frame/Web" ;
-};
String RID_WEBTOOLS_TOOLBOX
{
Text [ en-US ] = "Main Toolbar/Web" ;
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index 623995584032..ff5e12d89051 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -25,9 +25,6 @@
#define STR_CANTCREATE (RC_APP_BEGIN + 4)
#define STR_CANTOPEN (RC_APP_BEGIN + 5)
-// For the interface because the RID_APP_BEGIN is now Desktop.
-#define RID_SW_NAME ( RC_APP_BEGIN + 8)
-
#define STR_UNBENANNT (RC_APP_BEGIN + 13)
#define STR_VERSION (RC_APP_BEGIN + 14)
#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15)
diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc
index 7af1b8c5a36f..685b0e2a6116 100644
--- a/sw/source/uibase/inc/shells.hrc
+++ b/sw/source/uibase/inc/shells.hrc
@@ -45,18 +45,7 @@
#define RID_OLE_TOOLBOX (RC_SHELLS_BEGIN + 22)
#define RID_TOOLS_TOOLBOX (RC_SHELLS_BEGIN + 23)
-#define STR_SHELLNAME_TEXT (RC_SHELLS_BEGIN + 24)
-#define STR_SHELLNAME_TABLE (RC_SHELLS_BEGIN + 25)
-#define STR_SHELLNAME_FRAME (RC_SHELLS_BEGIN + 26)
-#define STR_SHELLNAME_GRAPHIC (RC_SHELLS_BEGIN + 27)
-#define STR_SHELLNAME_OBJECT (RC_SHELLS_BEGIN + 28)
-#define STR_SHELLNAME_LIST (RC_SHELLS_BEGIN + 29)
-#define STR_SHELLNAME_DRAW (RC_SHELLS_BEGIN + 30)
-#define STR_SHELLNAME_DRAW_TEXT (RC_SHELLS_BEGIN + 31)
-#define STR_SHELLNAME_MEDIA (RC_SHELLS_BEGIN + 32)
-
#define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33)
-#define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34)
#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37)
#define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38)
@@ -69,7 +58,6 @@
#define STR_SWBG_HEADER (RC_SHELLS_BEGIN + 45)
#define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46)
-#define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48)
#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50)
#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51)
@@ -85,9 +73,7 @@
#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61)
-#define STR_SHELLNAME_NAVIGATION (RC_SHELLS_BEGIN + 62)
-
-#define SHELLS_ACT_END STR_SHELLNAME_NAVIGATION
+#define SHELLS_ACT_END RID_MEDIA_TOOLBOX
#if SHELLS_ACT_END > RC_SHELLS_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc
index bf279f94c0bc..1c06a00b7807 100644
--- a/sw/source/uibase/inc/web.hrc
+++ b/sw/source/uibase/inc/web.hrc
@@ -26,8 +26,6 @@
#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3)
#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4)
#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5)
-#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6)
-#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7)
#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8)
#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9)
#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10)