svn commit: r1448495 [3/6] - in /openoffice/branches/ia2: ./ ext_libraries/ratscan/scan/ extras/l10n/source/rw/ extras/l10n/source/te/ extras/l10n/source/uz/ main/ main/autodoc/source/display/html/ main/automation/packimages/ main/automation/prj/ main/...

[st...@apache.org]

Modified: openoffice/branches/ia2/main/hwpfilter/source/hwpeq.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpeq.cpp?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpeq.cpp (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpeq.cpp Thu Feb 21 02:52:59 2013
@@ -40,7 +40,7 @@ using namespace std;
 //#define DEBUG
 
 
-/* @Man: hwp¼ö½ÄÀ» LaTeXÀ¸·Î ¹Ù²Ù±â */
+/* @Man: hwp수식을 LaTeX으로 바꾸기 */
 #ifdef WIN32
 # define ENDL  "\r\n"
 #else /* !WIN32 */
@@ -133,7 +133,7 @@ static hwpeq eq_tbl[] = {
   { "bullet",		NULL,		0,	0	},
   { "cap",		NULL,		0,	0	},
   { "cases",		NULL,		0,	EQ_ENV	},
-  { "ccol",     NULL,       0,  0   }, /* ¼¼·Î·Î °¡¿îµ¥ */
+  { "ccol",     NULL,       0,  0   }, /* 세로로 가운데 */
   { "cdot",		NULL,		0,	0	},
   { "cdots",		NULL,		0,	0	},
   { "check",		NULL,		1,	0	},
@@ -409,7 +409,7 @@ static hwpeq *lookup_eqn(char *str)
   return result;
 }
 
-/* ùÀÚ¸¸ ´ë¹®ÀÚÀ̰ųª ÀüºÎ ´ë¹®ÀÚ¸é ¼Ò¹®ÀÚ·Î ¹Ù²Û´Ù. */
+/* 첫자만 대문자이거나 전부 대문자면 소문자로 바꾼다. */
 
 static char *make_keyword( char *keyword, const char *token)
 {
@@ -469,7 +469,7 @@ void push_token(MzString &white, MzStrin
   stk->strm = strm;
 }
 
-/*
 ÀÐÀº ÅäÅ«ÀÇ ±æÀ̸¦ ¹ÝȯÇÑ´Ù. */
+/*
 읽은 토큰의 길이를 반환한다. */
 /* control char, control sequence, binary sequence,
    alphabet string, sigle character */
 static int next_token(MzString &white, MzString &token, istream *strm)
@@ -505,8 +505,8 @@ static int next_token(MzString &white, M
       ch = strm->get();
     } while( ch != EOF && (ch & 0x80 || isalpha(ch)) ) ;
     strm->putback(sal::static_int_cast<char>(ch));
-    /*  sub, sub, over, atop Ư¼ö ó¸®
-        ±× ÀÌÀ¯´Â next_state()¿¡ ¿µÇâÀ» ¹ÌÄ¡±â ¶§¹®ÀÌ´Ù.
+    /*  sub, sub, over, atop 특수 처리
+        그 이유는 next_state()에 영향을 미치기 때문이다.
      */
     if( !STRICMP("sub", token) || !STRICMP("from", token) ||
 	!STRICMP("sup", token) || !STRICMP("to", token) ||
@@ -557,17 +557,17 @@ static int read_white_space(MzString& ou
   return result;
 }
 
-/* Àμö°¡ ÇÊ¿äÇÏÁö ¾ÊÀº °æ¿ì °¢ Ç׸ñ°£ÀÇ ±¸ºÐÀº space¿Í brace
+/* 인수가 필요하지 않은 경우 각 항목간의 구분은 space와 brace
      sqrt {ab}c = sqrt{ab} c
-   (, }´Â grouping
-   ^, _ ´Â ¾ÕµÚ·Î °áÇÕÇÑ´Ù.
+   (, }는 grouping
+   ^, _ 는 앞뒤로 결합한다.
 
-   sqrt µî°ú °°ÀÌ Àμö°¡ ÀÖ´Â Çü½Ä Á¤¸®
+   sqrt 등과 같이 인수가 있는 형식 정리
      sqrt a  -> sqrt{a}
      sqrt {a}    -> sqrt{a}
-   1 ÀÌ»óÀÇ Àμö°¡ ÀÖ´Â °æ¿ì Àμöµé°£ÀÇ ¿ª¹éÀº ¾ø¾Ø´Ù.
+   1 이상의 인수가 있는 경우 인수들간의 역백은 없앤다.
      \frac a b   -> frac{a}{b}
-   overÀÇ Çü½Ä Á¤¸®
+   over의 형식 정리
      a over b    -> {a}over{b}
  */
 
@@ -602,7 +602,7 @@ static int eq_word(MzString& outs, istre
     state << white << token;
   }
   else {
-    /* Á¤»óÀûÀÎ token */
+    /* 정상적인 token */
     int script_status = SCRIPT_NONE;
     while( 1 ) {
       state << white << token;

Modified: openoffice/branches/ia2/main/hwpfilter/source/hwpfile.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpfile.cpp?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpfile.cpp (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpfile.cpp Thu Feb 21 02:52:59 2013
@@ -61,7 +61,7 @@ HWPFile::HWPFile(void)
 
 
 /**
- * TODO : Ãß°¡µÈ ½ºÅ¸Àϸ®½ºÆ®¿¡ ´ëÇÑ ¸Þ¸ð¸® ÇØÁ¦
+ * TODO : 추가된 스타일리스트에 대한 메모리 해제
  */
 HWPFile::~HWPFile(void)
 {
@@ -409,7 +409,7 @@ ColumnDef *HWPFile::GetColumnDef(int num
 	else
 		return 0;
 }
-/* @return À妽º´Â 1ºÎÅÍ ½ÃÀÛÇÑ´Ù. */
+/* @return 인덱스는 1부터 시작한다. */
 int HWPFile::GetPageMasterNum(int page)
 {
 	LinkedListIterator<ColumnInfo> it(&columnlist);

Modified: openoffice/branches/ia2/main/hwpfilter/source/hwpfile.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpfile.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpfile.h (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpfile.h Thu Feb 21 02:52:59 2013
@@ -192,7 +192,7 @@ class DLLEXPORT HWPFile
  * Reads paragraph list of hwp file from HIODev
  */
         bool ParaListRead();
-/* ±×¸² µîÀÇ Ãß°¡ Á¤º¸¸¦ Àд´Ù. */
+/* 그림 등의 추가 정보를 읽는다. */
 /**
  * Reads additional information like embeded image of hwp file from HIODev
  */
@@ -271,7 +271,7 @@ class DLLEXPORT HWPFile
         OlePicture *oledata;
 
     private:
-/* hwp ÆÄÀÏ À̸§ */
+/* hwp 파일 이름 */
         char      fname[256];
 		  int			m_nCurrentPage;
 		  int m_nMaxSettedPage;
@@ -289,7 +289,7 @@ class DLLEXPORT HWPFile
         LinkedList<EmPicture> emblist;
         LinkedList<HyperText> hyperlist;
         int currenthyper;
-        LinkedList<ParaShape> pslist;             /* ½ºÅ¸¿ÀÇǽºÀÇ ±¸Á¶»ó ÇÊ¿ä */
+        LinkedList<ParaShape> pslist;             /* 스타오피스의 구조상 필요 */
         LinkedList<CharShape> cslist;
         LinkedList<FBoxStyle> fbslist;
         LinkedList<DateCode> datecodes;

Modified: openoffice/branches/ia2/main/hwpfilter/source/hwplib.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwplib.h?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwplib.h (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwplib.h Thu Feb 21 02:52:59 2013
@@ -29,7 +29,7 @@
 
 #include <string>
 
-/* hwp96ºÎÅÍ hunit°¡ 4byte°¡ µÇ¾ú´Ù. */
+/* hwp96부터 hunit가 4byte가 되었다. */
 /**
  * size of hunit is 4 since hwp96 version
  */
@@ -130,11 +130,11 @@ typedef struct
 #define ONE_MILI        (71)
 #define ONE_DOT         (19)
 
-/* HWP 3.0 ¹®¼­ Á¤º¸ */
+/* HWP 3.0 문서 정보 */
 
 #define NLanguage       7
 
-/* Á¦¾î ¹®ÀÚ */
+/* 제어 문자 */
 /**
  * Control character
  */

Modified: openoffice/branches/ia2/main/hwpfilter/source/hwpread.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpread.cpp?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpread.cpp (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpread.cpp Thu Feb 21 02:52:59 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/ia2/main/hwpfilter/source/hwpreader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx (original)
+++ openoffice/branches/ia2/main/hwpfilter/source/hwpreader.cxx Thu Feb 21 02:52:59 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/ia2/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx (original)
+++ openoffice/branches/ia2/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx Thu Feb 21 02:52:59 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/ia2/main/i18npool/source/localedata/saxparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/localedata/saxparser.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/localedata/saxparser.cxx (original)
+++ openoffice/branches/ia2/main/i18npool/source/localedata/saxparser.cxx Thu Feb 21 02:52:59 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/ia2/main/i18npool/source/textconversion/textconversion.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/textconversion/textconversion.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/textconversion/textconversion.cxx (original)
+++ openoffice/branches/ia2/main/i18npool/source/textconversion/textconversion.cxx Thu Feb 21 02:52:59 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/ia2/main/i18npool/source/transliteration/textToPronounce_zh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/transliteration/textToPronounce_zh.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/transliteration/textToPronounce_zh.cxx (original)
+++ openoffice/branches/ia2/main/i18npool/source/transliteration/textToPronounce_zh.cxx Thu Feb 21 02:52:59 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/ia2/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst Thu Feb 21 02:52:59 2013
@@ -5,9 +5,9 @@ Globals
         variables
         {
             APACHEPROJECTNAME Apache OpenOffice
-            OOOBASEVERSION 3.5
-            OOOPACKAGEVERSION 3.5.0
-            UREPACKAGEVERSION 3.5.0
+            OOOBASEVERSION 4.0
+            OOOPACKAGEVERSION 4.0.0
+            UREPACKAGEVERSION 4.0.0
             URELAYERVERSION 1
             BASISROOTNAME ApacheOpenOffice
             UNIXBASISROOTNAME apacheopenoffice
@@ -17,7 +17,7 @@ Globals
             UREPACKAGEPREFIX apacheopenoffice
             SOLSUREPACKAGEPREFIX apacheopenoffice
             USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
             POOLPRODUCT 1
             PROGRESSBARCOLOR 14,133,205
             PROGRESSSIZE 320,7
@@ -40,9 +40,9 @@ Globals
             OOOXMLFILEFORMATNAME OpenOffice.org XML
             OOOXMLFILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5
-            SERVICETAG_PRODUCTVERSION 3.5
-            SERVICETAG_PARENTNAME Apache OpenOffice 3.5
+            SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
+            SERVICETAG_PRODUCTVERSION 4.0
+            SERVICETAG_PARENTNAME Apache OpenOffice 4.0
             SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
             SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
             REGISTRATION_HOST https://registration.openoffice.org
@@ -59,23 +59,23 @@ Apache_OpenOffice
         variables
         {
             PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
             PCPFILENAME openoffice.pcp
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1
             EVAL
-            PACKAGEVERSION 3.5.0
+            PACKAGEVERSION 4.0.0
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -90,7 +90,7 @@ Apache_OpenOffice
             STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
             CHANGETARGETDIR 1
             USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
             PATCHCODEFILE ooo_patchcodes.txt
             DOWNLOADBANNER	ooobanner.bmp
             DOWNLOADBITMAP	ooobitmap.bmp
@@ -118,22 +118,22 @@ Apache_OpenOffice_wJRE
         variables
         {
             PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1
             EVAL
-            PACKAGEVERSION 3.5.0
+            PACKAGEVERSION 4.0.0
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             WITHJREPRODUCT 1
@@ -149,7 +149,7 @@ Apache_OpenOffice_wJRE
             STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
             CHANGETARGETDIR 1
             USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
             PATCHCODEFILE ooo_patchcodes.txt
             JAVAPRODUCT 1
             DOWNLOADBANNER	ooobanner.bmp
@@ -177,7 +177,7 @@ Apache_OpenOffice_Dev
         variables
         {
             PRODUCTNAME AOO-Developer-Build
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
@@ -185,19 +185,19 @@ Apache_OpenOffice_Dev
             UNIXBASISROOTNAME aoodev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX aoobasis-dev
             UREPACKAGEPREFIX aoodev
             SOLSUREPACKAGEPREFIX aoodev
             REGISTRYLAYERNAME LayerDev
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             EVAL
-            PACKAGEVERSION 3.5.0
+            PACKAGEVERSION 4.0.0
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -213,7 +213,7 @@ Apache_OpenOffice_Dev
             CHANGETARGETDIR 1
             USE_FILEVERSION 1
             JAVAPRODUCT 0
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
             PATCHCODEFILE ooodev_patchcodes.txt
             CODEFILENAME codes_ooodev.txt
             DOWNLOADBANNER	ooobanner.bmp
@@ -245,8 +245,8 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 3.5.0
-            PACKAGEVERSION 3.5
+            PRODUCTVERSION 4.0.0
+            PACKAGEVERSION 4.0
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -287,19 +287,19 @@ Apache_OpenOffice_SDK
         variables
         {
             PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.5.0
+            BRANDPACKAGEVERSION 4
+            PACKAGEVERSION 4.0.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg34sdk
+            DATABASENAME openofficeorg40sdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
@@ -334,7 +334,7 @@ Apache_OpenOffice_Dev_SDK
         variables
         {
             PRODUCTNAME AOO-Developer-Build
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -342,8 +342,8 @@ Apache_OpenOffice_Dev_SDK
             UNIXBASISROOTNAME ooo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.5.0
+            BRANDPACKAGEVERSION 4
+            PACKAGEVERSION 4.0.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX aoobasis-dev
             UREPACKAGEPREFIX aoodev
@@ -353,7 +353,7 @@ Apache_OpenOffice_Dev_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg35devsdk
+            DATABASENAME openofficeorg40devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1

Modified: openoffice/branches/ia2/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx (original)
+++ openoffice/branches/ia2/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx Thu Feb 21 02:52:59 2013
@@ -267,7 +267,7 @@ javaPluginError jfw_plugin_getAllJavaInf
             }
         }
         
-        if (arExcludeList > 0)
+        if( arExcludeList != NULL)
         {
             bool bExclude = false;
             for (int j = 0; j < nLenList; j++)
@@ -397,7 +397,7 @@ javaPluginError jfw_plugin_getJavaInfoBy
             return JFW_PLUGIN_E_FAILED_VERSION;
     }
     
-    if (arExcludeList > 0)
+    if( arExcludeList != NULL)
     {
         for (int i = 0; i < nLenList; i++)
         {
@@ -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/ia2/main/jvmfwk/source/elements.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/jvmfwk/source/elements.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/jvmfwk/source/elements.cxx (original)
+++ openoffice/branches/ia2/main/jvmfwk/source/elements.cxx Thu Feb 21 02:52:59 2013
@@ -101,7 +101,7 @@ rtl::OString getElementModified()
 }
 
 
-void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
+void createSettingsStructure( xmlDoc* document, bool* pbNeedsSave)
 {
     rtl::OString sExcMsg("[Java framework] Error in function createSettingsStructure "
                          "(elements.cxx).");
@@ -121,11 +121,11 @@ void createSettingsStructure(xmlDoc * do
     }
     if (bFound)
 	{
-		bNeedsSave = false;
+		*pbNeedsSave = false;
         return;
 	}
     //We will modify this document
-    *bNeedsSave = true;
+    *pbNeedsSave = true;
     // Now we create the child elements ------------------
     //Get xsi:nil namespace
     xmlNs* nsXsi = xmlSearchNsByHref(

Modified: openoffice/branches/ia2/main/more_fonts/fonts/fc_local.conf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/more_fonts/fonts/fc_local.conf?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/more_fonts/fonts/fc_local.conf (original)
+++ openoffice/branches/ia2/main/more_fonts/fonts/fc_local.conf Thu Feb 21 02:52:59 2013
@@ -26,7 +26,6 @@
 
 	<alias binding="same">
 	  <family>Arimo</family>
-	  <family>Arial Narrow</family>
 	  <default>
 	  <family>Arial Narrow</family>
 	  </default>

Modified: openoffice/branches/ia2/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/cfgWin.js?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/cfgWin.js (original)
+++ openoffice/branches/ia2/main/odk/cfgWin.js Thu Feb 21 02:52:59 2013
@@ -919,18 +919,18 @@ function writeBatFile(fdir, file)
         "REM are necessary for building the examples of the Office Development Kit.\n" +
         "REM The Script was developed for the operating systems Windows.\n" +
         "REM The SDK name\n" +
-        "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+        "REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
         "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 3.0\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache 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 3\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
         "set OFFICE_HOME=" + office_home +
         "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
         "set OFFICE_BASE_HOME=" + office_base_home +
         "\n\n" +
         "REM URE installation directory.\n" +

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile Thu Feb 21 02:52:59 2013
@@ -135,6 +135,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/descri
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk Thu Feb 21 02:52:59 2013
@@ -19,8 +19,9 @@
 #
 #**************************************************************
 
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml Thu Feb 21 02:52:59 2013
@@ -25,6 +25,7 @@
     <platform value="#EXTENSION_PLATFORM#"/>
     <dependencies>
         <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
     </dependencies>
     <publisher>
         <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile Thu Feb 21 02:52:59 2013
@@ -133,6 +133,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/descri
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk Thu Feb 21 02:52:59 2013
@@ -19,8 +19,9 @@
 #
 #**************************************************************
 
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml Thu Feb 21 02:52:59 2013
@@ -25,6 +25,7 @@
     <platform value="#EXTENSION_PLATFORM#"/>
     <dependencies>
         <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
     </dependencies>
     <publisher>
         <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile Thu Feb 21 02:52:59 2013
@@ -149,6 +149,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/descri
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk Thu Feb 21 02:52:59 2013
@@ -19,8 +19,9 @@
 #
 #**************************************************************
 
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml Thu Feb 21 02:52:59 2013
@@ -25,6 +25,7 @@
     <platform value="#EXTENSION_PLATFORM#"/>
     <dependencies>
         <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
     </dependencies>
     <publisher>
         <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Modified: openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml Thu Feb 21 02:52:59 2013
@@ -31,6 +31,7 @@
     <name>Custom Tool Panel Example</name>
   </display-name>
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
+    <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
+    <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
   </dependencies>
 </description>

Modified: openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in Thu Feb 21 02:52:59 2013
@@ -29,11 +29,11 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/apacheopenoffice3
+# Example: OFFICE_HOME=/opt/apacheopenoffice4
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 

Modified: openoffice/branches/ia2/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/setsdkenv_windows.template?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/ia2/main/odk/setsdkenv_windows.template Thu Feb 21 02:52:59 2013
@@ -23,18 +23,18 @@ REM This script sets all enviroment vari
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name
-REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
-set OO_SDK_NAME=apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
+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 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
 set OFFICE_BASE_HOME=
 
 REM URE installation directory.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Pro
 set OO_SDK_JAVA_HOME=
 
 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
 set OO_SDK_OUT=
 
 REM Automatic deployment

Modified: openoffice/branches/ia2/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/util/makefile.pmk?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/ia2/main/odk/util/makefile.pmk Thu Feb 21 02:52:59 2013
@@ -22,7 +22,7 @@
 
 
 # used for sdk common files
-PRODUCT_RELEASE=3.5
+PRODUCT_RELEASE=4.0
 OFFICENAME=Apache OpenOffice
 SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/PrinterServer.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/PrinterServer.idl?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/PrinterServer.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/PrinterServer.idl Thu Feb 21 02:52:59 2013
@@ -29,7 +29,7 @@ interface XPrinterServer;
 
 /** manages several printers on one machine.
 
-    @since Apache OpenOffice 3.5
+    @since Apache OpenOffice 4.0
  */
 service PrinterServer : XPrinterServer
 {

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/ui/XStatusbarItem.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/ui/XStatusbarItem.idl?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/ui/XStatusbarItem.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/ui/XStatusbarItem.idl Thu Feb 21 02:52:59 2013
@@ -31,7 +31,7 @@ module com {  module sun {  module star 
 
     @see <type scope="com::sun::star::frame">XStatusbarController</type>
 
-    @since Apache OpenOffice 3.5
+    @since Apache OpenOffice 4.0
 */
 interface XStatusbarItem
 {

Modified: openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx Thu Feb 21 02:52:59 2013
@@ -609,13 +609,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 +662,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/ia2/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx Thu Feb 21 02:52:59 2013
@@ -33,8 +33,6 @@
 using namespace                 ::rtl;
 using namespace                 ::com::sun::star;
 
-
-
 #define UNIQUE              sal_False   // function name does not exist in Calc
 #define DOUBLE              sal_True    // function name exists in Calc
 
@@ -1850,8 +1848,7 @@ sal_Bool Complex::ParseString( const STR
 
 	if( IsImagUnit( *pStr ) && rStr.getLength() == 1)
 	{
-		rCompl.r = 0.0;
-		rCompl.i = 1.0;
+		rCompl.Num= double_complex ( 0.0, 1.0 );
 		rCompl.c = *pStr;
 		return sal_True;
 	}
@@ -1872,8 +1869,7 @@ sal_Bool Complex::ParseString( const STR
 				rCompl.c = pStr[ 1 ];
 				if( pStr[ 2 ] == 0 )
 				{
-					rCompl.r = f;
-					rCompl.i = ( *pStr == '+' )? 1.0 : -1.0;
+					rCompl.Num = double_complex (f, ( *pStr == '+' )? 1.0 : -1.0 );
 					return sal_True;
 				}
 			}
@@ -1883,8 +1879,7 @@ sal_Bool Complex::ParseString( const STR
 				pStr++;
 				if( *pStr == 0 )
 				{
-					rCompl.r = r;
-					rCompl.i = f;
+					rCompl.Num = double_complex (r, f);
 					return sal_True;
 				}
 			}
@@ -1896,14 +1891,12 @@ sal_Bool Complex::ParseString( const STR
 			pStr++;
 			if( *pStr == 0 )
 			{
-				rCompl.i = f;
-				rCompl.r = 0.0;
+				rCompl.Num = double_complex (0.0, f);
 				return sal_True;
 			}
 			break;
 		case 0:		// only real-part
-			rCompl.r = f;
-			rCompl.i = 0.0;
+			rCompl.Num = double_complex (f, 0.0);
 			return sal_True;
 	}
 
@@ -1918,26 +1911,26 @@ STRING Complex::GetString() const THROWD
     static const String aPlus( '+' );
     static const String aMinus( '-' );
 
-    CHK_FINITE(r);
-    CHK_FINITE(i);
+    CHK_FINITE(Num.real());
+    CHK_FINITE(Num.imag());
     STRING aRet;
 
-    bool bHasImag = i != 0.0;
-    bool bHasReal = !bHasImag || (r != 0.0);
+    bool bHasImag = Num.imag() != 0.0;
+    bool bHasReal = !bHasImag || (Num.real() != 0.0);
 
 	if( bHasReal )
-	    aRet = ::GetString( r );
+	    aRet = ::GetString( Num.real() );
     if( bHasImag )
     {
-        if( i == 1.0 )
+        if( Num.imag() == 1.0 )
         {
             if( bHasReal )
                 aRet += aPlus;
         }
-        else if( i == -1.0 )
+        else if( Num.imag() == -1.0 )
             aRet += aMinus;
         else
-            aRet += ::GetString( i, bHasReal );
+            aRet += ::GetString( Num.imag(), bHasReal );
         aRet += (c != 'j') ? aI : aJ;
     }
 
@@ -1947,12 +1940,12 @@ STRING Complex::GetString() const THROWD
 
 double Complex::Arg( void ) const THROWDEF_RTE_IAE
 {
-	if( r == 0.0 && i == 0.0 )
+	if( Num.real() == 0.0 && Num.imag() == 0.0 )
 		THROW_IAE;
 
-	double	phi = acos( r / Abs() );
+	double	phi = acos( Num.real() / Abs() );
 
-	if( i < 0.0 )
+	if( Num.imag() < 0.0 )
 		phi = -phi;
 
 	return phi;
@@ -1961,11 +1954,11 @@ double Complex::Arg( void ) const THROWD
 
 void Complex::Power( double fPower ) THROWDEF_RTE_IAE
 {
-	if( r == 0.0 && i == 0.0 )
+	if( Num.real() == 0.0 && Num.imag() == 0.0 )
 	{
 		if( fPower > 0 )
 		{
-			r = i = 0.0;
+			Num = double_complex ( 0.0, 0.0 );
 			return;
 		}
 		else
@@ -1976,15 +1969,14 @@ void Complex::Power( double fPower ) THR
 
 	p = Abs();
 
-	phi = acos( r / p );
-	if( i < 0.0 )
+	phi = acos( Num.real() / p );
+	if( Num.imag() < 0.0 )
 		phi = -phi;
 
 	p = pow( p, fPower );
 	phi *= fPower;
 
-	r = cos( phi ) * p;
-	i = sin( phi ) * p;
+	Num = double_complex (cos( phi ) * p, sin( phi ) * p);
 }
 
 
@@ -1992,15 +1984,15 @@ void Complex::Sqrt( void )
 {
 	static const double	fMultConst = 0.7071067811865475;	// ...2440084436210485 = 1/sqrt(2)
 	double	p = Abs();
-	double	i_ = sqrt( p - r ) * fMultConst;
+	double	i_ = sqrt( p - Num.real() ) * fMultConst;
 
-	r = sqrt( p + r ) * fMultConst;
-	i = ( i < 0.0 )? -i_ : i_;
+	Num = double_complex (sqrt( p + Num.real() ) * fMultConst, ( Num.imag() < 0.0 )? -i_ : i_);
 }
 
 
 void Complex::Sin( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
@@ -2014,11 +2006,13 @@ void Complex::Sin( void ) THROWDEF_RTE_I
 	}
 	else
 		r = sin( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cos( void ) THROWDEF_RTE_IAE
 {
+	double r = Num.real(), i = Num.imag() ;
 	if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
@@ -2032,23 +2026,23 @@ void Complex::Cos( void ) THROWDEF_RTE_I
 	}
 	else
 		r = cos( r );
-}
+	Num = double_complex ( r, i );
 
+}
 
 void Complex::Div( const Complex& z ) THROWDEF_RTE_IAE
 {
-	if( z.r == 0 && z.i == 0 )
+	if( z.Num.real() == 0 && z.Num.imag() == 0 )
 		THROW_IAE;
 
-	double	a1 = r;
-	double	a2 = z.r;
-	double	b1 = i;
-	double	b2 = z.i;
+	double	a1 = Num.real();
+	double	a2 = z.Num.real();
+	double	b1 = Num.imag();
+	double	b2 = z.Num.imag();
 
 	double	f = 1.0 / ( a2 * a2 + b2 * b2 );
 
-	r = ( a1 * a2 + b1 * b2 ) * f;
-	i = ( a2 * b1 - a1 * b2 ) * f;
+	Num = f * double_complex ( a1 * a2 + b1 * b2 ,  a2 * b1 - a1 * b2 );
 
     if( !c ) c = z.c;
 }
@@ -2056,14 +2050,14 @@ void Complex::Div( const Complex& z ) TH
 
 void Complex::Exp( void )
 {
-	double	fE = exp( r );
-	r = fE * cos( i );
-	i = fE * sin( i );
+	double	fE = exp( Num.real() );
+	Num = fE * double_complex ( cos( Num.imag() ), sin( Num.imag() ) );
 }
 
 
 void Complex::Ln( void ) THROWDEF_RTE_IAE
 {
+	double r = Num.real(), i = Num.imag() ;
 	if( r == 0.0 && i == 0.0 )
 		THROW_IAE;
 
@@ -2076,6 +2070,7 @@ void Complex::Ln( void ) THROWDEF_RTE_IA
 		i = -i;
 
 	r = log( fAbs );
+	Num = double_complex ( r, i );
 }
 
 
@@ -2095,6 +2090,7 @@ void Complex::Log2( void ) THROWDEF_RTE_
 
 void Complex::Tan(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2109,11 +2105,13 @@ void Complex::Tan(void) THROWDEF_RTE_IAE
             THROW_IAE;
         r = tan( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sec( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
@@ -2130,11 +2128,13 @@ void Complex::Sec( void ) THROWDEF_RTE_I
             THROW_IAE;
         r = 1.0 / cos( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Csc( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
@@ -2151,11 +2151,13 @@ void Complex::Csc( void ) THROWDEF_RTE_I
             THROW_IAE;
         r = 1.0 / sin( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cot(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2170,11 +2172,13 @@ void Complex::Cot(void) THROWDEF_RTE_IAE
             THROW_IAE;
         r = 1.0 / tan( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sinh( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
         THROW_IAE;
 
@@ -2187,11 +2191,13 @@ void Complex::Sinh( void ) THROWDEF_RTE_
 	}
 	else
 		r = sinh( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cosh( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
         THROW_IAE;
 
@@ -2204,11 +2210,13 @@ void Complex::Cosh( void ) THROWDEF_RTE_
 	}
 	else
 		r = cosh( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sech(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2225,11 +2233,13 @@ void Complex::Sech(void) THROWDEF_RTE_IA
             THROW_IAE;
         r = 1.0 / cosh( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Csch(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2246,6 +2256,7 @@ void Complex::Csch(void) THROWDEF_RTE_IA
             THROW_IAE;
         r = 1.0 / sinh( r );
     }
+    Num = double_complex ( r, i );
 }
 
 

Modified: openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.hxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.hxx (original)
+++ openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.hxx Thu Feb 21 02:52:59 2013
@@ -35,6 +35,19 @@
 
 #include <math.h>
 
+// STLport definitions
+// This works around some issues with Boost
+//
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
+#include <boost/tr1/complex.hpp>
+using namespace boost::math;
+#ifndef double_complex
+typedef std::complex<double>		double_complex;
+#endif
+
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 
@@ -436,11 +449,11 @@ public:
 
 //-----------------------------------------------------------------------------
 
+
 class Complex
 {
-	double					r;
-	double					i;
-    sal_Unicode             c;
+    double_complex		Num;
+    sal_Unicode          c;
 
 public:
     inline                  Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
@@ -798,49 +811,44 @@ inline const FuncData* FuncDataList::Get
 
 
 inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) :
-		r( fReal ), i( fImag ), c( cC )
+		Num( fReal, fImag ), c( cC )
 {
 }
 
 
 inline double Complex::Real( void ) const
 {
-	return r;
+	return Num.real();
 }
 
 
 inline double Complex::Imag( void ) const
 {
-	return i;
+	return Num.imag();
 }
 
 
 inline double Complex::Abs( void ) const
 {
-	return sqrt( r * r + i * i );
+	return std::norm( Num );
 }
 
 
 void Complex::Conjugate( void )
 {
-	i = -i;
+	Num = std::conj( Num );
 }
 
 
 inline void Complex::Mult( double f )
 {
-	i *= f;
-	r *= f;
+	Num = f * Num;
 }
 
 
 inline void Complex::Mult( const Complex& rM )
 {
-	double	r_ = r;
-	double	i_ = i;
-
-	r = r_ * rM.r - i_ * rM.i;
-	i = r_ * rM.i + i_ * rM.r;
+	Num = Num * rM.Num;
 
     if( !c ) c = rM.c;
 }
@@ -848,16 +856,16 @@ inline void Complex::Mult( const Complex
 
 inline void Complex::Sub( const Complex& rC )
 {
-	r -= rC.r;
-	i -= rC.i;
+	Num -= rC.Num;
+
     if( !c ) c = rC.c;
 }
 
 
 inline void Complex::Add( const Complex& rAdd )
 {
-	r += rAdd.r;
-	i += rAdd.i;
+	Num += rAdd.Num;
+
     if( !c ) c = rAdd.c;
 }
 

Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp Thu Feb 21 02:52:59 2013
@@ -80,7 +80,6 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 
 #endif
 
-#STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
 STD_RES_FILE( gid_File_Res_Svl, svl )

Modified: openoffice/branches/ia2/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/build.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/build.xml (original)
+++ openoffice/branches/ia2/main/scripting/java/build.xml Thu Feb 21 02:52:59 2013
@@ -25,7 +25,7 @@
   <!-- =================== Environmental Properties ======================= -->
 
   <property name="prj" value=".."/>
-  <property name="build.compiler"   value="classic"/>
+  <property name="build.compiler"   value="modern"/>
   <property name="optimize"   value="off"/>
   <property name="debug"   value="on"/>
   <property name="jardir" value="${out}/class"/>

Modified: openoffice/branches/ia2/main/scripting/workben/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/workben/build.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/workben/build.xml (original)
+++ openoffice/branches/ia2/main/scripting/workben/build.xml Thu Feb 21 02:52:59 2013
@@ -26,7 +26,7 @@
 
   <property name="prj" value=".."/>
   <property file="${prj}/java/build.env"/>
-  <property name="build.compiler"   value="classic"/>
+  <property name="build.compiler"   value="modern"/>
   <property name="optimize"   value="on"/>
   <property name="debug"   value="on"/>
   <property name="installerclasses" value="${out}/class/sframeworkinstall"/>

Modified: openoffice/branches/ia2/main/sd/source/ui/view/sdview2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/sdview2.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/sdview2.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/sdview2.cxx Thu Feb 21 02:52:59 2013
@@ -533,6 +533,12 @@ sal_Int8 View::AcceptDrop( const AcceptD
 		{
 			SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
 
+            if(pDragTransferable && (nDropAction & DND_ACTION_LINK))
+            {
+                // suppress own data when it's intention is to use it as fill information
+                pDragTransferable = 0;
+            }
+
 			if( pDragTransferable )
 			{
 				const View* pSourceView = pDragTransferable->GetView();
@@ -602,7 +608,7 @@ sal_Int8 View::AcceptDrop( const AcceptD
 					}
 
 					if( bHasPickObj && !bIsPresTarget &&
-					    ( !pPickObj->ISA( SdrGrafObj ) || bGraphic || bMtf || bBitmap || ( bXFillExchange && !pPickObj->ISA( SdrGrafObj ) && !pPickObj->ISA( SdrOle2Obj ) ) ) )
+					    ( bGraphic || bMtf || bBitmap || bXFillExchange ) )
 					{
 						if( mpDropMarkerObj != pPickObj )
 						{

Modified: openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx Thu Feb 21 02:52:59 2013
@@ -295,7 +295,7 @@ sal_Bool View::InsertData( const Transfe
 	SdrObject*				pPickObj = NULL;
 	SdPage*					pPage = NULL;
 	ImageMap*				pImageMap = NULL;
-	sal_Bool					bReturn = sal_False;
+	bool bReturn = false;
 	sal_Bool					bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 );
 	sal_Bool					bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink );
 	sal_uLong					nPasteOptions = SDRINSERT_SETDEFLAYER;
@@ -321,6 +321,12 @@ sal_Bool View::InsertData( const Transfe
 	SdTransferable* pOwnData = NULL;
     SdTransferable* pImplementation = SdTransferable::getImplementation( aDataHelper.GetTransferable() );
 
+    if(pImplementation && (rDnDAction & DND_ACTION_LINK))
+    {
+        // suppress own data when it's intention is to use it as fill information
+        pImplementation = 0;
+    }
+
 	// try to get own transfer data
 	if( pImplementation )
 	{
@@ -373,11 +379,14 @@ sal_Bool View::InsertData( const Transfe
 		}
 	}
 
-	if( pOwnData && !nFormat )
+    // Changed the whole decision tree to be dependent of bReturn as a flag that
+    // the work was done; this allows to check multiple formats and not just fail
+    // when a CHECK_FORMAT_TRANS(*format*) detected format does not work. This is
+    // e.g. necessary for FORMAT_BITMAP
+    if( pOwnData && !nFormat )
 	{
 		const View* pSourceView = pOwnData->GetView();
 
-
         if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() && ISA( View ) )
 		{
             mpClipboard->HandlePageDrop (*pOwnData);
@@ -419,7 +428,7 @@ sal_Bool View::InsertData( const Transfe
 							}
 						}
 
-						bReturn = sal_True;
+						bReturn = true;
 					}
 				}
 				else
@@ -596,12 +605,12 @@ sal_Bool View::InsertData( const Transfe
 								if( pMarkList != mpDragSrcMarkList )
 									delete pMarkList;
 
-								bReturn = sal_True;
+								bReturn = true;
 							}
 							else
 							{
 								maDropErrorTimer.Start();
-								bReturn = sal_False;
+								bReturn = false;
 							}
 						}
 					}
@@ -610,7 +619,7 @@ sal_Bool View::InsertData( const Transfe
 						pOwnData->SetInternalMove( sal_True );
 						MoveAllMarked( Size( maDropPos.X() - pOwnData->GetStartPos().X(),
 											 maDropPos.Y() - pOwnData->GetStartPos().Y() ), bCopy );
-						bReturn = sal_True;
+						bReturn = true;
 					}
 				}
 			}
@@ -636,7 +645,7 @@ sal_Bool View::InsertData( const Transfe
 				else
 				{
 					maDropErrorTimer.Start();
-					bReturn = sal_False;
+					bReturn = false;
 				}
 			}
 		}
@@ -672,7 +681,8 @@ sal_Bool View::InsertData( const Transfe
 		    pPage->SetPresentationLayout( aLayout, sal_False, sal_False );
 	   }
 	}
-	else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_DRAWING ) )
+	
+    if(!bReturn && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_DRAWING ))
 	{
 		SotStorageStreamRef xStm;
 
@@ -825,7 +835,8 @@ sal_Bool View::InsertData( const Transfe
 			}
 		}
 	}
-	else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ) )
+	
+    if(!bReturn && CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE))
 	{
 		::rtl::OUString aOUString;
 
@@ -844,14 +855,15 @@ sal_Bool View::InsertData( const Transfe
 				aRect.SetPos( maDropPos );
 				pObj->SetLogicRect( aRect );
 				InsertObjectAtView( pObj, *GetSdrPageView(), SDRINSERT_SETDEFLAYER );
-				bReturn = sal_True;
+				bReturn = true;
 			}
 		}
 	}
-	else if( !bLink &&
-			 ( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_EMBED_SOURCE ) ||
-			   CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_EMBEDDED_OBJ ) )  &&
-			   aDataHelper.HasFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ) )
+	
+    if(!bReturn && 
+        !bLink &&
+        (CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_EMBED_SOURCE) || CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_EMBEDDED_OBJ))  &&
+        aDataHelper.HasFormat(SOT_FORMATSTR_ID_OBJECTDESCRIPTOR))
 	{
         //TODO/LATER: is it possible that this format is binary?! (from old versions of SO)
         uno::Reference < io::XInputStream > xStm;
@@ -1031,15 +1043,16 @@ sal_Bool View::InsertData( const Transfe
                         }
                     }
 
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
 			}
 		}
 	}
-	else if( !bLink &&
-			 ( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) ||
-			   CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ) ) &&
-			   aDataHelper.HasFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE ) )
+	
+    if(!bReturn && 
+        !bLink &&
+        (CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE) || CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_EMBED_SOURCE_OLE)) &&
+        aDataHelper.HasFormat(SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE))
 	{
 		// online insert ole if format is forced or no gdi metafile is available
 		if( (nFormat != 0) || !aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) )
@@ -1182,7 +1195,7 @@ sal_Bool View::InsertData( const Transfe
 
 					// let the object stay in loaded state after insertion
 					pObj->Unload();
-            		bReturn = sal_True;
+            		bReturn = true;
 				}
 			}
 		}
@@ -1193,7 +1206,8 @@ sal_Bool View::InsertData( const Transfe
 			InsertMetaFile( aDataHelper, rPos, pImageMap, true );
 		}
 	}
-	else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_SVXB ) )
+	
+    if(!bReturn && (!bLink || pPickObj) && CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_SVXB))
 	{
 		SotStorageStreamRef xStm;
 
@@ -1227,10 +1241,11 @@ sal_Bool View::InsertData( const Transfe
 			ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea());
 
 			InsertGraphic( aGraphic, mnAction, aInsertPos, NULL, pImageMap );
-			bReturn = sal_True;
+			bReturn = true;
 		}
 	}
-	else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( FORMAT_GDIMETAFILE ) )
+	
+    if(!bReturn && (!bLink || pPickObj) && CHECK_FORMAT_TRANS(FORMAT_GDIMETAFILE))
 	{
 		Point aInsertPos( rPos );
 
@@ -1253,7 +1268,8 @@ sal_Bool View::InsertData( const Transfe
 
 		bReturn = InsertMetaFile( aDataHelper, aInsertPos, pImageMap, nFormat == 0 ? true : false ) ? sal_True : sal_False;
 	}
-	else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( FORMAT_BITMAP ) )
+	
+    if(!bReturn && (!bLink || pPickObj) && CHECK_FORMAT_TRANS(FORMAT_BITMAP))
 	{
 		BitmapEx aBmpEx;
 
@@ -1282,10 +1298,11 @@ sal_Bool View::InsertData( const Transfe
 			ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea());
 
 			InsertGraphic( aBmpEx, mnAction, aInsertPos, NULL, pImageMap );
-			bReturn = sal_True;
+			bReturn = true;
 		}
 	}
-	else if( pPickObj && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_XFA ) )
+
+    if(!bReturn && pPickObj && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_XFA ) )
 	{
 		SotStorageStreamRef xStm;
 
@@ -1348,7 +1365,8 @@ sal_Bool View::InsertData( const Transfe
 			}
 		}
 	}
