I believe the src charset pragma is archaic and unused

f64dc2c9 · Caolán McNamara · 3a17760c · f64dc2c9 · f64dc2c9 · f64dc2c9
Kaydet (Commit) f64dc2c9 authored Eyl 12, 2011 tarafından Caolán McNamara
45 changed files
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include "SpellDialog.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_SPELLCHECK -------------------------------------------------

--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -24,10 +24,9 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include "cuiimapdlg.hrc"
- // pragma ----------------------------------------------------------------
 ModalDialog RID_SVXDLG_IMAPURL
 {

--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -25,16 +25,9 @@
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include "fontsubs.hrc"
 #include "helpid.hrc"
- // pragma -------------------------------------------------------------------
 /**************************************************************************/
 TabPage RID_SVX_FONT_SUBSTITUTION

--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
 #include "optcolor.hrc"
- // pragma ----------------------------------------------------------------
 TabPage RID_SVXPAGE_COLORCONFIG
 {

--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
 #include "optdict.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SFXDLG_NEWDICT ----------------------------------------------------
 ModalDialog RID_SFXDLG_NEWDICT

--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -24,10 +24,9 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include -----------------------------------------------------------------
 #include "optfltr.hrc"
 #include <cuires.hrc>
- // pragma ------------------------------------------------------------------
 // RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT

--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
 #include "optinet2.hrc"
- // pragma -------------------------------------------------------------------
 /************************************************************************/
 /*                                                                      */

--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -24,13 +24,12 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include "autocdlg.hrc"
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <svx/svxids.hrc> // SID_AUTOFORMAT
- // pragma -------------------------------------------------------------------
 /**************************************************************************/
 /*                                                                        */
 /*  TabDialog RID_OFA_AUTOCORR_DLG                                        */

--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -24,7 +24,7 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
@@ -35,8 +35,6 @@
 #define UNLINKED_IMAGE                      \
    Text [ en-US ] = "Unlinked graphic" ; \
- // pragma ----------------------------------------------------------------
 // RID_SVXPAGE_BACKGROUND ------------------------------------------------
 TabPage RID_SVXPAGE_BACKGROUND
 {

--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -24,9 +24,7 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // pragma ----------------------------------------------------------------
- // include ---------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include "connect.hrc"
 #include <cuires.hrc>

--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -24,14 +24,13 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <cuires.hrc>
 #include "measure.hrc"
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 #define DELTA 20
- // pragma ----------------------------------------------------------------
 // RID_SVXPAGE_MEASURE ---------------------------------------------------
 TabPage RID_SVXPAGE_MEASURE

--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // pragma ----------------------------------------------------------------
 #include <svtools/controldims.hrc>
 #include <cuires.hrc>

--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -24,9 +24,8 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include <editeng/editrids.hrc>
- // pragma -------------------------------------------------------------------
 // Value strings ------------------------------------------------------------
 String RID_SVXITEMS_TRUE

--- a/editeng/source/misc/lingu.src
+++ b/editeng/source/misc/lingu.src
@@ -24,9 +24,8 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <editeng/editrids.hrc>
- // pragma ----------------------------------------------------------------
 // QueryBoxen ---------------------------------------------------------------
 QueryBox RID_SVXQB_CONTINUE

--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -447,7 +447,7 @@ Export::Export( const ByteString &rOutput, sal_Bool bWrite,
    if ( bEnableExport ) {
        aOutput.Open( String( rOutput, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_WRITE | STREAM_TRUNC );
        if( !aOutput.IsOpen() ) {
-            printf("ERROR : Can't open file %s\n",rOutput.GetBuffer());
+            fprintf(stderr, "ERROR : Can't open file %s\n",rOutput.GetBuffer());
            exit ( -1 );
        }
        aOutput.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
@@ -1111,25 +1111,8 @@ int Export::Execute( int nToken, const char * pToken )
        break;
        case PRAGMA : {
            bDontWriteOutput = sal_False;
-            while( sToken.SearchAndReplace( "\t", " " ) != STRING_NOTFOUND ) {};
+            fprintf(stderr, "ERROR: archaic PRAGMA %s\n", sToken.GetBuffer());
-            while( sToken.SearchAndReplace( "  ", " " ) != STRING_NOTFOUND ) {};
+            exit(-1);
-            sToken.EraseLeadingChars( ' ' );
-            sToken.EraseTrailingChars( ' ' );
-            ByteString sCharset = getToken(sToken, 1, ' ');
-            ByteString sSet = getToken(sToken, 2, ' ');
-            if (( sCharset.ToUpperAscii() == "CHARSET_IBMPC" ) ||
-                ( sCharset == "RTL_TEXTENCODING_IBM_850" ) ||
-                (( sCharset == "CHARSET" ) && ( sSet.ToUpperAscii() == "IBMPC" )))
-            {
-                aCharSet = RTL_TEXTENCODING_IBM_850;
-            }
-            else if (( sCharset == "CHARSET_ANSI" ) ||
-                ( sCharset == "RTL_TEXTENCODING_MS_1252" ) ||
-                (( sCharset == "CHARSET" ) && ( sSet.ToUpperAscii() == "ANSI" )))
-            {
-                aCharSet = RTL_TEXTENCODING_MS_1252;
-            }
        }
        break;
        case TEXTREFID : {

--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -24,12 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include "sc.hrc"
 #include "dwfunctr.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_CALCFUNC --------------------------------------------------
 DockingWindow FID_FUNCTION_BOX
 {

--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include "mgetempl.hrc"
- // pragma ----------------------------------------------------------------
 // TP_MANAGE_STYLES ------------------------------------------------------
 TabPage TP_MANAGE_STYLES

--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "docvor.hrc"
 #include "helpid.hrc"
-// pragma ----------------------------------------------------------------
 // DLG_ORGANIZE ----------------------------------------------------------

--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.src
@@ -24,14 +24,12 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "new.hrc"
 #include <sfx2/sfxcommands.h>
- // pragma ----------------------------------------------------------------
 // DLG_NEW_FILE ----------------------------------------------------------
 ModalDialog DLG_NEW_FILE
 {

--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.src
@@ -29,8 +29,6 @@
 #include <svtools/svtools.hrc>
 #include <svtools/sfxecode.hxx>
- // pragma ----------------------------------------------------------------
 String STR_ERR_HDLMESS
 {
    Text = "$(ACTION)$(ERROR)" ;

--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include "fontwork.hrc"
 #include "helpid.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_FONTWORK ---------------------------------------------------
 DockingWindow RID_SVXDLG_FONTWORK

--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 #include "hdft.hrc"
- // pragma ----------------------------------------------------------------
 #define  _TEXT_FT_LMARGIN \
        Text [ en-US ] = "~Left margin" ;                              \

--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -24,10 +24,9 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include "imapdlg.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_IMAP ----------------------------------------------------
 ModelessDialog RID_SVXDLG_IMAP

--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.src
@@ -25,9 +25,7 @@
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svx/dialogs.hrc>
- // pragma ----------------------------------------------------------------
 // Language-Strings ------------------------------------------------------

--- a/svx/source/dialog/optgrid.src
+++ b/svx/source/dialog/optgrid.src
@@ -24,12 +24,11 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 #include "optgrid.hrc"
- // pragma ----------------------------------------------------------------
 TabPage RID_SVXPAGE_GRID
 {

--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 #include "passwd.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_PASSWORD ---------------------------------------------------
 ModalDialog RID_SVXDLG_PASSWORD

--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -24,9 +24,8 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include <svx/dialogs.hrc>
- // pragma -------------------------------------------------------------------
 // Strings for the Draw-Dialog --------------------------------------------
 String RID_SVXSTR_SOLID

--- a/svx/source/engine3d/string3d.src
+++ b/svx/source/engine3d/string3d.src
@@ -24,9 +24,8 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ------------------------------------------------------------------
 #include <svx/dialogs.hrc>
- // pragma -------------------------------------------------------------------
 // Strings for the Draw Dialog --------------------------------------------
 String RID_SVX_3D_CREATE_LATHE

--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -24,14 +24,12 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #define __RSC
 #include "svx/svxerr.hxx"
 #include <svx/dialogs.hrc>
 #include <editeng/editerr.hxx>
- // pragma ----------------------------------------------------------------
 // Error-Context ---------------------------------------------------------
 Resource RID_SVXERRCTX
 {

--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -29,7 +29,6 @@
 #include <svtools/svtools.hrc>
 #include <svtools/sfxecode.hxx>
-// pragma ----------------------------------------------------------------
 Resource RID_ERRCTX
 {
    String ERRCTX_ERROR

--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 #include "stbctrls.h"
- // pragma ----------------------------------------------------------------
 // Strings ---------------------------------------------------------------
 String RID_SVXSTR_INSERT_TEXT

--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.src
@@ -27,7 +27,6 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
- // pragma ----------------------------------------------------------------
 // RID_SVXCTRL_COLOR -----------------------------------------------------
 DockingWindow RID_SVXCTRL_COLOR

--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -24,10 +24,9 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include <svx/dialogs.hrc>
 #include <helpid.hrc>
- // pragma ----------------------------------------------------------------
 /*
 * Bitmaps f"ur SvxFrameWindow

--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "globals.hrc"
 #include "chrdlg.hrc"

--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "globals.hrc"
 #include "chrdlg.hrc"

--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "dbui.hrc"
 #include "helpid.h"

--- a/sw/source/ui/envelp/envelp.src
+++ b/sw/source/ui/envelp/envelp.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "envelp.hrc"
 #include "globals.hrc"

--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "envfmt.hrc"
 #include "helpid.h"

--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "envlop.hrc"
 #include "helpid.h"

--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma *****************************************************************
 #include "envprt.hrc"
 #include "helpid.h"

--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "label.hrc"
 #include "globals.hrc"

--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "labfmt.hrc"
 #include "helpid.h"

--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -24,7 +24,6 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // #pragma ******************************************************************
 #include "labprt.hrc"
 #include "helpid.h"

--- a/sw/source/ui/fldui/javaedit.src
+++ b/sw/source/ui/fldui/javaedit.src
@@ -24,11 +24,10 @@
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/
- // include ---------------------------------------------------------------
 #include "javaedit.hrc"
 #include "fldui.hrc"
 #include "helpid.h"
- // pragma ----------------------------------------------------------------
 // RID_SVXDLG_POSTIT -----------------------------------------------------
 ModalDialog DLG_JAVAEDIT

--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -29,7 +29,6 @@
 #include "frmui.hrc"
 #include "cption.hrc"
 #include "cmdid.h"
- // #pragma ******************************************************************
 // ModalDialog **************************************************************
 ModalDialog DLG_CAPTION