[Libreoffice-commits] core.git: sfx2/source
Caolán McNamara
caolanm at redhat.com
Sat Jan 4 08:15:41 PST 2014
sfx2/source/doc/doc.hrc | 6 +--
sfx2/source/view/view.hrc | 50 +-------------------------------
sfx2/source/view/view.src | 70 ----------------------------------------------
3 files changed, 6 insertions(+), 120 deletions(-)
New commits:
commit 4e8f4aedb6418f46c7f6888057a6c62ba05905dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 4 16:14:06 2014 +0000
unused dialog definition
probably since the new vcl print dialog
Change-Id: I0cba1399682920c3bb5c9c40a80457a27cc1506e
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 7bc96e5..bcdbb71 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -26,9 +26,9 @@
#define RID_SFX_DOC_END (RID_SFX_DIALOG_START-1)
#define STR_NODEFPRINTER (RID_SFX_DOC_START+ 0)
-#define STR_PRINT_OPTIONS (RID_SFX_DOC_START+ 6)
-#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 7)
-#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 8)
+#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1)
+#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2)
+
#define MSG_CONFIRM_FILTER (RID_SFX_DOC_START+11)
#define MSG_CONFIRM_OVERWRITE_TEMPLATE (RID_SFX_DOC_START+12)
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 763da00..4efc0ea 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -24,31 +24,15 @@
// #defines *****************************************************************
#define STR_NODEFPRINTER (RID_SFX_VIEW_START+ 0)
-#define STR_PRINTER_NOTAVAIL (RID_SFX_VIEW_START+ 1)
+#define STR_ERROR_PRINTER_BUSY (RID_SFX_VIEW_START+ 1)
+#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 2)
-
-#define STR_PRINT_OPTIONS (RID_SFX_VIEW_START+ 6)
-
-#define STR_ERROR_PRINTER_BUSY (RID_SFX_VIEW_START+ 8)
-#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 9)
-#define STR_PRINTING (RID_SFX_VIEW_START+10)
-
-#define DLG_PRINTMONITOR (RID_SFX_VIEW_START)
-#define FT_DOCNAME 1
-#define FT_PRINTING 2
-#define FT_PRINTER 3
-#define FT_PRINTINFO 4
-#define PB_CANCELPRNMON 5
-#define STR_FT_PREPARATION 6
#define STR_PAGE (RID_SFX_VIEW_START+20)
#define STR_ERROR_PRINT (RID_SFX_VIEW_START+21)
#define STR_PRINT_NEWORI (RID_SFX_VIEW_START+22)
#define STR_PRINT_NEWSIZE (RID_SFX_VIEW_START+23)
#define STR_PRINT_NEWORISIZE (RID_SFX_VIEW_START+24)
-#define STR_PREVIEW_DOCINFO (RID_SFX_VIEW_START+25)
-#define STR_PREVIEW_NODOCINFO (RID_SFX_VIEW_START+26)
-
#define MSG_ERROR_SEND_MAIL (RID_SFX_VIEW_START+31)
#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_VIEW_START+33)
@@ -56,36 +40,6 @@
#define MSG_QUERY_OPENASTEMPLATE (RID_SFX_VIEW_START+41)
#define MSG_CANT_CLOSE (RID_SFX_VIEW_START+42)
-#define FT_FRAMENAME 3
-#define ED_FRAMENAME 4
-#define FT_URL 5
-#define ED_URL 6
-#define BT_FILEOPEN 7
-#define NM_MARGINHEIGHT 8
-#define FT_MARGINHEIGHT 9
-#define NM_MARGINWIDTH 10
-#define FT_MARGINWIDTH 11
-#define GB_MARGIN 12
-#define RB_SCROLLINGON 13
-#define RB_SCROLLINGOFF 14
-#define RB_SCROLLINGAUTO 15
-#define GB_SCROLLING 16
-#define GB_BORDER 17
-#define RB_FRMBORDER_ON 18
-#define RB_FRMBORDER_INHERIT 19
-#define RB_FRMBORDER_OFF 20
-#define CB_MARGINWIDTHDEFAULT 21
-#define CB_MARGINHEIGHTDEFAULT 22
-
-#define GB_WIDTH 23
-#define GB_HEIGHT 24
-#define FT_WIDTH 33
-#define FT_HEIGHT 37
-
-#define FL_SEP_LEFT 46
-#define FL_SEP_RIGHT 47
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 640e8c6..136836e 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -31,14 +31,6 @@ String STR_NOSTARTPRINTER
{
Text [ en-US ] = "Could not start printer.\nPlease check your printer configuration." ;
};
-String STR_PRINTER_NOTAVAIL
-{
- Text [ en-US ] = "This document has been formatted for the printer $1. The specified printer is not available. \nDo you want to use the standard printer $2 ?" ;
-};
-String STR_PRINT_OPTIONS
-{
- Text [ en-US ] = "Options..." ;
-};
String STR_ERROR_PRINTER_BUSY
{
Text [ en-US ] = "Printer busy" ;
@@ -47,10 +39,6 @@ String STR_ERROR_PRINT
{
Text [ en-US ] = "Error while printing" ;
};
-String STR_PRINTING
-{
- Text [ en-US ] = "Printing" ;
-};
String STR_PAGE
{
Text [ en-US ] = "Page " ;
@@ -75,68 +63,12 @@ String STR_PRINT_NEWORISIZE
{
Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ;
};
-String STR_PREVIEW_DOCINFO
-{
- Text [ en-US ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Title:</b><dd>$(TITEL)<dt><b>Subject:</b><dd>$(THEME)<dt><b>Keywords:</b><dd>$(KEYWORDS)<dt><b>Description:</b><dd>$(TEXT)</dl></font></body></html>" ;
-};
-String STR_PREVIEW_NODOCINFO
-{
- Text [ en-US ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No document properties found.</B></FONT></P></BODY></HTML>" ;
-};
+
// -----------------------------------------------------------------------
InfoBox MSG_CANT_CLOSE
{
Message [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ;
};
- // DLG_PRINTMONITOR ------------------------------------------------------
-
-#define DLG_PRINTMONITOR_TEXT \
- Text [ en-US ] = "Print Monitor" ; \
-
-ModelessDialog DLG_PRINTMONITOR
-{
- HelpID = HID_PRINTMONITOR ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Moveable = TRUE;
- Size = MAP_APPFONT ( 112 , 81 ) ;
- DLG_PRINTMONITOR_TEXT
- FixedText FT_DOCNAME
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Center = TRUE ;
- };
- FixedText FT_PRINTING
- {
- Pos = MAP_APPFONT ( 6 , 19 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Center = TRUE ;
- Text [ en-US ] = "is being printed on" ;
- };
- FixedText FT_PRINTER
- {
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Center = TRUE ;
- };
- FixedText FT_PRINTINFO
- {
- Pos = MAP_APPFONT ( 6 , 45 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Center = TRUE ;
- };
- CancelButton PB_CANCELPRNMON
- {
- Pos = MAP_APPFONT ( 31 , 61 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- String STR_FT_PREPARATION
- {
- Text [ en-US ] = "is being prepared for printing";
- };
-};
// MSG_ERROR_SEND_MAIL ---------------------------------------------------
More information about the Libreoffice-commits
mailing list