-	else if( !bLink && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_HTML ) )
+
+    if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_HTML))
 	{
 		SotStorageStreamRef xStm;
 
@@ -1359,7 +1377,8 @@ sal_Bool View::InsertData( const Transfe
             bReturn = SdrView::Paste( *xStm, String(), EE_FORMAT_HTML, maDropPos, pPage, nPasteOptions );
 		}
 	}
-	else if( !bLink && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_EDITENGINE ) )
+	
+    if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SOT_FORMATSTR_ID_EDITENGINE))
 	{
 		SotStorageStreamRef xStm;
 
@@ -1378,7 +1397,7 @@ sal_Bool View::InsertData( const Transfe
 				{
                     // mba: clipboard always must contain absolute URLs (could be from alien source)
                     pOLV->Read( *xStm, String(), EE_FORMAT_BIN, sal_False, mpDocSh->GetHeaderAttributes() );
-					bReturn = sal_True;
+					bReturn = true;
 				}
 			}
 
@@ -1387,7 +1406,8 @@ sal_Bool View::InsertData( const Transfe
                 bReturn = SdrView::Paste( *xStm, String(), EE_FORMAT_BIN, maDropPos, pPage, nPasteOptions );
 		}
 	}
-	else if( !bLink && CHECK_FORMAT_TRANS( FORMAT_RTF ) )
+
+    if(!bReturn && !bLink && CHECK_FORMAT_TRANS(FORMAT_RTF))
 	{
 		SotStorageStreamRef xStm;
 
@@ -1412,7 +1432,7 @@ sal_Bool View::InsertData( const Transfe
 					{
 						// mba: clipboard always must contain absolute URLs (could be from alien source)
 						pOLV->Read( *xStm, String(), EE_FORMAT_RTF, sal_False, mpDocSh->GetHeaderAttributes() );
-						bReturn = sal_True;
+						bReturn = true;
 					}
 				}
 
@@ -1422,7 +1442,8 @@ sal_Bool View::InsertData( const Transfe
 			}
 		}
 	}
