Kaydet (Commit) 467ac438 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Kohei Yoshida

add 'Japanese Postcard' paper size to both Paper format and Print dialog

üst 96d28ecf
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#define PAPERSIZE_B4_JIS 34 #define PAPERSIZE_B4_JIS 34
#define PAPERSIZE_B5_JIS 35 #define PAPERSIZE_B5_JIS 35
#define PAPERSIZE_B6_JIS 36 #define PAPERSIZE_B6_JIS 36
#define PAPERSIZE_POSTCARD_JP 46
#define PAPERSIZE_A6 56 #define PAPERSIZE_A6 56
#endif #endif
......
...@@ -418,6 +418,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD ...@@ -418,6 +418,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
< "#10 Envelope" ; PAPERSIZE_COM10; > ; < "#10 Envelope" ; PAPERSIZE_COM10; > ;
< "#11 Envelope" ; PAPERSIZE_COM11; > ; < "#11 Envelope" ; PAPERSIZE_COM11; > ;
< "#12 Envelope" ; PAPERSIZE_COM12; > ; < "#12 Envelope" ; PAPERSIZE_COM12; > ;
< "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
}; };
}; };
StringArray RID_SVXSTRARY_PAPERSIZE_DRAW StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
...@@ -452,6 +453,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW ...@@ -452,6 +453,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "C4 Envelope" ; PAPERSIZE_C4 ; > ; < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
< "Dia Slide" ; PAPERSIZE_DIA ; > ; < "Dia Slide" ; PAPERSIZE_DIA ; > ;
< "Screen" ; PAPERSIZE_SCREEN ; > ; < "Screen" ; PAPERSIZE_SCREEN ; > ;
< "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
}; };
}; };
// ********************************************************************** EOF // ********************************************************************** EOF
......
...@@ -1267,7 +1267,8 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) ...@@ -1267,7 +1267,8 @@ rtl::OUString Printer::GetPaperName( Paper ePaper )
PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_SCREEN, PAPER_C, PAPER_D, PAPER_E, PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_SCREEN, PAPER_C, PAPER_D, PAPER_E,
PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL, PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL,
PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16, PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16,
PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS, PAPER_B6_JIS PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS, PAPER_B6_JIS,
PAPER_POSTCARD_JP
}; };
OSL_ENSURE( sal_uInt32(SAL_N_ELEMENTS(PaperIndex)) == aPaperStrings.Count(), "localized paper name count wrong" ); OSL_ENSURE( sal_uInt32(SAL_N_ELEMENTS(PaperIndex)) == aPaperStrings.Count(), "localized paper name count wrong" );
for( int i = 0; i < int(SAL_N_ELEMENTS(PaperIndex)); i++ ) for( int i = 0; i < int(SAL_N_ELEMENTS(PaperIndex)); i++ )
......
...@@ -531,6 +531,7 @@ StringArray RID_STR_PAPERNAMES ...@@ -531,6 +531,7 @@ StringArray RID_STR_PAPERNAMES
< "B4 (JIS)"; >; < "B4 (JIS)"; >;
< "B5 (JIS)"; >; < "B5 (JIS)"; >;
< "B6 (JIS)"; >; < "B6 (JIS)"; >;
< "Japanese Postcard"; >;
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment