incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1339213 [7/11] - in /incubator/ooo/branches/alg/aw080: ./ ext_sources/ extras/l10n/source/en-GB/ extras/l10n/source/pt-BR/ extras/l10n/source/zh-CN/ extras/l10n/source/zh-TW/ main/ main/apache-commons/java/codec/ main/apache-commons/java/h...
Date Wed, 16 May 2012 15:07:08 GMT
Modified: incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hwpreader.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hwpreader.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hwpreader.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hwpreader.cxx Wed May 16 15:07:00 2012
@@ -358,7 +358,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));
@@ -367,7 +367,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])
         {
@@ -495,7 +495,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;
@@ -548,7 +548,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 )
@@ -556,7 +556,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
                     padd( ascii("xlink:href"), sXML_CDATA,
                         hconv(kstr2hstr( (uchar *)urltounix(prop->szPatternFile, buf), sbuf), gstr));
                 }
-                else                              /* ???????? image???? ?????? ???????? ????. */
+                else                              /* ÀÓº£µðµå image·Î¼­ ÆÄÀÏ·Î ÀúÀåÇØ¾ß ÇÑ´Ù. */
                 {
                     EmPicture *emp = 0L;
                     if ( strlen( prop->szPatternFile ) > 3)
@@ -608,8 +608,8 @@ void HwpReader::makeDrawMiscStyle( HWPDr
                 pList->clear();
                 rendEl( ascii("draw:fill-image"));
             }
-/* ???????????? ????????, ???????????? ????????, ?????? ????????. */
-            else if( prop->flag >> 16  & 0x01 )   /* ?????????? ???????? */
+/* If there is a gradient, or bitmap file exists, it is the first step. */
+            else if( prop->flag >> 16  & 0x01 )   /* the presence of the gradient */
             {
                 padd( ascii("draw:name"), sXML_CDATA, ascii(Int2Str(hdo->index, "Grad%d", buf)));
                 switch( prop->gstyle )
@@ -691,7 +691,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
                 pList->clear();
                 rendEl( ascii("draw:gradient"));
             }
-                                                  /* ???? */
+                                                  /* Hatching */
             else if( prop->pattern_type >> 24 & 0x01 )
             {
                 int type = prop->pattern_type & 0xffffff;
@@ -855,8 +855,8 @@ void HwpReader::makeStyles()
 
 /**
  * parse automatic styles from hwpfile
- * ?????????? ?????? ???? ???????? ????????. ???????? ?????? ????????, ??????, ???? ?????? ???????? ???????? ????????, Body?????? ?????? ?????? ???????? ????????.
- * 1. paragraph, text, fbox, page???????? ???? ????????.
+ * Automatically define a style that is reflected. For example, each paragraph or, tables, headers, etc, are defined in the style of the place, Body uses the style defined here.
+ * 1. paragraph, text, fbox, page styles are supported for.
  */
 void HwpReader::makeAutoStyles()
 {
@@ -1087,7 +1087,7 @@ void HwpReader::makeMasterStyles()
         rstartEl(ascii("style:master-page"), rList);
         pList->clear();
 
-        if( pSet[i].bIsSet )                      /* ???? ?????? ?????????? */
+        if( pSet[i].bIsSet )                /* If the current setting is changed */
         {
 			  if( !pSet[i].pagenumber ){
 					if( pPrevSet && pPrevSet->pagenumber )
@@ -1129,11 +1129,11 @@ void HwpReader::makeMasterStyles()
             pPage = &pSet[i];
             pPrevSet = &pSet[i];
         }
-        else if( pPrevSet )                       /* ?????? ?????? ???? ??????. */
+        else if( pPrevSet )          /*  If there is anything previously set. */
         {
             pPage = pPrevSet;
         }
-        else                                      /* ???? ?????? ?????? ???????????? */
+        else                         /* If there is already set to default settings */
         {
             rstartEl(ascii("style:header"), rList);
             padd(ascii("text:style-name"), sXML_CDATA, ascii("Standard"));
@@ -1183,7 +1183,7 @@ void HwpReader::makeMasterStyles()
             d->nPnPos = 0;
             rendEl(ascii("style:header"));
         }
-                                                  /* ???????? ????. */
+                                                  /* Is based */
         else if( pPage->header_odd && !pPage->header_even )
         {
             rstartEl(ascii("style:header"), rList);
@@ -1218,7 +1218,7 @@ void HwpReader::makeMasterStyles()
             d->nPnPos = 0;
             rendEl(ascii("style:header-left"));
         }
-                                                  /* ???????? ????. */
+                                                  /* Is based. */
         else if( pPage->header_even && !pPage->header_odd )
         {
             rstartEl(ascii("style:header-left"), rList);
@@ -1284,7 +1284,7 @@ void HwpReader::makeMasterStyles()
             d->nPnPos = 0;
             rendEl(ascii("style:footer"));
         }
-                                                  /* ???????? ????. */
+                                                  /* Is based. */
         else if( pPage->footer_odd && !pPage->footer_even )
         {
             rstartEl(ascii("style:footer"), rList);
@@ -1319,7 +1319,7 @@ void HwpReader::makeMasterStyles()
             d->nPnPos = 0;
             rendEl(ascii("style:footer-left"));
         }
-                                                  /* ???????? ????. */
+                                                  /* Is based. */
         else if( pPage->footer_even && !pPage->footer_odd )
         {
             rstartEl(ascii("style:footer-left"), rList);
@@ -1362,11 +1362,11 @@ void HwpReader::makeMasterStyles()
 
 
 /**
- * ?????? ???????? ???? ???????????? ??????.
+ * Create a text style for the properties.
  * 1. fo:font-size, fo:font-family, fo:letter-spacing, fo:color,
  *    style:text-background-color, fo:font-style, fo:font-weight,
  *    style:text-underline,style:text-outline,fo:text-shadow,style:text-position
- *    ?? ????????.
+ *    are supported.
  */
 void HwpReader::parseCharShape(CharShape * cshape)
 {
@@ -1436,11 +1436,11 @@ void HwpReader::parseCharShape(CharShape
 
 
 /**
- * ???? Paragraph?? ???????? properties???? ??????.
+ * Make paragraph + * corresponding to the physical properties.
  * 1. fo:margin-left,fo:margin-right,fo:margin-top, fo:margin-bottom,
  *    fo:text-indent, fo:line-height, fo:text-align, fo:border
- *    ?? ??????.
- * TODO : ?????? => ???????? ?????????? ?????????? ???????? ????.
+ *    are implemented.
+ * TODO : taepseoljeong => The default setting should be optional. Limited.
  */
 void HwpReader::parseParaShape(ParaShape * pshape)
 {
@@ -1508,7 +1508,7 @@ void HwpReader::parseParaShape(ParaShape
 
 
 /**
- * Paragraph?? ???? ???????? ??????.
+ * Styles made for paragraph.
  */
 void HwpReader::makePStyle(ParaShape * pshape)
 {
@@ -1578,8 +1578,8 @@ void HwpReader::makePStyle(ParaShape * p
 
 
 /**
- * ???????? ???????? ??????. ???????? header/footer, footnote???? ????????.
- * TODO : , fo:background-color(?????? ????)
+ * Create the style of the page. This header / footer, footnote, and so on.
+ * TODO : fo: background-color (no information)
  */
 void HwpReader::makePageStyle()
 {
@@ -1811,7 +1811,7 @@ void HwpReader::makePageStyle()
 		 rendEl(ascii("style:properties"));
 		 rendEl(ascii("style:footer-style"));
 
-	/* footnote style ???? dtd?????? ????????, ???????? ???????? ????. REALKING */
+	/* footnote style in this dtd missing, but the specification is defined. REALKING */
 		 rstartEl(ascii("style:footnote-layout"), rList);
 
 		 padd(ascii("style:distance-before-sep"), sXML_CDATA,
@@ -1850,17 +1850,17 @@ void HwpReader::makeColumns(ColumnDef *c
   {
 		switch( coldef->separator )
 		{
-			 case 1:                           /* ?????? */
+			 case 1:                           /* yapeunseon */
 				  padd(ascii("style:width"), sXML_CDATA, ascii("0.02mm"));
-			 case 3:                           /* ???? */
+			 case 3:                           /* dotted */
 				  padd(ascii("style:style"), sXML_CDATA, ascii("dotted"));
 				  padd(ascii("style:width"), sXML_CDATA, ascii("0.02mm"));
 				  break;
-			 case 2:                           /* ???????? */
-			 case 4:                           /* 2???? */
+			 case 2:                           /* dukkeounseon */
+			 case 4:                           /* 2 jungseon */
 				  padd(ascii("style:width"), sXML_CDATA, ascii("0.35mm"));
 				  break;
-			 case 0:                           /* ???? */
+			 case 0:                           /* None */
 			 default:
 				  padd(ascii("style:style"), sXML_CDATA, ascii("none"));
 				  break;
@@ -1974,14 +1974,14 @@ void HwpReader::makeTableStyle(Table *tb
         {
             switch( cl->linetype[2] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line*/
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -1991,56 +1991,56 @@ void HwpReader::makeTableStyle(Table *tb
         {
             switch( cl->linetype[0] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-left"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cl->linetype[1] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-right"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cl->linetype[2] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-top"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cl->linetype[3] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-bottom"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -2385,14 +2385,14 @@ void HwpReader::makeCaptionStyle(FBoxSty
                 case 0:
                     padd(ascii("fo:padding"), sXML_CDATA,ascii("0mm"));
                     break;
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -2402,56 +2402,56 @@ void HwpReader::makeCaptionStyle(FBoxSty
         {
             switch( cell->linetype[0] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-left"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[1] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-right"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[2] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-top"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[3] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-bottom"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -2470,11 +2470,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);
@@ -2596,14 +2596,14 @@ void HwpReader::makeFStyle(FBoxStyle * f
                 case 0:
 						  padd(ascii("fo:border"), sXML_CDATA, ascii("none"));
                     break;
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -2613,56 +2613,56 @@ void HwpReader::makeFStyle(FBoxStyle * f
         {
             switch( cell->linetype[0] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-left"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[1] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-right"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[2] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-top"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
             }
             switch( cell->linetype[3] )
             {
-                case 1:                           /* ???????? */
-                case 3:                           /* ???? -> ?????????????? ?????? ????. */
+                case 1:                           /* thin solid line */
+                case 3:                           /* dotted line -> Star Office does not have a dotted line. */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
                     break;
-                case 2:                           /* ???????? */
+                case 2:                           /* thick solid line */
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
                     break;
-                case 4:                           /* 2???? */
+                case 4:                           /* 2 jungseon */
                     padd(ascii("style:border-line-width-bottom"), sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
                     padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm double #000000"));
                     break;
@@ -2754,7 +2754,7 @@ void HwpReader::makeChars(hchar *str, in
 
 
 /**
- * ???????? ?????????? ???? ???? ?????? ?????? CharShape?? ???????? ????
+ * Special characters within a paragraph, but if you use characters other CharShape
  */
 void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
 {
@@ -2771,7 +2771,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();
@@ -2821,7 +2821,7 @@ void HwpReader::make_text_p0(HWPPara * p
 
 
 /**
- * ???????? ?????????? ?????? ???????? ???? CharShape?? ???????? ????
+ *  Special characters within a paragraph, but if you use characters other CharShape.
  */
 void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
 {
@@ -2841,7 +2841,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();
@@ -2904,7 +2904,7 @@ void HwpReader::make_text_p1(HWPPara * p
 
 
 /**
- * ???? ???? ?????????? ?????? ???????? ???? CharShape?? ???? ?????? ???? ????
+ * There are special characters in a paragraph of text handling for the case with other CharShape.
  */
 void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
 {
@@ -2920,7 +2920,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();
@@ -3043,9 +3043,9 @@ void HwpReader::make_text_p3(HWPPara * p
                     }
                     makeTab((Tab *) para->hhstr[n]);
                     break;
-                case CH_TEXT_BOX:                 /* 10 - ??/??????????/????/????/???????????? ?? */
+                case CH_TEXT_BOX:                 /* 10 - Table / text box / formula / buttons / Hypertext net */
                 {
-/* ?????? ???? ????????, ?????? text:p???? ???????? ?????? ????. */
+/* Once the tables are processed, and the formula text: p that goes into processing. */
                     TxtBox *hbox = (TxtBox *) para->hhstr[n];
 
                     if( hbox->style.anchor_type == 0 )
@@ -3152,11 +3152,11 @@ void HwpReader::make_text_p3(HWPPara * p
                     l = 0;
                     makeMailMerge((MailMerge *) para->hhstr[n]);
                     break;
-                case CH_COMPOSE:                  /* 23 - ???????? */
+                case CH_COMPOSE:                  /* 23 - text overlap */
                     break;
                 case CH_HYPHEN:                   // 24
                     break;
-                case CH_TOC_MARK:                 /* 25 ?????? 3???? ???????? ????. */
+                case CH_TOC_MARK:                 /* 25 Following 3 must work. */
                     if( !pstart ) {STARTP;}
                     if( !tstart ) {STARTT;}
                     makeChars(gstr, l);
@@ -3189,7 +3189,7 @@ void HwpReader::make_text_p3(HWPPara * p
 
 void HwpReader::makeFieldCode(FieldCode *hbox)
 {
-/* ?????? */
+/* Nureumteul*/
     if( hbox->type[0] == 4 && hbox->type[1] == 0 )
     {
         padd(ascii("text:placeholder-type"), sXML_CDATA, ascii("text"));
@@ -3200,7 +3200,7 @@ void HwpReader::makeFieldCode(FieldCode 
         rchars( OUString(gstr));
         rendEl( ascii("text:placeholder") );
     }
-/* ???????? */
+/* Text Summary */
     else if( hbox->type[0] == 3 && hbox->type[1] == 0 )
     {
         if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("title")))
@@ -3228,7 +3228,7 @@ void HwpReader::makeFieldCode(FieldCode 
             rendEl( ascii("text:keywords") );
         }
     }
-/* ???????? */
+/* Personal information. */
     else if( hbox->type[0] == 3 && hbox->type[1] == 1 )
     {
         if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("User")))
@@ -3293,7 +3293,7 @@ void HwpReader::makeFieldCode(FieldCode 
         }
 
     }
-    else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* ???????? */
+    else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* Created */
 	 {
 		 if( hbox->m_pDate )
 			 padd(ascii("style:data-style-name"), sXML_CDATA,
@@ -3308,7 +3308,7 @@ void HwpReader::makeFieldCode(FieldCode 
 
 /**
  * Completed
- * ???????????????? ???????? Reference?? ???????? hwp???? ?? ?????? ????.
+ * Refer to Reference Star Office bookmarks do not have the feature in a hwp.
  */
 void HwpReader::makeBookmark(Bookmark * hbox)
 {
@@ -3319,7 +3319,7 @@ void HwpReader::makeBookmark(Bookmark * 
         pList->clear();
         rendEl(ascii("text:bookmark"));
     }
-    else if (hbox->type == 1)                     /* ???? ???????? ???? ?????? ???? ???? */
+    else if (hbox->type == 1)                     /* If the block bukmakeuil has a beginning and an end */
     {
         padd(ascii("text:name"), sXML_CDATA, (hconv(hbox->id, gstr)));
         rstartEl(ascii("text:bookmark-start"), rList);
@@ -3580,10 +3580,10 @@ void HwpReader::makeTable(TxtBox * hbox)
 
 
 /**
- * ???????????? ???????? ????????.
+ * To parse the text boxes and tables.
  * 1. draw:style-name, draw:name, text:anchor-type, svg:width,
  *    fo:min-height, svg:x, svg:y
- * TODO : fo:background-color?? ???? ???? ????=>???????? ???????? ?? ???? ????????.
+ * TODO : fo:background-color of the cell color settings => I do not know yet whether to enter the style.
  */
 void HwpReader::makeTextBox(TxtBox * hbox)
 {
@@ -3627,7 +3627,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
             Double2Str(WTMM(( hbox->box_ys + hbox->cap_ys) )) + ascii("mm"));
         rstartEl(ascii("draw:text-box"), rList);
         pList->clear();
-        if( hbox->cap_pos % 2 )                   /* ?????? ?????? ???????? */
+        if( hbox->cap_pos % 2 )             /* is located at the top of the caption */
         {
             parsePara(hbox->caption.first());
         }
@@ -3698,7 +3698,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
     {
         rstartEl(ascii("draw:text-box"), rList);
         pList->clear();
-/* ?????? ????????, ?????? ?????? */
+/* If caption exists, on top of */
         if( hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type == TBL_TYPE )
         {
             parsePara(hbox->caption.first());
@@ -3711,7 +3711,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
         {
             parsePara(hbox->plists[0].first());
         }
-/* ?????? ????????, ???????? ?????? */
+/* If caption exists, at the bottom */
         if( hbox->style.cap_len > 0 && !(hbox->cap_pos % 2) && hbox->type == TBL_TYPE)
         {
             parsePara(hbox->caption.first());
@@ -3739,7 +3739,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
 
 
 /**
- * MathML?? ???????? ????.
+ * MathML should be converted.
  *
  */
 void HwpReader::makeFormula(TxtBox * hbox)
@@ -3797,9 +3797,9 @@ void HwpReader::makeFormula(TxtBox * hbo
 
 
 /**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ???????? ????????????
- * C:\ => ??????, D:\ => ????(/)?? ?????????? ?????? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * Href platform reads the information in C: \ or D: \ if you start with Linux or Solaris,
+ * if C: \ => Home, D: \ => root (/) is needed to convert the operation. It
+ * writes Hancomm because of the DOS emulator.
  */
 void HwpReader::makeHyperText(TxtBox * hbox)
 {
@@ -3842,9 +3842,9 @@ void HwpReader::makeHyperText(TxtBox * h
 
 
 /**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ???????? ????????????
- * C:\ => ??????, D:\ => ????(/)?? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * Href platform reads the information in C: \ or D: \ if you start with Linux or Solaris,
+ * if C: \ => Home, D: \ => root (/) has changed. It
+ * writes Hancomm because the DOS emulator.
  */
 void HwpReader::makePicture(Picture * hbox)
 {
@@ -3894,7 +3894,7 @@ void HwpReader::makePicture(Picture * hb
                     Double2Str(WTMM( hbox->box_ys + hbox->style.margin[1][2] + hbox->style.margin[1][3] + hbox->cap_ys )) + ascii("mm"));
                 rstartEl(ascii("draw:text-box"), rList);
                 pList->clear();
-                if( hbox->cap_pos % 2 )           /* ?????? ?????? ???????? */
+                if( hbox->cap_pos % 2 )           /* is located at the top of the caption */
                 {
                     parsePara(hbox->caption.first());
                 }
@@ -4041,7 +4041,7 @@ void HwpReader::makePicture(Picture * hb
             if( hbox->style.cap_len > 0 )
             {
                 rendEl( ascii("text:p"));
-                if( !(hbox->cap_pos % 2))         /* ?????? ???????? ????????, */
+                if( !(hbox->cap_pos % 2))         /* is located at the bottom of the caption, */
                 {
                     parsePara(hbox->caption.first());
                 }
@@ -4119,13 +4119,13 @@ void HwpReader::makePictureDRAW(HWPDrawi
 					 ZZPoint pt[3], r_pt[3];
 					 for(i = 0 ; i < 3 ; i++ ){
 						 pt[i].x = pal->pt[i].x - drawobj->property.rot_originx;
-                         /* ???????????? ???? */
+                         /* Convert to physical coordinates */
 						 pt[i].y = -(pal->pt[i].y - drawobj->property.rot_originy);
 					 }
 
                 double rotate, skewX ;
 
-                     /* 2 - ?????? ???? */
+                     /* 2 - Rotation calculation */
 					 if( pt[1].x == pt[0].x ){
 						 if( pt[1].y > pt[0].y )
 							 rotate = PI/2;
@@ -4142,7 +4142,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
 						 r_pt[i].y = (int)(pt[i].y * cos(-(rotate)) + pt[i].x * sin(-(rotate)));
 					 }
 
-                     /* 4 - ???? ???? */
+                     /* 4 - hwingak calculation */
 					 if( r_pt[2].y == r_pt[1].y )
 						 skewX = 0;
 					 else
@@ -4180,7 +4180,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
             }
             switch (drawobj->type)
             {
-                case HWPDO_LINE:                  /* ?? - ????????, ??????. */
+                case HWPDO_LINE:                  /* line - starting coordinates, kkeutjwapyo. */
                     if( drawobj->u.line_arc.flip & 0x01 )
                     {
                         padd(ascii("svg:x1"), sXML_CDATA,
@@ -4214,7 +4214,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
                     pList->clear();
                     rendEl(ascii("draw:line"));
                     break;
-                case HWPDO_RECT:                  /* ?????? - ????????, ????/???? */
+                case HWPDO_RECT:                  /* rectangle - the starting position, the horizontal / vertical */
                     if( !bIsRotate )
                     {
                         padd(ascii("svg:x"), sXML_CDATA,
@@ -4256,8 +4256,8 @@ void HwpReader::makePictureDRAW(HWPDrawi
                     }
                     rendEl(ascii("draw:rect"));
                     break;
-                case HWPDO_ELLIPSE:               /* ???? - ????????, ????/???? */
-                case HWPDO_ADVANCED_ELLIPSE:      /* ?????? ???? */
+                case HWPDO_ELLIPSE:               /* ellipse - the starting position, the horizontal / vertical */
+                case HWPDO_ADVANCED_ELLIPSE:      /* ellipse */
                 {
                     if( !bIsRotate )
                     {
@@ -4306,10 +4306,10 @@ void HwpReader::makePictureDRAW(HWPDrawi
                     break;
 
                 }
-                case HWPDO_ARC:                   /* ?? */
+                case HWPDO_ARC:                   /* Call */
                 case HWPDO_ADVANCED_ARC:
                 {
-                    /* ??????????, ???????????? ???? ?????? ?????? ???????? ????. */
+                    /* If the foil, Star Office is a full size of the ellipse size. */
 						 uint flip = drawobj->u.line_arc.flip;
                     if( !bIsRotate )
                     {
@@ -4416,7 +4416,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
                     break;
 
                 }
-                     case HWPDO_CURVE: /* ???? : ?????????? ????. */
+                     case HWPDO_CURVE: /* Curve converted to polygons. */
                 {
 						 sal_Bool bIsNatural = sal_True;
                          // os unused
@@ -4534,7 +4534,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
                     break;
                 }
                 case HWPDO_CLOSED_FREEFORM:
-                case HWPDO_FREEFORM:              /* ?????? */
+                case HWPDO_FREEFORM:              /* Polygon */
                 {
                     bool bIsPolygon = false;
 
@@ -4677,8 +4677,8 @@ void HwpReader::makeLine(Line *   )
 
 
 /**
- * ????-????-???????? : ?????????? ???? ?????? ????????.
- * ?????? ?????? ?? ??????, ???? ???????? ???????? ????????.
+ * Input - comments - Hidden Description: The description shows the hidden to the user.
+ * Paragraph may include, but pulled out just a character string to parse.
  */
 void HwpReader::makeHidden(Hidden * hbox)
 {
@@ -4708,7 +4708,11 @@ void HwpReader::makeHidden(Hidden * hbox
 
 
 /**
- * ?????? text:footnote, ?????? text:endnote?? ????
+ * ÀÌ¹Ì master-page¿¡¼­ ÀÛ¾÷ÀÌ µÇ¾ú±â ¶§¹®¿¡ µû·Î ÀÛ¾÷ÇÒ ÇÊ¿ä°¡ ¾ø´Ù.
+ * TODO : ³ªÁß¿¡ ¼Ò½ºÁ¤¸®ÇÒ¶§ Á¦°Å.
+ */
+/**
+ * Footnote text: footnote, endnotes text: endnote to convert
  */
 void HwpReader::makeFootnote(Footnote * hbox)
 {
@@ -4816,7 +4820,7 @@ void HwpReader::makeShowPageNum()
         nPos = 2;
     else if( hbox->where == 3 || hbox->where == 6 )
         nPos = 3;
-    else                                          /* ?? ?????? ???????? ??????. */
+    else                                          /* In this case it should not exist. */
     {
         if( d->nPnPos == 1 )
             nPos = 1;
@@ -4912,7 +4916,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: incubator/ooo/branches/alg/aw080/main/i18npool/source/search/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/i18npool/source/search/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/i18npool/source/search/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/i18npool/source/search/makefile.mk Wed May 16 15:07:00 2012
@@ -42,8 +42,9 @@ SLOFILES=	\
 			$(EXCEPTIONSFILES) \
 			$(SLO)$/levdis.obj
 
-# on unxsoli, no optimization for textsearch because of i105945
-.IF "$(OS)$(COM)$(CPUNAME)"=="SOLARISC52INTEL"
+# disabled optimization on unxsol*
+# for textsearch because of i105945 and i119332
+.IF "$(OS)"=="SOLARIS"
 EXCEPTIONSNOOPTFILES= \
         $(SLO)$/textsearch.obj
 .ENDIF

Modified: incubator/ooo/branches/alg/aw080/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/i18npool/source/search/textsearch.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/i18npool/source/search/textsearch.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/i18npool/source/search/textsearch.cxx Wed May 16 15:07:00 2012
@@ -752,7 +752,7 @@ SearchResult TextSearch::RESrchFrwrd( co
 
 	// use the ICU RegexMatcher to find the matches
 	UErrorCode nIcuErr = U_ZERO_ERROR;
-	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), endPos);
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), searchStr.getLength());
 	pRegexMatcher->reset( aSearchTargetStr);
 	// search until there is a valid match
 	for(;;)

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml Wed May 16 15:07:00 2012
@@ -23,9 +23,12 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  
- <updated>2008-08-27</updated>
+ <updated>2011-01-07</updated>
  
  <vendorInfos> 
+  <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
+  </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
@@ -38,6 +41,7 @@
  </vendorInfos>
 
  <plugins>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Wed May 16 15:07:00 2012
@@ -23,15 +23,19 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  
- <updated>2004-01-30</updated>
+ <updated>2011-01-07</updated>
  
- <vendorInfos> 
+ <vendorInfos>
+  <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
+  </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
  <plugins>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
  </plugins>
 </javaSelection>

Modified: incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpFileDocument.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpFileDocument.java?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpFileDocument.java (original)
+++ incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpFileDocument.java Wed May 16 15:07:00 2012
@@ -63,7 +63,7 @@ public class HelpFileDocument
 		if( aFile != null )
 		{
 			String aPath = "#HLP#" + aModule + "/" + aFile.getName();
-			doc.add(new Field("path", aPath, Field.Store.YES, Field.Index.UN_TOKENIZED));
+			doc.add(new Field("path", aPath, Field.Store.YES, Field.Index.NOT_ANALYZED));
 		}
 		
 		// Add the caption of the file to a field named "caption".  Specify a Reader,

Modified: incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpIndexerTool.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpIndexerTool.java?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpIndexerTool.java (original)
+++ incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/HelpIndexerTool.java Wed May 16 15:07:00 2012
@@ -35,21 +35,14 @@ import org.apache.lucene.analysis.standa
 import org.apache.lucene.analysis.cjk.CJKAnalyzer;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.util.Version;
+import org.apache.lucene.store.NIOFSDirectory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
 
-
-/**
-   When this tool is used with long path names on Windows, that is paths which start
-   with \\?\, then the caller must make sure that the path is unique. This is achieved
-   by removing '.' and '..' from the path. Paths which are created by
-   osl_getSystemPathFromFileURL fulfill this requirement. This is necessary because
-   lucene is patched to not use File.getCanonicalPath. See long_path.patch in the lucene
-   module.
- */
 public class HelpIndexerTool
 {
     public HelpIndexerTool()
@@ -182,8 +175,8 @@ public class HelpIndexerTool
         try
 		{
             Date start = new Date();
-            Analyzer analyzer = aLanguageStr.equals("ja") ? (Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
-            IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
+	    Analyzer analyzer = aLanguageStr.equals("ja") ? (Analyzer)new CJKAnalyzer(Version.LUCENE_29) : (Analyzer)new StandardAnalyzer(Version.LUCENE_29);
+	    IndexWriter writer = new IndexWriter( NIOFSDirectory.open(aIndexDir), analyzer, true, IndexWriter.MaxFieldLength.LIMITED );
 			if( !bExtensionMode )
 	            System.out.println( "Lucene: Indexing to directory '" + aIndexDir + "'..." );
             int nRet = indexDocs( writer, aModule, bExtensionMode, aCaptionFilesDir, aContentFilesDir );

Modified: incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/l10ntools/source/help/makefile.mk Wed May 16 15:07:00 2012
@@ -95,7 +95,7 @@ JAVACLASSFILES = \
 .IF "$(SYSTEM_LUCENE)" == "YES"
 EXTRAJARFILES += $(LUCENE_CORE_JAR) $(LUCENE_ANALYZERS_JAR)
 .ELSE
-JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+JARFILES += lucene-core-2.9.4-dev.jar lucene-analyzers-2.9.4-dev.jar
 .ENDIF
 JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
 

Modified: incubator/ooo/branches/alg/aw080/main/lucene/lucene.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/lucene/lucene.patch?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/lucene/lucene.patch (original)
+++ incubator/ooo/branches/alg/aw080/main/lucene/lucene.patch Wed May 16 15:07:00 2012
@@ -1,12 +1,24 @@
---- lucene-2.3.2/common-build.xml	2008-05-01 22:28:56.000000000 +0200
-+++ misc/build/lucene-2.3.2/common-build.xml	2008-06-16 16:01:28.812500000 +0200
-@@ -280 +280 @@
--		           value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
+--- lucene-2.9.4/common-build.xml	2012-05-11 17:34:48.000000000 -0500
++++ misc/build/lucene-2.9.4/common-build.xml	2012-05-11 17:37:20.000000000 -0500
+@@ -304,7 +304,7 @@
+ 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
+ 		<!-- impl version can be any string -->
+ 		<attribute name="Implementation-Version"
+-		           value="${version} ${svnversion} - ${DSTAMP} ${TSTAMP}"/>
 +		           value="${version}"/>
-@@ -297,6 +296,0 @@
+ 		<attribute name="Implementation-Vendor"
+ 		           value="The Apache Software Foundation"/>
+ 		<attribute name="X-Compile-Source-JDK" 
+@@ -321,12 +321,6 @@
+     <element name="manifest-attributes" optional="yes"/>
+   	<element name="metainf-includes" optional="yes"/>
+     <sequential>
 -      <!-- If possible, include the svnversion -->
--      <exec dir="." executable="svnversion"
+-      <exec dir="." executable="${svnversion.exe}"
 -            outputproperty="svnversion" failifexecutionfails="false">
 -        <arg line="."/>
 -      </exec>
 -      
+       <build-manifest/>
+     	
+       <jar

Modified: incubator/ooo/branches/alg/aw080/main/lucene/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/lucene/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/lucene/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/lucene/makefile.mk Wed May 16 15:07:00 2012
@@ -36,27 +36,24 @@ TARGET=so_lucene
 .IF "$(SOLAR_JAVA)" != ""
 
 LUCENE_MAJOR=2
-LUCENE_MINOR=3
-LUCENE_MICRO=2
+LUCENE_MINOR=9
+LUCENE_MICRO=4
 
 LUCENE_NAME=lucene-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO)
 # NOTE that the jar names do not contain the micro version
-LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
-LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
+LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO)-dev.jar
+LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO)-dev.jar
 
-TARFILE_NAME=$(LUCENE_NAME)
-TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2
-PATCH_FILES=lucene.patch 
-
-.IF "$(OS)" == "WNT"
-PATCH_FILES+= long_path.patch
-.ENDIF
+TARFILE_NAME=$(LUCENE_NAME)-src
+TARFILE_MD5=17960f35b2239654ba608cf1f3e256b3
+TARFILE_ROOTDIR=$(LUCENE_NAME)
 
+PATCH_FILES=lucene.patch 
 
 BUILD_DIR=.
 BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
 
-OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
+OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers/common$/$(LUCENE_ANALYZERS_JAR)
 
 .ENDIF
 

Modified: incubator/ooo/branches/alg/aw080/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ooo.lst?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ooo.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/ooo.lst Wed May 16 15:07:00 2012
@@ -10,19 +10,19 @@ http://svn.apache.org/repos/asf/incubato
 # Libraries with category A license
 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+17960f35b2239654ba608cf1f3e256b3-lucene-2.9.4-src.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
 3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
+625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
@@ -32,7 +32,6 @@ http://svn.apache.org/repos/asf/incubato
 980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz

Modified: incubator/ooo/branches/alg/aw080/main/sal/inc/osl/module.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/inc/osl/module.h?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/inc/osl/module.h (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/inc/osl/module.h Wed May 16 15:07:00 2012
@@ -66,9 +66,16 @@ typedef void ( SAL_CALL *oslGenericFunct
 
 /** Load a shared library or module.
     @param strModuleName denotes the name of the module to be loaded.
+    @param nRtldMode mode defined by logically OR-ing of SAL_LOADMODULE_* flags.
     @return NULL if the module could not be loaded, otherwise a handle to the module.
 */
 oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode);
+/** Load a shared library or module.
+    @param pModuleName denotes the name of the module to be loaded.
+    @param nRtldMode mode defined by logically OR-ing of SAL_LOADMODULE_* flags.
+    @return NULL if the module could not be loaded, otherwise a handle to the module.
+*/
+oslModule SAL_CALL osl_loadAsciiModule( const sal_Char* pModuleName, sal_Int32 nRtldMode);
 
 /** Load a module located relative to some other module.
 
@@ -79,8 +86,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
     @param relativePath
     a relative URL; must not be NULL.
 
-    @param mode
-    the SAL_LOADMODULE_xxx flags.
+    @param nRtldMode mode defined by logically OR-ing of SAL_LOADMODULE_* flags.
 
     @return
     a non-NULL handle to the loaded module, or NULL if an error occurred.
@@ -88,7 +94,23 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
     @since UDK 3.2.8
 */
 oslModule SAL_CALL osl_loadModuleRelative(
-    oslGenericFunction baseModule, rtl_uString * relativePath, sal_Int32 mode);
+    oslGenericFunction baseModule, rtl_uString* relativePath, sal_Int32 nRtldMode);
+/** Load a module located relative to some other module.
+
+    @param baseModule
+    must point to a function that is part of the code of some loaded module;
+    must not be NULL.
+
+    @param relativePath
+    a relative URL; must not be NULL.
+
+    @param nRtldMode mode defined by logically OR-ing of SAL_LOADMODULE_* flags.
+
+    @return
+    a non-NULL handle to the loaded module, or NULL if an error occurred.
+*/
+oslModule SAL_CALL osl_loadAsciiModuleRelative(
+    oslGenericFunction baseModule, const sal_Char* relativePath, sal_Int32 nRtldMode);
 
 /** Retrieve the handle of an already loaded module.
 
@@ -153,7 +175,7 @@ oslGenericFunction SAL_CALL osl_getFunct
     @param Module
     [in] a module handle as returned by osl_loadModule or osl_getModuleHandle
 
-    @param pFunctionSymbolName
+    @param pSymbolName
     [in] Name of the function that will be looked up. 
    
     @return
@@ -167,7 +189,7 @@ oslGenericFunction SAL_CALL osl_getFunct
     @see osl_getModuleHandle
     @see osl_getFunctionSymbol
 */
-oslGenericFunction SAL_CALL osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol);
+oslGenericFunction SAL_CALL osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbolName);
 
 
 /** Lookup URL of module which is mapped at the specified address.

Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/all/loadmodulerelative.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/all/loadmodulerelative.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/all/loadmodulerelative.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/all/loadmodulerelative.cxx Wed May 16 15:07:00 2012
@@ -64,4 +64,15 @@ oslModule SAL_CALL osl_loadModuleRelativ
     return ::osl_loadModule(abs.pData, mode);
 }
 
+oslModule SAL_CALL osl_loadAsciiModuleRelative(
+    oslGenericFunction const baseModule, const sal_Char* pRelativePathName,
+    sal_Int32 const nRtldMode)
+{
+	rtl_uString* pUniName = NULL;
+	rtl_uString_newFromAscii( &pUniName, pRelativePathName );
+	oslModule aModule = osl_loadModuleRelative( baseModule, pUniName, nRtldMode );
+	rtl_uString_release( pUniName );
+	return aModule;
+}
+
 }

Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c Wed May 16 15:07:00 2012
@@ -54,6 +54,15 @@ ULONG APIENTRY _DosLoadModule (PSZ pszOb
 	return rc;
 }
 
+oslModule SAL_CALL osl_loadAsciiModule( const sal_Char* pModuleName, sal_Int32 nRtldMode )
+{
+	rtl_uString* pUniName = NULL;
+	rtl_uString_newFromAscii( &pUniName, pModuleName );
+	oslModule aModule = osl_loadModule( pUniName, nRtldMode );
+	rtl_uString_release( pUniName );
+	return aModule;
+}
+
 oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMode)
 {
     HMODULE hModule;

Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/unx/module.c
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/unx/module.c?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/unx/module.c (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/unx/module.c Wed May 16 15:07:00 2012
@@ -37,8 +37,6 @@
 /* implemented in file.c */
 extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
 
-oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
-
 /*****************************************************************************/
 /* osl_loadModule */
 /*****************************************************************************/
@@ -59,7 +57,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
         char buffer[PATH_MAX];
 
         if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length))
-            pModule = osl_psz_loadModule(buffer, nRtldMode);
+            pModule = osl_loadAsciiModule(buffer, nRtldMode);
         rtl_uString_release(ustrTmp);
     }
 
@@ -67,10 +65,10 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
 }
 
 /*****************************************************************************/
-/* osl_psz_loadModule */
+/* osl_loadAsciiModule */
 /*****************************************************************************/
 
-oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode)
+oslModule SAL_CALL osl_loadAsciiModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode)
 {
     OSL_ASSERT(
         (nRtldMode & SAL_LOADMODULE_LAZY) == 0 ||

Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/w32/module.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/w32/module.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/w32/module.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/w32/module.cxx Wed May 16 15:07:00 2012
@@ -101,6 +101,18 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
 }
 
 /*****************************************************************************/
+/* osl_loadAsciiModule */
+/*****************************************************************************/
+oslModule SAL_CALL osl_loadAsciiModule( const sal_Char* pModuleName, sal_Int32 nRtldMode )
+{
+	rtl_uString* pUniName = NULL;
+	rtl_uString_newFromAscii( &pUniName, pModuleName );
+	oslModule aModule = osl_loadModule( pUniName, nRtldMode );
+	rtl_uString_release( pUniName );
+	return aModule;
+}
+
+/*****************************************************************************/
 /* osl_getModuleHandle */
 /*****************************************************************************/
 

Modified: incubator/ooo/branches/alg/aw080/main/sal/util/sal.map
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/util/sal.map?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/util/sal.map (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/util/sal.map Wed May 16 15:07:00 2012
@@ -618,13 +618,19 @@ UDK_3.10 { # OOo 3.2
 } UDK_3.9;
 
 
-UDK_3.11 { # OOo 3.4
+UDK_3.11 { # AOO 3.4
     global:
         osl_setEnvironment;
         osl_clearEnvironment;
         osl_setThreadName;
 } UDK_3.10;
 
+UDK_3.12 { # AOO 3.5
+    global:
+        osl_loadAsciiModule;
+        osl_loadAsciiModuleRelative;
+} UDK_3.11;
+
 PRIVATE_1.0 {
     global:
         osl_detail_ObjectRegistry_storeAddresses;

Modified: incubator/ooo/branches/alg/aw080/main/sax/source/tools/converter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sax/source/tools/converter.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sax/source/tools/converter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sax/source/tools/converter.cxx Wed May 16 15:07:00 2012
@@ -1335,8 +1335,8 @@ readDateTimeComponent(const ::rtl::OUStr
 
 static bool lcl_isLeapYear(const sal_uInt32 nYear)
 {
-    return ((nYear % 4) == 0)
-        && !(((nYear % 100) == 0) || ((nYear % 400) == 0));
+    return (((nYear % 4 == 0) && (nYear % 100 != 0)) ||
+	(nYear % 400 == 0));
 }
 
 static sal_uInt16

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx Wed May 16 15:07:00 2012
@@ -421,8 +421,12 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL
 			const ScPatternAttr* pPat2 = GetPattern(nCol2, nRow);
 			if (pPat1 != pPat2)
 			{
-				SetPattern(nCol1, nRow, *pPat2, sal_True);
-				SetPattern(nCol2, nRow, *pPat1, sal_True);
+				//maybe the content is the same
+				if (!(*pPat1 == *pPat2))
+				{
+					SetPattern(nCol1, nRow, *pPat2, sal_True);
+					SetPattern(nCol2, nRow, *pPat1, sal_True);
+				}
 			}
 		}
 	}
@@ -439,8 +443,12 @@ void ScTable::SwapRow(SCROW nRow1, SCROW
 			const ScPatternAttr* pPat2 = GetPattern(nCol, nRow2);
 			if (pPat1 != pPat2)
 			{
-				SetPattern(nCol, nRow1, *pPat2, sal_True);
-				SetPattern(nCol, nRow2, *pPat1, sal_True);
+				//maybe the content is the same
+				if (!(*pPat1 == *pPat2))
+				{
+					SetPattern(nCol, nRow1, *pPat2, sal_True);
+					SetPattern(nCol, nRow2, *pPat1, sal_True);
+				}
 			}
 		}
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx Wed May 16 15:07:00 2012
@@ -661,15 +661,8 @@ void XclImpDrawObjBase::ConvertFillStyle
             aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
             Bitmap aBitmap;
             aBitmap.Read( aMemStrm, sal_False );
-            XOBitmap aXOBitmap( aBitmap );
-            aXOBitmap.Bitmap2Array();
-            aXOBitmap.SetBitmapType( XBITMAP_8X8 );
-            if( aXOBitmap.GetBackgroundColor().GetColor() == COL_BLACK )
-                ::std::swap( aPattColor, aBackColor );
-            aXOBitmap.SetPixelColor( aPattColor );
-            aXOBitmap.SetBackgroundColor( aBackColor );
-            rSdrObj.SetMergedItem( XFillStyleItem( XFILL_BITMAP ) );
-            rSdrObj.SetMergedItem( XFillBitmapItem( EMPTY_STRING, aXOBitmap ) );
+            rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
+            rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_STRING, Graphic(aBitmap)));
         }
     }
 }

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/typemap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/typemap.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/typemap.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/typemap.cxx Wed May 16 15:07:00 2012
@@ -118,6 +118,7 @@
 #include <avmedia/mediaitem.hxx>
 #include <sfx2/frame.hxx>
 #include "attrib.hxx"
+#include <svx/sdooitm.hxx>
 
 #define SvxDrawToolItem             SfxAllEnumItem
 #define SvxDrawAlignItem            SfxAllEnumItem

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx Wed May 16 15:07:00 2012
@@ -36,7 +36,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/xbitmap.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xoutbmp.hxx>
 #include <sfx2/objsh.hxx>
@@ -483,15 +482,12 @@ sal_Bool ScViewFunc::ApplyGraphicToObjec
 			/******************************************************************
 			* Das Objekt wird mit der Graphik gefuellt
 			******************************************************************/
-			//pScDrawView->BegUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
 			pScDrawView->AddUndo(new SdrUndoAttrObj(*pPickObj));
-			//pScDrawView->EndUndo();
 
-			XOBitmap aXOBitmap( rGraphic.GetBitmap() );
 			SfxItemSet aSet( pScDrawView->getSdrModelFromSdrView().GetItemPool(),
 								XATTR_FILLSTYLE, XATTR_FILLBITMAP );
 			aSet.Put(XFillStyleItem(XFILL_BITMAP));
-			aSet.Put(XFillBitmapItem(String(), aXOBitmap));
+			aSet.Put(XFillBitmapItem(String(), rGraphic));
 
 			pPickObj->SetMergedItemSetAndBroadcast(aSet);
 

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_ooo.scp?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_ooo.scp Wed May 16 15:07:00 2012
@@ -373,8 +373,8 @@ STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
 #endif
 
 #if defined SOLAR_JAVA && ! defined SYSTEM_LUCENE
-STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 )
-STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
+STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.9.4-dev )
+STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.9.4-dev )
 #endif
 
 

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/sdkoo/sdkoo.scp?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/sdkoo/sdkoo.scp Wed May 16 15:07:00 2012
@@ -93,14 +93,14 @@ End
 
 #if defined MACOSX
 ScpAction scp_Copy_License_Txt_Sdk
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
+    Copy = "LICENSE";
+    Name = "LICENSE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End
 ScpAction scp_Copy_Notice_Txt_Sdk
-    README_ALL_LANG(Copy, NOTICE);
-    README_ALL_LANG(Name, NOTICE);
+    Copy = "NOTICE";
+    Name = "NOTICE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx Wed May 16 15:07:00 2012
@@ -187,7 +187,7 @@ void SdDrawDocument::CreateLayoutTemplat
     Color   aNullColor( COL_WHITE );
 	Bitmap  aNullBmp( aNullSize, 8 );
     aNullBmp.Erase( aNullColor );
-	rISet.Put(XFillBitmapItem(pPool,aNullBmp));
+	rISet.Put(XFillBitmapItem(pPool, Graphic(aNullBmp)));
 
 					// Schattenattribute (Drawing Engine)
 	rISet.Put(SdrOnOffItem(SDRATTR_SHADOW, sal_False));

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupage.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupage.cxx Wed May 16 15:07:00 2012
@@ -313,7 +313,7 @@ const SfxItemSet* FuPage::ExecuteDialog(
                 // always return something. If the name already was unique, it returns a pointer
                 // to the item it was triggered at, thus the new item needs to be deleted
                 // when it is not equal to the address of it.
-                const XFillBitmapItem aNewItem(String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic));
+                const XFillBitmapItem aNewItem(String(RTL_CONSTASCII_USTRINGPARAM("background")), aGraphic);
             	const XFillBitmapItem* pSaveItem = aNewItem.checkForUniqueItem(mpDoc);
 
                 pTempSet->Put( *pSaveItem );

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx Wed May 16 15:07:00 2012
@@ -174,10 +174,9 @@ SdrGrafObj* View::InsertGraphic( const G
 				EndUndo();
 			}
 
-			XOBitmap aXOBitmap( rGraphic.GetBitmap() );
 			SfxItemSet aSet(mpDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
 			aSet.Put(XFillStyleItem(XFILL_BITMAP));
-			aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), aXOBitmap));
+			aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), rGraphic));
 			pPickObj->SetMergedItemSetAndBroadcast(aSet);
 		}
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/description.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/description.xml?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/description.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/description.xml Wed May 16 15:07:00 2012
@@ -25,7 +25,7 @@
   xmlns:dep="http://openoffice.org/extensions/description/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+  <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
 
   <dependencies>
     <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
@@ -34,13 +34,13 @@
 
   <registration>
     <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-      <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
     </simple-license>
   </registration>
 
   <version value="1.2.0"/>
 
-  <platform value="UPDATED_PLATFORM" />
+  <platform value="UPDATED_SUPPORTED_PLATFORM" />
 
   <publisher>
       <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>

Modified: incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sdext/source/presenter/makefile.mk Wed May 16 15:07:00 2012
@@ -38,14 +38,21 @@ MAXLINELENGTH:=80000
 
 PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
 
-.IF "$(L10N_framework)"==""
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
 .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
 @all:
 	@echo "Presenter Screen build disabled."
 .ELSE
 
+.IF "$(L10N_framework)" != ""
+
+@all:
+	@echo "L10N framework disabled => Presenter Screen can not be built."
+
+.ELSE
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+
 DLLPRE=
 common_build_zip=
 
@@ -120,9 +127,9 @@ ZIP1EXT=		.oxt
 ZIP1FLAGS=-r
 ZIP1LIST=		*
 
-DESCRIPTION:=$(ZIP1DIR)$/description.xml
+EXTENSIONDIR=$(ZIP1DIR)
 
-PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
+.INCLUDE : extension_pre.mk
 
 .IF "$(WITH_LANG)"==""
 FIND_XCU=registry/data
@@ -136,9 +143,6 @@ COMPONENT_FILES=																			\
     $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs   	\
 	$(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu 
 
-#COMPONENT_MERGED_XCU= \
-#	$(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu 
-
 COMPONENT_BITMAPS=												\
 	$(ZIP1DIR)$/bitmaps$/BorderTop.png							\
 	$(ZIP1DIR)$/bitmaps$/BorderTopLeft.png						\
@@ -240,9 +244,6 @@ COMPONENT_IMAGES=\
 	$(ZIP1DIR)$/bitmaps$/extension_32.png \
 	$(ZIP1DIR)$/bitmaps$/extension_32_h.png
 
-COMPONENT_MANIFEST= 							\
-	$(ZIP1DIR)$/META-INF$/manifest.xml
-
 COMPONENT_LIBRARY= 								\
 	$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
 
@@ -275,21 +276,15 @@ LINKLINKFILES= \
     $(PACKAGE)/{$(my_XHPFILES)}
 
 # --- Targets ----------------------------------
-.ENDIF # L10N_framework
 
 .INCLUDE : target.mk
 .INCLUDE : extension_helplink.mk
 
-.IF "$(L10N_framework)"==""
 $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
 
 $(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
 	$(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
 
-$(COMPONENT_MANIFEST) : $$(@:f)
-	@-$(MKDIRHIER) $(@:d)
-	+$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
-
 $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
 	$(COPY) $< $@
@@ -357,26 +352,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
  .ENDIF	#"$(COM)"=="GCC"
 .ENDIF
 
+.INCLUDE : extension_post.mk
 
-$(DESCRIPTION) : description.xml
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
-$(ZIP1DIR)/%.xcu : %.xcu
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
-$(ZIP1DIR)$/%.xcs : %.xcs
-	@@-$(MKDIRHIER) $(@:d)
-	$(GNUCOPY) $< $@
-
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
-.ELSE
-ivo:
-	$(ECHO)
 .ENDIF # L10N_framework
-
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/epmfile.pm?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/epmfile.pm Wed May 16 15:07:00 2012
@@ -387,12 +387,12 @@ sub create_epm_header
 	
 	if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
 	{
-		$licensefilename = "license.txt";
+		$licensefilename = "LICENSE.txt";
 		$readmefilename = "readme.txt";
 	}
 	else
 	{
-		$licensefilename = "LICENSE";	
+		$licensefilename = "LICENSE";
 		$readmefilename = "README";	
 	}
 	
@@ -401,12 +401,12 @@ sub create_epm_header
 	{
 		if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
 		{
-			$licensefilename = "license_$searchlanguage.txt";
+			$licensefilename = "LICENSE.txt";
 			$readmefilename = "readme_$searchlanguage.txt";
 		}
 		else
 		{
-			$licensefilename = "LICENSE_$searchlanguage";
+			$licensefilename = "LICENSE";
 			$readmefilename = "README_$searchlanguage";
 		}
 	}
@@ -490,19 +490,12 @@ sub create_epm_header
 	}
 	else
 	{
-		for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
-		{
-			my $onefile = ${$filesinproduct}[$i];
-			my $filename = $onefile->{'Name'};
-		
-			if ( $filename eq $licensefilename )
-			{
-				$foundlicensefile = 1;
-				$line = "%license" . " " . $onefile->{'sourcepath'} . "\n";
-				push(@epmheader, $line);
-				last;
-			}
-		}
+		# refer to the license in the matching AOO installation
+		# TODO: sync AOO dest license full path with lpacks/sdks/exts
+		my $licpath = "openoffice.org3/program/" . $licensefilename;
+		$foundlicensefile = 1;
+		$line = "%license " . $licpath . "\n";
+		push(@epmheader, $line);
 	}
 
 	if (!($foundlicensefile))

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/globals.pm?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/globals.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/globals.pm Wed May 16 15:07:00 2012
@@ -193,7 +193,7 @@ BEGIN
 	%alllangmodules = ();
 	$englishlicenseset = 0;
 	$englishlicense = "";
-	$englishsolarislicensename = "LICENSE_en-US";
+	$englishsolarislicensename = "LICENSE";
 	$solarisdontcompress = 0;
 	$patharray = "";
 	

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/languagepack.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/languagepack.pm?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/languagepack.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/languagepack.pm Wed May 16 15:07:00 2012
@@ -515,7 +515,7 @@ sub build_installer_for_languagepack
 
 	# find and read english license file
 	my $licenselanguage = "en-US";					# always english !
-	my $licensefilename = "LICENSE_" . $licenselanguage;
+	my $licensefilename = "LICENSE";
 	my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
 	my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);

Modified: incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/worker.pm?rev=1339213&r1=1339212&r2=1339213&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/worker.pm (original)
+++ incubator/ooo/branches/alg/aw080/main/solenv/bin/modules/installer/worker.pm Wed May 16 15:07:00 2012
@@ -3126,10 +3126,10 @@ sub put_license_into_setup
 {
 	my ($installdir, $includepatharrayref) = @_;	
 
-	# find and read english license file
+	# find and read the license file
 	my $licenselanguage = "en-US";					# always english !
-	# my $licensefilename = "LICENSE_" . $licenselanguage;
-	my $licensefilename = "license_" . $licenselanguage . ".txt";
+	my $licensefilename = "LICENSE";
+#	my $licensefilename = "LICENSE" . ".txt";
 	my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
 	my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);



Mime
View raw message