You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/03/15 10:24:56 UTC

svn commit: r1456826 [3/6] - in /openoffice/branches/l10n/main: ./ autodoc/source/display/html/ automation/packimages/ automation/prj/ automation/source/communi/ automation/source/miniapp/ automation/source/testtool/ automation/util/ bridges/source/cpp...

Modified: openoffice/branches/l10n/main/hwpfilter/source/hwpread.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwpread.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwpread.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwpread.cpp Fri Mar 15 09:24:52 2013
@@ -70,10 +70,10 @@ int FieldCode::Read(HWPFile & hwpf)
 {
     ulong size;
     hchar dummy;
-    ulong len1;       /* hcharŸÀÔÀÇ ¹®ÀÚ¿­ Å×ÀÌÅÍ #1ÀÇ ±æÀÌ */
-    ulong len2;       /* hcharŸÀÔÀÇ ¹®ÀÚ¿­ Å×ÀÌÅÍ #2ÀÇ ±æÀÌ */
-    ulong len3;       /* hcharŸÀÔÀÇ ¹®ÀÚ¿­ Å×ÀÌÅÍ #3ÀÇ ±æÀÌ */
-    ulong binlen;     /* ÀÓÀÇ Çü½ÄÀÇ ¹ÙÀ̳ʸ® µ¥ÀÌŸ ±æÀÌ */
+    ulong len1;       /* hchar타입의 문자열 테이터 #1의 길이 */
+    ulong len2;       /* hchar타입의 문자열 테이터 #2의 길이 */
+    ulong len3;       /* hchar타입의 문자열 테이터 #3의 길이 */
+    ulong binlen;     /* 임의 형식의 바이너리 데이타 길이 */
 
     hwpf.Read4b(&size, 1);
     hwpf.Read2b(&dummy, 1);
@@ -107,7 +107,7 @@ int FieldCode::Read(HWPFile & hwpf)
 
     hwpf.ReadBlock(bin, binlen);
 
-     if( type[0] == 3 && type[1] == 2 ){ /* ¸¸µç³¯Â¥·Î¼­ Æ÷¸ËÀ» »ý¼ºÇØ¾ß ÇÑ´Ù. */
+     if( type[0] == 3 && type[1] == 2 ){ /* 만든날짜로서 포맷을 생성해야 한다. */
 		  DateCode *pDate = new DateCode;
           for (int i = 0 ; i < static_cast<int>(len3_); i++) {
 				if(str3[i] == 0 ) break;
@@ -387,46 +387,46 @@ int Picture::Read(HWPFile & hwpf)
     hwpf.AddBox(this);
 
     hwpf.Read4b(&follow_block_size, 1);
-    hwpf.Read2b(&dummy1, 1);                      /* ¿¹¾à 4¹ÙÀÌÆ® */
+    hwpf.Read2b(&dummy1, 1);                      /* 예약 4바이트 */
     hwpf.Read2b(&dummy2, 1);
 
     style.boxnum = fboxnum++;
 	 zorder = zindex++;
-    hwpf.Read1b(&style.anchor_type, 1);           /* ±âÁØÀ§Ä¡ */
-    hwpf.Read1b(&style.txtflow, 1);               /* ±×¸²ÇÇÇÔ. 0-2(ÀÚ¸®Â÷Áö,Åõ¸í,¾î¿ï¸²) */
-    hwpf.Read2b(&style.xpos, 1);                  /* °¡·ÎÀ§Ä¡ : 1 ¿ÞÂÊ, 2¿À¸¥ÂÊ, 3 °¡¿îµ¥, ÀÌ¿Ü = ÀÓÀÇ */
-    hwpf.Read2b(&style.ypos, 1);                  /* ¼¼·ÎÀ§Ä¡ : 1 À§, 2 ¾Æ·¡, 3 °¡¿îµ¥, ÀÌ¿Ü ÀÓÀÇ */
-    hwpf.Read2b(&option, 1);                      /* ±âŸ¿É¼Ç : Å׵θ®,±×¸²¹ÝÀü,µî. bit·Î ÀúÀå. */
-    hwpf.Read2b(&ctrl_ch, 1);                     /* Ç×»ó 11 */
-    hwpf.Read2b(style.margin, 12);                /* ¿©¹é : [0-2][] out/in/¼¿,[][0-3] ¿Þ/¿À¸¥/À§/¾Æ·¡ ¿©¹é */
-    hwpf.Read2b(&box_xs, 1);                      /* ¹Ú½ºÅ©±â °¡·Î */
-    hwpf.Read2b(&box_ys, 1);                      /* ¼¼·Î */
-    hwpf.Read2b(&cap_xs, 1);                      /* ĸ¼Ç Å©±â °¡·Î */
-    hwpf.Read2b(&cap_ys, 1);                      /* ¼¼·Î */
-    hwpf.Read2b(&style.cap_len, 1);               /* ±æÀÌ */
-    hwpf.Read2b(&xs, 1);                          /* Àüü Å©±â(¹Ú½º Å©±â + ĸ¼Ç + ¿©¹é) °¡·Î */
-    hwpf.Read2b(&ys, 1);                          /* ¼¼·Î */
-    hwpf.Read2b(&cap_margin, 1);                  /* ĸ¼Ç ¿©¹é */
+    hwpf.Read1b(&style.anchor_type, 1);           /* 기준위치 */
+    hwpf.Read1b(&style.txtflow, 1);               /* 그림피함. 0-2(자리차지,투명,어울림) */
+    hwpf.Read2b(&style.xpos, 1);                  /* 가로위치 : 1 왼쪽, 2오른쪽, 3 가운데, 이외 = 임의 */
+    hwpf.Read2b(&style.ypos, 1);                  /* 세로위치 : 1 위, 2 아래, 3 가운데, 이외 임의 */
+    hwpf.Read2b(&option, 1);                      /* 기타옵션 : 테두리,그림반전,등. bit로 저장. */
+    hwpf.Read2b(&ctrl_ch, 1);                     /* 항상 11 */
+    hwpf.Read2b(style.margin, 12);                /* 여백 : [0-2][] out/in/셀,[][0-3] 왼/오른/위/아래 여백 */
+    hwpf.Read2b(&box_xs, 1);                      /* 박스크기 가로 */
+    hwpf.Read2b(&box_ys, 1);                      /* 세로 */
+    hwpf.Read2b(&cap_xs, 1);                      /* 캡션 크기 가로 */
+    hwpf.Read2b(&cap_ys, 1);                      /* 세로 */
+    hwpf.Read2b(&style.cap_len, 1);               /* 길이 */
+    hwpf.Read2b(&xs, 1);                          /* 전체 크기(박스 크기 + 캡션 + 여백) 가로 */
+    hwpf.Read2b(&ys, 1);                          /* 세로 */
+    hwpf.Read2b(&cap_margin, 1);                  /* 캡션 여백 */
     hwpf.Read1b(&xpos_type, 1);
     hwpf.Read1b(&ypos_type, 1);
-    hwpf.Read1b(&smart_linesp, 1);                /* ÁÙ°£°Ý º¸È£ : 0 ¹Ìº¸È£, 1 º¸È£ */
+    hwpf.Read1b(&smart_linesp, 1);                /* 줄간격 보호 : 0 미보호, 1 보호 */
     hwpf.Read1b(&reserved1, 1);
-    hwpf.Read2b(&pgx, 1);                         /* ½ÇÁ¦ °è»êµÈ ¹Ú½º °¡·Î */
-    hwpf.Read2b(&pgy, 1);                         /* ¼¼·Î */
-    hwpf.Read2b(&pgno, 1);                        /* ÆäÀÌÁö ¼ýÀÚ : 0ºÎÅÍ ½ÃÀÛ */
-    hwpf.Read2b(&showpg, 1);                      /* ¹Ú½ºº¸¿©ÁÜ */
-    hwpf.Read2b(&cap_pos, 1);                     /* ĸ¼ÇÀ§Ä¡ 0 - 7 ¸Þ´º¼ø¼­. */
-    hwpf.Read2b(&num, 1);                         /* ¹Ú½º¹øÈ£ 0ºÎÅÍ ½ÃÀÛÇؼ­ ¸Å±äÀϷùøÈ£ */
-
-    hwpf.Read1b(&pictype, 1);                     /* ±×¸²Á¾·ù */
-
-    skip[0] = (short) hwpf.Read2b();              /* ±×¸²¿¡¼­ ½ÇÁ¦ Ç¥½Ã¸¦ ½ÃÀÛÇÒ À§Ä¡ °¡·Î */
-    skip[1] = (short) hwpf.Read2b();              /* ¼¼·Î */
-    scale[0] = (short) hwpf.Read2b();             /* È®´ëºñÀ² : 0 °íÁ¤, ÀÌ¿Ü ÆÛ¼¾Æ® ´ÜÀ§ °¡·Î */
-    scale[1] = (short) hwpf.Read2b();             /* ¼¼·Î */
+    hwpf.Read2b(&pgx, 1);                         /* 실제 계산된 박스 가로 */
+    hwpf.Read2b(&pgy, 1);                         /* 세로 */
+    hwpf.Read2b(&pgno, 1);                        /* 페이지 숫자 : 0부터 시작 */
+    hwpf.Read2b(&showpg, 1);                      /* 박스보여줌 */
+    hwpf.Read2b(&cap_pos, 1);                     /* 캡션위치 0 - 7 메뉴순서. */
+    hwpf.Read2b(&num, 1);                         /* 박스번호 0부터 시작해서 매긴일련번호 */
+
+    hwpf.Read1b(&pictype, 1);                     /* 그림종류 */
+
+    skip[0] = (short) hwpf.Read2b();              /* 그림에서 실제 표시를 시작할 위치 가로 */
+    skip[1] = (short) hwpf.Read2b();              /* 세로 */
+    scale[0] = (short) hwpf.Read2b();             /* 확대비율 : 0 고정, 이외 퍼센트 단위 가로 */
+    scale[1] = (short) hwpf.Read2b();             /* 세로 */
 
-    hwpf.Read1b(picinfo.picun.path, 256);         /* ±×¸²ÆÄÀÏ À̸§ : Á¾·ù°¡ DrawingÀÌ ¾Æ´Ò¶§. */
-    hwpf.Read1b(reserved3, 9);                    /* ¹à±â/¸í¾Ï/±×¸²È¿°ú µî */
+    hwpf.Read1b(picinfo.picun.path, 256);         /* 그림파일 이름 : 종류가 Drawing이 아닐때. */
+    hwpf.Read1b(reserved3, 9);                    /* 밝기/명암/그림효과 등 */
 
     UpdateBBox(this);
     if( pictype != PICTYPE_DRAW )
@@ -663,7 +663,7 @@ int ShowPageNum::Read(HWPFile & hwpf)
 }
 
 
-/* Ȧ¼öÂʽÃÀÛ/°¨Ãß±â (21) */
+/* 홀수쪽시작/감추기 (21) */
 PageNumCtrl::PageNumCtrl():HBox(CH_PAGE_NUM_CTRL)
 {
 }
@@ -797,7 +797,7 @@ int Outline::Read(HWPFile & hwpf)
 }
 
 
-/* ¹­À½ ºóÄ­(30) */
+/* 묶음 빈칸(30) */
 KeepSpace::KeepSpace():HBox(CH_KEEP_SPACE)
 {
 }
@@ -814,7 +814,7 @@ int KeepSpace::Read(HWPFile & hwpf)
 }
 
 
-/* °íÁ¤Æø ºóÄ­(31) */
+/* 고정폭 빈칸(31) */
 FixedSpace::FixedSpace():HBox(CH_FIXED_SPACE)
 {
 }

Modified: openoffice/branches/l10n/main/hwpfilter/source/hwpreader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwpreader.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwpreader.cxx (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwpreader.cxx Fri Mar 15 09:24:52 2013
@@ -360,7 +360,7 @@ void HwpReader::makeMeta()
 		}
         sprintf(buf,"%d-%02d-%02dT%02d:%02d:00",year,month,day,hour,minute);
 
-/* 2001³â 9¿ù 8ÀÏ Åä¿äÀÏ, 14½Ã 16ºÐ */
+/* 2001년 9월 8일 토요일, 14시 16분 */
 // 2001-09-07T11:16:47
         rstartEl( ascii("meta:creation-date"), rList );
         rchars( ascii(buf));
@@ -369,7 +369,7 @@ void HwpReader::makeMeta()
 
     if (hwpinfo->summary.keyword[0][0] || hwpinfo->summary.etc[0][0])
     {
-/* ½ºÆå¿¡´Â dc·Î µÇ¾îÀÖ´Ù. */
+/* 스펙에는 dc로 되어있다. */
         rstartEl(ascii("meta:keywords"), rList);
         if (hwpinfo->summary.keyword[0][0])
         {
@@ -497,7 +497,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
         if( hdo->type == HWPDO_LINE || hdo->type == HWPDO_ARC || hdo->type == HWPDO_FREEFORM ||
             hdo->type == HWPDO_ADVANCED_ARC )
         {
-                                                  /* È­»ìÇ¥¸¦ »ç¿ë */
+                                                  /* 화살표를 사용 */
             if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade  )
             {
                 ArrowShape[prop->line_tstyle].bMade = sal_True;
@@ -550,7 +550,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
 
         if( hdo->type != HWPDO_LINE )
         {
-            if( prop->flag >> 18  & 0x01 )        /* ºñÆ®¸Ê ÆÄÀÏ ¼Ó¼º Á¸Àç */
+            if( prop->flag >> 18  & 0x01 )        /* 비트맵 파일 속성 존재 */
             {
                 padd( ascii("draw:name"), sXML_CDATA, ascii(Int2Str(hdo->index, "fillimage%d", buf)));
                 if( !prop->pictype )
@@ -558,7 +558,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
                     padd( ascii("xlink:href"), sXML_CDATA,
                         hconv(kstr2hstr( (uchar *)urltounix(prop->szPatternFile).c_str()).c_str()));
                 }
-                else                              /* ÀÓº£µðµå image·Î¼­ ÆÄÀÏ·Î ÀúÀåÇØ¾ß ÇÑ´Ù. */
+                else                              /* 임베디드 image로서 파일로 저장해야 한다. */
                 {
                     EmPicture *emp = 0L;
                     if ( strlen( prop->szPatternFile ) > 3)
@@ -2471,11 +2471,11 @@ void HwpReader::makeCaptionStyle(FBoxSty
 
 
 /**
- * Floating °´Ã¼¿¡ ´ëÇÑ ½ºÅ¸ÀÏÀ» ¸¸µç´Ù.
+ * Floating 객체에 대한 스타일을 만든다.
  */
 void HwpReader::makeFStyle(FBoxStyle * fstyle)
 {
-                                                  /* ĸ¼Ç exist */
+                                                  /* 캡션 exist */
     if( ( fstyle->boxtype == 'G' || fstyle->boxtype == 'X' ) && fstyle->cap_len > 0 )
     {
         makeCaptionStyle(fstyle);
@@ -2769,7 +2769,7 @@ void HwpReader::make_text_p0(HWPPara * p
     }
     if( d->bFirstPara && d->bInBody )
     {
-        strcpy(buf,"[¹®¼­ÀÇ Ã³À½]");
+        strcpy(buf,"[문서의 처음]");
         padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
         rstartEl(ascii("text:bookmark"), rList);
         pList->clear();
@@ -2840,7 +2840,7 @@ void HwpReader::make_text_p1(HWPPara * p
     if( d->bFirstPara && d->bInBody )
     {
 /* for HWP's Bookmark */
-        strcpy(buf,"[¹®¼­ÀÇ Ã³À½]");
+        strcpy(buf,"[문서의 처음]");
         padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
         rstartEl(ascii("text:bookmark"), rList);
         pList->clear();
@@ -2918,7 +2918,7 @@ void HwpReader::make_text_p3(HWPPara * p
     {
         if( !pstart )
             STARTP;
-        strcpy(buf,"[¹®¼­ÀÇ Ã³À½]");
+        strcpy(buf,"[문서의 처음]");
         padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
         rstartEl(ascii("text:bookmark"), rList);
         pList->clear();
@@ -4697,8 +4697,8 @@ void HwpReader::makeHidden(Hidden * hbox
 
 
 /**
- * ÀÌ¹Ì master-page¿¡¼­ ÀÛ¾÷ÀÌ µÇ¾ú±â ¶§¹®¿¡ µû·Î ÀÛ¾÷ÇÒ ÇÊ¿ä°¡ ¾ø´Ù.
- * TODO : ³ªÁß¿¡ ¼Ò½ºÁ¤¸®ÇÒ¶§ Á¦°Å.
+ * 이미 master-page에서 작업이 되었기 때문에 따로 작업할 필요가 없다.
+ * TODO : 나중에 소스정리할때 제거.
  */
 /**
  * Footnote text: footnote, endnotes text: endnote to convert
@@ -4905,7 +4905,7 @@ void HwpReader::parsePara(HWPPara * para
             if( d->bFirstPara && d->bInBody )
             {
 /* for HWP's Bookmark */
-                strcpy(buf,"[¹®¼­ÀÇ Ã³À½]");
+                strcpy(buf,"[문서의 처음]");
                 padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
                 rstartEl(ascii("text:bookmark"), rList);
                 pList->clear();

Modified: openoffice/branches/l10n/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx (original)
+++ openoffice/branches/l10n/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx Fri Mar 15 09:24:52 2013
@@ -41,9 +41,9 @@ IndexEntrySupplier_asian::IndexEntrySupp
 {
 	implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii("index_data" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

Modified: openoffice/branches/l10n/main/i18npool/source/localedata/data/es_PE.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/i18npool/source/localedata/data/es_PE.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/i18npool/source/localedata/data/es_PE.xml (original)
+++ openoffice/branches/l10n/main/i18npool/source/localedata/data/es_PE.xml Fri Mar 15 09:24:52 2013
@@ -34,215 +34,8 @@
 <PlatformID>generic</PlatformID>
 </Platform>
 </LC_INFO>
-<LC_CTYPE unoid="generic">
-<Separators>
-<DateSeparator>/</DateSeparator>
-<ThousandSeparator>.</ThousandSeparator>
-<DecimalSeparator>,</DecimalSeparator>
-<TimeSeparator>:</TimeSeparator>
-<Time100SecSeparator>,</Time100SecSeparator>
-<ListSeparator>;</ListSeparator>
-<LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
-<LongDateDaySeparator> de </LongDateDaySeparator>
-<LongDateMonthSeparator> de </LongDateMonthSeparator>
-<LongDateYearSeparator> </LongDateYearSeparator>
-</Separators>
-<Markers>
-<QuotationStart>‘</QuotationStart>
-<QuotationEnd>’</QuotationEnd>
-<DoubleQuotationStart>“</DoubleQuotationStart>
-<DoubleQuotationEnd>”</DoubleQuotationEnd>
-</Markers>
-<TimeAM>a.m.</TimeAM>
-<TimePM>p.m.</TimePM>
-<MeasurementSystem>Metric</MeasurementSystem>
-</LC_CTYPE>
-<LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$S/-280A]">
-<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
-<FormatCode>D/MM/AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
-<FormatCode>NN DD/MMM AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
-<FormatCode>MM/AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
-<FormatCode>DD/MMM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
-<FormatCode>MMMM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
-<FormatCode>QQ AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
-<FormatCode>DD/MM/AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
-<FormatCode>DD/MM/AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
-<FormatCode>D "de" MMM "de" AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
-<FormatCode>D "de" MMM "de" AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
-<FormatCode>D "de" MMMM "de" AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-<FormatCode>NN D "de" MMM "de" AA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-<FormatCode>NN D "de" MMMM "de" AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
-<FormatCode>D. MMM. AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
-<FormatCode>D. MMMM AAAA</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
-<FormatCode>MM-DD</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
-<FormatCode>AA-MM-DD</FormatCode>
-<DefaultName>ISO 8601</DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-<FormatCode>AAAA-MM-DD</FormatCode>
-<DefaultName>ISO 8601</DefaultName>
-</FormatElement>
-<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
-<FormatCode>WW</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
-<FormatCode>HH:MM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
-<FormatCode>HH:MM:SS</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
-<FormatCode>HH:MM AM/PM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
-<FormatCode>HH:MM:SS AM/PM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
-<FormatCode>[HH]:MM:SS</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
-<FormatCode>MM:SS,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
-<FormatCode>[HH]:MM:SS,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
-<FormatCode>DD/MM/AA HH:MM</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
-<FormatCode>DD/MM/AAAA HH:MM:SS</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-<FormatCode>Estandar</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
-<FormatCode>0</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
-<FormatCode>0,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
-<FormatCode>#.##0</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
-<FormatCode>#.##0,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
-<FormatCode>#.###,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
-<FormatCode>[CURRENCY]#.##0;[CURRENCY]-#.##0</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
-<FormatCode>[CURRENCY]#.##0,00;[CURRENCY]-#.##0,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
-<FormatCode>[CURRENCY]#.##0;[RED][CURRENCY]-#.##0</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
-<FormatCode>[CURRENCY]#.##0,00;[RED][CURRENCY]-#.##0,00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
-<FormatCode>#.##0,00 CCC</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
-<FormatCode>[CURRENCY]#.##0,--;[RED][CURRENCY]-#.##0,--</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
-<FormatCode>0%</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
-<FormatCode>0,00%</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
-<FormatCode>0,00E+000</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
-<FormatCode>0,00E+00</FormatCode>
-<DefaultName></DefaultName>
-</FormatElement>
-</LC_FORMAT>
+<LC_CTYPE ref="es_DO"/>
+<LC_FORMAT ref="es_DO" replaceTo="[$S/-280A]"/>
 <LC_COLLATION ref="en_US"/>
 <LC_SEARCH ref="en_US"/>
 <LC_INDEX ref="es_ES"/>

Modified: openoffice/branches/l10n/main/i18npool/source/localedata/saxparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/i18npool/source/localedata/saxparser.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/i18npool/source/localedata/saxparser.cxx (original)
+++ openoffice/branches/l10n/main/i18npool/source/localedata/saxparser.cxx Fri Mar 15 09:24:52 2013
@@ -321,8 +321,6 @@ public:
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-
-
 	if( argc < 6) {
 		printf( "usage : %s <locaLe> <XML inputfile> <destination file> <services.rdb location> <types.rdb location>\n", argv[0] );
 		exit( 1 );
@@ -336,9 +334,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 			::rtl::OUString::createFromAscii(argv[4]),
 			::rtl::OUString::createFromAscii(argv[5]), true );
 	}
-	catch ( Exception& )
+	catch( const Exception& e)
 	{
-		printf( "Exception on createRegistryServiceFactory\n" );
+		const OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
+		printf( "Exception on createRegistryServiceFactory: \"%s\"\n", aMsg.getStr() );
 		exit(1);
 	}
 
@@ -373,10 +372,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 			rParser->parseStream( source );
 		}
 
-		catch( Exception & e )
+		catch( const Exception& e)
 		{
-			OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-			printf( "Exception during parsing : %s\n" ,  o1.getStr() );
+			const OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
+			printf( "Exception during parsing : \"%s\"\n",  aMsg.getStr() );
 			exit(1);
 		}
         nError = pDocHandler->nError;

Modified: openoffice/branches/l10n/main/i18npool/source/textconversion/textconversion.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/i18npool/source/textconversion/textconversion.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/i18npool/source/textconversion/textconversion.cxx (original)
+++ openoffice/branches/l10n/main/i18npool/source/textconversion/textconversion.cxx Fri Mar 15 09:24:52 2013
@@ -37,9 +37,9 @@ extern "C" { static void SAL_CALL thisMo
 TextConversion::TextConversion()
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "textconv_dict" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( "textconv_dict" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

Modified: openoffice/branches/l10n/main/i18npool/source/transliteration/textToPronounce_zh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/i18npool/source/transliteration/textToPronounce_zh.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/i18npool/source/transliteration/textToPronounce_zh.cxx (original)
+++ openoffice/branches/l10n/main/i18npool/source/transliteration/textToPronounce_zh.cxx Fri Mar 15 09:24:52 2013
@@ -144,9 +144,9 @@ extern "C" { static void SAL_CALL thisMo
 TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( "index_data" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

Modified: openoffice/branches/l10n/main/icu/icu4c-4_0_1-src.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/icu/icu4c-4_0_1-src.patch?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/icu/icu4c-4_0_1-src.patch (original)
+++ openoffice/branches/l10n/main/icu/icu4c-4_0_1-src.patch Fri Mar 15 09:24:52 2013
@@ -285,3 +285,17 @@
                  --len;
              }
          }
+--- misc/icu/source/tools/genuca/genuca.cpp	2009-01-15 08:46:02.000000000 +0100
++++ misc/build/icu/source/tools/genuca/genuca.cpp	2013-01-30 07:45:01.000000000 +0100
+@@ -904,9 +904,9 @@
+       {0x20000, 0x2A6D6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24)  },  //6 CJK_IMPLICIT_TAG,   /* 0x20000-0x2A6D6*/
+       {0x2F800, 0x2FA1D, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24)  },  //7 CJK_IMPLICIT_TAG,   /* 0x2F800-0x2FA1D*/
+ #endif
+-      {0xAC00, 0xD7B0, UCOL_SPECIAL_FLAG | (HANGUL_SYLLABLE_TAG << 24) },  //0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/
++      {0xAC00, 0xD7B0, static_cast<int32_t>(UCOL_SPECIAL_FLAG | (HANGUL_SYLLABLE_TAG << 24)) },  //0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/
+       //{0xD800, 0xDC00, UCOL_SPECIAL_FLAG | (LEAD_SURROGATE_TAG << 24)  },  //1 LEAD_SURROGATE_TAG,  /* D800-DBFF*/
+-      {0xDC00, 0xE000, UCOL_SPECIAL_FLAG | (TRAIL_SURROGATE_TAG << 24) },  //2 TRAIL_SURROGATE DC00-DFFF
++      {0xDC00, 0xE000, static_cast<int32_t>(UCOL_SPECIAL_FLAG | (TRAIL_SURROGATE_TAG << 24)) },  //2 TRAIL_SURROGATE DC00-DFFF
+       // Now directly handled in the collation code by the swapCJK function. 
+       //{0x3400, 0x4DB6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24)    },  //3 CJK_IMPLICIT_TAG,   /* 0x3400-0x4DB5*/
+       //{0x4E00, 0x9FA6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24)    },  //4 CJK_IMPLICIT_TAG,   /* 0x4E00-0x9FA5*/

Modified: openoffice/branches/l10n/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/branches/l10n/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt Fri Mar 15 09:24:52 2013
@@ -1,7 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installuser_	1	Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine_	2	Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser_	1	Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine_	2	Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2

Modified: openoffice/branches/l10n/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/branches/l10n/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt Fri Mar 15 09:24:52 2013
@@ -1,7 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-basisinstalluser	1	Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstalluser_	1	Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine_	2	Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser	1	Software\OpenOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser_	1	Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine	2	Software\OpenOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine_	2	Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2

Modified: openoffice/branches/l10n/main/instsetoo_native/res/nologoinstall.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/instsetoo_native/res/nologoinstall.bmp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst Fri Mar 15 09:24:52 2013
@@ -9,8 +9,8 @@ Globals
             OOOPACKAGEVERSION 4.0.0
             UREPACKAGEVERSION 4.0.0
             URELAYERVERSION 1
-            BASISROOTNAME ApacheOpenOffice
-            UNIXBASISROOTNAME apacheopenoffice
+            BASISROOTNAME OpenOffice
+            UNIXBASISROOTNAME openoffice
             HIDELICENSEDIALOG 1
             PACKAGEPREFIX 
             BASISPACKAGEPREFIX aoobasis
@@ -58,7 +58,8 @@ Apache_OpenOffice
     {
         variables
         {
-            PRODUCTNAME Apache OpenOffice
+            FULLPRODUCTNAME Apache OpenOffice
+            PRODUCTNAME OpenOffice
             PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
@@ -117,7 +118,8 @@ Apache_OpenOffice_wJRE
     {
         variables
         {
-            PRODUCTNAME Apache OpenOffice
+            FULLPRODUCTNAME Apache OpenOffice
+            PRODUCTNAME OpenOffice
             PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
@@ -176,6 +178,7 @@ Apache_OpenOffice_Dev
     {
         variables
         {
+            FULLPRODUCTNAME AOO-Developer-Build
             PRODUCTNAME AOO-Developer-Build
             PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
@@ -244,6 +247,7 @@ URE
         downloadname URE_{productversion}_{os}_install_{languages}
         variables
         {
+            FULLPRODUCTNAME URE
             PRODUCTNAME URE
             PRODUCTVERSION 4.0.0
             PACKAGEVERSION 4.0
@@ -286,7 +290,8 @@ Apache_OpenOffice_SDK
         downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME Apache OpenOffice
+            FULLPRODUCTNAME Apache OpenOffice
+            PRODUCTNAME OpenOffice
             PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -333,6 +338,7 @@ Apache_OpenOffice_Dev_SDK
         downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
+            FULLPRODUCTNAME AOO-Developer-Build
             PRODUCTNAME AOO-Developer-Build
             PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION

Modified: openoffice/branches/l10n/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx (original)
+++ openoffice/branches/l10n/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx Fri Mar 15 09:24:52 2013
@@ -498,7 +498,7 @@ javaPluginError jfw_plugin_startJavaVirt
             sRuntimeLib, osl_getThreadTextEncoding());
         rtl::OString sSymbol = rtl::OUStringToOString(
             sSymbolCreateJava, osl_getThreadTextEncoding());
-        fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION
+        fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
                 "Java runtime library: %s does not export symbol %s !\n",
                 sLib.getStr(), sSymbol.getStr());
         return JFW_PLUGIN_E_VM_CREATION_FAILED;
@@ -589,13 +589,13 @@ javaPluginError jfw_plugin_startJavaVirt
         rtl::OUString message;
         if( err < 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create Java Virtual Machine\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
         else if( err > 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create JavaVirtualMachine, abort handler was called.\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
@@ -603,7 +603,7 @@ javaPluginError jfw_plugin_startJavaVirt
     else
     {
         *ppVm = pJavaVM;
-        JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n");
+        JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n");
     }
         
         

Modified: openoffice/branches/l10n/main/l10ntools/inc/export.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/inc/export.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/inc/export.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/inc/export.hxx Fri Mar 15 09:24:52 2013
@@ -24,11 +24,9 @@
 #ifndef _EXPORT_HXX
 #define _EXPORT_HXX
 
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
 #include <l10ntools/directory.hxx>
-#endif
 
+#include <tagtest.hxx>
 
 // #define MERGE_SOURCE_LANGUAGES <- To merge en-US and de resource 
 
@@ -55,31 +53,6 @@
 
 #define JAPANESE_ISO "ja"
 
-
-struct eqstr{
-  sal_Bool operator()(const char* s1, const char* s2) const{
-    return strcmp(s1,s2)==0;
-  }
-};
-
-struct equalByteString{
-        bool operator()( const ByteString& rKey1, const ByteString& rKey2 ) const {
-            return rKey1.CompareTo( rKey2 )==COMPARE_EQUAL;
-    }
-};
-struct lessByteString{
-        bool operator()( const ByteString& rKey1, const ByteString& rKey2 ) const {
-            return rKey1.CompareTo( rKey2 )==COMPARE_LESS;
-    }
-};
-
-struct hashByteString{
-    size_t operator()( const ByteString& rName ) const{
-                std::hash< const char* > myHash;
-                return myHash( rName.GetBuffer() );
-    }
-};
-
 class PFormEntrys;
 class MergeData;
 typedef std::set<ByteString , lessByteString > ByteStringSet;

Modified: openoffice/branches/l10n/main/l10ntools/inc/l10ntools/directory.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/inc/l10ntools/directory.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/inc/l10ntools/directory.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/inc/l10ntools/directory.hxx Fri Mar 15 09:24:52 2013
@@ -19,6 +19,9 @@
  * 
  *************************************************************/
 
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+
 #include <vector>
 #include <algorithm>
 #include <rtl/ustring.hxx>
@@ -33,10 +36,7 @@
 
 #include <stdio.h>
 
-#ifndef L10NTOOLS_FILE_HXX
-#define L10NTOOLS_FILE_HXX
 #include <l10ntools/file.hxx>
-#endif
 
 namespace transex{
 
@@ -73,3 +73,6 @@ class Directory
 };
 
 }
+
+#endif // L10NTOOLS_DIRECTORY_HXX
+

Modified: openoffice/branches/l10n/main/l10ntools/inc/l10ntools/file.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/inc/l10ntools/file.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/inc/l10ntools/file.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/inc/l10ntools/file.hxx Fri Mar 15 09:24:52 2013
@@ -19,6 +19,9 @@
  * 
  *************************************************************/
 
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+
 #include "rtl/ustring.hxx"
 
 namespace transex
@@ -42,3 +45,6 @@ class File
 };
 
 }
+
+#endif // L10NTOOLS_FILE_HXX
+

Modified: openoffice/branches/l10n/main/l10ntools/inc/srciter.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/inc/srciter.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/inc/srciter.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/inc/srciter.hxx Fri Mar 15 09:24:52 2013
@@ -20,14 +20,12 @@
  *************************************************************/
 
 
+#ifndef L10NTOOLS_SRCITER_HXX
+#define L10NTOOLS_SRCITER_HXX
 
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
 #include <l10ntools/directory.hxx>
-#endif
 
 // class SourceTreeIterator
-//
 
 class SourceTreeIterator
 {
@@ -51,4 +49,5 @@ public:
 	virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
 };
 
+#endif // L10NTOOLS_SRCITER_HXX
 

Modified: openoffice/branches/l10n/main/l10ntools/inc/tagtest.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/inc/tagtest.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/inc/tagtest.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/inc/tagtest.hxx Fri Mar 15 09:24:52 2013
@@ -27,6 +27,7 @@
 #include <tools/string.hxx>
 #include <tools/list.hxx>
 #include <hash_map> /* std::hashmap*/
+#include <rtl/string.h>
 
 class GSILine;
 
@@ -53,8 +54,7 @@ struct lessByteString{
 
 struct hashByteString{
     size_t operator()( const ByteString& rName ) const{
-                std::hash< const char* > myHash;
-                return myHash( rName.GetBuffer() );
+        return rtl_str_hashCode_WithLength( rName.GetBuffer(), rName.Len());
     }
 };
 

Modified: openoffice/branches/l10n/main/l10ntools/source/export2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/export2.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/export2.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/export2.cxx Fri Mar 15 09:24:52 2013
@@ -263,13 +263,8 @@ void Export::RemoveUTF8ByteOrderMarker( 
 }
 
 bool Export::hasUTF8ByteOrderMarker( const ByteString &rString ){
-    // Byte order marker signature
-    
-    const unsigned char c1 =  0xEF;
-    const unsigned char c2 =  0xBB;
-    const unsigned char c3 =  0xBF;
-
-    const char bom[ 3 ] = { c1 , c2 , c3 };
+    // UTF-8 BOM: Byte order marker signature
+    static const unsigned char bom[3] = { 0xEF, 0xBB, 0xBF };
     
     return      rString.Len() >= 3 &&
                 rString.GetChar( 0 ) == bom[ 0 ] &&

Modified: openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx Fri Mar 15 09:24:52 2013
@@ -46,7 +46,7 @@ class convert_po : public convert_gen_im
     ~convert_po();
 
     void startLook (char *syyText);
-    void setValue  (char *syyText);
+    void setValue  (char *syyText, int iLineCnt);
     void setFuzzy  (char *syyText);
     void setKey    (char *syyText);
     void setMsgId  (char *syyText);

Modified: openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx Fri Mar 15 09:24:52 2013
@@ -89,21 +89,15 @@ void convert_po::startLook(char *syyText
 
 
 /**********************   I M P L E M E N T A T I O N   **********************/
-void convert_po::setValue(char *syyText)
+void convert_po::setValue(char *syyText, int iLineCnt)
 {
-  int inx;
-  std::string sText(syyText);
-
-  // find terminating "
-  for (inx =  sText.size(); sText[--inx] != '\"';) ;
-  sText.erase(inx);
-
   if (mbExpectId)
-    msId = sText;
+    msId = syyText;
   if (mbExpectStr)
-    msStr = sText;
+    msStr = syyText;
   mbExpectId  =
   mbExpectStr = false;
+  miLineNo   += iLineCnt;
 }
 
 
@@ -131,6 +125,11 @@ void convert_po::setKey(char *syyText)
   // remove trailing blanks
   for (i = msKey.size() -1; msKey[i] == '\r' || msKey[i] == ' ' || msKey[i] == '\t'; --i) ;
   msKey.erase(i+1);
+
+  if (msKey == "macrodlg.src#RID_MACROCHOOSER.modaldialog.text")
+  {
+    msKey = "jan";
+  }
 }
 
 
@@ -234,12 +233,25 @@ void convert_po::save(const std::string&
                       bool               bFuzzy)
 {
   std::ostream outFile(&outBuffer);
+  std::string  newText(sText), newENUStext(sENUStext);
+  int          i;
+  
+  for (i = 0; (i = newText.find("\"", i)) != (int)std::string::npos;)
+  {
+    newText.insert(i, "\\");
+    i += 2;
+  }
+  for (i = 0; (i = newENUStext.find("\"", i)) != (int)std::string::npos;)
+  {
+    newENUStext.insert(i, "\\");
+    i += 2;
+  }
 
   outFile << std::endl << "#: " << sFileName << "#" << sKey << std::endl;
   if (bFuzzy)
     outFile << "#, fuzzy" << std::endl;
-  outFile << "msgid  \"" << sENUStext << "\"" << std::endl
-          << "msgstr \"" << sText     << "\"" << std::endl;
+  outFile << "msgid  \"" << newENUStext << "\"" << std::endl
+          << "msgstr \"" << newText     << "\"" << std::endl;
 }
 
 

Modified: openoffice/branches/l10n/main/l10ntools/source/gConPolex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPolex.l?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPolex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPolex.l Fri Mar 15 09:24:52 2013
@@ -75,31 +75,66 @@ SPACE [ \t]*
 %%
 
 
-"\"".* {
-  LOCptr->setValue(&yytext[1]);
+"\"" {
+  if (LOCptr->mbExpectId || LOCptr->mbExpectStr)
+  {
+    char buildValue[8000];
+    int j, i, iLineCnt;
+
+    // loop across multiple "..." and combine them, while keeping the source
+    for (j = -1, iLineCnt = i = 0; yytext[i] == '\"';)
+    {
+      // build current "..."
+      for (; (buildValue[++j] = yytext[++i] = yyinput()) != '\"';)
+        if (yytext[i] == '\\')
+        {
+          yytext[++i] = yyinput();
+          if (yytext[i] != '\"')
+            ++j;
+          buildValue[j] = yytext[i];
+        }
+      --j;
+
+      // skip until next line
+      for (; (yytext[++i] = yyinput()) != '\n' && yytext[i] != '\"' && yytext[i] != EOF;) ;
+      if (yytext[i] == '\n')
+      {
+        ++iLineCnt;
+        yytext[++i] = yyinput();
+      }
+    }
+    if (yytext[i] != EOF)
+    {
+      unput(yytext[i]);
+    }
+    buildValue[j+1] = '\0';
+    LOCptr->setValue(buildValue, iLineCnt);
+  }
 }
 
 
-"#,"{SPACE}.*[fF][uU][zZ][zZ][yY] {
+^"#,"{SPACE}.*[fF][uU][zZ][zZ][yY] {
   LOCptr->setFuzzy(yytext);
 }
 
 
-"#:".* {
+^"#:".* {
   LOCptr->setKey(yytext);
 }
 
-"#~".*\r*\n {
+
+^"#~".* {
   // special comment, just skip
+  LOCptr->setMsgStr(yytext);
 }
 
 
-{SPACE}[mM][sS][gG][iI][dD]{SPACE} {
+^[mM][sS][gG][iI][dD]{SPACE} {
   LOCptr->setMsgId(yytext);
 }
 
 
-{SPACE}[mM][sS][gG][sS][tT][rR]{SPACE} {
+^[mM][sS][gG][sS][tT][rR]{SPACE} {
   LOCptr->setMsgStr(yytext);
 }
 

Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx Fri Mar 15 09:24:52 2013
@@ -192,7 +192,7 @@ void l10nMem_impl::setSourceKey(int     
   }
   else
   {
-    // add key, if changed text this is wrong but handled in reorganize
+    // add key, if changed text, this is wrong but handled in reorganize
     mcDb.addKey(iLineNo, sSourceFile, sKey, sText, l10nMem::ENTRY_ADDED);
   }
 }
@@ -339,16 +339,19 @@ bool l10nMem_impl::convFilterWarning(con
                                      const std::string& sKey,
                                      const std::string& sOrgText)
 {
+  if (sOrgText == "-")
+    return true;
+
   if (msModuleName == "basic")
   {
-    if (sOrgText == "-"               ||
-        sSourceFile == "basic.src"    ||
+    if (sSourceFile == "basic.src"    ||
         sSourceFile == "basmsg.src"   ||
         sSourceFile == "svtmsg.src"   ||
         sSourceFile == "testtool.src" ||
         sSourceFile == "ttmsg.src"    )
       return true;
   }
+
   return false;
 }
 
@@ -363,13 +366,22 @@ void l10nMem_impl::convEntryKey(int     
                                bool               bIsFuzzy)
 {
   std::vector<int> ivEntryList;
-  int              i, iSize = mcDb.mcFileList.size();
+  std::string      sKeyUpper;
+  int              i, iSize, iCandidate;
+
 
   // filter out dummy messages, silently
-  if (convFilterWarning(sSourceFile, sKey, sOrgText))
+  if (!sText.size() || convFilterWarning(sSourceFile, sKey, sOrgText))
     return;
 
+  // make copy of key in upper case
+  iSize     = sKey.size();
+  sKeyUpper = sKey;
+  for (i = 0; i < iSize; ++i)
+    sKeyUpper[i] = toupper(sKeyUpper[i]);
+
   // Find all matching file names
+  iSize      = mcDb.mcFileList.size();
   for (i = 1; i < iSize; ++i)
     if (sSourceFile == mcDb.mcFileList[i].msPureName)
     {
@@ -390,7 +402,7 @@ void l10nMem_impl::convEntryKey(int     
   }
 
   // Loop through all potential en_US entries
-  for (i = 0; i < iSize; ++i)
+  for (iCandidate = i = 0; i < iSize; ++i)
   {
     l10nMem_enus_entry& curE = mcDb.mcENUSlist[ivEntryList[i]];
 
@@ -399,10 +411,39 @@ void l10nMem_impl::convEntryKey(int     
       continue;
 
     // The msgId must match
-    if (sOrgText != curE.msText)
+    if (sOrgText == curE.msText)
+      break;
+
+    // is this the second (or more candidate ? then we cannot use key
+    if (iCandidate)
+    {
+      iCandidate = -1;
+      continue;
+    }
+
+    // compare keys, but be aware of different length
+    if (sKeyUpper != curE.msUpperKey)
       continue;
 
+    iCandidate = ivEntryList[i];
+  }
+  if (i == iSize && iCandidate <= 0)
+  {
+    showWarning("key(" + sKey + ")  lang(" + mcDb.mcLangList[mcDb.miCurLangInx] +
+                ") with msgId(" + sOrgText + ") cannot be matched", iLineNo);
+  }
+  else
+  {
+    // Primarely use text match, alternatively use key candidate 
+    if (i == iSize)
+    {
+      i = iCandidate;
+      showDebug("matching through KEY, key(" + sKey + ")  lang(" + mcDb.mcLangList[mcDb.miCurLangInx] +
+                ") with msgId(" + sOrgText + ")", iLineNo);
+    }
+
     // update language text
+    l10nMem_enus_entry& curE = mcDb.mcENUSlist[ivEntryList[i]];
     l10nMem_lang_entry& curL = curE.mcLangList[mcDb.miCurLangInx];
 
     if (sText != curL.msText)
@@ -411,9 +452,5 @@ void l10nMem_impl::convEntryKey(int     
       curL.mbFuzzy = bIsFuzzy;
       curE.meState = l10nMem::ENTRY_CHANGED;
     }
-    return;
   }
-
-  showWarning("key(" + sKey + ")  lang(" + mcDb.mcLangList[mcDb.miCurLangInx] +
-              ") with msgId(" + sOrgText + ") cannot be matched", iLineNo);
 }

Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx Fri Mar 15 09:24:52 2013
@@ -59,6 +59,7 @@ class l10nMem_enus_entry
     ~l10nMem_enus_entry();
 
     std::string                     msKey;      // key in po file and source file
+    std::string                     msUpperKey; // key converted to uppercase (for compare)
     std::string                     msText;     // en_US text from source file
     l10nMem::ENTRY_STATE            meState;    // status information
     int                             miFileInx;  // index of file name

Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx Fri Mar 15 09:24:52 2013
@@ -68,10 +68,24 @@ l10nMem_enus_entry::l10nMem_enus_entry(c
                                        miFileInx(iFileInx),
                                        miLineNo(iLineNo)
 {
-  int i;
+  int  i, iSize;
+  char ch;
 
+  // add dummy language entries
   for (i = 0; i < iLangSize; ++i)
     mcLangList.push_back(l10nMem_lang_entry("", false));
+
+  // convert key to upper case
+  iSize      = sKey.size();
+  msUpperKey = sKey;
+  for (i = 0; i < iSize; ++i)
+  {
+    ch = msUpperKey[i];
+    if (ch == ' ' || ch == '*' || ch == '+')
+      msUpperKey[i] = '_';
+    else
+      msUpperKey[i] = toupper(msUpperKey[i]);
+  }
 }
 
 

Modified: openoffice/branches/l10n/main/more_fonts/fonts/fc_local.conf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/more_fonts/fonts/fc_local.conf?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/more_fonts/fonts/fc_local.conf (original)
+++ openoffice/branches/l10n/main/more_fonts/fonts/fc_local.conf Fri Mar 15 09:24:52 2013
@@ -26,7 +26,6 @@
 
 	<alias binding="same">
 	  <family>Arimo</family>
-	  <family>Arial Narrow</family>
 	  <default>
 	  <family>Arial Narrow</family>
 	  </default>

Modified: openoffice/branches/l10n/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/cfgWin.js?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/cfgWin.js (original)
+++ openoffice/branches/l10n/main/odk/cfgWin.js Fri Mar 15 09:24:52 2013
@@ -22,8 +22,8 @@
 // examples of the Office Development Kit. The script duplicates the template
 // script and inserts the variables into the copied script.
 // The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice\\UNO\\InstallPath\\";
 var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
 var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
 var sDirDotNet1_1 = "v1.1.4322";
@@ -923,18 +923,18 @@ function writeBatFile(fdir, file)
         "set OO_SDK_NAME=" + oo_sdk_name  +
         "\n\n" +
         "REM Installation directory of the Software Development Kit.\n" +
-        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\Basic 4.0\\sdk\n" +
         "set OO_SDK_HOME=" + oo_sdk_home  +
         "\n\n" +
         "REM Office installation directory.\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
         "set OFFICE_HOME=" + office_home +
         "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice\\Basis 4.0\n" +
         "set OFFICE_BASE_HOME=" + office_base_home +
         "\n\n" +
         "REM URE installation directory.\n" +
-        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +
+        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice\\URE\n" +
         "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
         "\n\n" +
         "REM Directory of the make command.\n" +

Modified: openoffice/branches/l10n/main/odk/configure.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/configure.pl?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/configure.pl (original)
+++ openoffice/branches/l10n/main/odk/configure.pl Fri Mar 15 09:24:52 2013
@@ -235,7 +235,7 @@ if ( $main::OFFICE_OR_URE eq "Office" )
 else
 {
     # prepare URE path
-    $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure";
+    $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice/ure";
     $main::OO_SDK_URE_HOME_SUGGESTION = "" unless
         -e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
     for (;;)
@@ -711,8 +711,8 @@ sub searchprog
 
 sub searchMacOffice
 {
-	if (-d "/Applications/Apache OpenOffice.app" ) {
-		return "/Applications/Apache OpenOffice.app"
+	if (-d "/Applications/OpenOffice.app" ) {
+		return "/Applications/OpenOffice.app"
 	}
 	if (-d "/Applications/OpenOffice.org.app" ) {
 		return "/Applications/OpenOffice.org.app"
@@ -732,9 +732,9 @@ sub searchMacOffice
 
 sub searchoffice
 {
-	my $offset = rindex($main::sdkpath, "/apacheopenoffice");
+	my $offset = rindex($main::sdkpath, "/openoffice");
 	my $tmpOffice = substr($main::sdkpath, 0, $offset);
-	my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";
+	my $officepath = "$tmpOffice/openoffice$main::OO_MAJORVERSION";
 
 #	if ( $main::OO_MINORVERSION > 0) {
 #		$officepath = "$officepath$main::OO_MINORVERSION";

Modified: openoffice/branches/l10n/main/odk/docs/images/sdk_head-1.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/docs/images/sdk_head-1.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/l10n/main/odk/docs/install.html
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/docs/install.html?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/docs/install.html (original)
+++ openoffice/branches/l10n/main/odk/docs/install.html Fri Mar 15 09:24:52 2013
@@ -188,7 +188,7 @@
 		  <tr valign="top">
 		  <td class="cell20"><b>OFFICE_HOME</b></td>
 		  <td class="cell80">Path to an existing Apache OpenOffice 
-		  base installation, e.g. &quot;/opt/apacheopenoffice3&quot;. Be sure 
+		  base installation, e.g. &quot;/opt/openoffice3&quot;. Be sure 
 		  that it is not a user installation only. Exactly one of OFFICE_HOME
           and OO_SDK_URE_HOME must be set. The other should be either unset or
           set to an empty value.</td>
@@ -205,7 +205,7 @@
           <tr>
           <td class="cell20"><b>OO_SDK_URE_HOME</b></td>
           <td class="cell80">Path to an existing UNO Runtime Environment
-          installation, e.g. &quot;/opt/apacheopenoffice/ure&quot;. Exactly one of
+          installation, e.g. &quot;/opt/openoffice/ure&quot;. Exactly one of
           OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
           either unset or set to an empty value.</td>
           </tr>

Modified: openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in Fri Mar 15 09:24:52 2013
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
+# Example: OO_SDK_HOME=/opt/openoffice/basis4.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/apacheopenoffice4
+# Example: OFFICE_HOME=/opt/openoffice4
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
+# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
 OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
 export OO_SDK_URE_HOME
 

Modified: openoffice/branches/l10n/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_windows.template?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_windows.template Fri Mar 15 09:24:52 2013
@@ -27,18 +27,18 @@ REM Example: set OO_SDK_NAME=apacheopeno
 set OO_SDK_NAME=apacheopenoffice4.0_sdk
 
 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
+REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
+REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
 set OFFICE_BASE_HOME=
 
 REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
 set OO_SDK_URE_HOME=
 
 REM Directory of the make command.

Modified: openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (original)
+++ openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java Fri Mar 15 09:24:52 2013
@@ -188,7 +188,7 @@ final class InstallationFinder {
      */    
     private static String getPathFromWindowsRegistry() {
 
-        final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
+        final String SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
 
         String path = null;
         

Modified: openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c (original)
+++ openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c Fri Mar 15 09:24:52 2013
@@ -61,7 +61,7 @@ void closeErrorFile();
  * environment variable to the program directory of the UNO installation.
  * If no installation is specified by the user, the default installation on
  * the system will be taken. The default installation is read from the
- * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the 
+ * default value of the key "Software\OpenOffice\UNO\InstallPath" from the 
  * root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing, 
  * the key is read from the root key HKEY_LOCAL_MACHINE.</p>
  */

Modified: openoffice/branches/l10n/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/util/makefile.pmk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/l10n/main/odk/util/makefile.pmk Fri Mar 15 09:24:52 2013
@@ -23,8 +23,8 @@
 
 # used for sdk common files
 PRODUCT_RELEASE=4.0
-OFFICENAME=Apache OpenOffice
-SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
+OFFICENAME=OpenOffice
+SDKDIRNAME=openoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
 TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
 IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"

Modified: openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu (original)
+++ openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu Fri Mar 15 09:24:52 2013
@@ -27,6 +27,9 @@
 		<prop oor:name="ooName" install:module="brand">
 			<value >${PRODUCTNAME}</value>
 		</prop>
+		<prop oor:name="ooFullname" install:module="brand">
+			<value >${FULLPRODUCTNAME}</value>
+		</prop>
 		<prop oor:name="ooSetupVersion" install:module="brand">
 			<value >${PRODUCTVERSION}</value>
 		</prop>

Modified: openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Setup.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Setup.xcs?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Setup.xcs (original)
+++ openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Setup.xcs Fri Mar 15 09:24:52 2013
@@ -228,14 +228,21 @@
 				<desc>Contains common product and version information</desc>
 			</info>
 			<!--The default must be written by the setup.-->
-			<prop oor:name="ooName" oor:type="xs:string">
-				<info>
-					<desc>Specifies the name of a product.</desc>
-				</info>
-				<value/>
-				<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
-			</prop>
-			<prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">
+            <prop oor:name="ooName" oor:type="xs:string">
+                <info>
+                    <desc>Specifies the name of a product.</desc>
+                </info>
+                <value/>
+                <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
+            </prop>
+            <prop oor:name="ooFullname" oor:type="xs:string">
+                <info>
+                    <author>orw</author>
+                    <desc>Specifies the full name of a product.</desc>
+                </info>
+                <value/>
+            </prop>
+            <prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">
 				<info>
 					<desc>Specifies the version of the SO 6/7 or OOo 1.0 xml file formats.</desc>
 				</info>

Modified: openoffice/branches/l10n/main/ooo_custom_images/dev/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ooo_custom_images/dev/introabout/intro.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/l10n/main/ooo_custom_images/dev_nologo/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ooo_custom_images/dev_nologo/introabout/intro.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/l10n/main/ooo_custom_images/nologo/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ooo_custom_images/nologo/introabout/intro.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/l10n/main/sal/osl/unx/file_volume.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sal/osl/unx/file_volume.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sal/osl/unx/file_volume.cxx (original)
+++ openoffice/branches/l10n/main/sal/osl/unx/file_volume.cxx Fri Mar 15 09:24:52 2013
@@ -80,8 +80,7 @@ static const sal_Char* MOUNTTAB="/etc/mt
 
 #elif defined(MACOSX)
 
-#include <ufs/ufs/quota.h>
-//#include <ctype.h>
+#include <sys/quota.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #define HAVE_STATFS_H

Modified: openoffice/branches/l10n/main/sal/osl/unx/interlck.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sal/osl/unx/interlck.c?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sal/osl/unx/interlck.c (original)
+++ openoffice/branches/l10n/main/sal/osl/unx/interlck.c Fri Mar 15 09:24:52 2013
@@ -31,7 +31,7 @@
 #error please use asm/interlck_sparc.s
 #elif defined ( SOLARIS) && defined ( X86 )
 #error please use asm/interlck_x86.s
-#elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) )
+#elif (defined(__GNUC__) || defined(__clang__)) && (defined(X86) || defined(X86_64))
 /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */
 
 extern int osl_isSingleCPU;
@@ -212,3 +212,4 @@ oslInterlockedCount SAL_CALL osl_decreme
 }
 
 #endif /* default */
+

Modified: openoffice/branches/l10n/main/sal/osl/unx/module.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sal/osl/unx/module.c?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sal/osl/unx/module.c (original)
+++ openoffice/branches/l10n/main/sal/osl/unx/module.c Fri Mar 15 09:24:52 2013
@@ -83,7 +83,7 @@ oslModule SAL_CALL osl_loadAsciiModule(c
 
 #if OSL_DEBUG_LEVEL > 1
 		if (pLib == 0)
-			OSL_TRACE("Error osl_loadModule: %s\n", dlerror());
+			OSL_TRACE("error: osl_loadModule failed with %s\n", dlerror());
 #endif /* OSL_DEBUG_LEVEL */
 
 		return ((oslModule)(pLib));
@@ -120,7 +120,7 @@ void SAL_CALL osl_unloadModule(oslModule
 #if OSL_DEBUG_LEVEL > 1
         if (nRet != 0)
         {
-			fprintf(stderr, "Error osl_unloadModule: %s\n", dlerror());
+			fprintf(stderr, "error: osl_unloadModule failed with %s\n", dlerror());
         }
 #else
         (void) nRet;
@@ -154,7 +154,7 @@ osl_getAsciiFunctionSymbol(oslModule Mod
         fcnAddr = dlsym(Module, pSymbol);
         
         if (!fcnAddr)
-            OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s\n", dlerror());
+            OSL_TRACE("error: osl_getAsciiFunctionSymbol failed with %s\n", dlerror());
 	}
 #endif
 
@@ -234,3 +234,4 @@ sal_Bool SAL_CALL osl_getModuleURLFromFu
 {
     return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl); 
 }
+

Modified: openoffice/branches/l10n/main/sc/inc/helpids.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/inc/helpids.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/inc/helpids.h (original)
+++ openoffice/branches/l10n/main/sc/inc/helpids.h Fri Mar 15 09:24:52 2013
@@ -524,6 +524,10 @@
 #define HID_FUNC_COTHYP                                         "SC_HID_FUNC_COTHYP"
 #define HID_FUNC_TANHYP                                         "SC_HID_FUNC_TANHYP"
 #define HID_FUNC_ARCTAN2                                        "SC_HID_FUNC_ARCTAN2"
+#define HID_FUNC_COSECANT                                       "SC_HID_FUNC_COSECANT"
+#define HID_FUNC_SECANT                                         "SC_HID_FUNC_SECANT"
+#define HID_FUNC_SECANTHYP                                      "SC_HID_FUNC_SECANTHYP"
+#define HID_FUNC_COSECANTHYP                                    "SC_HID_FUNC_COSECANTHYP"
 #define HID_FUNC_DEG                                            "SC_HID_FUNC_DEG"
 #define HID_FUNC_RAD                                            "SC_HID_FUNC_RAD"
 #define HID_FUNC_EXP                                            "SC_HID_FUNC_EXP"

Modified: openoffice/branches/l10n/main/sc/source/core/inc/interpre.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/core/inc/interpre.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/core/inc/interpre.hxx (original)
+++ openoffice/branches/l10n/main/sc/source/core/inc/interpre.hxx Fri Mar 15 09:24:52 2013
@@ -44,7 +44,9 @@
 // This header must be included before including any Boost
 // math function.
 //
+#ifndef BOOST_MATH_OVERFLOW_ERROR_POLICY
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY errno_on_error
+#endif
 
 class ScDocument;
 class SbxVariable;
@@ -609,13 +611,6 @@ void ScGetDate();
 void ScGetTime();
 void ScGetDiffDate();
 void ScGetDiffDate360();
-void ScPower();
-void ScAmpersand();
-void ScAdd();
-void ScSub();
-void ScMul();
-void ScDiv();
-void ScPow();
 void ScCurrent();
 void ScStyle();
 void ScDde();
@@ -669,6 +664,13 @@ void ScIntercept();
 double ScGetGCD(double fx, double fy);
 void ScGCD();
 void ScLCM();
+void ScPower();
+void ScAmpersand();
+void ScAdd();
+void ScSub();
+void ScMul();
+void ScDiv();
+void ScPow();
 //-------------------------- Matrixfunktionen ---------------------------------
 
 void ScMatValue();

Modified: openoffice/branches/l10n/main/sc/source/ui/drawfunc/objdraw.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/drawfunc/objdraw.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/drawfunc/objdraw.src (original)
+++ openoffice/branches/l10n/main/sc/source/ui/drawfunc/objdraw.src Fri Mar 15 09:24:52 2013
@@ -131,6 +131,9 @@
                     HelpID = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
                     RadioCheck = TRUE ; \
                     Text [ en-US ] = "~Justified" ; \
+				};\
+            };\
+        };\
 	};\
     MenuItem\
     {\

Modified: openoffice/branches/l10n/main/sc/source/ui/optdlg/tpcalc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/optdlg/tpcalc.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/optdlg/tpcalc.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/optdlg/tpcalc.cxx Fri Mar 15 09:24:52 2013
@@ -112,6 +112,17 @@ __EXPORT ScTpCalcOptions::~ScTpCalcOptio
 
 void ScTpCalcOptions::Init()
 {
+    const Size a6Size = aFtPrec.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+    const Size aMin = aFtPrec.CalcMinimumSize();
+    const Point aPos = aFtPrec.GetPosPixel();
+    const long nNewX = aPos.X() + aFtPrec.GetSizePixel().Width() - aMin.Width();
+
+    aFtPrec.SetPosPixel( Point( nNewX, aPos.Y() ) );
+    aFtPrec.SetSizePixel( aMin );
+    aBtnGeneralPrec.SetSizePixel( Size(
+        nNewX - a6Size.Width() - aBtnGeneralPrec.GetPosPixel().X(),
+        aBtnGeneralPrec.GetSizePixel().Height() ) );
+
 	aBtnIterate .SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
     aBtnGeneralPrec.SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
 	aBtnDateStd .SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );

Modified: openoffice/branches/l10n/main/sc/source/ui/src/optdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/src/optdlg.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/src/optdlg.src (original)
+++ openoffice/branches/l10n/main/sc/source/ui/src/optdlg.src Fri Mar 15 09:24:52 2013
@@ -160,8 +160,9 @@ TabPage RID_SCPAGE_CALC
     {
         HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC";
         Pos = MAP_APPFONT ( 12 , 147 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
+        Size = MAP_APPFONT ( 148 , 26 ) ;
         Text [ en-US ] = "Limit decimals for general number format" ;
+        WordBreak = TRUE ;
     };
     FixedText FT_PREC
     {

Modified: openoffice/branches/l10n/main/sc/source/ui/src/scfuncs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/src/scfuncs.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/src/scfuncs.src (original)
+++ openoffice/branches/l10n/main/sc/source/ui/src/scfuncs.src Fri Mar 15 09:24:52 2013
@@ -3647,8 +3647,103 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
 			Text [ en-US ] = "The value for the y coordinate." ;
 		};
 	};
-
-	 // -=*# Resource for function DEG #*=-
+    // -=*# Resource for function CSC #*=-
+    Resource SC_OPCODE_COSECANT
+    {
+        String 1 // Description
+        {
+            Text [ en-US ] = "Return the cosecant of an angle. CSC(x)=1/SIN(x)" ;
+        };
+        ExtraData =
+        {
+            0;
+            ID_FUNCTION_GRP_MATH;
+            U2S( HID_FUNC_COSECANT );
+            1; 0;
+            0;
+        };
+        String 2 // Name of Parameter 1
+        {
+            Text [ en-US ] = "Angle" ;
+        };
+        String 3 // Description of Parameter 1
+        {
+            Text [ en-US ] = "The angle in radians for which the cosecant is to be calculated." ;
+        };
+    };   
+    // -=*# Resource for function SEC #*=-
+    Resource SC_OPCODE_SECANT
+    {
+        String 1 // Description
+        {
+            Text [ en-US ] = "Return the secant of an angle. SEC(x)=1/COS(x)" ;
+        };
+        ExtraData =
+        {
+            0;
+            ID_FUNCTION_GRP_MATH;
+            U2S( HID_FUNC_SECANT );
+            1; 0;
+            0;
+        };
+        String 2 // Name of Parameter 1
+        {
+            Text [ en-US ] = "Angle" ;
+        };
+        String 3 // Description of Parameter 1
+        {
+            Text [ en-US ] = "The angle in radians for which the secant is to be calculated." ;
+        };
+    };   
+    // -=*# Resource for function CSCH #*=-
+    Resource SC_OPCODE_COSECANT_HYP
+    {
+        String 1 // Description
+        {
+            Text [ en-US ] = "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)" ;
+        };
+        ExtraData =
+        {
+            0;
+            ID_FUNCTION_GRP_MATH;
+            U2S( HID_FUNC_COSECANTHYP );
+            1; 0;
+            0;
+        };
+        String 2 // Name of Parameter 1
+        {
+            Text [ en-US ] = "Angle" ;
+        };
+        String 3 // Description of Parameter 1
+        {
+            Text [ en-US ] = "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated." ;
+        };
+    };
+    // -=*# Resource for function SECH #*=-
+    Resource SC_OPCODE_SECANT_HYP
+    {
+        String 1 // Description
+        {
+            Text [ en-US ] = "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)" ;
+        };
+        ExtraData =
+        {
+            0;
+            ID_FUNCTION_GRP_MATH;
+            U2S( HID_FUNC_SECANTHYP );
+            1; 0;
+            0;
+        };
+        String 2 // Name of Parameter 1
+        {
+            Text [ en-US ] = "Angle" ;
+        };
+        String 3 // Description of Parameter 1
+        {
+            Text [ en-US ] = "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated." ;
+        };
+    };    
+	// -=*# Resource for function DEG #*=-
 	Resource SC_OPCODE_DEG
 	{
 		String 1 // Description

Modified: openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx Fri Mar 15 09:24:52 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
 uno::Any SAL_CALL 
 ScVbaWindow::getCaption() throw (uno::RuntimeException)
 {
-	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
+	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice Calc" ) );
 	static sal_Int32 nCrudLen = sCrud.getLength();
 
 	rtl::OUString sTitle;

Modified: openoffice/branches/l10n/main/sc/util/hidother.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/util/hidother.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/util/hidother.src (original)
+++ openoffice/branches/l10n/main/sc/util/hidother.src Fri Mar 15 09:24:52 2013
@@ -191,6 +191,10 @@ hidspecial HID_FUNC_SINHYP		 { HelpID = 
 hidspecial HID_FUNC_COTHYP		 { HelpID = HID_FUNC_COTHYP; };
 hidspecial HID_FUNC_TANHYP		 { HelpID = HID_FUNC_TANHYP; };
 hidspecial HID_FUNC_ARCTAN2		 { HelpID = HID_FUNC_ARCTAN2; };
+hidspecial HID_FUNC_COSECANT     { HelpID = HID_FUNC_COSECANT; };
+hidspecial HID_FUNC_SECANT       { HelpID = HID_FUNC_SECANT; };
+hidspecial HID_FUNC_COSECANTHYP  { HelpID = HID_FUNC_COSECANTHYP; };
+hidspecial HID_FUNC_SECANTHYP    { HelpID = HID_FUNC_SECANTHYP; };
 hidspecial HID_FUNC_DEG		 { HelpID = HID_FUNC_DEG; };
 hidspecial HID_FUNC_RAD		 { HelpID = HID_FUNC_RAD; };
 hidspecial HID_FUNC_EXP		 { HelpID = HID_FUNC_EXP; };