regards
From 84a04befffec32ae4c9922a833c4f9748ebae8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= <pjacquod@alumni.ethz.ch>
Date: Sat, 27 Nov 2010 16:01:55 +0100
Subject: [PATCH 6/7] waring - initializer fixes in sw3io
---
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 181 ++++++++++-----------
1 files changed, 87 insertions(+), 94 deletions(-)
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index f283e66..e014201 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -88,123 +88,116 @@ sal_Char __FAR_DATA sSW3IO_DropDownField[] = "DropDownExport";
struct OldFormats
{
NfIndexTableOffset eFormatIdx;
- USHORT nOldFormat;
+ USHORT nOldFormat;
};
static OldFormats aOldDateFmt40[] =
{
// Datumsfelder:
- NF_DATE_SYSTEM_SHORT, DFF_SSYS, // Kurzes Systemdatum
- NF_DATE_SYSTEM_LONG, DFF_LSYS, // Langes Systemdatum
- NF_DATE_SYS_DDMMYY, DFF_DMY, // 06.10.64
- NF_DATE_SYS_DDMMYYYY, DFF_DMYY, // 06.10.1964
- NF_DATE_SYS_DMMMYY, DFF_DMMY, // 06. Okt 64
- NF_DATE_SYS_DMMMYYYY, DFF_DMMYY, // 06. Okt 1964
- NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY, // 06. Oktober 1964
- NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY, // 06. Oktober 64
- NF_DATE_SYS_NNDMMMYY, DFF_DDMMY, // Di, 06. Okt 64
- NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY, // Di, 06. Oktober 64
- NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY, // Di, 06. Oktober 1964
- NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY, // Dienstag, 06. Oktober 1964
- NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY, // Dienstag, 06. Oktober 64
- NF_DATE_SYS_MMYY, DFF_MY, // 10.64
- NF_DATE_DIN_MMDD, DFF_MD, // 10-06
- NF_DATE_DIN_YYMMDD, DFF_YMD, // 64-10-06
- NF_DATE_DIN_YYYYMMDD, DFF_YYMD, // 1964-10-06
-
- NF_NUMERIC_START, 0 // Tabellenende
+ { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
+ { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
+ { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
+ { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
+ { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
+ { NF_DATE_SYS_DMMMYYYY, DFF_DMMYY }, // 06. Okt 1964
+ { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY }, // 06. Oktober 1964
+ { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY }, // 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMYY, DFF_DDMMY }, // Di, 06. Okt 64
+ { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY }, // Di, 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY }, // Di, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY }, // Dienstag, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY }, // Dienstag, 06. Oktober 64
+ { NF_DATE_SYS_MMYY, DFF_MY }, // 10.64
+ { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
+ { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
+ { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldDateFmt30[] =
{
// Datumsfelder:
- NF_DATE_SYSTEM_SHORT, DFF_SSYS, // Kurzes Systemdatum
- NF_DATE_SYSTEM_LONG, DFF_LSYS, // Langes Systemdatum
- NF_DATE_SYS_DDMMYY, DFF_DMY, // 06.10.64
- NF_DATE_SYS_DDMMYYYY, DFF_DMYY, // 06.10.1964
- NF_DATE_SYS_DMMMYY, DFF_DMMY, // 06. Okt 64
- NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/, // 06. Okt 1964
- NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/, // 06. Oktober 1964
- NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/, // 06. Oktober 64
- NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/, // Di, 06. Oktober 1964
- NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/, // Di, 06. Okt 64
- NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/, // Di, 06. Oktober 64
- NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/, // Dienstag, 06. Oktober 1964
- NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/, // Dienstag, 06. Oktober 64
- NF_DATE_SYS_MMYY, 2 /*DFF_MY*/, // 10.64
- NF_DATE_DIN_MMDD, DFF_MD, // 10-06
- NF_DATE_DIN_YYMMDD, DFF_YMD, // 64-10-06
- NF_DATE_DIN_YYYYMMDD, DFF_YYMD, // 1964-10-06
-
- NF_NUMERIC_START, 0 // Tabellenende
+ { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
+ { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
+ { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
+ { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
+ { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
+ { NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/ }, // 06. Okt 1964
+ { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/ }, // 06. Oktober 1964
+ { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/ }, // 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/ }, // Di, 06. Oktober 1964
+ { NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/ }, // Di, 06. Okt 64
+ { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/ }, // Di, 06. Oktober 64
+ { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/ }, // Dienstag, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/ }, // Dienstag, 06. Oktober 64
+ { NF_DATE_SYS_MMYY, 2 /*DFF_MY*/ }, // 10.64
+ { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
+ { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
+ { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldTimeFmt[] =
{
// Zeitfelder:
- NF_TIME_HHMMSS, TF_SYSTEM, // Systemzeit
- NF_TIME_HHMM, TF_SSMM_24, // 23:25
- NF_TIME_HHMMAMPM, TF_SSMM_12, // 11:25 PM
-
- NF_NUMERIC_START, 0 // Tabellenende
+ { NF_TIME_HHMMSS, TF_SYSTEM }, // Systemzeit
+ { NF_TIME_HHMM, TF_SSMM_24 }, // 23:25
+ { NF_TIME_HHMMAMPM, TF_SSMM_12 }, // 11:25 PM
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldGetSetExpFmt40[] =
{
- NF_TEXT, VVF_CMD, // Kommando anzeigen
- NF_TEXT, VVF_INVISIBLE, // unsichtbar
- NF_PERCENT_INT, VVF_XXP, // 1234%
- NF_PERCENT_DEC2, VVF_XX_XXP, // 1.234,56%
- NF_TEXT, VVF_CLEAR, // ???
-
- NF_NUMBER_SYSTEM, VVF_SYS, // Zahlenformat aus der
- // Systemeinstellung
- NF_NUMBER_INT, VVF_X, // 1234
- NF_NUMBER_DEC2, VVF_X_X, // 1234,5
- NF_NUMBER_DEC2, VVF_X_XX, // 1245,56
- NF_NUMBER_1000DEC2, VVF_XX_XX, // 1.234,56
- NF_NUMBER_1000DEC2, VVF_XX_X, // 1.234,5
- NF_NUMBER_1000DEC2, VVF_XX_XXX, // 1.234,567
- NF_CURRENCY_1000DEC2, VVF_SYS_CUR, // currency format from the
- // system setup
- // (1.234,00 DM)
- NF_CURRENCY_1000INT, VVF_X_CUR, // 1234 DM
- NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR, // 1234,56 DM 1234,00 DM
- NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR, // 1234,56 DM 1234,-- DM
- NF_CURRENCY_1000INT, VVF_CUR_X, // DM 1234
- NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX, // DM 1234,56 DM 1234,00
- NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0, // DM 1234,56 DM 1234,--
-
- NF_NUMERIC_START, 0 // Tabellenende
+ {NF_TEXT, VVF_CMD }, // Kommando anzeigen
+ {NF_TEXT, VVF_INVISIBLE }, // unsichtbar
+ {NF_PERCENT_INT, VVF_XXP }, // 1234%
+ {NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
+ {NF_TEXT, VVF_CLEAR }, // ???
+ {NF_NUMBER_SYSTEM, VVF_SYS }, // Zahlenformat aus der
+ // Systemeinstellung
+ {NF_NUMBER_INT, VVF_X }, // 1234
+ {NF_NUMBER_DEC2, VVF_X_X }, // 1234,5
+ {NF_NUMBER_DEC2, VVF_X_XX }, // 1245,56
+ {NF_NUMBER_1000DEC2, VVF_XX_XX }, // 1.234,56
+ {NF_NUMBER_1000DEC2, VVF_XX_X }, // 1.234,5
+ {NF_NUMBER_1000DEC2, VVF_XX_XXX }, // 1.234,567
+ {NF_CURRENCY_1000DEC2, VVF_SYS_CUR }, // currency format from the
+ // system setup
+ // (1.234,00 DM)
+ {NF_CURRENCY_1000INT, VVF_X_CUR }, // 1234 DM
+ {NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR }, // 1234,56 DM 1234,00 DM
+ {NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR }, // 1234,56 DM 1234,-- DM
+ {NF_CURRENCY_1000INT, VVF_CUR_X }, // DM 1234
+ {NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX }, // DM 1234,56 DM 1234,00
+ {NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0 }, // DM 1234,56 DM 1234,--
+ {NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldGetSetExpFmt30[] =
{
- NF_TEXT, VVF_CMD, // Kommando anzeigen
- NF_TEXT, VVF_INVISIBLE, // unsichtbar
- NF_PERCENT_INT, VVF_XXP, // 1234%
- NF_PERCENT_DEC2, VVF_XX_XXP, // 1.234,56%
- NF_TEXT, VVF_CLEAR, // ???
-
- NF_NUMBER_SYSTEM, 0x0020, // Zahlenformat aus der
- // Systemeinstellung
- NF_NUMBER_INT, 0x0080, // 1234
- NF_NUMBER_1000DEC2, 0x0100, // 1.234,56
- NF_NUMBER_DEC2, 0x0100, // 1234,5
- NF_NUMBER_DEC2, 0x0100, // 1245,56
- NF_NUMBER_1000DEC2, 0x0100, // 1.234,5
- NF_NUMBER_1000DEC2, 0x0100, // 1.234,567
- NF_CURRENCY_1000DEC2, 0x0200, // currency format from
- // system setup
- // (1.234,00 DM)
- NF_CURRENCY_1000INT, 0x1000, // 1234 DM
- NF_CURRENCY_1000DEC2, 0x1000, // 1234,56 DM 1234,00 DM
- NF_CURRENCY_1000DEC2_DASHED, 0x1000, // 1234,56 DM 1234,-- DM
- NF_CURRENCY_1000INT, 0x1000, // DM 1234
- NF_CURRENCY_1000DEC2, 0x1000, // DM 1234,56 DM 1234,00
- NF_CURRENCY_1000DEC2_DASHED, 0x1000, // DM 1234,56 DM 1234,--
-
- NF_NUMERIC_START, 0 // Tabellenende
+ {NF_TEXT, VVF_CMD }, // Kommando anzeigen
+ {NF_TEXT, VVF_INVISIBLE }, // unsichtbar
+ {NF_PERCENT_INT, VVF_XXP }, // 1234%
+ {NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
+ {NF_TEXT, VVF_CLEAR }, // ???
+ {NF_NUMBER_SYSTEM, 0x0020 }, // Zahlenformat aus der
+ // Systemeinstellung
+ { NF_NUMBER_INT, 0x0080 }, // 1234
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,56
+ { NF_NUMBER_DEC2, 0x0100 }, // 1234,5
+ { NF_NUMBER_DEC2, 0x0100 }, // 1245,56
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,5
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,567
+ { NF_CURRENCY_1000DEC2, 0x0200 }, // currency format from
+ // system setup
+ // (1.234,00 DM)
+ { NF_CURRENCY_1000INT, 0x1000 }, // 1234 DM
+ { NF_CURRENCY_1000DEC2, 0x1000 }, // 1234,56 DM 1234,00 DM
+ { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // 1234,56 DM 1234,-- DM
+ { NF_CURRENCY_1000INT, 0x1000 }, // DM 1234
+ { NF_CURRENCY_1000DEC2, 0x1000 }, // DM 1234,56 DM 1234,00
+ { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // DM 1234,56 DM 1234,--
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
/*N*/ void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--
1.7.1
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.