-	else if( CHECK_FORMAT_TRANS( FORMAT_FILE_LIST ) )
+	
+    if(!bReturn && CHECK_FORMAT_TRANS(FORMAT_FILE_LIST))
 	{
         FileList aDropFileList;
 
@@ -1436,9 +1457,10 @@ sal_Bool View::InsertData( const Transfe
             maDropInsertFileTimer.Start();
         }
 
-		bReturn = sal_True;
+		bReturn = true;
 	}
-	else if( CHECK_FORMAT_TRANS( FORMAT_FILE ) )
+
+    if(!bReturn && CHECK_FORMAT_TRANS(FORMAT_FILE))
 	{
         String aDropFile;
 
@@ -1449,9 +1471,10 @@ sal_Bool View::InsertData( const Transfe
 			maDropInsertFileTimer.Start();
         }
 
-		bReturn = sal_True;
+		bReturn = true;
 	}
-	else if( !bLink && CHECK_FORMAT_TRANS( FORMAT_STRING ) )
+
+    if(!bReturn && !bLink && CHECK_FORMAT_TRANS(FORMAT_STRING))
 	{
 		if( ( FORMAT_STRING == nFormat ) ||
             ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_SOLK ) &&
@@ -1467,7 +1490,7 @@ sal_Bool View::InsertData( const Transfe
 				if( pOLV )
 				{
 					pOLV->InsertText( aOUString );
-					bReturn = sal_True;
+					bReturn = true;
 				}
 
                 if( !bReturn )

Modified: openoffice/branches/ia2/main/sdext/source/minimizer/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sdext/source/minimizer/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sdext/source/minimizer/description.xml (original)
+++ openoffice/branches/ia2/main/sdext/source/minimizer/description.xml Thu Feb 21 02:52:59 2013
@@ -28,8 +28,8 @@
     <identifier value="UPDATED_IDENTIFIER"/>
 
     <dependencies>
-        <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-        <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
     </dependencies>
 
     <registration>

Modified: openoffice/branches/ia2/main/sdext/source/pdfimport/config/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sdext/source/pdfimport/config/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sdext/source/pdfimport/config/description.xml (original)
+++ openoffice/branches/ia2/main/sdext/source/pdfimport/config/description.xml Thu Feb 21 02:52:59 2013
@@ -27,8 +27,8 @@
     <identifier value="UPDATED_IDENTIFIER" />
 
     <dependencies>
-        <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-        <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
     </dependencies>
 
     <registration>

Modified: openoffice/branches/ia2/main/sdext/source/presenter/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sdext/source/presenter/description.xml?rev=1448495&r1=1448494&r2=1448495&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sdext/source/presenter/description.xml (original)
+++ openoffice/branches/ia2/main/sdext/source/presenter/description.xml Thu Feb 21 02:52:59 2013
@@ -28,8 +28,8 @@
   <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
 
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-    <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+    <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+    <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
   </dependencies>
 
   <registration>