cui/source/tabpages/page.h | 1 + cui/source/tabpages/page.src | 2 ++ vcl/source/gdi/print.cxx | 3 ++- vcl/source/src/print.src | 1 + 4 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 467ac438a3864b3f10ca2f14ed7c5497cf75e4de Author: Takeshi Abe <t...@fixedpoint.jp> Date: Wed Mar 14 02:07:36 2012 +0900 add 'Japanese Postcard' paper size to both Paper format and Print dialog diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 9a6af59..bc7ad78 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -72,6 +72,7 @@ #define PAPERSIZE_B4_JIS 34 #define PAPERSIZE_B5_JIS 35 #define PAPERSIZE_B6_JIS 36 +#define PAPERSIZE_POSTCARD_JP 46 #define PAPERSIZE_A6 56 #endif diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index b1bf107..91873c7 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -418,6 +418,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD < "#10 Envelope" ; PAPERSIZE_COM10; > ; < "#11 Envelope" ; PAPERSIZE_COM11; > ; < "#12 Envelope" ; PAPERSIZE_COM12; > ; + < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ; }; }; StringArray RID_SVXSTRARY_PAPERSIZE_DRAW @@ -452,6 +453,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW < "C4 Envelope" ; PAPERSIZE_C4 ; > ; < "Dia Slide" ; PAPERSIZE_DIA ; > ; < "Screen" ; PAPERSIZE_SCREEN ; > ; + < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ; }; }; // ********************************************************************** EOF diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index e25aa3a..90e8403 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -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_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_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" ); for( int i = 0; i < int(SAL_N_ELEMENTS(PaperIndex)); i++ ) diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index e1dab96..986c381 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -531,6 +531,7 @@ StringArray RID_STR_PAPERNAMES < "B4 (JIS)"; >; < "B5 (JIS)"; >; < "B6 (JIS)"; >; + < "Japanese Postcard"; >; }; }; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits