diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-22 12:23:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-22 14:35:10 +0100 |
commit | 95a04382225383cca7cae466a6842caa51ecd00e (patch) | |
tree | acfff7606060ac34329f0feef7eaceaa34226501 | |
parent | 34ff95a4e11d9b81e3258eb451ece7e201c3657d (diff) |
MONITOR_TYPE_MAIL is never used anymore
Change-Id: Id6d4b235e9eff610ad33a0815b2ade6d78ad704f
-rw-r--r-- | sw/inc/dbui.hrc | 2 | ||||
-rw-r--r-- | sw/inc/helpid.h | 1 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbui.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbui.src | 13 | ||||
-rw-r--r-- | sw/source/ui/inc/dbui.hxx | 1 |
5 files changed, 1 insertions, 20 deletions
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc index c88c526a9e8e..e5dabf07f31d 100644 --- a/sw/inc/dbui.hrc +++ b/sw/inc/dbui.hrc @@ -86,8 +86,6 @@ #define FT_PRINTER 7 #define FT_PRINTINFO 8 #define PB_CANCELPRNMON 9 -#define FT_SENDING 10 -#define STR_EMAILMON 11 #define FT_STATUS 12 #define FT_CREATEDOCUMENTS 13 #define FT_PROGRESS 14 diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 3b9689f284ca..1f81705fa65c 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -20,7 +20,6 @@ #include <svx/svxcommands.h> #include <sfx2/sfxcommands.h> -#define HID_MERGE_PRINTMONITOR "SW_HID_MERGE_PRINTMONITOR" #define HID_DOCINFO_EDT "SW_HID_DOCINFO_EDT" #define HID_PASSWD "SW_HID_PASSWD" #define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE" diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 17c18dabc925..aad23f22e222 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -27,8 +27,7 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) : ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ), aDocName (this, SW_RES( FT_DOCNAME )), aPrinting (this, SW_RES( - eType == MONITOR_TYPE_MAIL ? - FT_SENDING : eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )), + eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )), aPrinter (this, SW_RES( FT_PRINTER )), aPrintInfo (this, SW_RES( FT_PRINTINFO )), aCancel (this, SW_RES( PB_CANCELPRNMON )) @@ -36,7 +35,6 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) switch (eType) { case MONITOR_TYPE_SAVE: SetText(SW_RES(STR_SAVEMON)); break; - case MONITOR_TYPE_MAIL: SetText(SW_RES(STR_EMAILMON)); break; case MONITOR_TYPE_PRINT: break; } FreeResource(); diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index 2c244ffa8938..79aff5dee110 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -23,7 +23,6 @@ // DLG_PRINTMONITOR ------------------------------------------------------ ModelessDialog DLG_PRINTMONITOR { - HelpID = HID_MERGE_PRINTMONITOR ; SVLOOK = TRUE ; HIDE = TRUE ; OUTPUTSIZE = TRUE ; @@ -43,13 +42,6 @@ ModelessDialog DLG_PRINTMONITOR CENTER = TRUE ; Text [ en-US ] = "is being prepared for printing on" ; }; - FixedText FT_SENDING - { - Pos = MAP_APPFONT ( 6, 17 ) ; - Size = MAP_APPFONT ( 100, 8 ) ; - CENTER = TRUE ; - Text [ en-US ] = "is being sent to"; - }; FixedText FT_SAVING { Pos = MAP_APPFONT ( 6, 17 ) ; @@ -75,10 +67,6 @@ ModelessDialog DLG_PRINTMONITOR Size = MAP_APPFONT ( 50, 14 ) ; TABSTOP = TRUE ; }; - String STR_EMAILMON - { - Text [ en-US ] = "Send-Monitor"; - }; String STR_SAVEMON { Text [ en-US ] = "Save-Monitor"; @@ -159,7 +147,6 @@ String STR_FILTER_ACCDB // DLG_MM_CREATIONMONITOR ------------------------------------------------------ ModelessDialog DLG_MM_CREATIONMONITOR { - HelpID = HID_MERGE_PRINTMONITOR ; SVLOOK = TRUE ; HIDE = TRUE ; OUTPUTSIZE = TRUE ; diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 967f2a11640f..30190ab2f980 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -31,7 +31,6 @@ public: enum PrintMonitorType { MONITOR_TYPE_PRINT, - MONITOR_TYPE_MAIL, MONITOR_TYPE_SAVE }; FixedText aDocName; |