CWS-TOOLING: integrate CWS vcl118

3 files changed, 1 insertions, 232 deletions

diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
index dcef661d01b8..209d284a7fde 100644
--- a/editeng/inc/editeng/editrids.hrc
+++ b/editeng/inc/editeng/editrids.hrc
@@ -240,45 +240,6 @@
 #define RID_SVXITEMS_WEIGHT_ULTRABOLD       (RID_EDIT_START + 167)
 #define RID_SVXITEMS_WEIGHT_BLACK           (RID_EDIT_START + 168)
 
-// paper formats
-#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 169)
-#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 170)
-#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 171)
-#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 172)
-#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 173)
-#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 174)
-#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 175)
-#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 176)
-#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 177)
-#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 178)
-#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 179)
-#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 180)
-#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 181)
-#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 182)
-#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 183)
-#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 184)
-#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 185)
-#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 186)
-#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 187)
-#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 188)
-#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 189)
-#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 190)
-#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 191)
-#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 192)
-#define RID_SVXSTR_PAPER_LEGAL2             (RID_SVX_START + 193)
-#define RID_SVXSTR_PAPER_MONARCH            (RID_SVX_START + 194)
-#define RID_SVXSTR_PAPER_COM675             (RID_SVX_START + 195)
-#define RID_SVXSTR_PAPER_COM9               (RID_SVX_START + 196)
-#define RID_SVXSTR_PAPER_COM10              (RID_SVX_START + 197)
-#define RID_SVXSTR_PAPER_COM11              (RID_SVX_START + 198)
-#define RID_SVXSTR_PAPER_COM12              (RID_SVX_START + 199)
-#define RID_SVXSTR_PAPER_KAI16              (RID_SVX_START + 200)
-#define RID_SVXSTR_PAPER_KAI32              (RID_SVX_START + 201)
-#define RID_SVXSTR_PAPER_KAI32BIG           (RID_SVX_START + 202)
-#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 203)
-#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 204)
-#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 205)
-
 // enum FontItalic -------------------------------------------------------
 #define RID_SVXITEMS_ITALIC_BEGIN           (RID_EDIT_START + 206)
 #define RID_SVXITEMS_ITALIC_NONE            (RID_EDIT_START + 206)
diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src
index 9fe7f3013ce6..c528dc8b0bd0 100644
--- a/editeng/source/items/page.src
+++ b/editeng/source/items/page.src
@@ -29,154 +29,6 @@
 
 #include <editeng/editrids.hrc>
 
-String RID_SVXSTR_PAPER_A0
-{
-    Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
-    Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
-    Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
-    Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
-    Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
-    Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
-    Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
-    Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
-    Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
-    Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
-    Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
-    Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
-    Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
-    Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
-    Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
-    Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
-    Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
-    Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
-    Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
-    Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
-    Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
-    Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
-    Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
-       Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
-    Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
-    Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
-    Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
-    Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
-    Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
-    Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
-    Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
-    Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
-    Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
-    Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
-    Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
-    Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
-    Text = "B6 (JIS)" ;
-};
 String RID_SVXSTR_PAPERBIN
 {
     Text [ en-US ] = "Paper tray" ;
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 3d79b980ec1d..8ba97193c3bc 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -135,51 +135,7 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
 
 String SvxPaperInfo::GetName( Paper ePaper )
 {
-    sal_uInt16  nResId = 0;
-
-    switch ( ePaper )
-    {
-        case PAPER_A0:          nResId = RID_SVXSTR_PAPER_A0;       break;
-        case PAPER_A1:          nResId = RID_SVXSTR_PAPER_A1;       break;
-        case PAPER_A2:          nResId = RID_SVXSTR_PAPER_A2;       break;
-        case PAPER_A3:          nResId = RID_SVXSTR_PAPER_A3;       break;
-        case PAPER_A4:          nResId = RID_SVXSTR_PAPER_A4;       break;
-        case PAPER_A5:          nResId = RID_SVXSTR_PAPER_A5;       break;
-        case PAPER_B4_ISO:      nResId = RID_SVXSTR_PAPER_B4_ISO;   break;
-        case PAPER_B5_ISO:      nResId = RID_SVXSTR_PAPER_B5_ISO;   break;
-        case PAPER_LETTER:      nResId = RID_SVXSTR_PAPER_LETTER;   break;
-        case PAPER_LEGAL:       nResId = RID_SVXSTR_PAPER_LEGAL;    break;
-        case PAPER_TABLOID:     nResId = RID_SVXSTR_PAPER_TABLOID;  break;
-        case PAPER_USER:        nResId = RID_SVXSTR_PAPER_USER;     break;
-        case PAPER_B6_ISO:      nResId = RID_SVXSTR_PAPER_B6_ISO;   break;
-        case PAPER_ENV_C4:      nResId = RID_SVXSTR_PAPER_C4;       break;
-        case PAPER_ENV_C5:      nResId = RID_SVXSTR_PAPER_C5;       break;
-        case PAPER_ENV_C6:      nResId = RID_SVXSTR_PAPER_C6;       break;
-        case PAPER_ENV_C65:     nResId = RID_SVXSTR_PAPER_C65;      break;
-        case PAPER_ENV_DL:      nResId = RID_SVXSTR_PAPER_DL;       break;
-        case PAPER_SLIDE_DIA:   nResId = RID_SVXSTR_PAPER_DIA;      break;
-        case PAPER_SCREEN:      nResId = RID_SVXSTR_PAPER_SCREEN;   break;
-        case PAPER_C:           nResId = RID_SVXSTR_PAPER_C;        break;
-        case PAPER_D:           nResId = RID_SVXSTR_PAPER_D;        break;
-        case PAPER_E:           nResId = RID_SVXSTR_PAPER_E;        break;
-        case PAPER_EXECUTIVE:   nResId = RID_SVXSTR_PAPER_EXECUTIVE;break;
-        case PAPER_FANFOLD_LEGAL_DE: nResId = RID_SVXSTR_PAPER_LEGAL2;  break;
-        case PAPER_ENV_MONARCH: nResId = RID_SVXSTR_PAPER_MONARCH;  break;
-        case PAPER_ENV_PERSONAL:    nResId = RID_SVXSTR_PAPER_COM675;   break;
-        case PAPER_ENV_9:       nResId = RID_SVXSTR_PAPER_COM9;     break;
-        case PAPER_ENV_10:      nResId = RID_SVXSTR_PAPER_COM10;    break;
-        case PAPER_ENV_11:      nResId = RID_SVXSTR_PAPER_COM11;    break;
-        case PAPER_ENV_12:      nResId = RID_SVXSTR_PAPER_COM12;    break;
-        case PAPER_KAI16:       nResId = RID_SVXSTR_PAPER_KAI16;    break;
-        case PAPER_KAI32:       nResId = RID_SVXSTR_PAPER_KAI32;    break;
-        case PAPER_KAI32BIG:    nResId = RID_SVXSTR_PAPER_KAI32BIG; break;
-        case PAPER_B4_JIS:      nResId = RID_SVXSTR_PAPER_B4_JIS;   break;
-        case PAPER_B5_JIS:      nResId = RID_SVXSTR_PAPER_B5_JIS;   break;
-        case PAPER_B6_JIS:      nResId = RID_SVXSTR_PAPER_B6_JIS;   break;
-        default: DBG_ERRORFILE( "unknown papersize" );
-    }
-
-    return ( nResId > 0 ) ? String( EditResId( nResId ) ) : String();
+    return String( Printer::GetPaperName( ePaper ) );
 }