from:"orw"

svn commit: r1629834 - /openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx

2014-10-07 Thread orw

Author: orw
Date: Tue Oct  7 09:09:30 2014
New Revision: 1629834

URL: http://svn.apache.org/r1629834
Log:
125618: *.docx import: correct detection of paragraph break and line break 
characters, esp. in context of Chinese text

patch by: Mark Hung marklh9 at gmail dot com
review by: orw


Modified:
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1629834r1=1629833r2=1629834view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx 
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx Tue Oct  
7 09:09:30 2014
@@ -4520,8 +4520,12 @@ void DomainMapper::lcl_utext(const sal_u
 {
 m_pImpl-getTableManager().utext(data_, len);
 
-if(len == 1  ((*data_) == 0x0d || (*data_) == 0x07))
+if ( len == 1
+  ( (*(const sal_Unicode*)data_) == 0x0d
+|| (*(const sal_Unicode*)data_) == 0x07 ) )
+{
 
m_pImpl-finishParagraph(m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH));
+}
 else
 {

svn commit: r1629885 - in /openoffice/trunk/main/sw: inc/tgrditem.hxx source/core/layout/atrfrm.cxx

2014-10-07 Thread orw

Author: orw
Date: Tue Oct  7 13:08:12 2014
New Revision: 1629885

URL: http://svn.apache.org/r1629885
Log:
125549: accept only positive values for SwTextGridItem::nBaseWidth

kudos to Mark Hung for defect finding and analysis


Modified:
openoffice/trunk/main/sw/inc/tgrditem.hxx
openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx

Modified: openoffice/trunk/main/sw/inc/tgrditem.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/tgrditem.hxx?rev=1629885r1=1629884r2=1629885view=diff
==
--- openoffice/trunk/main/sw/inc/tgrditem.hxx (original)
+++ openoffice/trunk/main/sw/inc/tgrditem.hxx Tue Oct  7 13:08:12 2014
@@ -93,7 +93,14 @@ public:
 
 //for textgrid enhancement
 sal_uInt16 GetBaseWidth() const { return nBaseWidth;}
-void SetBaseWidth( sal_uInt16 nNew ) { nBaseWidth = nNew; }
+void SetBaseWidth( sal_uInt16 nNew )
+{
+// only accept positive values
+if ( nBaseWidth  0 )
+{
+nBaseWidth = nNew;
+}
+}
 
 sal_Bool IsSnapToChars() const { return bSnapToChars; }
 sal_Bool GetSnapToChars() const { return bSnapToChars; }

Modified: openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx?rev=1629885r1=1629884r2=1629885view=diff
==
--- openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx Tue Oct  7 13:08:12 
2014
@@ -2185,10 +2185,18 @@ sal_Bool SwFmtLineNumber::PutValue( cons
  */
 
 SwTextGridItem::SwTextGridItem()
-: SfxPoolItem( RES_TEXTGRID ), aColor( COL_LIGHTGRAY ), nLines( 20 ),
-  nBaseHeight( 400 ), nRubyHeight( 200 ), eGridType( GRID_NONE ),
-  bRubyTextBelow( 0 ), bPrintGrid( 1 ), bDisplayGrid( 1 ),
-  nBaseWidth(400), bSnapToChars( 1 ), bSquaredMode(1)
+: SfxPoolItem( RES_TEXTGRID )
+, aColor( COL_LIGHTGRAY )
+, nLines( 20 )
+, nBaseHeight( 400 )
+, nRubyHeight( 200 )
+, eGridType( GRID_NONE )
+, bRubyTextBelow( 0 )
+, bPrintGrid( 1 )
+, bDisplayGrid( 1 )
+, nBaseWidth( 400 )
+, bSnapToChars( 1 )
+, bSquaredMode( 1 )
 {
 }

svn commit: r1619696 - /openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 07:33:58 2014
New Revision: 1619696

URL: http://svn.apache.org/r1619696
Log:
Update Feed meta data: updating additional Mac OS X text for languages Catalan, 
Catalan (Valencia RACV) and Catalan (Valencia AVL) with result of google 
translate


Modified:
openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

Modified: openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt?rev=1619696r1=1619695r2=1619696view=diff
==
--- openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt (original)
+++ openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt Fri Aug 22 
07:33:58 2014
@@ -5,9 +5,9 @@ en-US,Only for Mac OS X versions 10.7 or
 ar,ÙÙØ· ÙØ¥ØµØ¯Ø§Ø±Ø§Øª ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Mac OS X 10.7 Ø£Ù Ø£ØØ¯Ø«
 ast,Only for Mac OS X versions 10.7 or newer
 bg,Ð¡Ð°Ð¼Ð¾ Ð·Ð° Mac OS X 10.7 Ð¸Ð»Ð¸ Ð¿Ð¾-Ð½Ð¾Ð²Ð° Ð²ÐµÑÑÐ¸Ñ
-ca,Only for Mac OS X versions 10.7 or newer
-ca-XR,Only for Mac OS X versions 10.7 or newer
-ca-XV,Only for Mac OS X versions 10.7 or newer
+ca,NomÃ©s per a Mac OS X versiÃ³ 10.7 o mÃ©s recent
+ca-XR,NomÃ©s per a Mac OS X versiÃ³ 10.7 o mÃ©s recent
+ca-XV,NomÃ©s per a Mac OS X versiÃ³ 10.7 o mÃ©s recent
 cs,Pouze pro Mac OS verze 10.7 a novÄjÅ¡Ã
 da,Kun for Mac OS X version 10.7 eller nyere
 de,Nur fÃ¼r Mac OS X-Versionen 10.7 oder neuer

svn commit: r1619698 [1/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 07:55:56 2014
New Revision: 1619698

URL: http://svn.apache.org/r1619698
Log:
Update Service: adjust Update Feeds for installed versions 3.2.0, 3.2.1, 3.3.0, 
3.4.0 and 3.4.1 to notify the availability of version 4.1.1


Modified:
openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update

openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update

svn commit: r1619698 [4/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update?rev=1619698r1=1619697r2=1619698view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 Fri Aug 22 07:55:56 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 3.2.1 instances/title
-updatedWed May  7 07:43:10 UTC 2014 UTC/updated
+titleUpdate Feed for 3.2.1 instances/title
+updatedFri, Aug 22, 2014  7:37:45 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,10 +79,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_2_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -95,10 +95,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_2_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -111,10 +111,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+

svn commit: r1619698 [6/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update?rev=1619698r1=1619697r2=1619698view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 Fri Aug 22 07:55:56 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 3.4.0 instances/title
-updatedWed May  7 07:43:22 UTC 2014 UTC/updated
+titleUpdate Feed for 3.4.0 instances/title
+updatedFri, Aug 22, 2014  7:43:57 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,10 +79,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO3_4_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -95,10 +95,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO3_4_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -111,10 +111,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+

svn commit: r1619698 [2/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw


Modified: openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update?rev=1619698r1=1619697r2=1619698view=diff
==
--- openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update 
(original)
+++ openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update Fri 
Aug 22 07:55:56 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 3.4.1 instances/title
-updatedWed May  7 07:43:26 UTC 2014 UTC/updated
+titleUpdate Feed for 3.4.1 instances/title
+updatedFri, Aug 22, 2014  7:46:37 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,10 +79,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO3_4_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -95,10 +95,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO3_4_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -111,10 +111,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description

svn commit: r1619698 [3/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update?rev=1619698r1=1619697r2=1619698view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 Fri Aug 22 07:55:56 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 3.2.0 instances/title
-updatedWed May  7 07:43:04 UTC 2014 UTC/updated
+titleUpdate Feed for 3.2.0 instances/title
+updatedFri, Aug 22, 2014  7:35:06 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,10 +79,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_2_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -95,10 +95,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_2_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -111,10 +111,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+

svn commit: r1619698 [5/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update?rev=1619698r1=1619697r2=1619698view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
 Fri Aug 22 07:55:56 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 3.3.0 instances/title
-updatedWed May  7 07:43:16 UTC 2014 UTC/updated
+titleUpdate Feed for 3.3.0 instances/title
+updatedFri, Aug 22, 2014  7:41:02 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,10 +79,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_3_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -95,10 +95,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
 inst:idOpenOffice.org_3_ast/inst:id
-inst:version- Apache OpenOffice 4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version- Apache OpenOffice 4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=OOo3_3_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -111,10 +111,10 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+

svn commit: r920095 - in /websites/production/ooo-site: cgi-bin/ content/

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 08:01:35 2014
New Revision: 920095

Log:
publish up-to-date Update Feeds for installed versions 3.2.0, 3.2.1, 3.3.0, 
3.4.0 and 3.4.1

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r920094, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r920094, websites/staging/ooo-site/trunk/content/

svn commit: r1619705 - /openoffice/devtools/genUpdateFeed/feed-entry-template.Update

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 08:48:23 2014
New Revision: 1619705

URL: http://svn.apache.org/r1619705
Log:
reverting change of revision 1612057 as the Update Service code relies on this 
namespace URI 


Modified:
openoffice/devtools/genUpdateFeed/feed-entry-template.Update

Modified: openoffice/devtools/genUpdateFeed/feed-entry-template.Update
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/feed-entry-template.Update?rev=1619705r1=1619704r2=1619705view=diff
==
--- openoffice/devtools/genUpdateFeed/feed-entry-template.Update (original)
+++ openoffice/devtools/genUpdateFeed/feed-entry-template.Update Fri Aug 22 
08:48:23 2014
@@ -4,7 +4,7 @@
 category term=%PRODUCTNAME%_%LANGUAGECODE% label=Apache OpenOffice 
update/
 summary%ADDITIONALTEXT%/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:id%PRODUCTNAME%_%LANGUAGECODE%/inst:id
 inst:version%NEWVERSION%/inst:version
 inst:buildid%NEWBUILDID%/inst:buildid

svn commit: r1619709 [3/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update?rev=1619709r1=1619708r2=1619709view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 Fri Aug 22 08:50:39 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleUpdate Feed for 3.2.0 instances/title
-updatedFri, Aug 22, 2014  7:35:06 AM UTC/updated
+updatedFri, Aug 22, 2014  8:23:42 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,7 +79,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -95,7 +95,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -111,7 +111,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -127,7 +127,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version

svn commit: r1619709 [4/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update?rev=1619709r1=1619708r2=1619709view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 Fri Aug 22 08:50:39 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleUpdate Feed for 3.2.1 instances/title
-updatedFri, Aug 22, 2014  7:37:45 AM UTC/updated
+updatedFri, Aug 22, 2014  8:27:44 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,7 +79,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -95,7 +95,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -111,7 +111,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -127,7 +127,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version

svn commit: r1619709 [1/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 08:50:39 2014
New Revision: 1619709

URL: http://svn.apache.org/r1619709
Log:
Update Service: apply needed namesprace URI for Update Feeds for installed 
versions 3.2.0, 3.2.1, 3.3.0, 3.4.0 and 3.4.1


Modified:
openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update

openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update

svn commit: r1619709 [5/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update?rev=1619709r1=1619708r2=1619709view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update
 Fri Aug 22 08:50:39 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleUpdate Feed for 3.3.0 instances/title
-updatedFri, Aug 22, 2014  7:41:02 AM UTC/updated
+updatedFri, Aug 22, 2014  8:33:20 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,7 +79,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -95,7 +95,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -111,7 +111,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -127,7 +127,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version

svn commit: r1619709 [2/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw


Modified: openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update?rev=1619709r1=1619708r2=1619709view=diff
==
--- openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update 
(original)
+++ openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update Fri 
Aug 22 08:50:39 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleUpdate Feed for 3.4.1 instances/title
-updatedFri, Aug 22, 2014  7:46:37 AM UTC/updated
+updatedFri, Aug 22, 2014  8:44:03 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,7 +79,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -95,7 +95,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -111,7 +111,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -127,7 +127,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -145,7 +145,7 @@
 category term=OpenOffice.org_3_bg

svn commit: r1619709 [6/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-08-22 Thread orw

Modified: 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update?rev=1619709r1=1619708r2=1619709view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 Fri Aug 22 08:50:39 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleUpdate Feed for 3.4.0 instances/title
-updatedFri, Aug 22, 2014  7:43:57 AM UTC/updated
+updatedFri, Aug 22, 2014  8:41:16 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -13,7 +13,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -29,7 +29,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -45,7 +45,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -61,7 +61,7 @@
 category term=OpenOffice.org_3_ar label=Apache OpenOffice update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ar/inst:id
 inst:version- Apache OpenOffice 3.4.1/inst:version
 inst:buildid9593/inst:buildid
@@ -79,7 +79,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -95,7 +95,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summaryOnly for Mac OS X versions 10.7 or newer/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -111,7 +111,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version
 inst:buildid9775/inst:buildid
@@ -127,7 +127,7 @@
 category term=OpenOffice.org_3_ast label=Apache OpenOffice 
update/
 summary/summary
 content type=application/xml
-inst:description 
xmlns:inst=https://wiki.openoffice.org/wiki/Update_Service;
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_ast/inst:id
 inst:version- Apache OpenOffice 4.1.1/inst:version

svn commit: r920103 - in /websites/production/ooo-site: cgi-bin/ content/

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 08:56:34 2014
New Revision: 920103

Log:
publish correct Update Feeds for installed version 3.2.0, 3.2.1, 3.3.0, 3.4.0 
and 3.4.1

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r920102, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r920102, websites/staging/ooo-site/trunk/content/

svn commit: r1619724 [4/4] - in /openoffice/updates-site/trunk: aoo40/check.Update aoo401/check.Update aoo410/check.Update

2014-08-22 Thread orw

Modified: openoffice/updates-site/trunk/aoo410/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo410/check.Update?rev=1619724r1=1619723r2=1619724view=diff
==
--- openoffice/updates-site/trunk/aoo410/check.Update (original)
+++ openoffice/updates-site/trunk/aoo410/check.Update Fri Aug 22 09:49:03 2014
@@ -1,4 +1,2716 @@
-?xml version=1.0 encoding=UTF-8?
-!-- Product Update Feed for AOO 4.1.0 instances --
-inst:description xmlns:inst=http://installation.openoffice.org/description;
-/inst:description
\ No newline at end of file
+?xml version=1.0 encoding=utf-8?
+feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
+titleUpdate Feed for 4.1.0 instances/title
+updatedFri, Aug 22, 2014  8:56:05 AM UTC/updated
+author
+nameApache OpenOffice project/name
+urihttp://openoffice.org/uri
+/author
+
+!-- Asturian - Windows --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_ast label=Apache OpenOffice update/
+summary/summary
+content type=application/xml
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:idOpenOffice_4_ast/inst:id
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
+inst:osWindows/inst:os
+inst:archx86/inst:arch
+inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_1_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
+/inst:description
+/content
+/entry
+!-- Asturian - Mac OS X 64bit --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_ast label=Apache OpenOffice update/
+summaryOnly for Mac OS X versions 10.7 or newer/summary
+content type=application/xml
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:idOpenOffice_4_ast/inst:id
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
+inst:osMacOSX/inst:os
+inst:archX86_64/inst:arch
+inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_1_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
+/inst:description
+/content
+/entry
+!-- Asturian - Linux 32bit --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_ast label=Apache OpenOffice update/
+summary/summary
+content type=application/xml
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:idOpenOffice_4_ast/inst:id
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
+inst:osLinux/inst:os
+inst:archx86/inst:arch
+inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_1_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
+/inst:description
+/content
+/entry
+!-- Asturian - Linux 64bit --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_ast label=Apache OpenOffice update/
+summary/summary
+content type=application/xml
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:idOpenOffice_4_ast/inst:id
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
+inst:osLinux/inst:os
+inst:archX86_64/inst:arch
+inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_1_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
+/inst:description
+/content
+/entry
+
+
+!-- Bulgarian - Windows --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_bg label=Apache OpenOffice update/
+summary/summary
+content type=application/xml
+inst:description 
xmlns:inst=http://installation.openoffice.org/description;
+inst:idOpenOffice_4_bg/inst:id
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
+inst:osWindows/inst:os
+inst:archx86/inst:arch
+inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_1_0_bgamp;utm_medium=Clientamp;utm_campaign=Upgrade/
+/inst:description
+/content
+/entry
+!-- Bulgarian - Mac OS X 64bit --
+entry
+titleUpdate available/title
+category term=OpenOffice_4_bg label=Apache OpenOffice update/
+summaryÐ¡Ð°Ð¼Ð¾ Ð·Ð° Mac OS X 10.7 Ð¸Ð»Ð¸ Ð¿Ð¾-Ð½Ð¾Ð²Ð° 
Ð²ÐµÑÑÐ¸Ñ/summary
+content type=application/xml
+

svn commit: r1619724 [2/4] - in /openoffice/updates-site/trunk: aoo40/check.Update aoo401/check.Update aoo410/check.Update

2014-08-22 Thread orw


Modified: openoffice/updates-site/trunk/aoo40/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo40/check.Update?rev=1619724r1=1619723r2=1619724view=diff
==
--- openoffice/updates-site/trunk/aoo40/check.Update (original)
+++ openoffice/updates-site/trunk/aoo40/check.Update Fri Aug 22 09:49:03 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 4.0.0 instances/title
-updatedWed May  7 07:43:34 UTC 2014 UTC/updated
+titleUpdate Feed for 4.0.0 instances/title
+updatedFri, Aug 22, 2014  8:48:32 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -15,8 +15,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -31,8 +31,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -47,8 +47,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -63,8 +63,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archX86_64/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -81,8 +81,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_bgamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -97,8 +97,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_0_bgamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -113,8 +113,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archx86/inst:arch

svn commit: r1619724 [3/4] - in /openoffice/updates-site/trunk: aoo40/check.Update aoo401/check.Update aoo410/check.Update

2014-08-22 Thread orw

Modified: openoffice/updates-site/trunk/aoo401/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo401/check.Update?rev=1619724r1=1619723r2=1619724view=diff
==
--- openoffice/updates-site/trunk/aoo401/check.Update (original)
+++ openoffice/updates-site/trunk/aoo401/check.Update Fri Aug 22 09:49:03 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
-titleProduct Update Feed for 4.0.1 instances/title
-updatedWed May  7 07:43:39 UTC 2014 UTC/updated
+titleUpdate Feed for 4.0.1 instances/title
+updatedFri, Aug 22, 2014  8:52:33 AM UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -15,8 +15,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -31,8 +31,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -47,8 +47,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -63,8 +63,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_ast/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archX86_64/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_astamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -81,8 +81,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osWindows/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_bgamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -97,8 +97,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osMacOSX/inst:os
 inst:archx86/inst:arch
 inst:update type=text/html 
src=http://www.openoffice.org/download?utm_source=AOO4_0_1_bgamp;utm_medium=Clientamp;utm_campaign=Upgrade/
@@ -113,8 +113,8 @@
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_bg/inst:id
-inst:version4.1.0/inst:version
-inst:buildid9764/inst:buildid
+inst:version4.1.1/inst:version
+inst:buildid9775/inst:buildid
 inst:osLinux/inst:os
 inst:archx86/inst:arch

svn commit: r1619724 [1/4] - in /openoffice/updates-site/trunk: aoo40/check.Update aoo401/check.Update aoo410/check.Update

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 09:49:03 2014
New Revision: 1619724

URL: http://svn.apache.org/r1619724
Log:
Update Service: adjust Update Feeds for installed versions 4.0.0, 4.0.1 and 
4.1.0 to notify the availability of version 4.1.1


Modified:
openoffice/updates-site/trunk/aoo40/check.Update
openoffice/updates-site/trunk/aoo401/check.Update
openoffice/updates-site/trunk/aoo410/check.Update

svn commit: r920113 - in /websites/production/ooo-site: cgi-bin/ content/

2014-08-22 Thread orw

Author: orw
Date: Fri Aug 22 10:42:23 2014
New Revision: 920113

Log:
publish update to French website for 4.1.1 release

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r920112, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r920112, websites/staging/ooo-site/trunk/content/

svn commit: r1619307 - /openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

2014-08-21 Thread orw

Author: orw
Date: Thu Aug 21 08:10:10 2014
New Revision: 1619307

URL: http://svn.apache.org/r1619307
Log:
Update Feed meta data: updating additional Mac OS X text for language Lituanian


Modified:
openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

Modified: openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt?rev=1619307r1=1619306r2=1619307view=diff
==
--- openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt (original)
+++ openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt Thu Aug 21 
08:10:10 2014
@@ -26,7 +26,7 @@ it,Solo per Mac OS X 10.7 o superiore
 ja,å¯ä¸ã®Mac OS Xãã¼ã¸ã§ã³10.7ä»¥é
 km,ááááá¶áááááááá Mac OS X 10.7 
á¬áááá¸áá¶á
 ko,ì¤ì§ ë§¥ OS X ë²ì  10.7 ì´ì ë²ì 
-lt,Tik Mac OS X versijos 10.7 arba naujesnÄ
+lt,Tik Mac OS X 10.7 arba naujesnei laidai
 nb,Bare for Mac OS X versjon 10.7 eller nyere
 nl,Alleen voor Mac OS X-versies 10.7 of nieuwer
 pl,Tylko dla wersji Mac OS X 10.7 lub nowszy

svn commit: r1619365 - /openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

2014-08-21 Thread orw

Author: orw
Date: Thu Aug 21 11:39:47 2014
New Revision: 1619365

URL: http://svn.apache.org/r1619365
Log:
Update Feed meta data: updating additional Mac OS X text for language Hebrew


Modified:
openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt

Modified: openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt?rev=1619365r1=1619364r2=1619365view=diff
==
--- openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt (original)
+++ openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt Thu Aug 21 
11:39:47 2014
@@ -19,7 +19,7 @@ fi,Vain Mac OS X-versiot 10.7 tai uudemp
 fr,Seulement pour les versions Mac OS X 10.7 ou plus rÃ©cent
 gd,Only for Mac OS X versions 10.7 or newer
 gl,SÃ³ para as versiÃ³ns de Mac OS X 10.7 ou superior
-he,×¨×§ ×¢×××¨ ××¨×¡×××ª Mac OS X 10.7 ×× ×××© ×××ª×¨
+he,××××¢× ×Ö¾Mac OS X ×××¨×¡× 10.7 ×××¢××
 hi,à¤®à¥à¤ à¤à¤à¤¸ à¤à¤à¥à¤¸ à¤¸à¤à¤¸à¥à¤à¤°à¤£à¥à¤ à¤à¥ 
à¤²à¤¿à¤ 10.7 à¤¯à¤¾ à¤¨à¤
 hu,Csak a Mac OS X 10.7 vagy Ãºjabb verziÃ³
 it,Solo per Mac OS X 10.7 o superiore

svn commit: r1619375 - /openoffice/ooo-site/trunk/content/brand.mdtext

2014-08-21 Thread orw

Author: orw
Date: Thu Aug 21 12:25:22 2014
New Revision: 1619375

URL: http://svn.apache.org/r1619375
Log:
changing head line to 4.1.1 release

Modified:
openoffice/ooo-site/trunk/content/brand.mdtext

Modified: openoffice/ooo-site/trunk/content/brand.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/brand.mdtext?rev=1619375r1=1619374r2=1619375view=diff
==
--- openoffice/ooo-site/trunk/content/brand.mdtext (original)
+++ openoffice/ooo-site/trunk/content/brand.mdtext Thu Aug 21 12:25:22 2014
@@ -7,7 +7,7 @@ tagline:The Free and Open Productivity 
 logo:  AOO_logos/100MillAOO100px.png
 domain:www.openoffice.org
 divid: bannera
-announce:  New: Apache OpenOffice 4.1.0 released!
-announceurl:   
https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce
-announcetip:   New: Apache OpenOffice 4.1.0 released!
+announce:  New: Apache OpenOffice 4.1.1 released!
+announceurl:   
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes
+announcetip:   New: Apache OpenOffice 4.1.1 released!

svn commit: r1619379 - /openoffice/ooo-site/trunk/content/index.html

2014-08-21 Thread orw

Author: orw
Date: Thu Aug 21 12:42:53 2014
New Revision: 1619379

URL: http://svn.apache.org/r1619379
Log:
dummy change to check/trigger staging builder

Modified:
openoffice/ooo-site/trunk/content/index.html

Modified: openoffice/ooo-site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1619379r1=1619378r2=1619379view=diff
==
--- openoffice/ooo-site/trunk/content/index.html (original)
+++ openoffice/ooo-site/trunk/content/index.html Thu Aug 21 12:42:53 2014
@@ -167,9 +167,7 @@
 
 body
 
-!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a
-screen reader.
---
+!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a screen reader. --
 h1 style=display: none;Apache OpenOffice/h1
 
 div id=actionstatements

svn commit: r1619063 - in /openoffice/devtools/genUpdateFeed: AdditionalTextForMacOSX.txt LanguageCodeMap.txt ProductInfos.txt

2014-08-20 Thread orw

Author: orw
Date: Wed Aug 20 10:06:43 2014
New Revision: 1619063

URL: http://svn.apache.org/r1619063
Log:
update meta data about 4.1.1 release for Update Feed generation


Modified:
openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt
openoffice/devtools/genUpdateFeed/ProductInfos.txt

Modified: openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt?rev=1619063r1=1619062r2=1619063view=diff
==
--- openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt (original)
+++ openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt Wed Aug 20 
10:06:43 2014
@@ -6,6 +6,7 @@ ar,ÙÙØ· ÙØ¥ØµØ¯Ø§Ø±
 ast,Only for Mac OS X versions 10.7 or newer
 bg,Ð¡Ð°Ð¼Ð¾ Ð·Ð° Mac OS X 10.7 Ð¸Ð»Ð¸ Ð¿Ð¾-Ð½Ð¾Ð²Ð° Ð²ÐµÑÑÐ¸Ñ
 ca,Only for Mac OS X versions 10.7 or newer
+ca-XR,Only for Mac OS X versions 10.7 or newer
 ca-XV,Only for Mac OS X versions 10.7 or newer
 cs,Pouze pro Mac OS verze 10.7 a novÄjÅ¡Ã
 da,Kun for Mac OS X version 10.7 eller nyere

Modified: openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt?rev=1619063r1=1619062r2=1619063view=diff
==
--- openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt (original)
+++ openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt Wed Aug 20 10:06:43 
2014
@@ -13,6 +13,7 @@ ar,Arabic
 ast,Asturian
 bg,Bulgarian
 ca,Catalan
+ca-XR,Catalan (Valencia RACV)
 ca-XV,Catalan (Valencia AVL)
 cs,Czech,http://www.openoffice.org/cs/download
 da,Danish

Modified: openoffice/devtools/genUpdateFeed/ProductInfos.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/ProductInfos.txt?rev=1619063r1=1619062r2=1619063view=diff
==
--- openoffice/devtools/genUpdateFeed/ProductInfos.txt (original)
+++ openoffice/devtools/genUpdateFeed/ProductInfos.txt Wed Aug 20 10:06:43 2014
@@ -24,8 +24,8 @@
 
 4.1.0 OpenOffice_4 9764 http://www.openoffice.org/download en-US ast bg cs da 
de el en-GB es eu fi fr gd gl he hi hu it ja km ko lt nb nl pl pt pt-BR ru sk 
sl sr sv ta th tr vi zh-CN zh-TW
 
-# temporary entry for 4.1.1 - BUILDID has to be corrected; list of 
LANGUAGECODEs has to be corrected
-4.1.1 OpenOffice_4 9772 http://www.openoffice.org/download en-US ast bg ca 
ca-XV cs da de el en-GB es eu fi fr gd gl he hi hu it ja km ko lt nb nl pl pt 
pt-BR ru sk sl sr sv ta th tr vi zh-CN zh-TW
+
+4.1.1 OpenOffice_4 9775 http://www.openoffice.org/download en-US ast bg ca 
ca-XR ca-XV cs da de el en-GB es eu fi fr gd gl he hi hu it ja km ko lt nb nl 
pl pt pt-BR ru sk sl sr sv ta th tr vi zh-CN zh-TW

svn commit: r1612778 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/core/txtnode/atrfld.cxx

2014-07-23 Thread orw

Author: orw
Date: Wed Jul 23 07:12:02 2014
New Revision: 1612778

URL: http://svn.apache.org/r1612778
Log:
125296: correction of fix for issue 125044

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1612539

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1612539

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1612539

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx?rev=1612778r1=1612777r2=1612778view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx Wed Jul 
23 07:12:02 2014
@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool 
 const SwField* pFld = GetFmtFld().GetField();
 const XubString aNewExpand( 
pFld-ExpandField(m_pTxtNode-GetDoc()-IsClipBoard()) );
 
-if ( !bForceNotify 
- aNewExpand == m_aExpand )
+if ( aNewExpand == m_aExpand )
 {
 // Bei Seitennummernfeldern
 const sal_uInt16 nWhich = pFld-GetTyp()-Which();
@@ -372,7 +371,11 @@ void SwTxtFld::ExpandTxtFld( const bool 
 {
 m_pTxtNode-ModifyNotification( 0, 0 );
 }
-return;
+if ( !bForceNotify )
+{
+// done, if no further notification forced.
+return;
+}
 }
 }

svn commit: r1612782 - /openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx

2014-07-23 Thread orw

Author: orw
Date: Wed Jul 23 07:25:52 2014
New Revision: 1612782

URL: http://svn.apache.org/r1612782
Log:
125299: bring back break which got accidently lost by merging changes for 
issue 78498 from trunk to branch AOO410


Modified:
openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx

Modified: openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx?rev=1612782r1=1612781r2=1612782view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx 
(original)
+++ openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx Wed Jul 
23 07:25:52 2014
@@ -1944,6 +1944,7 @@ void lcl_SetStyleProperty(const SfxItemP
 else
 throw lang::IllegalArgumentException();
 }
+break;
 
 case RES_PARATR_OUTLINELEVEL:
 {

svn commit: r1612801 - /openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx

2014-07-23 Thread orw

Author: orw
Date: Wed Jul 23 08:53:15 2014
New Revision: 1612801

URL: http://svn.apache.org/r1612801
Log:
125289: do apply possible changed GraphicStreamURL only for embedded images 
which already have its stream inside the package
fixes also issue 125290


Modified:
openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx

Modified: openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx?rev=1612801r1=1612800r2=1612801view=diff
==
--- openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx (original)
+++ openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx Wed Jul 23 
08:53:15 2014
@@ -1147,9 +1147,12 @@ void XMLShapeExport::ImpExportGraphicObj
 OUString aResolveURL( sImageURL );
 const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM( 
vnd.sun.star.Package: ) );
 
-// sj: trying to preserve the filename
+// sj: trying to preserve the filename for embedded images 
which already have its stream inside the package
+bool bIsEmbeddedImageWithExistingStreamInPackage = false;
 if ( aStreamURL.match( sPackageURL, 0 ) )
 {
+bIsEmbeddedImageWithExistingStreamInPackage = true;
+
 rtl::OUString sRequestedName( aStreamURL.copy( 
sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) );
 sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 
1;
 if ( ( nLastIndex  0 )  ( nLastIndex  
sRequestedName.getLength() ) )
@@ -1169,21 +1172,24 @@ void XMLShapeExport::ImpExportGraphicObj
 
 if ( !aStr.isEmpty() )
 {
-aStreamURL = sPackageURL;
-if ( aStr[0] == '#' )
-{
-aStreamURL = aStreamURL.concat( aStr.copy( 1, 
aStr.getLength() - 1 ) );
-}
-else
+// apply possible changed stream URL to embedded image 
object
+if ( bIsEmbeddedImageWithExistingStreamInPackage )
 {
-aStreamURL = aStreamURL.concat( aStr );
+aStreamURL = sPackageURL;
+if ( aStr[0] == '#' )
+{
+aStreamURL = aStreamURL.concat( aStr.copy( 1, 
aStr.getLength() - 1 ) );
+}
+else
+{
+aStreamURL = aStreamURL.concat( aStr );
+}
+
+uno::Any aAny;
+aAny = aStreamURL;
+xPropSet-setPropertyValue( OUString( 
RTL_CONSTASCII_USTRINGPARAM( GraphicStreamURL ) ), aAny );
 }
 
-// update stream URL for load on demand
-uno::Any aAny;
-aAny = aStreamURL;
-xPropSet-setPropertyValue( OUString( 
RTL_CONSTASCII_USTRINGPARAM( GraphicStreamURL ) ), aAny );
-
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE );
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, 
XML_EMBED );
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD );

svn commit: r1612804 - in /openoffice/branches/AOO410: ./ main/ main/xmloff/source/draw/shapeexport2.cxx

2014-07-23 Thread orw

Author: orw
Date: Wed Jul 23 09:15:22 2014
New Revision: 1612804

URL: http://svn.apache.org/r1612804
Log:
125289: do apply possible changed GraphicStreamURL only for embedded images 
which already have its stream inside the package
fixes also issue 125290

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1612801

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1612801

Modified: openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx?rev=1612804r1=1612803r2=1612804view=diff
==
--- openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx 
(original)
+++ openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx Wed Jul 
23 09:15:22 2014
@@ -1147,9 +1147,12 @@ void XMLShapeExport::ImpExportGraphicObj
 OUString aResolveURL( sImageURL );
 const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM( 
vnd.sun.star.Package: ) );
 
-// sj: trying to preserve the filename
+// sj: trying to preserve the filename for embedded images 
which already have its stream inside the package
+bool bIsEmbeddedImageWithExistingStreamInPackage = false;
 if ( aStreamURL.match( sPackageURL, 0 ) )
 {
+bIsEmbeddedImageWithExistingStreamInPackage = true;
+
 rtl::OUString sRequestedName( aStreamURL.copy( 
sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) );
 sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 
1;
 if ( ( nLastIndex  0 )  ( nLastIndex  
sRequestedName.getLength() ) )
@@ -1169,21 +1172,24 @@ void XMLShapeExport::ImpExportGraphicObj
 
 if ( !aStr.isEmpty() )
 {
-aStreamURL = sPackageURL;
-if ( aStr[0] == '#' )
-{
-aStreamURL = aStreamURL.concat( aStr.copy( 1, 
aStr.getLength() - 1 ) );
-}
-else
+// apply possible changed stream URL to embedded image 
object
+if ( bIsEmbeddedImageWithExistingStreamInPackage )
 {
-aStreamURL = aStreamURL.concat( aStr );
+aStreamURL = sPackageURL;
+if ( aStr[0] == '#' )
+{
+aStreamURL = aStreamURL.concat( aStr.copy( 1, 
aStr.getLength() - 1 ) );
+}
+else
+{
+aStreamURL = aStreamURL.concat( aStr );
+}
+
+uno::Any aAny;
+aAny = aStreamURL;
+xPropSet-setPropertyValue( OUString( 
RTL_CONSTASCII_USTRINGPARAM( GraphicStreamURL ) ), aAny );
 }
 
-// update stream URL for load on demand
-uno::Any aAny;
-aAny = aStreamURL;
-xPropSet-setPropertyValue( OUString( 
RTL_CONSTASCII_USTRINGPARAM( GraphicStreamURL ) ), aAny );
-
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, 
XML_SIMPLE );
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, 
XML_EMBED );
 mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, 
XML_ONLOAD );

svn commit: r1612539 - /openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx

2014-07-22 Thread orw

Author: orw
Date: Tue Jul 22 10:39:40 2014
New Revision: 1612539

URL: http://svn.apache.org/r1612539
Log:
125296: correction of fix for issue 125044


Modified:
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx

Modified: openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx?rev=1612539r1=1612538r2=1612539view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx Tue Jul 22 10:39:40 
2014
@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool 
 const SwField* pFld = GetFmtFld().GetField();
 const XubString aNewExpand( 
pFld-ExpandField(m_pTxtNode-GetDoc()-IsClipBoard()) );
 
-if ( !bForceNotify 
- aNewExpand == m_aExpand )
+if ( aNewExpand == m_aExpand )
 {
 // Bei Seitennummernfeldern
 const sal_uInt16 nWhich = pFld-GetTyp()-Which();
@@ -372,7 +371,11 @@ void SwTxtFld::ExpandTxtFld( const bool 
 {
 m_pTxtNode-ModifyNotification( 0, 0 );
 }
-return;
+if ( !bForceNotify )
+{
+// done, if no further notification forced.
+return;
+}
 }
 }

svn commit: r1611549 - /openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx

2014-07-18 Thread orw

Author: orw
Date: Fri Jul 18 07:48:50 2014
New Revision: 1611549

URL: http://svn.apache.org/r1611549
Log:
124231: field variable dialog: check access to current field as it could be 
unavailable caused by its change and a followed removal from the document by 
e.g. a conditional hide of a section


Modified:
openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx

Modified: openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx?rev=1611549r1=1611548r2=1611549view=diff
==
--- openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/fldui/fldvar.cxx Fri Jul 18 07:48:50 2014
@@ -34,27 +34,17 @@
 #include docufld.hxx
 #include expfld.hxx
 #include ddefld.hxx
-#ifndef _VIEW_HXX
 #include view.hxx
-#endif
 #include wrtsh.hxx
 #include doc.hxx
 #include docary.hxx
 #include swmodule.hxx
-#ifndef _FLDVAR_HXX
 #include fldvar.hxx
-#endif
 #include calc.hxx
 #include svl/zformat.hxx
-#ifndef _GLOBALS_HRC
 #include globals.hrc
-#endif
-#ifndef _FLDUI_HRC
 #include fldui.hrc
-#endif
-#ifndef _FLDTDLG_HRC
 #include fldtdlg.hrc
-#endif
 
 #define USER_DATA_VERSION_1 1
 #define USER_DATA_VERSION USER_DATA_VERSION_1
@@ -142,21 +132,23 @@ void SwFldVarPage::Reset(const SfxItemSe
}
else
{
-SwField* pCurField = GetCurField();
+const SwField* pCurField = GetCurField();
+ASSERT( pCurField != NULL,
+SwFldVarPage::Reset(..) - SwField instance missing! );
 nTypeId = pCurField-GetTypeId();
-   if (nTypeId == TYP_SETINPFLD)
-   nTypeId = TYP_INPUTFLD;
-   nPos = 
aTypeLB.InsertEntry(GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId)));
-aTypeLB.SetEntryData(nPos, reinterpret_castvoid*(nTypeId));
-aNumFormatLB.SetAutomaticLanguage(pCurField-IsAutomaticLanguage());
+if ( nTypeId == TYP_SETINPFLD )
+nTypeId = TYP_INPUTFLD;
+nPos = aTypeLB.InsertEntry( GetFldMgr().GetTypeStr( 
GetFldMgr().GetPos( nTypeId ) ) );
+aTypeLB.SetEntryData( nPos, reinterpret_cast void* ( nTypeId ) );
+aNumFormatLB.SetAutomaticLanguage( pCurField-IsAutomaticLanguage() );
 SwWrtShell *pSh = GetWrtShell();
-if(!pSh)
+if ( !pSh )
 pSh = ::GetActiveWrtShell();
-if(pSh)
+if ( pSh )
 {
-const SvNumberformat* pFormat = 
pSh-GetNumberFormatter()-GetEntry(pCurField-GetFormat());
-if(pFormat)
-aNumFormatLB.SetLanguage(pFormat-GetLanguage());
+const SvNumberformat* pFormat = 
pSh-GetNumberFormatter()-GetEntry( pCurField-GetFormat() );
+if ( pFormat )
+aNumFormatLB.SetLanguage( pFormat-GetLanguage() );
 }
 }
 
@@ -281,337 +273,338 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, Lis
bInvisible = sal_False, bSeparator = sal_False, 
bChapterLevel = sal_False;
sal_Bool bFormat = nSize != 0;
 
-   switch (nTypeId)
-   {
-   case TYP_USERFLD:
-   {
-   // Benutzertyp aendern oder anlegen
-   SwUserFieldType* pType = (SwUserFieldType*)
-   GetFldMgr().GetFldType(RES_USERFLD, nSelPos);
-
-   if (pType)
-   {
-   if (!IsFldEdit())
-   {
-   if (pBox || (bInit  !IsRefresh()))
// Nur bei Interaktion mit Maus
-   {
-   
aNameED.SetText(pType-GetName());
-
-   if (pType-GetType() == 
UF_STRING)
-   {
-   
aValueED.SetText(pType-GetContent());
-   
aNumFormatLB.SelectEntryPos(0);
-   }
-   else
-   
aValueED.SetText(pType-GetContent());
-// 
aValueED.SetText(pType-GetContent(aNumFormatLB.GetFormat()));
-   }
-   }
-   else
-   aValueED.SetText(pType-GetContent());
-   }
-   else
-   {
-   if (pBox)   // Nur bei Interaktion mit Maus
-   {
-   aNameED.SetText(aEmptyStr);
-   aValueED.SetText(aEmptyStr

svn commit: r1611555 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/ui/fldui/fldvar.cxx

2014-07-18 Thread orw

Author: orw
Date: Fri Jul 18 08:27:43 2014
New Revision: 1611555

URL: http://svn.apache.org/r1611555
Log:
124231: field variable dialog: check access to current field as it could be 
unavailable caused by its change and a followed removal from the document by 
e.g. a conditional hide of a section

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/ui/fldui/fldvar.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1611549

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1611549

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1611549

Modified: openoffice/branches/AOO410/main/sw/source/ui/fldui/fldvar.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/fldui/fldvar.cxx?rev=1611555r1=1611554r2=1611555view=diff
==
--- openoffice/branches/AOO410/main/sw/source/ui/fldui/fldvar.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/fldui/fldvar.cxx Fri Jul 18 
08:27:43 2014
@@ -34,27 +34,17 @@
 #include docufld.hxx
 #include expfld.hxx
 #include ddefld.hxx
-#ifndef _VIEW_HXX
 #include view.hxx
-#endif
 #include wrtsh.hxx
 #include doc.hxx
 #include docary.hxx
 #include swmodule.hxx
-#ifndef _FLDVAR_HXX
 #include fldvar.hxx
-#endif
 #include calc.hxx
 #include svl/zformat.hxx
-#ifndef _GLOBALS_HRC
 #include globals.hrc
-#endif
-#ifndef _FLDUI_HRC
 #include fldui.hrc
-#endif
-#ifndef _FLDTDLG_HRC
 #include fldtdlg.hrc
-#endif
 
 #define USER_DATA_VERSION_1 1
 #define USER_DATA_VERSION USER_DATA_VERSION_1
@@ -142,21 +132,23 @@ void SwFldVarPage::Reset(const SfxItemSe
}
else
{
-SwField* pCurField = GetCurField();
+const SwField* pCurField = GetCurField();
+ASSERT( pCurField != NULL,
+SwFldVarPage::Reset(..) - SwField instance missing! );
 nTypeId = pCurField-GetTypeId();
-   if (nTypeId == TYP_SETINPFLD)
-   nTypeId = TYP_INPUTFLD;
-   nPos = 
aTypeLB.InsertEntry(GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId)));
-aTypeLB.SetEntryData(nPos, reinterpret_castvoid*(nTypeId));
-aNumFormatLB.SetAutomaticLanguage(pCurField-IsAutomaticLanguage());
+if ( nTypeId == TYP_SETINPFLD )
+nTypeId = TYP_INPUTFLD;
+nPos = aTypeLB.InsertEntry( GetFldMgr().GetTypeStr( 
GetFldMgr().GetPos( nTypeId ) ) );
+aTypeLB.SetEntryData( nPos, reinterpret_cast void* ( nTypeId ) );
+aNumFormatLB.SetAutomaticLanguage( pCurField-IsAutomaticLanguage() );
 SwWrtShell *pSh = GetWrtShell();
-if(!pSh)
+if ( !pSh )
 pSh = ::GetActiveWrtShell();
-if(pSh)
+if ( pSh )
 {
-const SvNumberformat* pFormat = 
pSh-GetNumberFormatter()-GetEntry(pCurField-GetFormat());
-if(pFormat)
-aNumFormatLB.SetLanguage(pFormat-GetLanguage());
+const SvNumberformat* pFormat = 
pSh-GetNumberFormatter()-GetEntry( pCurField-GetFormat() );
+if ( pFormat )
+aNumFormatLB.SetLanguage( pFormat-GetLanguage() );
 }
 }
 
@@ -281,337 +273,338 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, Lis
bInvisible = sal_False, bSeparator = sal_False, 
bChapterLevel = sal_False;
sal_Bool bFormat = nSize != 0;
 
-   switch (nTypeId)
-   {
-   case TYP_USERFLD:
-   {
-   // Benutzertyp aendern oder anlegen
-   SwUserFieldType* pType = (SwUserFieldType*)
-   GetFldMgr().GetFldType(RES_USERFLD, nSelPos);
-
-   if (pType)
-   {
-   if (!IsFldEdit())
-   {
-   if (pBox || (bInit  !IsRefresh()))
// Nur bei Interaktion mit Maus
-   {
-   
aNameED.SetText(pType-GetName());
-
-   if (pType-GetType() == 
UF_STRING)
-   {
-   
aValueED.SetText(pType-GetContent());
-   
aNumFormatLB.SelectEntryPos(0);
-   }
-   else

svn commit: r1610671 - in /openoffice/trunk/main/sw/source: core/frmedt/feshview.cxx core/layout/fly.cxx ui/shells/textsh.cxx

2014-07-15 Thread orw

Author: orw
Date: Tue Jul 15 12:15:37 2014
New Revision: 1610671

URL: http://svn.apache.org/r1610671
Log:
121443: - register text frames and graphics on the correct page frame
- trigger formatting of selected object when moving view to the 
selected object or when graphical horizontal line has been inserted.


Modified:
openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
openoffice/trunk/main/sw/source/core/layout/fly.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh.cxx

Modified: openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx?rev=1610671r1=1610670r2=1610671view=diff
==
--- openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx Tue Jul 15 
12:15:37 2014
@@ -2459,16 +2459,18 @@ const SwFrmFmt*  SwFEShell::GetFlyNum(sa
return GetDoc()-GetFlyNum(nIdx, eType );
 }
 
+
 // zeige das akt. selektierte Object an
 void SwFEShell::MakeSelVisible()
 {
-   if( Imp()-HasDrawView() 
-   Imp()-GetDrawView()-GetMarkedObjectList().GetMarkCount() )
-   {
-   MakeVisible( Imp()-GetDrawView()-GetAllMarkedRect() );
-   }
-   else
-   SwCrsrShell::MakeSelVisible();
+if ( Imp()-HasDrawView() 
+ Imp()-GetDrawView()-GetMarkedObjectList().GetMarkCount() )
+{
+GetCurrFrm(); // just to trigger formatting in case the selected 
object is not formatted.
+MakeVisible( Imp()-GetDrawView()-GetAllMarkedRect() );
+}
+else
+SwCrsrShell::MakeSelVisible();
 }
 
 

Modified: openoffice/trunk/main/sw/source/core/layout/fly.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/fly.cxx?rev=1610671r1=1610670r2=1610671view=diff
==
--- openoffice/trunk/main/sw/source/core/layout/fly.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/fly.cxx Tue Jul 15 12:15:37 2014
@@ -2223,40 +2223,10 @@ void SwFrm::AppendFly( SwFlyFrm *pNew )
 pDrawObjs-Insert( *pNew );
 pNew-ChgAnchorFrm( this );
 
-   //Bei der Seite anmelden; kann sein, dass noch keine da ist - die
-   //Anmeldung wird dann in SwPageFrm::PreparePage durch gefuehrt.
-   SwPageFrm *pPage = FindPageFrm();
-   if ( pPage )
-   {
-   if ( pNew-IsFlyAtCntFrm()  pNew-Frm().Top() == WEIT_WECH )
-   {
-   //Versuch die Seitenformatierung von neuen Dokumenten 
etwas
-   //guenstiger zu gestalten.
-   //Wir haengen die Flys erstenmal nach hinten damit sie 
bei heftigem
-   //Fluss der Anker nicht unoetig oft formatiert werden.
-   //Damit man noch brauchbar an das Ende des Dokumentes 
springen
-   //kann werden die Flys nicht ganz an das Ende gehaengt.
-   SwRootFrm *pRoot = (SwRootFrm*)pPage-GetUpper();
-if( !SwLayHelper::CheckPageFlyCache( pPage, pNew ) )
-{
-SwPageFrm *pTmp = pRoot-GetLastPage();
-if ( pTmp-GetPhyPageNum()  30 )
-{
-for ( sal_uInt16 i = 0; i  10; ++i )
-{
-pTmp = (SwPageFrm*)pTmp-GetPrev();
-if( pTmp-GetPhyPageNum() = pPage-GetPhyPageNum() )
-break; // damit wir nicht vor unserem Anker landen
-}
-if ( pTmp-IsEmptyPage() )
-pTmp = (SwPageFrm*)pTmp-GetPrev();
-pPage = pTmp;
-}
-   }
-pPage-AppendFlyToPage( pNew );
-   }
-   else
-pPage-AppendFlyToPage( pNew );
+SwPageFrm* pPage = FindPageFrm();
+if ( pPage != NULL )
+{
+pPage-AppendFlyToPage( pNew );
 }
 }
 

Modified: openoffice/trunk/main/sw/source/ui/shells/textsh.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh.cxx?rev=1610671r1=1610670r2=1610671view=diff
==
--- openoffice/trunk/main/sw/source/ui/shells/textsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh.cxx Tue Jul 15 12:15:37 
2014
@@ -680,30 +680,31 @@ void SwTextShell::ExecInsert(SfxRequest 
 }
break;
}
-   case FN_INSERT_HRULER:
-   {
-   String sPath;
-   sal_Bool bSimpleLine = sal_False;
-   sal_Bool bRet = sal_False;
-   Window* pParent = GetView().GetWindow();
+
+case FN_INSERT_HRULER:
+{
+String sPath;
+sal_Bool bSimpleLine = sal_False;
+sal_Bool bRet = sal_False

svn commit: r1610719 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/core/fields/cellfml.cxx main/sw/source/core/txtnode/atrfld.cxx

2014-07-15 Thread orw

Author: orw
Date: Tue Jul 15 14:59:43 2014
New Revision: 1610719

URL: http://svn.apache.org/r1610719
Log:
125228: correct consideration of InputFields in table cells are part of table 
formulas

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/fields/cellfml.cxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1610411

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1610411

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1610411

Modified: openoffice/branches/AOO410/main/sw/source/core/fields/cellfml.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/fields/cellfml.cxx?rev=1610719r1=1610718r2=1610719view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/fields/cellfml.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/fields/cellfml.cxx Tue Jul 
15 14:59:43 2014
@@ -156,53 +156,61 @@ double SwTableBox::GetValue( SwTblCalcPa
 if ( nSttPos  rTxt.Len() 
  ( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
 {
-   SwIndex aIdx( pTxtNd, nSttPos );
-SwTxtFld * const pTxtFld = static_castSwTxtFld*(
-pTxtNd-GetTxtAttrForCharAt(aIdx.GetIndex(), 
RES_TXTATR_FIELD));
-   if( !pTxtFld )
-   break;
-
-   rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // 
wieder zuruecksetzen
-
-   const SwField* pFld = pTxtFld-GetFmtFld().GetField();
-   switch( pFld-GetTyp()-Which()  )
-   {
-   case RES_SETEXPFLD:
-   nRet = ((SwSetExpField*)pFld)-GetValue();
-   break;
-   case RES_USERFLD:
-   nRet = ((SwUserFieldType*)pFld)-GetValue();
-   break;
-   case RES_TABLEFLD:
-   {
-   SwTblField* pTblFld = (SwTblField*)pFld;
-   if( !pTblFld-IsValid() )   
// ist der Wert gueltig ??
-   {
-   // die richtige Tabelle 
mitgeben!
-   const SwTable* pTmp = 
rCalcPara.pTbl;
-   rCalcPara.pTbl = 
pTxtNd-FindTableNode()-GetTable();
-   pTblFld-CalcField( rCalcPara );
-   rCalcPara.pTbl = pTmp;
-   }
-   nRet = pTblFld-GetValue();
-   }
-   break;
-
-   case RES_DATETIMEFLD:
-   nRet = ((SwDateTimeField*)pFld)-GetValue();
-   break;
+SwTxtFld * const pTxtFld =
+static_castSwTxtFld*( pTxtNd-GetTxtAttrForCharAt( nSttPos, 
RES_TXTATR_FIELD ) );
+if ( pTxtFld == NULL )
+break;
 
-   case RES_JUMPEDITFLD:
-   //JP 14.09.98: Bug 56112 - der Platzhalter kann 
nie einen
-   //  gueltigen 
Inhalt haben!
-   nRet = 0;
-   break;
+rCalcPara.rCalc.SetCalcError( CALC_NOERR );// wieder 
zuruecksetzen
 
-   default:
-String const value(pFld-ExpandField(true));
-nRet = rCalcPara.rCalc.Calculate(value).GetDouble();
-   }
-   }
+const SwField* pFld = pTxtFld-GetFmtFld().GetField();
+switch ( pFld-GetTyp()-Which() )
+{
+case RES_SETEXPFLD:
+nRet = ( (SwSetExpField*) pFld )-GetValue();
+break;
+case RES_USERFLD:
+nRet = ( (SwUserFieldType*) pFld )-GetValue();
+break;
+case RES_TABLEFLD:
+{
+SwTblField* pTblFld = (SwTblField*) pFld;
+if ( !pTblFld-IsValid() ) // ist der Wert gueltig

svn commit: r1610722 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/core/frmedt/feshview.cxx main/sw/source/core/layout/fly.cxx main/sw/source/ui/shells/textsh.cxx

2014-07-15 Thread orw

Author: orw
Date: Tue Jul 15 15:12:17 2014
New Revision: 1610722

URL: http://svn.apache.org/r1610722
Log:
121443: - register text frames and graphics on the correct page frame
- trigger formatting of selected object when moving view to the 
selected object or when graphical horizontal line has been inserted.

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/frmedt/feshview.cxx
openoffice/branches/AOO410/main/sw/source/core/layout/fly.cxx
openoffice/branches/AOO410/main/sw/source/ui/shells/textsh.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1610671

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1610671

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1610671

Modified: openoffice/branches/AOO410/main/sw/source/core/frmedt/feshview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/frmedt/feshview.cxx?rev=1610722r1=1610721r2=1610722view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/frmedt/feshview.cxx 
(original)
+++ openoffice/branches/AOO410/main/sw/source/core/frmedt/feshview.cxx Tue Jul 
15 15:12:17 2014
@@ -2462,16 +2462,18 @@ const SwFrmFmt*  SwFEShell::GetFlyNum(sa
return GetDoc()-GetFlyNum(nIdx, eType );
 }
 
+
 // zeige das akt. selektierte Object an
 void SwFEShell::MakeSelVisible()
 {
-   if( Imp()-HasDrawView() 
-   Imp()-GetDrawView()-GetMarkedObjectList().GetMarkCount() )
-   {
-   MakeVisible( Imp()-GetDrawView()-GetAllMarkedRect() );
-   }
-   else
-   SwCrsrShell::MakeSelVisible();
+if ( Imp()-HasDrawView() 
+ Imp()-GetDrawView()-GetMarkedObjectList().GetMarkCount() )
+{
+GetCurrFrm(); // just to trigger formatting in case the selected 
object is not formatted.
+MakeVisible( Imp()-GetDrawView()-GetAllMarkedRect() );
+}
+else
+SwCrsrShell::MakeSelVisible();
 }
 
 

Modified: openoffice/branches/AOO410/main/sw/source/core/layout/fly.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/layout/fly.cxx?rev=1610722r1=1610721r2=1610722view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/layout/fly.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/layout/fly.cxx Tue Jul 15 
15:12:17 2014
@@ -2243,40 +2243,10 @@ void SwFrm::AppendFly( SwFlyFrm *pNew )
 pDrawObjs-Insert( *pNew );
 pNew-ChgAnchorFrm( this );
 
-   //Bei der Seite anmelden; kann sein, dass noch keine da ist - die
-   //Anmeldung wird dann in SwPageFrm::PreparePage durch gefuehrt.
-   SwPageFrm *pPage = FindPageFrm();
-   if ( pPage )
-   {
-   if ( pNew-IsFlyAtCntFrm()  pNew-Frm().Top() == WEIT_WECH )
-   {
-   //Versuch die Seitenformatierung von neuen Dokumenten 
etwas
-   //guenstiger zu gestalten.
-   //Wir haengen die Flys erstenmal nach hinten damit sie 
bei heftigem
-   //Fluss der Anker nicht unoetig oft formatiert werden.
-   //Damit man noch brauchbar an das Ende des Dokumentes 
springen
-   //kann werden die Flys nicht ganz an das Ende gehaengt.
-   SwRootFrm *pRoot = (SwRootFrm*)pPage-GetUpper();
-if( !SwLayHelper::CheckPageFlyCache( pPage, pNew ) )
-{
-SwPageFrm *pTmp = pRoot-GetLastPage();
-if ( pTmp-GetPhyPageNum()  30 )
-{
-for ( sal_uInt16 i = 0; i  10; ++i )
-{
-pTmp = (SwPageFrm*)pTmp-GetPrev();
-if( pTmp-GetPhyPageNum() = pPage-GetPhyPageNum() )
-break; // damit wir nicht vor unserem Anker landen
-}
-if ( pTmp-IsEmptyPage() )
-pTmp = (SwPageFrm*)pTmp-GetPrev();
-pPage = pTmp;
-}
-   }
-pPage-AppendFlyToPage( pNew );
-   }
-   else
-pPage-AppendFlyToPage( pNew );
+SwPageFrm* pPage = FindPageFrm();
+if ( pPage != NULL )
+{
+pPage-AppendFlyToPage( pNew );
 }
 }
 

Modified: openoffice/branches/AOO410/main/sw/source/ui/shells/textsh.cxx
URL: 
http

svn commit: r1610411 - in /openoffice/trunk/main/sw/source/core: fields/cellfml.cxx txtnode/atrfld.cxx

2014-07-14 Thread orw

Author: orw
Date: Mon Jul 14 13:36:56 2014
New Revision: 1610411

URL: http://svn.apache.org/r1610411
Log:
125228: correct consideration of InputFields in table cells are part of table 
formulas


Modified:
openoffice/trunk/main/sw/source/core/fields/cellfml.cxx
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx

Modified: openoffice/trunk/main/sw/source/core/fields/cellfml.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/fields/cellfml.cxx?rev=1610411r1=1610410r2=1610411view=diff
==
--- openoffice/trunk/main/sw/source/core/fields/cellfml.cxx (original)
+++ openoffice/trunk/main/sw/source/core/fields/cellfml.cxx Mon Jul 14 13:36:56 
2014
@@ -156,53 +156,61 @@ double SwTableBox::GetValue( SwTblCalcPa
 if ( nSttPos  rTxt.Len() 
  ( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
 {
-   SwIndex aIdx( pTxtNd, nSttPos );
-SwTxtFld * const pTxtFld = static_castSwTxtFld*(
-pTxtNd-GetTxtAttrForCharAt(aIdx.GetIndex(), 
RES_TXTATR_FIELD));
-   if( !pTxtFld )
-   break;
-
-   rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // 
wieder zuruecksetzen
-
-   const SwField* pFld = pTxtFld-GetFmtFld().GetField();
-   switch( pFld-GetTyp()-Which()  )
-   {
-   case RES_SETEXPFLD:
-   nRet = ((SwSetExpField*)pFld)-GetValue();
-   break;
-   case RES_USERFLD:
-   nRet = ((SwUserFieldType*)pFld)-GetValue();
-   break;
-   case RES_TABLEFLD:
-   {
-   SwTblField* pTblFld = (SwTblField*)pFld;
-   if( !pTblFld-IsValid() )   
// ist der Wert gueltig ??
-   {
-   // die richtige Tabelle 
mitgeben!
-   const SwTable* pTmp = 
rCalcPara.pTbl;
-   rCalcPara.pTbl = 
pTxtNd-FindTableNode()-GetTable();
-   pTblFld-CalcField( rCalcPara );
-   rCalcPara.pTbl = pTmp;
-   }
-   nRet = pTblFld-GetValue();
-   }
-   break;
-
-   case RES_DATETIMEFLD:
-   nRet = ((SwDateTimeField*)pFld)-GetValue();
-   break;
+SwTxtFld * const pTxtFld =
+static_castSwTxtFld*( pTxtNd-GetTxtAttrForCharAt( nSttPos, 
RES_TXTATR_FIELD ) );
+if ( pTxtFld == NULL )
+break;
 
-   case RES_JUMPEDITFLD:
-   //JP 14.09.98: Bug 56112 - der Platzhalter kann 
nie einen
-   //  gueltigen 
Inhalt haben!
-   nRet = 0;
-   break;
+rCalcPara.rCalc.SetCalcError( CALC_NOERR );// wieder 
zuruecksetzen
 
-   default:
-String const value(pFld-ExpandField(true));
-nRet = rCalcPara.rCalc.Calculate(value).GetDouble();
-   }
-   }
+const SwField* pFld = pTxtFld-GetFmtFld().GetField();
+switch ( pFld-GetTyp()-Which() )
+{
+case RES_SETEXPFLD:
+nRet = ( (SwSetExpField*) pFld )-GetValue();
+break;
+case RES_USERFLD:
+nRet = ( (SwUserFieldType*) pFld )-GetValue();
+break;
+case RES_TABLEFLD:
+{
+SwTblField* pTblFld = (SwTblField*) pFld;
+if ( !pTblFld-IsValid() ) // ist der Wert gueltig 
??
+{
+// die richtige Tabelle mitgeben!
+const SwTable* pTmp = rCalcPara.pTbl;
+rCalcPara.pTbl = pTxtNd-FindTableNode()-GetTable();
+pTblFld-CalcField( rCalcPara );
+rCalcPara.pTbl = pTmp;
+}
+nRet = pTblFld-GetValue();
+}
+break;
+
+case RES_DATETIMEFLD:
+nRet = ( (SwDateTimeField*) pFld )-GetValue();
+break;
+
+case RES_JUMPEDITFLD:
+// placeholder does not have valid content
+nRet = 0;
+break;
+
+default

svn commit: r1609427 - in /openoffice/devtools/genUpdateFeed: ./ AdditionalTextForMacOSX.txt LanguageCodeMap.txt ProductInfos.txt feed-entry-template.Update feed-prefix.Update generate-update-feed.sh

2014-07-10 Thread orw

Author: orw
Date: Thu Jul 10 09:11:14 2014
New Revision: 1609427

URL: http://svn.apache.org/r1609427
Log:
bash script inclusive needed meta data to generate Update Feeds


Added:
openoffice/devtools/genUpdateFeed/
openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt
openoffice/devtools/genUpdateFeed/ProductInfos.txt
openoffice/devtools/genUpdateFeed/feed-entry-template.Update   (with props)
openoffice/devtools/genUpdateFeed/feed-prefix.Update   (with props)
openoffice/devtools/genUpdateFeed/generate-update-feed.sh   (with props)

Added: openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt?rev=1609427view=auto
==
--- openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt (added)
+++ openoffice/devtools/genUpdateFeed/AdditionalTextForMacOSX.txt Thu Jul 10 
09:11:14 2014
@@ -0,0 +1,45 @@
+ï»¿# Additional text for installed OpenOffice instance on Mac OS X
+#
+
+en-US,Only for Mac OS X versions 10.7 or newer
+ar,ÙÙØ· ÙØ¥ØµØ¯Ø§Ø±Ø§Øª ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Mac OS X 10.7 Ø£Ù Ø£ØØ¯Ø«
+ast,Only for Mac OS X versions 10.7 or newer
+bg,Ð¡Ð°Ð¼Ð¾ Ð·Ð° Mac OS X 10.7 Ð¸Ð»Ð¸ Ð¿Ð¾-Ð½Ð¾Ð²Ð° Ð²ÐµÑÑÐ¸Ñ
+ca,Only for Mac OS X versions 10.7 or newer
+ca-XV,Only for Mac OS X versions 10.7 or newer
+cs,Pouze pro Mac OS verze 10.7 a novÄjÅ¡Ã
+da,Kun for Mac OS X version 10.7 eller nyere
+de,Nur fÃ¼r Mac OS X-Versionen 10.7 oder neuer
+el,ÎÏÎ½Î¿ Î³Î¹Î± Mac OS X ÎµÎºÎ´ÏÏÎµÎ¹Ï 10.7 Î® Î½ÎµÏÏÎµÏÎ¿
+en-GB,Only for Mac OS X versions 10.7 or newer
+es,SÃ³lo para versiones de Mac OS X 10.7 o mÃ¡s reciente
+eu,Mac OS X bertsioak soilik 10.7 edo berriagoa
+fi,Vain Mac OS X-versiot 10.7 tai uudempi
+fr,Seulement pour les versions Mac OS X 10.7 ou plus rÃ©cent
+gd,Only for Mac OS X versions 10.7 or newer
+gl,SÃ³ para as versiÃ³ns de Mac OS X 10.7 ou superior
+he,×¨×§ ×¢×××¨ ××¨×¡×××ª Mac OS X 10.7 ×× ×××© ×××ª×¨
+hi,à¤®à¥à¤ à¤à¤à¤¸ à¤à¤à¥à¤¸ à¤¸à¤à¤¸à¥à¤à¤°à¤£à¥à¤ à¤à¥ 
à¤²à¤¿à¤ 10.7 à¤¯à¤¾ à¤¨à¤
+hu,Csak a Mac OS X 10.7 vagy Ãºjabb verziÃ³
+it,Solo per Mac OS X 10.7 o superiore
+ja,å¯ä¸ã®Mac OS Xãã¼ã¸ã§ã³10.7ä»¥é
+km,ááááá¶áááááááá Mac OS X 10.7 
á¬áááá¸áá¶á
+ko,ì¤ì§ ë§¥ OS X ë²ì  10.7 ì´ì ë²ì 
+lt,Tik Mac OS X versijos 10.7 arba naujesnÄ
+nb,Bare for Mac OS X versjon 10.7 eller nyere
+nl,Alleen voor Mac OS X-versies 10.7 of nieuwer
+pl,Tylko dla wersji Mac OS X 10.7 lub nowszy
+pt,Somente para as versÃµes do Mac OS X 10.7 ou mais recente
+pt-BR,Somente para as versÃµes do Mac OS X 10.7 ou mais recente
+ru,Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Mac OS X Ð²ÐµÑÑÐ¸Ð¹ 10.7 Ð¸Ð»Ð¸ Ð½Ð¾Ð²ÐµÐµ
+sk,Iba pre Mac OS verzie 10.7 a novÅ¡ie
+sl,Samo za Mac OS X 10.7 ali novejÅ¡i
+sr,Ð¡Ð°Ð¼Ð¾ Ð·Ð° ÐÐ°Ñ ÐÐ¡ ÐÑ 10.7 Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð²ÐµÑÐ·Ð¸ÑÐµ
+sv,Endast fÃ¶r Mac OS X-versioner 10.7 eller nyare
+ta,à®à®°à¯ Mac OS X, à®ªà®¤à®¿à®ªà¯à®ªà¯à®à®³à¯ 10.7 à®à®²à¯à®²à®¤à¯ 
à®ªà¯à®¤à®¿à®¯
+th,à¹à¸à¸à¸²à¸°à¸ªà¸³à¸«à¸£à¸±à¸ Mac OS X à¸£à¸¸à¹à¸ 10.7 
à¸«à¸£à¸·à¸à¹à¸«à¸¡à¹à¸à¸§à¹à¸²
+tr,Sadece Mac OS X sÃ¼rÃ¼mleri iÃ§in 10.7 veya daha yeni
+vi,Chá» cho cÃ¡c phiÃªn báº£n Mac OS X 10.7 hoáº·c má»i hÆ¡n
+zh-CN,ä»éç¨äºMac OS Xçæ¬10.7ææ´é«çæ¬
+zh-TW,åé©ç¨æ¼Mac OS Xçæ¬10.7ææ´é«çæ¬
+

Added: openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt?rev=1609427view=auto
==
--- openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt (added)
+++ openoffice/devtools/genUpdateFeed/LanguageCodeMap.txt Thu Jul 10 09:11:14 
2014
@@ -0,0 +1,51 @@
+ï»¿# Map of language codes
+#
+# Format:
+# LANGUAGECODE,LANGUAGE,DOWNLOADURL
+#
+# Legend:
+# LANGUAGECODE  Language code of an released language
+# LANGUAGE  Human-readable language name
+# DOWNLOADURL   optional URL the user is guided to for corresponding package 
in the named language
+
+en-US,English (US)
+ar,Arabic
+ast,Asturian
+bg,Bulgarian
+ca,Catalan
+ca-XV,Catalan (Valencia AVL)
+cs,Czech,http://www.openoffice.org/cs/download
+da,Danish
+de,German,http://www.openoffice.org/de
+el,Greek
+en-GB,English (British)
+es,Spanish,http://www.openoffice.org/es/descargar
+eu,Basque
+fi,Finnish
+fr,French,http://www.openoffice.org/fr/Telecharger
+gd,Gaelic (Scottish)
+gl,Galician
+he,Hebrew
+hi,Hindi
+hu,Hungarian
+it,Italian,http://www.openoffice.org/it/download
+ja,Japanese,http://www.openoffice.org/ja/download
+km,Khmer
+ko,Korean
+lt,Lituanian
+nb,Norwegian (BokmÃ¥l)
+nl,Dutch,http://www.openoffice.org/nl/downloaden.html
+pl,Polish
+pt,Portuguese (European),http://www.openoffice.org/pt
+pt-BR,Portuguese (Brazilian)
+ru,Russian
+sk,Slovak,http

svn commit: r1609437 - /openoffice/devtools/genUpdateFeed/generate-update-feed.sh

2014-07-10 Thread orw

Author: orw
Date: Thu Jul 10 10:35:01 2014
New Revision: 1609437

URL: http://svn.apache.org/r1609437
Log:
genUpdateFeed: add missing license header


Modified:
openoffice/devtools/genUpdateFeed/generate-update-feed.sh

Modified: openoffice/devtools/genUpdateFeed/generate-update-feed.sh
URL: 
http://svn.apache.org/viewvc/openoffice/devtools/genUpdateFeed/generate-update-feed.sh?rev=1609437r1=1609436r2=1609437view=diff
==
--- openoffice/devtools/genUpdateFeed/generate-update-feed.sh (original)
+++ openoffice/devtools/genUpdateFeed/generate-update-feed.sh Thu Jul 10 
10:35:01 2014
@@ -1,4 +1,24 @@
 #!/bin/bash
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  License); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *
 #
 # bash script to generate the Update Feeds requested by installed AOO/OOo 
instance via HTTP/HTTPS
 # to check, if a new AOO version is available for the requesting AOO/OOo 
instance

svn commit: r1609084 - /openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst

2014-07-09 Thread orw

Author: orw
Date: Wed Jul  9 10:29:35 2014
New Revision: 1609084

URL: http://svn.apache.org/r1609084
Log:
125084: provide Update URL for AOO 4.1.1 instances


Modified:
openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst

Modified: openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst?rev=1609084r1=1609083r2=1609084view=diff
==
--- openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst 
(original)
+++ openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst Wed 
Jul  9 10:29:35 2014
@@ -71,7 +71,7 @@ Apache_OpenOffice
 ABOUTBOXPRODUCTVERSION 4.1.1
 BASEPRODUCTVERSION 4.1
 PCPFILENAME openoffice.pcp
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 1
@@ -130,7 +130,7 @@ Apache_OpenOffice_wJRE
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.1.1
 BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo411/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
@@ -197,7 +197,7 @@ Apache_OpenOffice_Dev
 UREPACKAGEPREFIX aoodev
 SOLSUREPACKAGEPREFIX aoodev
 REGISTRYLAYERNAME LayerDev
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 EVAL
 PACKAGEVERSION 4.1.1
@@ -410,7 +410,7 @@ Apache_OpenOffice_Beta
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.1.1
 BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 0

svn commit: r1609086 - in /openoffice/updates-site/trunk/aoo411: ./ check.Update index.html

2014-07-09 Thread orw

Author: orw
Date: Wed Jul  9 10:35:06 2014
New Revision: 1609086

URL: http://svn.apache.org/r1609086
Log:
125084: empty XML update feed for AOO 4.1.1


Added:
openoffice/updates-site/trunk/aoo411/
openoffice/updates-site/trunk/aoo411/check.Update   (with props)
openoffice/updates-site/trunk/aoo411/index.html   (with props)

Added: openoffice/updates-site/trunk/aoo411/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo411/check.Update?rev=1609086view=auto
==
--- openoffice/updates-site/trunk/aoo411/check.Update (added)
+++ openoffice/updates-site/trunk/aoo411/check.Update Wed Jul  9 10:35:06 2014
@@ -0,0 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Product Update Feed for AOO 4.1.1 instances --
+inst:description xmlns:inst=http://installation.openoffice.org/description;
+/inst:description
\ No newline at end of file

Propchange: openoffice/updates-site/trunk/aoo411/check.Update
--
svn:mime-type = text/xml

Added: openoffice/updates-site/trunk/aoo411/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo411/index.html?rev=1609086view=auto
==
--- openoffice/updates-site/trunk/aoo411/index.html (added)
+++ openoffice/updates-site/trunk/aoo411/index.html Wed Jul  9 10:35:06 2014
@@ -0,0 +1,12 @@
+ï»¿!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
+html
+head
+meta http-equiv=content-type content=text/html; charset=utf-8 /
+titleApache OpenOffice Product Update Service for installed AOO 4.1.1 
instances/title
+/head
+body
+h1Apache OpenOffice Product Update Service for installed AOO 4.1.1 
instances/h1
+h2Folder containing update service feed for AOO 4.1.1 users performing 
the update check and getting the message about an available new version./h2
+pcontents...check.Update ... xml feed /p
+/body
+/html

Propchange: openoffice/updates-site/trunk/aoo411/index.html
--
svn:executable = *

svn commit: r1609179 - in /openoffice/trunk/main/sysui/desktop: debian/makefile.mk productversion.mk slackware/makefile.mk

2014-07-09 Thread orw

Author: orw
Date: Wed Jul  9 14:37:08 2014
New Revision: 1609179

URL: http://svn.apache.org/r1609179
Log:
124940: further 'version numbers' which need to be adapted to 4.2


Modified:
openoffice/trunk/main/sysui/desktop/debian/makefile.mk
openoffice/trunk/main/sysui/desktop/productversion.mk
openoffice/trunk/main/sysui/desktop/slackware/makefile.mk

Modified: openoffice/trunk/main/sysui/desktop/debian/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/makefile.mk?rev=1609179r1=1609178r2=1609179view=diff
==
--- openoffice/trunk/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/debian/makefile.mk Wed Jul  9 14:37:08 
2014
@@ -41,7 +41,7 @@ TARGET=debian
 
 .IF $(PKGFORMAT)!=$(PKGFORMAT:s/deb//)
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.2-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES) 
 
 %/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office 
$*$/usr/lib/menu
-   ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//)) $*$/etc$/
-   /bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.0//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
-@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.0//))/'  
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.0//)
-   echo Package: $(*:f:s/_/ /:1:s/4.0//)  $@
-   cat $(@:f) | tr -d \015 | sed 
s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//))/  $@
-   echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)  $@
+   ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
+   /bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
+@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.2//))/'  
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.2//)
+   echo Package: $(*:f:s/_/ /:1:s/4.2//)  $@
+   cat $(@:f) | tr -d \015 | sed 
s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//))/  $@
+   echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.2//))-$(PKGREV)  $@
@du -k -s $* | awk -F ' ' '{ printf Installed-Size: %s\n, $$1 ; }'  
$@
 
 %/DEBIAN/postinst : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.2//))/g  $@
 
 %/DEBIAN/postrm : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.2//))/g  $@
 
 %/DEBIAN/prerm : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.2//))/g  $@
 
 # --- packaging ---
 

Modified: openoffice/trunk/main/sysui/desktop/productversion.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/productversion.mk?rev=1609179r1=1609178r2=1609179view=diff
==
--- openoffice/trunk/main/sysui/desktop/productversion.mk (original)
+++ openoffice/trunk/main/sysui/desktop/productversion.mk Wed Jul  9 14:37:08 
2014
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
 # default values to minimize maintenance effort
 
 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1
+PRODUCTVERSION = 4.2
 
 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 4

Modified: openoffice/trunk/main/sysui/desktop/slackware/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/slackware/makefile.mk?rev=1609179r1=1609178r2=1609179view=diff
==
--- openoffice/trunk/main/sysui/desktop/slackware/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/slackware/makefile.mk Wed Jul  9 
14:37:08 2014
@@ -36,7 +36,7 @@ TARGET=slackware
 
 # --- Files 
 
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES

svn commit: r1609191 - in /openoffice/branches/AOO410/main/sysui/desktop: debian/makefile.mk productversion.mk slackware/makefile.mk

2014-07-09 Thread orw

Author: orw
Date: Wed Jul  9 14:49:01 2014
New Revision: 1609191

URL: http://svn.apache.org/r1609191
Log:
125084: further 'version numbers' which need to be adapted to 4.1.1


Modified:
openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk
openoffice/branches/AOO410/main/sysui/desktop/productversion.mk
openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk

Modified: openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk?rev=1609191r1=1609190r2=1609191view=diff
==
--- openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk Wed Jul  9 
14:49:01 2014
@@ -41,7 +41,7 @@ TARGET=debian
 
 .IF $(PKGFORMAT)!=$(PKGFORMAT:s/deb//)
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} 
$(PKGDIR)$/$i4.1-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES) 
 
 %/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office 
$*$/usr/lib/menu
-   ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//)) $*$/etc$/
-   /bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.0//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
-@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.0//))/'  
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.0//)
-   echo Package: $(*:f:s/_/ /:1:s/4.0//)  $@
-   cat $(@:f) | tr -d \015 | sed 
s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//))/  $@
-   echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)  $@
+   ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.1//)) $*$/etc$/
+   /bin/sh -c -x cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.1//)  
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh
+@cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.1//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.1//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.1//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.1//))/'  
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.1//)
+   echo Package: $(*:f:s/_/ /:1:s/4.1//)  $@
+   cat $(@:f) | tr -d \015 | sed 
s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.1//))/  $@
+   echo Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.1//))-$(PKGREV)  $@
@du -k -s $* | awk -F ' ' '{ printf Installed-Size: %s\n, $$1 ; }'  
$@
 
 %/DEBIAN/postinst : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.1//))/g  $@
 
 %/DEBIAN/postrm : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.1//))/g  $@
 
 %/DEBIAN/prerm : $$(@:f)
-@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.0//))/g  $@
+@cat $ | tr -d \015 | sed -e s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ 
/:1:s/4.1//))/g  $@
 
 # --- packaging ---
 

Modified: openoffice/branches/AOO410/main/sysui/desktop/productversion.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/productversion.mk?rev=1609191r1=1609190r2=1609191view=diff
==
--- openoffice/branches/AOO410/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/AOO410/main/sysui/desktop/productversion.mk Wed Jul  9 
14:49:01 2014
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
 # default values to minimize maintainance effort
 
 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1
+PRODUCTVERSION = 4.1.1
 
 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 4

Modified: openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk?rev=1609191r1=1609190r2=1609191view=diff
==
--- openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk 
(original)
+++ openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk Wed Jul 
 9 14:49:01 2014
@@ -36,7 +36,7 @@ TARGET=slackware
 
 # --- Files

svn commit: r1608730 - in /openoffice/trunk/main/writerfilter/source/dmapper: DomainMapper.cxx DomainMapper_Impl.cxx DomainMapper_Impl.hxx

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 11:36:35 2014
New Revision: 1608730

URL: http://svn.apache.org/r1608730
Log:
125215: *.docx import: Bookmark ID has to be treated as an Integer


Modified:
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx

Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1608730r1=1608729r2=1608730view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx 
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx Tue Jul  
8 11:36:35 2014
@@ -1413,18 +1413,21 @@ void DomainMapper::lcl_attribute(Id nNam
 case NS_rtf::LN_endnote:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 break;
+
 case NS_rtf::LN_BOOKMARKNAME:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 // sStringValue contains the bookmark name
 sLocalBookmarkName = sStringValue;
 break;
+
 case NS_rtf::LN_IBKL:
 /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0.5 */
 //contains the bookmark identifier - has to be added to the 
bookmark name imported before
 //if it is already available then the bookmark should be inserted
-m_pImpl-AddBookmark( sLocalBookmarkName, sStringValue );
+m_pImpl-AddBookmark( sLocalBookmarkName, nIntValue );
 sLocalBookmarkName = ::rtl::OUString();
 break;
+
 case NS_rtf::LN_LISTLEVEL:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 break;

Modified: 
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1608730r1=1608729r2=1608730view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Tue 
Jul  8 11:36:35 2014
@@ -3541,10 +3541,12 @@ void DomainMapper_Impl::PopFieldContext(
 /*-- 11.06.2007 16:19:00---
 
   ---*/
-void DomainMapper_Impl::AddBookmark( const ::rtl::OUString rBookmarkName, 
const ::rtl::OUString rId )
+void DomainMapper_Impl::AddBookmark(
+const ::rtl::OUString rBookmarkName,
+const sal_Int32 nId )
 {
 uno::Reference text::XTextAppend   xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
-BookmarkMap_t::iterator aBookmarkIter = m_aBookmarkMap.find( rId );
+BookmarkMap_t::iterator aBookmarkIter = m_aBookmarkMap.find( nId );
 //is the bookmark name already registered?
 try
 {
@@ -3575,7 +3577,7 @@ void DomainMapper_Impl::AddBookmark( con
 uno::Reference text::XTextCursor  xCursor = 
xTextAppend-createTextCursorByRange( xTextAppend-getEnd() );
 bool bIsStart = !xCursor-goLeft(1, false);
 uno::Reference text::XTextRange  xCurrent = xCursor-getStart();
-m_aBookmarkMap.insert(BookmarkMap_t::value_type( rId, 
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
+m_aBookmarkMap.insert(BookmarkMap_t::value_type( nId, 
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
 }
 }
 catch( const uno::Exception )

Modified: 
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx?rev=1608730r1=1608729r2=1608730view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx Tue 
Jul  8 11:36:35 2014
@@ -289,7 +289,7 @@ class DomainMapper_Impl
 public:
 typedef TableManager ::com::sun::star::uno::Reference 
::com::sun::star::text::XTextRange , PropertyMapPtr  TableManager_t;
 typedef TableDataHandler ::com::sun::star::uno::Reference 
::com::sun::star::text::XTextRange , TablePropertyMapPtr  TableDataHandler_t;
-typedef std::map  ::rtl::OUString, BookmarkInsertPosition  BookmarkMap_t;
+typedef std::map  sal_Int32, BookmarkInsertPosition  BookmarkMap_t;
 
 private:
 SourceDocumentType 
 m_eDocumentType;
@@ -554,7 +554,9 @@ public:
 //the end of field is reached (0x15 appeared) - the command might

svn commit: r1608733 - in /openoffice/trunk/main/sw: inc/IDocumentMarkAccess.hxx source/core/doc/docbm.cxx source/core/doc/docdde.cxx source/core/inc/MarkManager.hxx source/filter/ww8/wrtw8nds.cxx

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 11:45:46 2014
New Revision: 1608733

URL: http://svn.apache.org/r1608733
Log:
125215: MarkManager: remove unnecessary mark container


Modified:
openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
openoffice/trunk/main/sw/source/core/doc/docbm.cxx
openoffice/trunk/main/sw/source/core/doc/docdde.cxx
openoffice/trunk/main/sw/source/core/inc/MarkManager.hxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx

Modified: openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx?rev=1608733r1=1608732r2=1608733view=diff
==
--- openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx (original)
+++ openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx Tue Jul  8 11:45:46 
2014
@@ -250,11 +250,6 @@ class IDocumentMarkAccess
 virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition 
pos) const =0;
 virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition 
pos) const =0;
 
-// Marks exclusive annotation marks
-virtual const_iterator_t getCommonMarksBegin() const = 0;
-virtual const_iterator_t getCommonMarksEnd() const = 0;
-virtual sal_Int32 getCommonMarksCount() const = 0;
-
 // Annotation Marks
 virtual const_iterator_t getAnnotationMarksBegin() const = 0;
 virtual const_iterator_t getAnnotationMarksEnd() const = 0;

Modified: openoffice/trunk/main/sw/source/core/doc/docbm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docbm.cxx?rev=1608733r1=1608732r2=1608733view=diff
==
--- openoffice/trunk/main/sw/source/core/doc/docbm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docbm.cxx Tue Jul  8 11:45:46 2014
@@ -358,7 +358,6 @@ namespace sw { namespace mark
 , m_vBookmarks()
 , m_vFieldmarks()
 , m_vAnnotationMarks()
-, m_vCommonMarks()
 , m_pDoc(rDoc)
 { }
 
@@ -444,13 +443,11 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_castIBookmark*)
 lcl_InsertMarkSorted(m_vBookmarks, pMark);
 break;
 case IDocumentMarkAccess::TEXT_FIELDMARK:
 case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_castIFieldmark*
 lcl_InsertMarkSorted(m_vFieldmarks, pMark);
 break;
@@ -460,7 +457,6 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // no special array for these
 break;
 }
@@ -830,16 +826,6 @@ namespace sw { namespace mark
 {
 OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in Bookmark container.);
 }
-
-ppBookmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppBookmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppBookmark);
-}
-else
-{
-OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in common mark container.);
-}
 }
 break;
 
@@ -862,15 +848,6 @@ namespace sw { namespace mark
 pTextFieldmark-ReleaseDoc(m_pDoc);
 }
 
-ppFieldmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppFieldmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppFieldmark);
-}
-else
-{
-OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Fieldmark not found in common mark container.);
-}
 }
 break;
 
@@ -891,17 +868,7 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-{
-IDocumentMarkAccess::iterator_t ppOtherMark = 
lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppOtherMark != m_vCommonMarks.end

svn commit: r1608738 - in /openoffice/branches/AOO410: ./ main/ main/writerfilter/source/dmapper/DomainMapper.cxx main/writerfilter/source/dmapper/DomainMapper_Impl.cxx main/writerfilter/source/dmappe

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 12:01:26 2014
New Revision: 1608738

URL: http://svn.apache.org/r1608738
Log:
125215: *.docx import: Bookmark ID has to be treated as an Integer

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper.cxx

openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx

openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1608730

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1608730

Modified: 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1608738r1=1608737r2=1608738view=diff
==
--- 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper.cxx 
(original)
+++ 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper.cxx 
Tue Jul  8 12:01:26 2014
@@ -1413,18 +1413,21 @@ void DomainMapper::lcl_attribute(Id nNam
 case NS_rtf::LN_endnote:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 break;
+
 case NS_rtf::LN_BOOKMARKNAME:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 // sStringValue contains the bookmark name
 sLocalBookmarkName = sStringValue;
 break;
+
 case NS_rtf::LN_IBKL:
 /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0.5 */
 //contains the bookmark identifier - has to be added to the 
bookmark name imported before
 //if it is already available then the bookmark should be inserted
-m_pImpl-AddBookmark( sLocalBookmarkName, sStringValue );
+m_pImpl-AddBookmark( sLocalBookmarkName, nIntValue );
 sLocalBookmarkName = ::rtl::OUString();
 break;
+
 case NS_rtf::LN_LISTLEVEL:
 /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
 break;

Modified: 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1608738r1=1608737r2=1608738view=diff
==
--- 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
 (original)
+++ 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
 Tue Jul  8 12:01:26 2014
@@ -3541,10 +3541,12 @@ void DomainMapper_Impl::PopFieldContext(
 /*-- 11.06.2007 16:19:00---
 
   ---*/
-void DomainMapper_Impl::AddBookmark( const ::rtl::OUString rBookmarkName, 
const ::rtl::OUString rId )
+void DomainMapper_Impl::AddBookmark(
+const ::rtl::OUString rBookmarkName,
+const sal_Int32 nId )
 {
 uno::Reference text::XTextAppend   xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
-BookmarkMap_t::iterator aBookmarkIter = m_aBookmarkMap.find( rId );
+BookmarkMap_t::iterator aBookmarkIter = m_aBookmarkMap.find( nId );
 //is the bookmark name already registered?
 try
 {
@@ -3575,7 +3577,7 @@ void DomainMapper_Impl::AddBookmark( con
 uno::Reference text::XTextCursor  xCursor = 
xTextAppend-createTextCursorByRange( xTextAppend-getEnd() );
 bool bIsStart = !xCursor-goLeft(1, false);
 uno::Reference text::XTextRange  xCurrent = xCursor-getStart();
-m_aBookmarkMap.insert(BookmarkMap_t::value_type( rId, 
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
+m_aBookmarkMap.insert(BookmarkMap_t::value_type( nId, 
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
 }
 }
 catch( const uno::Exception )

Modified: 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx?rev=1608738r1=1608737r2=1608738view=diff
==
--- 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
 (original)
+++ 
openoffice/branches/AOO410/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx
 Tue Jul  8 12:01:26 2014
@@ -289,7 +289,7 @@ class DomainMapper_Impl
 public:
 typedef

svn commit: r1608740 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/inc/ main/sw/source/core/doc/ main/sw/source/core/inc/ main/sw/source/filter/ww8/

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 12:09:06 2014
New Revision: 1608740

URL: http://svn.apache.org/r1608740
Log:
125215: MarkManager: remove unnecessary mark container

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/inc/IDocumentMarkAccess.hxx
openoffice/branches/AOO410/main/sw/source/core/doc/docbm.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/docdde.cxx
openoffice/branches/AOO410/main/sw/source/core/inc/MarkManager.hxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/wrtw8nds.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1608733

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1608733

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1608733

Modified: openoffice/branches/AOO410/main/sw/inc/IDocumentMarkAccess.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/IDocumentMarkAccess.hxx?rev=1608740r1=1608739r2=1608740view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/IDocumentMarkAccess.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/IDocumentMarkAccess.hxx Tue Jul  8 
12:09:06 2014
@@ -250,11 +250,6 @@ class IDocumentMarkAccess
 virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition 
pos) const =0;
 virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition 
pos) const =0;
 
-// Marks exclusive annotation marks
-virtual const_iterator_t getCommonMarksBegin() const = 0;
-virtual const_iterator_t getCommonMarksEnd() const = 0;
-virtual sal_Int32 getCommonMarksCount() const = 0;
-
 // Annotation Marks
 virtual const_iterator_t getAnnotationMarksBegin() const = 0;
 virtual const_iterator_t getAnnotationMarksEnd() const = 0;

Modified: openoffice/branches/AOO410/main/sw/source/core/doc/docbm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/doc/docbm.cxx?rev=1608740r1=1608739r2=1608740view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/doc/docbm.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/doc/docbm.cxx Tue Jul  8 
12:09:06 2014
@@ -358,7 +358,6 @@ namespace sw { namespace mark
 , m_vBookmarks()
 , m_vFieldmarks()
 , m_vAnnotationMarks()
-, m_vCommonMarks()
 , m_pDoc(rDoc)
 { }
 
@@ -444,13 +443,11 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
 case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_castIBookmark*)
 lcl_InsertMarkSorted(m_vBookmarks, pMark);
 break;
 case IDocumentMarkAccess::TEXT_FIELDMARK:
 case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // if(dynamic_castIFieldmark*
 lcl_InsertMarkSorted(m_vFieldmarks, pMark);
 break;
@@ -460,7 +457,6 @@ namespace sw { namespace mark
 case IDocumentMarkAccess::NAVIGATOR_REMINDER:
 case IDocumentMarkAccess::DDE_BOOKMARK:
 case IDocumentMarkAccess::UNO_BOOKMARK:
-lcl_InsertMarkSorted(m_vCommonMarks, pMark);
 // no special array for these
 break;
 }
@@ -830,16 +826,6 @@ namespace sw { namespace mark
 {
 OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in Bookmark container.);
 }
-
-ppBookmark = lcl_FindMark(m_vCommonMarks, *ppMark);
-if ( ppBookmark != m_vCommonMarks.end() )
-{
-m_vCommonMarks.erase(ppBookmark);
-}
-else
-{
-OSL_ENSURE( false, MarkManager::deleteMark(..) - 
Bookmark not found in common mark container.);
-}
 }
 break;
 
@@ -862,15 +848,6 @@ namespace sw { namespace mark
 pTextFieldmark-ReleaseDoc(m_pDoc);
 }
 
-ppFieldmark = lcl_FindMark(m_vCommonMarks, *ppMark

svn commit: r1608819 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/inc/ main/sw/source/core/attr/ main/sw/source/core/doc/ main/sw/source/core/edit/ main/sw/source/core/txtnode/ main/sw/

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 15:01:05 2014
New Revision: 1608819

URL: http://svn.apache.org/r1608819
Log:
78498: Do not keep OutlineLevel attribute at paragraph when a Paragraph Style 
is assigned.

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/inc/doc.hxx
openoffice/branches/AOO410/main/sw/inc/editsh.hxx
openoffice/branches/AOO410/main/sw/inc/fmtcol.hxx
openoffice/branches/AOO410/main/sw/inc/ndtxt.hxx
openoffice/branches/AOO410/main/sw/source/core/attr/format.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/docfmt.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/docglbl.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/doctxm.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/fmtcol.cxx
openoffice/branches/AOO410/main/sw/source/core/edit/edfcol.cxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx
openoffice/branches/AOO410/main/sw/source/core/undo/unfmco.cxx
openoffice/branches/AOO410/main/sw/source/core/unocore/unosett.cxx
openoffice/branches/AOO410/main/sw/source/core/unocore/unostyle.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1606055

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1606055

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1606055

Modified: openoffice/branches/AOO410/main/sw/inc/doc.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/doc.hxx?rev=1608819r1=1608818r2=1608819view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/doc.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/doc.hxx Tue Jul  8 15:01:05 2014
@@ -1303,7 +1303,7 @@ public:
sal_Bool bBroadcast = 
sal_False);
void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = 
sal_False );
-// -- OD 2007-11-06 #i62675#
+
 // Add 4th optional parameter bResetListAttrs.
 // 'side effect' of SetTxtFmtColl with bReset = true is that the hard
 // attributes of the affected text nodes are cleared, except the break
@@ -1311,10 +1311,12 @@ public:
 // The new parameter bResetListAttrs indicates, if the list attributes
 // (list style, restart at and restart with) are cleared as well in case
 // that bReset = true and the paragraph style has a list style attribute 
set.
-sal_Bool SetTxtFmtColl( const SwPaM rRg, SwTxtFmtColl *pFmt,
-bool bReset = true,
-bool bResetListAttrs = false );
-// --
+sal_Bool SetTxtFmtColl(
+const SwPaM rRg,
+SwTxtFmtColl *pFmt,
+const bool bReset = true,
+const bool bResetListAttrs = false );
+
SwTxtFmtColl* FindTxtFmtCollByName( const String rName ) const
{   return (SwTxtFmtColl*)FindFmtByName( 
(SvPtrarr)*pTxtFmtCollTbl, rName ); }
 

Modified: openoffice/branches/AOO410/main/sw/inc/editsh.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/editsh.hxx?rev=1608819r1=1608818r2=1608819view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/editsh.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/editsh.hxx Tue Jul  8 15:01:05 2014
@@ -303,11 +303,11 @@ public:
sal_uInt16 GetTxtFmtCollCount() const;
SwTxtFmtColl GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
SwTxtFmtColl* GetCurTxtFmtColl() const;
-// -- OD 2007-11-06 #i62675#
+
 // Add 2nd optional parameter bResetListAttrs - see also 
SwDoc::SetTxtFmtColl(..)
 void SetTxtFmtColl( SwTxtFmtColl*,
-bool bResetListAttrs = false );
-// --
+const bool bResetListAttrs = false );
+
SwTxtFmtColl *MakeTxtFmtColl(const String rFmtCollName,
SwTxtFmtColl *pDerivedFrom = 0);
void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False);

Modified: openoffice/branches/AOO410/main/sw/inc/fmtcol.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/fmtcol.hxx?rev=1608819r1=1608818r2=1608819view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/fmtcol.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/fmtcol.hxx Tue Jul  8 15:01:05 2014

svn commit: r1608825 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/filter/rtf/ main/sw/source/filter/ww8/ main/sw/source/filter/xml/

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 15:08:09 2014
New Revision: 1608825

URL: http://svn.apache.org/r1608825
Log:
78498:  WW8 import - improvements/corrections regarding outline level  Co
- import outline level attribute at Paragraph Styles
- import outline level attribute at paragraphs
- refactor code to apply list level properties to Outline Style
-- only consider WW8 list styles applied to WW8 Built-in Heading Styles
-- only assign AOO counterparts of WW8 Built-in Heading Styles to 
Outline Style

cherry-picked - from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/filter/rtf/swparrtf.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.hxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par2.hxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par5.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par6.cxx
openoffice/branches/AOO410/main/sw/source/filter/xml/swxml.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1606061

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1606061

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1606061

Modified: openoffice/branches/AOO410/main/sw/source/filter/rtf/swparrtf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/filter/rtf/swparrtf.cxx?rev=1608825r1=1608824r2=1608825view=diff
==
--- openoffice/branches/AOO410/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/filter/rtf/swparrtf.cxx Tue Jul  
8 15:08:09 2014
@@ -3931,13 +3931,12 @@ SwTxtFmtColl* SwRTFParser::MakeColl(cons
 if( !nPos )
 {
 pColl = pDoc-GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
-   //pColl-SetOutlineLevel( nOutlineLevel );  
//#outline level,removed by zhaojianwei
-   if(nOutlineLevel  MAXLEVEL )   
//-add by zhaojianwei
-   pColl-AssignToListLevelOfOutlineStyle( 
nOutlineLevel );
-   else
-   
pColl-DeleteAssignmentToListLevelOfOutlineStyle(); //-end,zhaojianwei
-   return pColl;
-   }
+if ( nOutlineLevel  MAXLEVEL )
+pColl-AssignToListLevelOfOutlineStyle( nOutlineLevel );
+else
+pColl-DeleteAssignmentToListLevelOfOutlineStyle();
+return pColl;
+}
 
// erzeuge einen Namen
aNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM( NoName( ));

Modified: openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx?rev=1608825r1=1608824r2=1608825view=diff
==
--- openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx Tue Jul  8 
15:08:09 2014
@@ -3791,7 +3791,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uIn
 mpDrawEditEngine = 0;
 pWWZOrder = 0;
 pFormImpl = 0;
-mpChosenOutlineNumRule = 0;
 pNumFldType = 0;
 nFldNum = 0;
 
@@ -4448,7 +4447,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8G
 pStyles-PostProcessStyles();
 
 if (pCollA)
-SetOutLineStyles();
+SetOutlineStyles();
 
 pSBase = new WW8ScannerBase(pStrm,pTableStream,pDataStream,pWwFib);
 
@@ -5185,178 +5184,135 @@ public:
 }
 };
 
-void SwWW8ImplReader::SetOutLineStyles()
+
+void SwWW8ImplReader::SetOutlineStyles()
 {
-/*
-#i3674# - Load new document and insert document cases.
-*/
-SwNumRule aOutlineRule(*rDoc.GetOutlineNumRule());
-// #i53044,i53213#
-// mpChosenOutlineNumRule has to be set to point to local variable
-// aOutlineRule, because its used below to be compared this 
aOutlineRule.
-// But at the end of the method mpChosenOutlineNumRule has to be set to
-// rDoc.GetOutlineNumRule(), because aOutlineRule will be destroyed.
-mpChosenOutlineNumRule = aOutlineRule;
-
-sw::ParaStyles aOutLined(sw::util

svn commit: r1608829 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/filter/ww8/ww8par.cxx main/sw/source/filter/ww8/ww8par2.cxx main/sw/source/filter/ww8/ww8par2.hxx main/sw/source

2014-07-08 Thread orw

Author: orw
Date: Tue Jul  8 15:16:41 2014
New Revision: 1608829

URL: http://svn.apache.org/r1608829
Log:
78498:  WW8 import - some further improvements and corrections regarding 
outline:
- apply default outline level to WW8 Build-in Heading Styles
- get WW8 Build-In Heading Styles' list level applied to the paragraphs
- apply list level properties of WW8 Built-In Heading Styles only, if
  the list level of the WW8 Build-In Heading Style corresponds to its 
  outline level

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/   (props changed)
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par2.hxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par3.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1607111

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1607111

Propchange: openoffice/branches/AOO410/main/sw/
--
  Merged /openoffice/trunk/main/sw:r1607111

Modified: openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx?rev=1608829r1=1608828r2=1608829view=diff
==
--- openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8par.cxx Tue Jul  8 
15:16:41 2014
@@ -4554,13 +4554,13 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8G
 }
 else //ordinary case
 {
-   //Modify here for #119405, by easyfan, 2012-05-24
-   mbOnLoadingMain = true;
-   //End of modification, by easyfan
-ReadText(0, pWwFib-ccpText, MAN_MAINTEXT);
-   //Modify here for #119405, by easyfan, 2012-05-24
-   mbOnLoadingMain = false;
-   //End of modification, by easyfan
+//Modify here for #119405, by easyfan, 2012-05-24
+mbOnLoadingMain = true;
+//End of modification, by easyfan
+ReadText( 0, pWwFib-ccpText, MAN_MAINTEXT );
+//Modify here for #119405, by easyfan, 2012-05-24
+mbOnLoadingMain = false;
+//End of modification, by easyfan
 }
 
 ::SetProgressState(nProgress, mpDocShell);// Update
@@ -5255,17 +5255,12 @@ void SwWW8ImplReader::SetOutlineStyles()
 }
 }
 
-if ( pChosenWW8ListStyle == NULL )
-{
-// no WW8 list style for Outline Style found -- nothing to do
-return;
-}
-
 // - set list level properties of Outline Style - ODF's list style applied 
by default to headings
 // - assign corresponding Heading Paragraph Styles to the Outline Style
 // - If a heading Paragraph Styles is not applying the WW8 list style 
which had been chosen as
 //   the one which provides the list level properties for the Outline 
Style, its assignment to
-//   the Outline Style is removed and a potential applied WW8 list style 
is assigned directly.
+//   the Outline Style is removed. A potential applied WW8 list style is 
assigned directly and
+//   its default outline level is applied.
 SwNumRule aOutlineRule( *rDoc.GetOutlineNumRule() );
 bool bAppliedChangedOutlineStyle = false;
 std::vector SwWW8StyInf* ::iterator aStylesIterEnd =
@@ -5282,18 +5277,21 @@ void SwWW8ImplReader::SetOutlineStyles()
 continue;
 }
 
-#if OSL_DEBUG_LEVEL  1
-ASSERT( pStyleInf-mnWW8OutlineLevel == pStyleInf-nListLevel,
-WW8 import - SwWW8ImplReader::SetOutlineStyles() - it is 
not expected that WW8 Built-In Heading styles have different outline level and 
list level );
-#endif
-const SwNumFmt rRule = pChosenWW8ListStyle-Get( 
pStyleInf-mnWW8OutlineLevel );
-aOutlineRule.Set( pStyleInf-mnWW8OutlineLevel, rRule );
-bAppliedChangedOutlineStyle = true;
+if ( pChosenWW8ListStyle != NULL
+  pStyleInf-mnWW8OutlineLevel == pStyleInf-nListLevel )
+{
+const SwNumFmt rRule = pChosenWW8ListStyle-Get( 
pStyleInf-mnWW8OutlineLevel );
+aOutlineRule.Set( pStyleInf-mnWW8OutlineLevel, rRule );
+bAppliedChangedOutlineStyle = true;
+}
+
 // in case that there are more styles on this level ignore them
 nOutlineStyleListLevelWithAssignment |= 
nOutlineStyleListLevelOfWW8BuiltInHeadingStyle;
 
 SwTxtFmtColl* pTxtFmtColl = 
static_castSwTxtFmtColl*(pStyleInf-pFmt

svn commit: r1608376 - /openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx

2014-07-07 Thread orw

Author: orw
Date: Mon Jul  7 09:04:38 2014
New Revision: 1608376

URL: http://svn.apache.org/r1608376
Log:
123812: SfxBaseModel::storeSelf(..) - accept arguement FailOnWarning in order 
to get new Version saved, if requested

Patch by: hanya
Review by: orw


Modified:
openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx

Modified: openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx?rev=1608376r1=1608375r2=1608376view=diff
==
--- openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx (original)
+++ openoffice/trunk/main/sfx2/source/doc/sfxbasemodel.cxx Mon Jul  7 09:04:38 
2014
@@ -1610,7 +1610,8 @@ void SAL_CALL SfxBaseModel::storeSelf( c
if ( !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( VersionComment ) ) )
   !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( Author ) ) )
   !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( InteractionHandler ) ) )
-  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( StatusIndicator ) ) ) )
+  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( StatusIndicator ) ) )
+  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( FailOnWarning ) ) ) )
{
 m_pData-m_pObjectShell-AddLog( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX unexpected parameter for 
storeSelf, might be no problem if SaveAs is executed. ) ) );
 m_pData-m_pObjectShell-StoreLog();

svn commit: r1608384 - in /openoffice/branches/AOO410: ./ main/ main/sfx2/source/doc/sfxbasemodel.cxx

2014-07-07 Thread orw

Author: orw
Date: Mon Jul  7 09:17:53 2014
New Revision: 1608384

URL: http://svn.apache.org/r1608384
Log:
123812: SfxBaseModel::storeSelf(..) - accept arguement FailOnWarning in order 
to get new Version saved, if requested

Patch by: hanya
Review by: orw

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1608376

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1608376

Modified: openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx?rev=1608384r1=1608383r2=1608384view=diff
==
--- openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx (original)
+++ openoffice/branches/AOO410/main/sfx2/source/doc/sfxbasemodel.cxx Mon Jul  7 
09:17:53 2014
@@ -1610,7 +1610,8 @@ void SAL_CALL SfxBaseModel::storeSelf( c
if ( !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( VersionComment ) ) )
   !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( Author ) ) )
   !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( InteractionHandler ) ) )
-  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( StatusIndicator ) ) ) )
+  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( StatusIndicator ) ) )
+  !aSeqArgs[nInd].Name.equals( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( FailOnWarning ) ) ) )
{
 m_pData-m_pObjectShell-AddLog( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX unexpected parameter for 
storeSelf, might be no problem if SaveAs is executed. ) ) );
 m_pData-m_pObjectShell-StoreLog();

svn commit: r1607793 - /openoffice/trunk/main/xmloff/source/text/txtexppr.cxx

2014-07-04 Thread orw

Author: orw
Date: Fri Jul  4 08:19:12 2014
New Revision: 1607793

URL: http://svn.apache.org/r1607793
Log:
124107: ODF export - suppress export of fo:margin for paragraph styles


Modified:
openoffice/trunk/main/xmloff/source/text/txtexppr.cxx

Modified: openoffice/trunk/main/xmloff/source/text/txtexppr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtexppr.cxx?rev=1607793r1=1607792r2=1607793view=diff
==
--- openoffice/trunk/main/xmloff/source/text/txtexppr.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtexppr.cxx Fri Jul  4 08:19:12 
2014
@@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::Con
XMLPropertyState* pClip11State = NULL;
XMLPropertyState* pClipState = NULL;
 
+   // filter fo:margin
 XMLPropertyState* pAllParaMargin = NULL;
+XMLPropertyState* pAllParaMarginRel = NULL;
 XMLPropertyState* pAllMargin = NULL;
 
 //
@@ -586,6 +588,7 @@ void XMLTextExportPropertySetMapper::Con
 case CTF_TEXT_CLIP11:  pClip11State = propertie; break;
 case CTF_TEXT_CLIP:pClipState = propertie; 
break;
 case CTF_PARAMARGINALL: pAllParaMargin = propertie; break;
+case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break;
 case CTF_MARGINALL: pAllMargin = propertie; break;
 
 //
@@ -675,6 +678,11 @@ void XMLTextExportPropertySetMapper::Con
 pAllParaMargin-mnIndex = -1; // just export individual attributes...
 pAllParaMargin-maValue.clear();
 }
+if (pAllParaMarginRel)
+{
+pAllParaMarginRel-mnIndex = -1; // just export individual 
attributes...
+pAllParaMarginRel-maValue.clear();
+}
 if (pAllMargin)
 {
 pAllMargin-mnIndex = -1; // just export individual attributes...

svn commit: r1607861 - in /openoffice/branches/AOO410: ./ main/ main/xmloff/source/text/txtexppr.cxx

2014-07-04 Thread orw

Author: orw
Date: Fri Jul  4 14:16:12 2014
New Revision: 1607861

URL: http://svn.apache.org/r1607861
Log:
124107: ODF export - suppress export of fo:margin for paragraph styles

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1607793

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1607793

Modified: openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx?rev=1607861r1=1607860r2=1607861view=diff
==
--- openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx (original)
+++ openoffice/branches/AOO410/main/xmloff/source/text/txtexppr.cxx Fri Jul  4 
14:16:12 2014
@@ -464,7 +464,9 @@ void XMLTextExportPropertySetMapper::Con
XMLPropertyState* pClip11State = NULL;
XMLPropertyState* pClipState = NULL;
 
+   // filter fo:margin
 XMLPropertyState* pAllParaMargin = NULL;
+XMLPropertyState* pAllParaMarginRel = NULL;
 XMLPropertyState* pAllMargin = NULL;
 
sal_Bool bNeedsAnchor = sal_False;
@@ -584,6 +586,7 @@ void XMLTextExportPropertySetMapper::Con
 case CTF_TEXT_CLIP11:  pClip11State = propertie; break;
 case CTF_TEXT_CLIP:pClipState = propertie; 
break;
 case CTF_PARAMARGINALL: pAllParaMargin = propertie; break;
+case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break;
 case CTF_MARGINALL: pAllMargin = propertie; break;
}
}
@@ -641,6 +644,11 @@ void XMLTextExportPropertySetMapper::Con
 pAllParaMargin-mnIndex = -1; // just export individual attributes...
 pAllParaMargin-maValue.clear();
 }
+if (pAllParaMarginRel)
+{
+pAllParaMarginRel-mnIndex = -1; // just export individual 
attributes...
+pAllParaMarginRel-maValue.clear();
+}
 if (pAllMargin)
 {
 pAllMargin-mnIndex = -1; // just export individual attributes...

svn commit: r1607867 - in /openoffice/branches/AOO410: ./ main/ main/xmloff/source/text/txtimppr.cxx

2014-07-04 Thread orw

Author: orw
Date: Fri Jul  4 14:37:41 2014
New Revision: 1607867

URL: http://svn.apache.org/r1607867
Log:
124107: ODF import - ignore fo:margin=100% for paragraph styles as core 
attributes are not able to treat it correctly.
 The result is the same - value are inherited from parent

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/xmloff/source/text/txtimppr.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1607836

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1607836

Modified: openoffice/branches/AOO410/main/xmloff/source/text/txtimppr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmloff/source/text/txtimppr.cxx?rev=1607867r1=1607866r2=1607867view=diff
==
--- openoffice/branches/AOO410/main/xmloff/source/text/txtimppr.cxx (original)
+++ openoffice/branches/AOO410/main/xmloff/source/text/txtimppr.cxx Fri Jul  4 
14:37:41 2014
@@ -312,9 +312,11 @@ void XMLTextImportPropertyMapper::finish
XMLPropertyState* pVertOrientRelAsChar = 0;
XMLPropertyState* pBackTransparency = NULL; // transparency in %
XMLPropertyState* pBackTransparent = NULL;  // transparency as boolean
+
 XMLPropertyState* pAllParaMargin = 0;
 XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
 ::std::auto_ptrXMLPropertyState pNewParaMargins[4];
+
 XMLPropertyState* pAllMargin = 0;
 XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
 ::std::auto_ptrXMLPropertyState pNewMargins[4];
@@ -385,21 +387,42 @@ void XMLTextImportPropertyMapper::finish

bHasAnyWidth = sal_True; break;
 case CTF_BACKGROUND_TRANSPARENCY: pBackTransparency = property; break;
 case CTF_BACKGROUND_TRANSPARENT:  pBackTransparent = property; break;
+
 case CTF_PARAMARGINALL:
+pAllParaMargin = property;
+break;
 case CTF_PARAMARGINALL_REL:
-pAllParaMargin = property; break;
+{
+sal_uInt32 nValue;
+property-maValue = nValue;
+// treat fo:margin=100% as it is not exisiting as the
+// corresponding core attribute classes - SvxULSpaceItem and
+// SvxLRSpaceItem - are not able to treat such a value 
correctly.
+// The result will be the same as the values will be inherited
+// from parent, when the no margin attribute is given.
+if ( nValue != 100 )
+{
+pAllParaMargin = property;
+}
+}
+break;
+
 case CTF_PARALEFTMARGIN:
 case CTF_PARALEFTMARGIN_REL:
 pParaMargins[XML_LINE_LEFT] = property; break;
+
 case CTF_PARARIGHTMARGIN:
 case CTF_PARARIGHTMARGIN_REL:
 pParaMargins[XML_LINE_RIGHT] = property; break;
+
 case CTF_PARATOPMARGIN:
 case CTF_PARATOPMARGIN_REL:
 pParaMargins[XML_LINE_TOP] = property; break;
+
 case CTF_PARABOTTOMMARGIN:
 case CTF_PARABOTTOMMARGIN_REL:
 pParaMargins[XML_LINE_BOTTOM] = property; break;
+
 case CTF_MARGINALL:
 pAllMargin = property; break;
 case CTF_MARGINLEFT:
@@ -428,7 +451,8 @@ void XMLTextImportPropertyMapper::finish
 
 for (sal_uInt16 i = 0; i  4; i++)
 {
-if (pAllParaMargin  !pParaMargins[i])
+if ( pAllParaMargin != NULL
+  pParaMargins[i] == NULL )
 {
 #ifdef DBG_UTIL
 sal_Int16 nTmp = getPropertySetMapper()-GetEntryContextId(
@@ -437,9 +461,12 @@ void XMLTextImportPropertyMapper::finish
 nTmp = CTF_PARABOTTOMMARGIN_REL,
 wrong property context id );
 #endif
-pNewParaMargins[i].reset(new XMLPropertyState(
-pAllParaMargin-mnIndex + (2*i) + 2, pAllParaMargin-maValue));
+// IMPORTANT NOTE: the index calculation depends on the right 
order in the property map
+pNewParaMargins[i].reset(
+new XMLPropertyState( pAllParaMargin-mnIndex + (2*i) + 2,
+  pAllParaMargin-maValue ) );
 }
+
 if (pAllMargin  !pMargins[i])
 {
 #ifdef DBG_UTIL
@@ -448,8 +475,10 @@ void XMLTextImportPropertyMapper::finish
 OSL_ENSURE( nTmp = CTF_MARGINLEFT  nTmp = CTF_MARGINBOTTOM,
 wrong property context id );
 #endif
-pNewMargins[i].reset(new XMLPropertyState

svn commit: r1607011 [2/2] - in /openoffice/branches/AOO410: ./ main/ main/sfx2/inc/sfx2/ main/sw/inc/ main/sw/source/ui/app/

2014-07-01 Thread orw

Modified: openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx?rev=1607011r1=1607010r2=1607011view=diff
==
--- openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx Tue Jul  1 
08:14:18 2014
@@ -163,7 +163,7 @@ void  SwDocShell::StateStyleSheet(SfxIte
SfxTemplateItem aItem(nWhich, aName);
 
sal_uInt16 nMask = 0;
-   if( 
pDoc-get(IDocumentSettingAccess::HTML_MODE) )
+   if( 
mpDoc-get(IDocumentSettingAccess::HTML_MODE) )
nMask = SWSTYLEBIT_HTML;
else
{
@@ -189,7 +189,7 @@ void  SwDocShell::StateStyleSheet(SfxIte
 
case SID_STYLE_FAMILY3:
 
-   if( 
pDoc-get(IDocumentSettingAccess::HTML_MODE) )
+   if( 
mpDoc-get(IDocumentSettingAccess::HTML_MODE) )
rSet.DisableItem( nWhich );
else
{
@@ -205,7 +205,7 @@ void  SwDocShell::StateStyleSheet(SfxIte
case SID_STYLE_FAMILY4:
{
SvxHtmlOptions* pHtmlOpt = 
SvxHtmlOptions::Get();
-   if( 
pDoc-get(IDocumentSettingAccess::HTML_MODE)  
!pHtmlOpt-IsPrintLayoutExtension())
+   if( 
mpDoc-get(IDocumentSettingAccess::HTML_MODE)  
!pHtmlOpt-IsPrintLayoutExtension())
rSet.DisableItem( nWhich );
else
{
@@ -431,14 +431,14 @@ void SwDocShell::ExecStyleSheet( SfxRequ
break;
case SFX_STYLE_FAMILY_FRAME:
{
-   SwFrmFmt* pFrm = 
pWrtShell-GetCurFrmFmt();
+   SwFrmFmt* pFrm = 
mpWrtShell-GetCurFrmFmt();
if( pFrm )
aParam = 
pFrm-GetName();
}
break;
case SFX_STYLE_FAMILY_CHAR:
{
-   SwCharFmt* pChar = 
pWrtShell-GetCurCharFmt();
+   SwCharFmt* pChar = 
mpWrtShell-GetCurCharFmt();
if( pChar )
aParam = 
pChar-GetName();
}
@@ -523,7 +523,7 @@ sal_uInt16 SwDocShell::Edit(
SfxStyleSheetBase *pStyle = 0;
 
sal_uInt16 nRet = nMask;
-   sal_Bool bModified = pDoc-IsModified();
+   sal_Bool bModified = mpDoc-IsModified();
 
if( bNew )
{
@@ -542,17 +542,16 @@ sal_uInt16 SwDocShell::Edit(
{
if(rParent.Len())
{
-   SwTxtFmtColl* pColl = 
pWrtShell-FindTxtFmtCollByName( rParent );
+   SwTxtFmtColl* pColl = 
mpWrtShell-FindTxtFmtCollByName( rParent );
 if(!pColl)
 {
 sal_uInt16 nId = 
SwStyleNameMapper::GetPoolIdFromUIName(rParent, 
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
 if(USHRT_MAX != nId)
-pColl =  pWrtShell-GetTxtCollFromPool( nId );
+pColl =  mpWrtShell-GetTxtCollFromPool( nId );
 }

pDStyle-GetCollection()-SetDerivedFrom( pColl );
pDStyle-PresetParent( rParent );
 
-   //#outline level,add by zhaojianwei
 /*When a new paragraph style is 
created based on a to outline style
assigned paragraph style, the 
outline level attribute and the list
style attribute of the new 
paragraph style have to be set to 0
@@ -563,12 +562,11 @@ sal_uInt16 SwDocShell::Edit(

svn commit: r1606055 - in /openoffice/trunk/main/sw: inc/ source/core/attr/ source/core/doc/ source/core/edit/ source/core/txtnode/ source/core/undo/ source/core/unocore/

2014-06-27 Thread orw

Author: orw
Date: Fri Jun 27 12:27:55 2014
New Revision: 1606055

URL: http://svn.apache.org/r1606055
Log:
78498: Do not keep OutlineLevel attribute at paragraph when a Paragraph Style 
is assigned.


Modified:
openoffice/trunk/main/sw/inc/doc.hxx
openoffice/trunk/main/sw/inc/editsh.hxx
openoffice/trunk/main/sw/inc/fmtcol.hxx
openoffice/trunk/main/sw/inc/ndtxt.hxx
openoffice/trunk/main/sw/source/core/attr/format.cxx
openoffice/trunk/main/sw/source/core/doc/docfmt.cxx
openoffice/trunk/main/sw/source/core/doc/docglbl.cxx
openoffice/trunk/main/sw/source/core/doc/doctxm.cxx
openoffice/trunk/main/sw/source/core/doc/fmtcol.cxx
openoffice/trunk/main/sw/source/core/edit/edfcol.cxx
openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx
openoffice/trunk/main/sw/source/core/undo/unfmco.cxx
openoffice/trunk/main/sw/source/core/unocore/unosett.cxx
openoffice/trunk/main/sw/source/core/unocore/unostyle.cxx

Modified: openoffice/trunk/main/sw/inc/doc.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/doc.hxx?rev=1606055r1=1606054r2=1606055view=diff
==
--- openoffice/trunk/main/sw/inc/doc.hxx (original)
+++ openoffice/trunk/main/sw/inc/doc.hxx Fri Jun 27 12:27:55 2014
@@ -1310,7 +1310,7 @@ public:
sal_Bool bBroadcast = 
sal_False);
void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = 
sal_False );
-// -- OD 2007-11-06 #i62675#
+
 // Add 4th optional parameter bResetListAttrs.
 // 'side effect' of SetTxtFmtColl with bReset = true is that the hard
 // attributes of the affected text nodes are cleared, except the break
@@ -1318,10 +1318,12 @@ public:
 // The new parameter bResetListAttrs indicates, if the list attributes
 // (list style, restart at and restart with) are cleared as well in case
 // that bReset = true and the paragraph style has a list style attribute 
set.
-sal_Bool SetTxtFmtColl( const SwPaM rRg, SwTxtFmtColl *pFmt,
-bool bReset = true,
-bool bResetListAttrs = false );
-// --
+sal_Bool SetTxtFmtColl(
+const SwPaM rRg,
+SwTxtFmtColl *pFmt,
+const bool bReset = true,
+const bool bResetListAttrs = false );
+
SwTxtFmtColl* FindTxtFmtCollByName( const String rName ) const
{   return (SwTxtFmtColl*)FindFmtByName( 
(SvPtrarr)*pTxtFmtCollTbl, rName ); }
 

Modified: openoffice/trunk/main/sw/inc/editsh.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/editsh.hxx?rev=1606055r1=1606054r2=1606055view=diff
==
--- openoffice/trunk/main/sw/inc/editsh.hxx (original)
+++ openoffice/trunk/main/sw/inc/editsh.hxx Fri Jun 27 12:27:55 2014
@@ -303,11 +303,11 @@ public:
sal_uInt16 GetTxtFmtCollCount() const;
SwTxtFmtColl GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
SwTxtFmtColl* GetCurTxtFmtColl() const;
-// -- OD 2007-11-06 #i62675#
+
 // Add 2nd optional parameter bResetListAttrs - see also 
SwDoc::SetTxtFmtColl(..)
 void SetTxtFmtColl( SwTxtFmtColl*,
-bool bResetListAttrs = false );
-// --
+const bool bResetListAttrs = false );
+
SwTxtFmtColl *MakeTxtFmtColl(const String rFmtCollName,
SwTxtFmtColl *pDerivedFrom = 0);
void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False);

Modified: openoffice/trunk/main/sw/inc/fmtcol.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/fmtcol.hxx?rev=1606055r1=1606054r2=1606055view=diff
==
--- openoffice/trunk/main/sw/inc/fmtcol.hxx (original)
+++ openoffice/trunk/main/sw/inc/fmtcol.hxx Fri Jun 27 12:27:55 2014
@@ -69,29 +69,31 @@ protected:

SwTxtFmtColl *pNextTxtFmtColl;
 
-   SwTxtFmtColl( SwAttrPool rPool, const sal_Char* pFmtCollName,
-   SwTxtFmtColl* pDerFrom = 0,
-   sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
-   : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
-   pDerFrom, nFmtWh ),
-  // -- OD 2007-01-24 #i73790#
-  mbStayAssignedToListLevelOfOutlineStyle( false ),
-  // --
-  //nOutlineLevel( NO_NUMBERING )  //-#outline level,removed by 
zhaojianwei
- mbAssignedToOutlineStyle(false)   //-#outline 
level,added by zhaojianwei
-{ pNextTxtFmtColl = this; }
-
-   SwTxtFmtColl( SwAttrPool rPool, const String rFmtCollName,
-   SwTxtFmtColl* pDerFrom = 0

svn commit: r1606061 - in /openoffice/trunk/main/sw/source/filter: rtf/swparrtf.cxx ww8/ww8par.cxx ww8/ww8par.hxx ww8/ww8par2.cxx ww8/ww8par2.hxx ww8/ww8par3.cxx ww8/ww8par5.cxx ww8/ww8par6.cxx xml/sw

2014-06-27 Thread orw

Author: orw
Date: Fri Jun 27 12:34:10 2014
New Revision: 1606061

URL: http://svn.apache.org/r1606061
Log:
78498:  WW8 import - improvements/corrections regarding outline level  Co
- import outline level attribute at Paragraph Styles
- import outline level attribute at paragraphs
- refactor code to apply list level properties to Outline Style
-- only consider WW8 list styles applied to WW8 Built-in Heading Styles
-- only assign AOO counterparts of WW8 Built-in Heading Styles to 
Outline Style


Modified:
openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par2.hxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx
openoffice/trunk/main/sw/source/filter/xml/swxml.cxx

Modified: openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx?rev=1606061r1=1606060r2=1606061view=diff
==
--- openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx Fri Jun 27 12:34:10 
2014
@@ -3922,13 +3922,12 @@ SwTxtFmtColl* SwRTFParser::MakeColl(cons
 if( !nPos )
 {
 pColl = pDoc-GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
-   //pColl-SetOutlineLevel( nOutlineLevel );  
//#outline level,removed by zhaojianwei
-   if(nOutlineLevel  MAXLEVEL )   
//-add by zhaojianwei
-   pColl-AssignToListLevelOfOutlineStyle( 
nOutlineLevel );
-   else
-   
pColl-DeleteAssignmentToListLevelOfOutlineStyle(); //-end,zhaojianwei
-   return pColl;
-   }
+if ( nOutlineLevel  MAXLEVEL )
+pColl-AssignToListLevelOfOutlineStyle( nOutlineLevel );
+else
+pColl-DeleteAssignmentToListLevelOfOutlineStyle();
+return pColl;
+}
 
// erzeuge einen Namen
aNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM( NoName( ));

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1606061r1=1606060r2=1606061view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Fri Jun 27 12:34:10 
2014
@@ -3792,7 +3792,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uIn
 mpDrawEditEngine = 0;
 pWWZOrder = 0;
 pFormImpl = 0;
-mpChosenOutlineNumRule = 0;
 pNumFldType = 0;
 nFldNum = 0;
 
@@ -4449,7 +4448,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8G
 pStyles-PostProcessStyles();
 
 if (pCollA)
-SetOutLineStyles();
+SetOutlineStyles();
 
 pSBase = new WW8ScannerBase(pStrm,pTableStream,pDataStream,pWwFib);
 
@@ -5186,178 +5185,135 @@ public:
 }
 };
 
-void SwWW8ImplReader::SetOutLineStyles()
+
+void SwWW8ImplReader::SetOutlineStyles()
 {
-/*
-#i3674# - Load new document and insert document cases.
-*/
-SwNumRule aOutlineRule(*rDoc.GetOutlineNumRule());
-// #i53044,i53213#
-// mpChosenOutlineNumRule has to be set to point to local variable
-// aOutlineRule, because its used below to be compared this 
aOutlineRule.
-// But at the end of the method mpChosenOutlineNumRule has to be set to
-// rDoc.GetOutlineNumRule(), because aOutlineRule will be destroyed.
-mpChosenOutlineNumRule = aOutlineRule;
-
-sw::ParaStyles aOutLined(sw::util::GetParaStyles(rDoc));
-// #i98791# - sorting algorithm adjusted
-sw::util::SortByAssignedOutlineStyleListLevel(aOutLined);
 
-typedef sw::ParaStyleIter myParaStyleIter;
-/*
-If we are inserted into a document then don't clobber existing existing
-levels.
-*/
-sal_uInt16 nFlagsStyleOutlLevel = 0;
-if (!mbNewDoc)
+// If we are inserted into a document then don't clobber existing outline 
levels.
+sal_uInt16 nOutlineStyleListLevelWithAssignment = 0;
+if ( !mbNewDoc )
 {
-// #i70748# - backward iteration needed due to the outline level 
attribute
+sw::ParaStyles aOutLined( sw::util::GetParaStyles( rDoc ) );
+sw::util::SortByAssignedOutlineStyleListLevel( aOutLined );
 sw::ParaStyles::reverse_iterator aEnd = aOutLined.rend();
-for ( sw::ParaStyles::reverse_iterator

svn commit: r1605689 [2/2] - in /openoffice/trunk/main: sfx2/inc/sfx2/objsh.hxx sw/inc/docsh.hxx sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/d

2014-06-26 Thread orw

Modified: openoffice/trunk/main/sw/source/ui/app/docstyle.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docstyle.cxx?rev=1605689r1=1605688r2=1605689view=diff
==
--- openoffice/trunk/main/sw/source/ui/app/docstyle.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docstyle.cxx Thu Jun 26 08:03:24 2014
@@ -1267,11 +1267,10 @@ void SwDocStyleSheet::SetItemSet( const 
if( pColl != pColl-GetNextTxtFmtColl() )
pCColl-SetNextTxtFmtColl( 
pColl-GetNextTxtFmtColl() );
 
-   //pCColl-SetOutlineLevel( 
pColl-GetOutlineLevel() );//#outline level,zhaojianwei
if( 
pColl-IsAssignedToListLevelOfOutlineStyle())

pCColl-AssignToListLevelOfOutlineStyle(pColl-GetAssignedOutlineStyleLevel());
else
-   
pCColl-DeleteAssignmentToListLevelOfOutlineStyle();//--end,zhaojianwei
+   
pCColl-DeleteAssignmentToListLevelOfOutlineStyle();

svn commit: r1605717 - in /openoffice/trunk/main/sw/source/filter/ww8: ww8par.cxx ww8par.hxx ww8par5.cxx ww8par6.cxx

2014-06-26 Thread orw

Author: orw
Date: Thu Jun 26 09:24:49 2014
New Revision: 1605717

URL: http://svn.apache.org/r1605717
Log:
125122: WW8 import: Handle nested TOX fields
- only the content of nested TOX fields is imported, no TOX field itself


Modified:
openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1605717r1=1605716r2=1605717view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Thu Jun 26 09:24:49 
2014
@@ -3724,8 +3724,9 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uIn
 , nIdctHint(0)
 , bBidi(false)
 , bReadTable(false)
-, mbLoadingTOCCache(false)
-, mbLoadingTOCHyperlink(false)
+, mbLoadingTOXCache(false)
+, mnEmbeddedTOXLevel(0)
+, mbLoadingTOXHyperlink(false)
 , mpPosAfterTOC(0)
 , mbCareFirstParaEndInToc(false)
 , mbCareLastParaEndInToc(false)

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx?rev=1605717r1=1605716r2=1605717view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx Thu Jun 26 09:24:49 
2014
@@ -1216,10 +1216,12 @@ private:
 boost::shared_ptrSwPaM mpTableEndPaM;
 WW8PLCFx_Cp_FKP* pFirstTablePap;
 
-// Indicate that currently on loading a TOC, managed by Read_F_TOX() and 
End_Field()
-bool mbLoadingTOCCache;
-// Indicate that current on loading a hyperlink, which is inside a TOC; 
Managed by Read_F_Hyperlink() and End_Field()
-bool mbLoadingTOCHyperlink;
+// Indicate that currently on loading a TOX, managed by Read_F_TOX() and 
End_Field()
+bool mbLoadingTOXCache;
+int mnEmbeddedTOXLevel;
+
+// Indicate that current on loading a hyperlink, which is inside a TOX; 
Managed by Read_F_Hyperlink() and End_Field()
+bool mbLoadingTOXHyperlink;
 // a document position recorded the after-position of TOC section, managed 
by Read_F_TOX() and End_Field()
 SwPaM* mpPosAfterTOC;
 
@@ -1289,12 +1291,10 @@ private:
 void ImportTox( int nFldId, String aStr );
 
 void EndSprm( sal_uInt16 nId );
-// -- OD 2010-05-06 #i103711#
-// -- OD 2010-05-11 #i105414#
+
 void NewAttr( const SfxPoolItem rAttr,
   const bool bFirstLineOfStSet = false,
   const bool bLeftIndentSet = false );
-// --
 
 bool GetFontParams(sal_uInt16, FontFamily, String, FontPitch,
 rtl_TextEncoding);

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx?rev=1605717r1=1605716r2=1605717view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx Thu Jun 26 09:24:49 
2014
@@ -706,41 +706,48 @@ sal_uInt16 SwWW8ImplReader::End_Field()
 }
 }
 break;
-// Doing corresponding status management for TOC field, index 
field, hyperlink field and page reference field
+// Doing corresponding status management for TOX field, index 
field, hyperlink field and page reference field
 case 13://TOX
 case 8://index
-if (mbLoadingTOCCache)
+if ( mbLoadingTOXCache )
 {
-maTOXEndCps.insert(nCP);
-mbLoadingTOCCache = false;
-if ( pPaM-End()  
- pPaM-End()-nNode.GetNode().GetTxtNode()  
- pPaM-End()-nNode.GetNode().GetTxtNode()-Len() == 0 
)
+if ( mnEmbeddedTOXLevel  0 )
 {
-JoinNode(*pPaM);
+--mnEmbeddedTOXLevel;
 }
 else
 {
+maTOXEndCps.insert( nCP );
+mbLoadingTOXCache = false;
+if ( pPaM-End()
+  pPaM-End()-nNode.GetNode().GetTxtNode()
+  
pPaM-End()-nNode.GetNode().GetTxtNode()-Len() == 0 )
+{
+JoinNode( *pPaM );
+}
+else
+{
 mbCareLastParaEndInToc

svn commit: r1603723 - in /openoffice/branches/AOO410: ./ main/ main/sw/inc/ main/sw/source/core/crsr/ main/sw/source/core/doc/ main/sw/source/core/txtnode/

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 06:53:05 2014
New Revision: 1603723

URL: http://svn.apache.org/r1603723
Log:
125044: - use field's content cache on SwTxtFld construction only for 
clipboard documents
- assure invalidation and updates on code to update fields

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/inc/txtannotationfld.hxx
openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
openoffice/branches/AOO410/main/sw/source/core/crsr/crstrvl.cxx
openoffice/branches/AOO410/main/sw/source/core/doc/docfld.cxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/thints.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1602434

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1602434

Modified: openoffice/branches/AOO410/main/sw/inc/txtannotationfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/txtannotationfld.hxx?rev=1603723r1=1603722r2=1603723view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/txtannotationfld.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/txtannotationfld.hxx Thu Jun 19 
06:53:05 2014
@@ -33,7 +33,8 @@ class SwTxtAnnotationFld : public SwTxtF
 public:
 SwTxtAnnotationFld(
 SwFmtFld  rAttr,
-xub_StrLen const nStart );
+xub_StrLen const nStart,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtAnnotationFld();
 

Modified: openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/txtfld.hxx?rev=1603723r1=1603722r2=1603723view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/txtfld.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/txtfld.hxx Thu Jun 19 06:53:05 2014
@@ -41,18 +41,14 @@ class SwTxtFld : public SwTxtAttr
 public:
 SwTxtFld(
 SwFmtFld  rAttr,
-xub_StrLen const nStart );
+xub_StrLen const nStart,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtFld();
 
 void CopyTxtFld( SwTxtFld *pDest ) const;
 
-void ExpandTxtFld() const;
-inline void ExpandAlways()
-{
-m_aExpand += ' '; // changing current value to assure that 
ExpandTxtFld() changes the value.
-ExpandTxtFld();
-}
+void ExpandTxtFld( const bool bForceNotify = false ) const;
 
 // get and set TxtNode pointer
 inline SwTxtNode* GetpTxtNode() const
@@ -89,7 +85,8 @@ public:
 SwTxtInputFld(
 SwFmtFld  rAttr,
 xub_StrLen const nStart,
-xub_StrLen const nEnd );
+xub_StrLen const nEnd,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtInputFld();
 

Modified: openoffice/branches/AOO410/main/sw/source/core/crsr/crstrvl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/crsr/crstrvl.cxx?rev=1603723r1=1603722r2=1603723view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/crsr/crstrvl.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/crsr/crstrvl.cxx Thu Jun 19 
06:53:05 2014
@@ -722,7 +722,7 @@ sal_Bool SwCrsrShell::MoveFldType(
 SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
 (SwDateTimeFieldType*)pDoc-GetSysFldType( RES_DATETIMEFLD ) ) 
);
 
-pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() );
+pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(), 
pDoc-IsClipBoard() );
 pTxtFld-ChgTxtNode( pTNd );
 }
 

Modified: openoffice/branches/AOO410/main/sw/source/core/doc/docfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/doc/docfld.cxx?rev=1603723r1=1603722r2=1603723view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/doc/docfld.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/doc/docfld.cxx Thu Jun 19 
06:53:05 2014
@@ -2006,7 +2006,7 @@ void SwDoc::ChangeDBFields( const SvStri
}
 
if (bExpand)
-   pTxtFld-ExpandAlways();
+   pTxtFld-ExpandTxtFld( true );
}
SetModified();
 }

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx?rev=1603723r1=1603722r2=1603723view=diff

svn commit: r1603754 - in /openoffice/branches/AOO410: ./ main/ main/sw/inc/ndgrf.hxx main/sw/source/core/graphic/ndgrf.cxx main/sw/source/core/unocore/unoframe.cxx main/sw/source/filter/xml/xmltexte.

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 08:26:24 2014
New Revision: 1603754

URL: http://svn.apache.org/r1603754
Log:
114361: provide and accept changed URL of embedded graphic file during save 
(ODF export)

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx
openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx
openoffice/branches/AOO410/main/sw/source/core/unocore/unoframe.cxx
openoffice/branches/AOO410/main/sw/source/filter/xml/xmltexte.cxx
openoffice/branches/AOO410/main/xmloff/source/draw/shapeexport2.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1595847

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1595847

Modified: openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx?rev=1603754r1=1603753r2=1603754view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx Thu Jun 19 08:26:24 2014
@@ -25,52 +25,38 @@
 #include sfx2/lnkbase.hxx
 #include svtools/grfmgr.hxx
 #include ndnotxt.hxx
-// -- OD, MAV 2005-08-17 #i53025#
 #include com/sun/star/embed/XStorage.hpp
-// --
-// -- OD 2007-03-28 #i73788#
 #include boost/shared_ptr.hpp
 #include boost/weak_ptr.hpp
 class SwAsyncRetrieveInputStreamThreadConsumer;
-// --
 
 class SwGrfFmtColl;
 class SwDoc;
 class GraphicAttr;
 class SvStorage;
-// 
-// SwGrfNode
-// 
+
+
 class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
 {
-   friend class SwNodes;
+friend class SwNodes;
 
-   GraphicObject maGrfObj;
-   GraphicObject* mpReplacementGraphic;
+GraphicObject maGrfObj;
+GraphicObject* mpReplacementGraphic;
 ::sfx2::SvBaseLinkRef refLink;   // falls Grafik nur als Link, dann 
Pointer gesetzt
-   Size nGrfSize;
-// String aStrmName;   // SW3: Name des 
Storage-Streams fuer Embedded
-   String aNewStrmName;// SW3/XML: new stream name (either SW3 
stream
-   // name or 
package url)
-   String aLowResGrf;  // HTML: LowRes Grafik 
(Ersatzdarstellung bis
-   //  
die normale (HighRes) geladen ist.
-   sal_Bool bTransparentFlagValid  :1;
-   sal_Bool bInSwapIn  :1;
-
-   sal_Bool bGrafikArrived :1;
-   sal_Bool bChgTwipSize   :1;
-   sal_Bool bChgTwipSizeFromPixel  :1;
-   sal_Bool bLoadLowResGrf :1;
-   sal_Bool bFrameInPaint  :1; //Um Start-/EndActions 
im Paint (ueber
-   
//SwapIn zu verhindern.
-   sal_Bool bScaleImageMap :1; //Image-Map in SetTwipSize 
skalieren
+Size nGrfSize;
+sal_Bool bInSwapIn :1;
+
+sal_Bool bGrafikArrived :1;
+sal_Bool bChgTwipSize :1;
+sal_Bool bChgTwipSizeFromPixel :1;
+sal_Bool bLoadLowResGrf :1;
+sal_Bool bFrameInPaint :1;  // Um Start-/EndActions im Paint (ueber SwapIn 
zu verhindern.
+sal_Bool bScaleImageMap :1; // Image-Map in SetTwipSize skalieren
 
-// -- OD 2007-01-19 #i73788#
 boost::shared_ptr SwAsyncRetrieveInputStreamThreadConsumer  
mpThreadConsumer;
 bool mbLinkedInputStreamReady;
 com::sun::star::uno::Referencecom::sun::star::io::XInputStream 
mxInputStream;
 sal_Bool mbIsStreamReadOnly;
-// --
 
SwGrfNode( const SwNodeIndex rWhere,
   const String rGrfName, const String rFltName,
@@ -90,13 +76,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwN
void InsertLink( const String rGrfName, const String rFltName );
sal_Bool ImportGraphic( SvStream rStrm );
sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
-// -- OD 2005-05-04 #i48434# - adjust return type and rename method to
-// indicate that its an private one.
-// -- OD 2005-08-17 #i53025#
-// embedded graphic stream couldn't be inside a 3.1 - 5.2 storage any more.
-// Thus, return value isn't needed any more.
 void _GetStreamStorageNames( String rStrmName, String rStgName ) const;
-// --
void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
 
@@ -193,14 +173,18 @@ public:
  const GraphicObject* pGrfObj = 0,
  sal_Bool bModify = sal_True );
 // Laden der Grafik unmittelbar vor der Anzeige

svn commit: r1603757 - in /openoffice/branches/AOO410: ./ main/ main/sw/inc/ndgrf.hxx main/sw/source/core/graphic/ndgrf.cxx main/sw/source/filter/xml/xmltexte.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 08:42:48 2014
New Revision: 1603757

URL: http://svn.apache.org/r1603757
Log:
124946: only apply new embedded stream name for a graphic, if is already has 
one.
- needed correction for the fix made for issue 114361

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx
openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx
openoffice/branches/AOO410/main/sw/source/filter/xml/xmltexte.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1597102

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1597102

Modified: openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx?rev=1603757r1=1603756r2=1603757view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/ndgrf.hxx Thu Jun 19 08:42:48 2014
@@ -75,7 +75,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwN
 
void InsertLink( const String rGrfName, const String rFltName );
sal_Bool ImportGraphic( SvStream rStrm );
-   sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
 void _GetStreamStorageNames( String rStrmName, String rStgName ) const;
void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
@@ -177,6 +176,7 @@ public:
 // Entfernen der Grafik, um Speicher freizugeben
 short SwapOut();
 
+sal_Bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
 // applying new stream name for embedded graphic - needed as saving the 
document might change this stream name
 void ApplyNewEmbeddedStreamName( const String r )
 {

Modified: openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx?rev=1603757r1=1603756r2=1603757view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx Thu Jun 19 
08:42:48 2014
@@ -239,7 +239,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGraphic  !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new 
one is set.
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
maGrfObj.SetGraphic( *pGraphic );
@@ -249,7 +249,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGrfObj  !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new 
one is set.
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
maGrfObj = *pGrfObj;
@@ -265,7 +265,7 @@ sal_Bool SwGrfNode::ReRead(
 
else
{
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
// einen neuen Grafik-Link anlegen
@@ -546,21 +546,16 @@ short SwGrfNode::SwapIn( sal_Bool bWaitF
else
nRet = 1;
}
-   else if( maGrfObj.IsSwappedOut() )
-   {
-   // Die Grafik ist im Storage oder im TempFile drin
-   if( !HasStreamName() )
-   nRet = (short)maGrfObj.SwapIn();
-   else
-   {
+else if ( maGrfObj.IsSwappedOut() )
+{
+// Die Grafik ist im Storage oder im TempFile drin
+if ( !HasEmbeddedStreamName() )
+nRet = (short) maGrfObj.SwapIn();
+else
+{
 
-// -- OD 2005-05-04 #i48434# - usage of new method 
_GetStreamForEmbedGrf(..)
 try
 {
-// -- OD, MAV 2005-08-17 #i53025# - needed correction of new
-// method _GetStreamForEmbedGrf(..)
-//bool bGraphic(false);
-//SvStream* pStrm = _GetStreamForEmbedGrf( bGraphic );
 String aStrmName, aPicStgName;
 _GetStreamStorageNames( aStrmName, aPicStgName );
 uno::Reference  embed::XStorage  refPics = 
_GetDocSubstorageOrRoot( aPicStgName );
@@ -571,34 +566,30 @@ short SwGrfNode::SwapIn( sal_Bool bWaitF
 nRet = 1;
 delete pStrm;
 }
-// --
 }
 catch ( uno::Exception

svn commit: r1603774 - in /openoffice/branches/AOO410: ./ main/ main/svx/source/svdraw/svdograf.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:21:59 2014
New Revision: 1603774

URL: http://svn.apache.org/r1603774
Log:
124966: keep picture format information - GfxLink instance - also for the 
reading of preview picture data in order to avoid trouble on save in case that 
the preview data equals the picture data

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1597109

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1597109

Modified: openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx?rev=1603774r1=1603773r2=1603774view=diff
==
--- openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx (original)
+++ openoffice/branches/AOO410/main/svx/source/svdraw/svdograf.cxx Thu Jun 19 
09:21:59 2014
@@ -1537,9 +1537,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, Graph
 {
 pFilterData = new com::sun::star::uno::Sequence 
com::sun::star::beans::PropertyValue ( 3 );
 
-com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-sal_Bool bAllowPartialStreamRead = sal_True;
-sal_Bool bCreateNativeLink = sal_False;
+const com::sun::star::awt::Size aPreviewSizeHint( 64, 
64 );
+const sal_Bool bAllowPartialStreamRead = sal_True;
+// create GfxLink instance also for previews in 
order to avoid that its corresponding
+// data is cleared in the graphic cache entry in case 
that the preview data equals the complete graphic data
+const sal_Bool bCreateNativeLink = sal_True;
 (*pFilterData)[ 0 ].Name = String( 
RTL_CONSTASCII_USTRINGPARAM( PreviewSizeHint ) );
 (*pFilterData)[ 0 ].Value = aPreviewSizeHint;
 (*pFilterData)[ 1 ].Name = String( 
RTL_CONSTASCII_USTRINGPARAM( AllowPartialStreamRead ) );

svn commit: r1603785 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/core/txtnode/txtedt.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:36:09 2014
New Revision: 1603785

URL: http://svn.apache.org/r1603785
Log:
124877: method SwTxtNode::RstTxtAttr(..) - correct refactoring (made for 
issue 123389) causing serious endless loop

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/txtnode/txtedt.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1597076

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1597076

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/txtedt.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/txtedt.cxx?rev=1603785r1=1603784r2=1603785view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/txtedt.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/txtedt.cxx Thu Jun 
19 09:36:09 2014
@@ -640,8 +640,9 @@ void SwTxtNode::RstTxtAttr(
 }
 }
 }
-++i;
 }
+
+++i;
 }
 
 TryDeleteSwpHints();

svn commit: r1603787 - in /openoffice/branches/AOO410: ./ main/ main/svtools/source/filter/filter.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:38:35 2014
New Revision: 1603787

URL: http://svn.apache.org/r1603787
Log:
124717: do not mark *.svm graphic files as *.bmp graphic files

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1595851

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1595851

Modified: openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx?rev=1603787r1=1603786r2=1603787view=diff
==
--- openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx (original)
+++ openoffice/branches/AOO410/main/svtools/source/filter/filter.cxx Thu Jun 19 
09:38:35 2014
@@ -1630,8 +1630,8 @@ sal_uInt16 GraphicFilter::ImportGraphic(
if( !ImportXPM( rIStream, rGraphic ) )
nStatus = GRFILTER_FILTERERROR;
}
-else if( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) ||
-aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) )
+else if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP )
+  || aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) )
 {
 // SV interne Importfilter fuer Bitmaps und MetaFiles
 rIStream  rGraphic;
@@ -1642,8 +1642,11 @@ sal_uInt16 GraphicFilter::ImportGraphic(
 }
 else
 {
-// #15508# added BMP type (checked, works)
-eLinkType = GFX_LINK_TYPE_NATIVE_BMP;
+if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) )
+{
+// #15508# added BMP type (checked, works)
+eLinkType = GFX_LINK_TYPE_NATIVE_BMP;
+}
 }
 }
 else if( aFilterName.EqualsIgnoreCaseAscii( IMP_WMF ) ||

svn commit: r1603794 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/core/crsr/viscrs.cxx main/sw/source/core/inc/rootfrm.hxx main/sw/source/core/layout/trvlfrm.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:45:28 2014
New Revision: 1603794

URL: http://svn.apache.org/r1603794
Log:
125024: SwRootFrm::CalcFrmRects(..) - remove code regarding table selection as 
it is not used any more.

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/crsr/viscrs.cxx
openoffice/branches/AOO410/main/sw/source/core/inc/rootfrm.hxx
openoffice/branches/AOO410/main/sw/source/core/layout/trvlfrm.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1600581,1600587

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1600581,1600587

Modified: openoffice/branches/AOO410/main/sw/source/core/crsr/viscrs.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/crsr/viscrs.cxx?rev=1603794r1=1603793r2=1603794view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/crsr/viscrs.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/crsr/viscrs.cxx Thu Jun 19 
09:45:28 2014
@@ -815,13 +815,15 @@ void SwShellCrsr::SetMark()
 void SwShellCrsr::FillRects()
 {
 // die neuen Rechtecke berechnen
-if( HasMark() 
-GetPoint()-nNode.GetNode().IsCntntNode() 
-GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) 
-(GetMark()-nNode == GetPoint()-nNode ||
-(GetMark()-nNode.GetNode().IsCntntNode() 
-GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) )   ))
-GetShell()-GetLayout()-CalcFrmRects( *this, 
GetShell()-IsTableMode() ); //swmod 071107//swmod 071225
+if ( HasMark()
+  GetPoint()-nNode.GetNode().IsCntntNode()
+  GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() )
+  ( GetMark()-nNode == GetPoint()-nNode
+  || ( GetMark()-nNode.GetNode().IsCntntNode()
+GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) ) ) )
+{
+GetShell()-GetLayout()-CalcFrmRects( *this );
+}
 }
 
 

Modified: openoffice/branches/AOO410/main/sw/source/core/inc/rootfrm.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/inc/rootfrm.hxx?rev=1603794r1=1603793r2=1603794view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/inc/rootfrm.hxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/inc/rootfrm.hxx Thu Jun 19 
09:45:28 2014
@@ -268,9 +268,7 @@ public:
 // next page border
 const SwPageFrm* GetPageAtPos( const Point rPt, const Size* pSize = 0, 
bool bExtend = false ) const;
 
-void CalcFrmRects(
-SwShellCrsr,
-const sal_Bool bIsTblSel );
+void CalcFrmRects( SwShellCrsr );
 
 // Calculates the cells included from the current selection
 // false: There was no result because of an invalid layout

Modified: openoffice/branches/AOO410/main/sw/source/core/layout/trvlfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/layout/trvlfrm.cxx?rev=1603794r1=1603793r2=1603794view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/layout/trvlfrm.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/layout/trvlfrm.cxx Thu Jun 
19 09:45:28 2014
@@ -1982,9 +1982,6 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCur
  *Ende nach links erweitern, bis Frame-Start Rect berechnen
  *und bei mehr als 2 Frames von allen dazwischen liegenden
  *Frames die PrtArea dazu.
- * 4. Wenn es sich um eine Tabellenselektion handelt wird fuer jeden
- *PaM im Ring der CellFrm besorgt, dessen PrtArea wird zu den
- *Rechtecken addiert.
  *
  * Grosser Umbau wg. der FlyFrm; denn diese muessen ausgespart werden.
  * Ausnahmen: - Der Fly in dem die Selektion stattfindet (wenn sie in einem Fly
@@ -2006,8 +2003,7 @@ inline void Sub( SwRegionRects rRegion,
 }
 
 void SwRootFrm::CalcFrmRects(
-SwShellCrsr rCrsr,
-const sal_Bool bIsTblMode )
+SwShellCrsr rCrsr )
 {
 SwPosition *pStartPos = rCrsr.Start(),
*pEndPos   = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() : 
rCrsr.GetPoint();
@@ -2051,523 +2047,513 @@ void SwRootFrm::CalcFrmRects(
 }
 }
 
-//Fall 4: Tabellenselection
-if( bIsTblMode )
+// falls eine nicht erlaubte Selection besteht, dann korrigiere das
+// nicht erlaubt ist Header/Footer/TableHeadline ueber 2 Seiten
+do
+{  // middle check

svn commit: r1603799 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/core/graphic/ndgrf.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:51:56 2014
New Revision: 1603799

URL: http://svn.apache.org/r1603799
Log:
124999: As Writer graphics are no longer painted via the graphic manager - see 
SwNoTxtFrm::PaintPicture(..) - it is needed to swap out the Writer graphics 
automatically after a certain amount of time. -- 5000ms

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1600883

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1600883

Modified: openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx?rev=1603799r1=1603798r2=1603799view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/graphic/ndgrf.cxx Thu Jun 19 
09:51:56 2014
@@ -62,6 +62,11 @@
 using namespace com::sun::star;
 
 
+// As Writer graphics are no longer painted via the graphic manager - see 
SwNoTxtFrm::PaintPicture(..) -
+// it is needed to swap out the Writer graphics automatically after a certain 
amount of time.
+// -- 5000ms
+#define TIMETOSWAPOUTGRAPHICAUTOMATICALLY 5000
+
 // 
 // SwGrfNode
 // 
@@ -78,7 +83,7 @@ SwGrfNode::SwGrfNode(
   mbLinkedInputStreamReady( false ),
   mbIsStreamReadOnly( sal_False )
 {
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
 
 bGrafikArrived = sal_True;
@@ -97,7 +102,7 @@ SwGrfNode::SwGrfNode(
   mbIsStreamReadOnly( sal_False )
 {
 maGrfObj = rGrfObj;
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 if ( rGrfObj.HasUserData()  rGrfObj.IsSwappedOut() )
 maGrfObj.SetSwapState();
 bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
@@ -120,7 +125,7 @@ SwGrfNode::SwGrfNode(
   mbLinkedInputStreamReady( false ),
   mbIsStreamReadOnly( sal_False )
 {
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 
 Graphic aGrf;
 aGrf.SetDefaultType();

svn commit: r1603801 - in /openoffice/branches/AOO410: ./ main/ main/vcl/win/source/gdi/salbmp.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:55:51 2014
New Revision: 1603801

URL: http://svn.apache.org/r1603801
Log:
125000: WinSalBitmap::ImplCreateGdiPlusBitmap() - check last status of newly 
created Gdiplus::Bitmap instance before using it.

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/vcl/win/source/gdi/salbmp.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1600861

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1600861

Modified: openoffice/branches/AOO410/main/vcl/win/source/gdi/salbmp.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/win/source/gdi/salbmp.cxx?rev=1603801r1=1603800r2=1603801view=diff
==
--- openoffice/branches/AOO410/main/vcl/win/source/gdi/salbmp.cxx (original)
+++ openoffice/branches/AOO410/main/vcl/win/source/gdi/salbmp.cxx Thu Jun 19 
09:55:51 2014
@@ -310,24 +310,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreat
 
 if(pRetval)
 {
-sal_uInt8* pSrcRGB(pRGB-mpBits);
-const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
-const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
-const Gdiplus::Rect aAllRect(0, 0, nW, nH);
-Gdiplus::BitmapData aGdiPlusBitmapData;
-pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
-
-// copy data to Gdiplus::Bitmap; format is BGR here in both cases, 
so memcpy is possible
-for(sal_uInt32 y(0); y  nH; y++)
+if ( pRetval-GetLastStatus() == Gdiplus::Ok )
 {
-const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
-sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 
+ (nYInsert * aGdiPlusBitmapData.Stride);
+sal_uInt8* pSrcRGB(pRGB-mpBits);
+const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
+const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
+const Gdiplus::Rect aAllRect(0, 0, nW, nH);
+Gdiplus::BitmapData aGdiPlusBitmapData;
+pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
 
-memcpy(targetPixels, pSrcRGB, nW * 3);
-pSrcRGB += nW * 3 + nExtraRGB;
-}
+// copy data to Gdiplus::Bitmap; format is BGR here in both 
cases, so memcpy is possible
+for(sal_uInt32 y(0); y  nH; y++)
+{
+const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
+sal_uInt8* targetPixels = 
(sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride);
 
-pRetval-UnlockBits(aGdiPlusBitmapData);
+memcpy(targetPixels, pSrcRGB, nW * 3);
+pSrcRGB += nW * 3 + nExtraRGB;
+}
+
+pRetval-UnlockBits(aGdiPlusBitmapData);
+}
+else
+{
+delete pRetval;
+pRetval = NULL;
+}
 }
 }

svn commit: r1603803 - in /openoffice/branches/AOO410: ./ main/ main/sfx2/source/sidebar/SidebarDockingWindow.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 09:57:52 2014
New Revision: 1603803

URL: http://svn.apache.org/r1603803
Log:
124891: SidebarDockingWindow::GetFocus() - check, if sidebar controller is 
available before accessing it.

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1600630

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1600630

Modified: 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx?rev=1603803r1=1603802r2=1603803view=diff
==
--- 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx 
(original)
+++ 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx 
Thu Jun 19 09:57:52 2014
@@ -84,7 +84,10 @@ void SidebarDockingWindow::DoDispose (vo
 
 void SidebarDockingWindow::GetFocus()
 {
-mpSidebarController-GetFocusManager().GrabFocus();
+if (mpSidebarController.is())
+{
+mpSidebarController-GetFocusManager().GrabFocus();
+}
 }

svn commit: r1603804 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/ui/wrtsh/wrtsh2.cxx

2014-06-19 Thread orw

Author: orw
Date: Thu Jun 19 10:01:55 2014
New Revision: 1603804

URL: http://svn.apache.org/r1603804
Log:
125050: correct text range for comment/annotation at a table cell selection

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1600590

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1600590

Modified: openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx?rev=1603804r1=1603803r2=1603804view=diff
==
--- openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/wrtsh/wrtsh2.cxx Thu Jun 19 
10:01:55 2014
@@ -100,7 +100,10 @@ void SwWrtShell::Insert( SwField rFld )
 GetTblCrs()-Normalize( sal_False );
 const SwPosition rStartPos( 
*(GetTblCrs()-GetMark()-nNode.GetNode().GetCntntNode()), 0 );
 KillPams();
-EndPara();
+if ( !IsEndOfPara() )
+{
+EndPara();
+}
 const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint() 
);
 pAnnotationTextRange = new SwPaM( rStartPos, rEndPos );
 }

svn commit: r1602823 - /openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx

2014-06-16 Thread orw

Author: orw
Date: Mon Jun 16 08:40:28 2014
New Revision: 1602823

URL: http://svn.apache.org/r1602823
Log:
125055: follow-up of fix for issue 124338 - adjust condition to trigger sort of 
bookmarks in order to avoid serious performance decrease
Kudos to Ariel for his analysis


Modified:
openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx

Modified: openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx?rev=1602823r1=1602822r2=1602823view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/ndtxt.cxx Mon Jun 16 08:40:28 
2014
@@ -1080,6 +1080,8 @@ void SwTxtNode::Update(
 // Bookmarks must never grow to either side, when editing (directly) 
to the left or right (#i29942#)!
 // And a bookmark with same start and end must remain to the left of 
the inserted text (used in XML import).
 {
+bool bAtLeastOneBookmarkMoved = false;
+bool bAtLeastOneExpandedBookmarkAtInsertionPosition = false;
 const IDocumentMarkAccess* const pMarkAccess = 
getIDocumentMarkAccess();
 for ( IDocumentMarkAccess::const_iterator_t ppMark = 
pMarkAccess-getAllMarksBegin();
 ppMark != pMarkAccess-getAllMarksEnd();
@@ -1087,14 +1089,28 @@ void SwTxtNode::Update(
 {
 const ::sw::mark::IMark* const pMark = ppMark-get();
 const SwPosition* pEnd = pMark-GetMarkEnd();
-SwIndex  rIdx = const_castSwIndex(pEnd-nContent);
+SwIndex  rEndIdx = const_castSwIndex(pEnd-nContent);
 if( this == pEnd-nNode.GetNode() 
-rPos.GetIndex() == rIdx.GetIndex() )
+rPos.GetIndex() == rEndIdx.GetIndex() )
 {
-rIdx.Assign( aTmpIdxReg, rIdx.GetIndex() );
-bSortMarks = true;
+rEndIdx.Assign( aTmpIdxReg, rEndIdx.GetIndex() );
+bAtLeastOneBookmarkMoved = true;
+}
+else if ( !bAtLeastOneExpandedBookmarkAtInsertionPosition )
+{
+if ( pMark-IsExpanded() )
+{
+const SwPosition* pStart = pMark-GetMarkStart();
+if ( this == pStart-nNode.GetNode()
+  rPos.GetIndex() == pStart-nContent.GetIndex() 
)
+{
+bAtLeastOneExpandedBookmarkAtInsertionPosition = 
true;
+}
+}
 }
 }
+
+bSortMarks = bAtLeastOneBookmarkMoved  
bAtLeastOneExpandedBookmarkAtInsertionPosition;
 }
 }

svn commit: r1602833 - in /openoffice/branches/AOO410: ./ main/ main/sw/source/core/txtnode/ndtxt.cxx

2014-06-16 Thread orw

Author: orw
Date: Mon Jun 16 09:58:58 2014
New Revision: 1602833

URL: http://svn.apache.org/r1602833
Log:
125055: follow-up of fix for issue 124338 - adjust condition to trigger sort of 
bookmarks in order to avoid serious performance decrease
Kudos to Ariel for his analysis

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1602823

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1602823

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx?rev=1602833r1=1602832r2=1602833view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/ndtxt.cxx Mon Jun 16 
09:58:58 2014
@@ -1075,6 +1075,8 @@ void SwTxtNode::Update(
 // Bookmarks must never grow to either side, when editing (directly) 
to the left or right (#i29942#)!
 // And a bookmark with same start and end must remain to the left of 
the inserted text (used in XML import).
 {
+bool bAtLeastOneBookmarkMoved = false;
+bool bAtLeastOneExpandedBookmarkAtInsertionPosition = false;
 const IDocumentMarkAccess* const pMarkAccess = 
getIDocumentMarkAccess();
 for ( IDocumentMarkAccess::const_iterator_t ppMark = 
pMarkAccess-getAllMarksBegin();
 ppMark != pMarkAccess-getAllMarksEnd();
@@ -1082,14 +1084,28 @@ void SwTxtNode::Update(
 {
 const ::sw::mark::IMark* const pMark = ppMark-get();
 const SwPosition* pEnd = pMark-GetMarkEnd();
-SwIndex  rIdx = const_castSwIndex(pEnd-nContent);
+SwIndex  rEndIdx = const_castSwIndex(pEnd-nContent);
 if( this == pEnd-nNode.GetNode() 
-rPos.GetIndex() == rIdx.GetIndex() )
+rPos.GetIndex() == rEndIdx.GetIndex() )
 {
-rIdx.Assign( aTmpIdxReg, rIdx.GetIndex() );
-bSortMarks = true;
+rEndIdx.Assign( aTmpIdxReg, rEndIdx.GetIndex() );
+bAtLeastOneBookmarkMoved = true;
+}
+else if ( !bAtLeastOneExpandedBookmarkAtInsertionPosition )
+{
+if ( pMark-IsExpanded() )
+{
+const SwPosition* pStart = pMark-GetMarkStart();
+if ( this == pStart-nNode.GetNode()
+  rPos.GetIndex() == pStart-nContent.GetIndex() 
)
+{
+bAtLeastOneExpandedBookmarkAtInsertionPosition = 
true;
+}
+}
 }
 }
+
+bSortMarks = bAtLeastOneBookmarkMoved  
bAtLeastOneExpandedBookmarkAtInsertionPosition;
 }
 }

svn commit: r1602850 - in /openoffice/trunk/main/sw: inc/txtfld.hxx source/core/txtnode/atrfld.cxx source/core/unocore/unofield.cxx

2014-06-16 Thread orw

Author: orw
Date: Mon Jun 16 12:01:46 2014
New Revision: 1602850

URL: http://svn.apache.org/r1602850
Log:
125086: correct UNO-API implementation for com::sun::star::text::XTextField 
in Writer to reflect changes made for the in-place editing of Input Fields


Modified:
openoffice/trunk/main/sw/inc/txtfld.hxx
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
openoffice/trunk/main/sw/source/core/unocore/unofield.cxx

Modified: openoffice/trunk/main/sw/inc/txtfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/txtfld.hxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/inc/txtfld.hxx (original)
+++ openoffice/trunk/main/sw/inc/txtfld.hxx Mon Jun 16 12:01:46 2014
@@ -27,6 +27,8 @@
 #include tools/string.hxx
 #include pam.hxx
 
+#include boost/shared_ptr.hpp
+
 class SwTxtNode;
 
 // ATT_FLD ***
@@ -68,6 +70,13 @@ public:
 // enable notification that field content has changed and needs 
reformatting
 virtual void NotifyContentChange( SwFmtFld rFmtFld );
 
+// deletes the given field via removing the corresponding text selection 
from the document's content
+static void DeleteTxtFld( const SwTxtFld rTxtFld );
+
+// return text selection for the given field
+static void GetPamForTxtFld( const SwTxtFld rTxtFld,
+ boost::shared_ptr SwPaM  rPamForTxtFld );
+
 };
 
 class SwTxtInputFld : public SwTxtFld

Modified: openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx Mon Jun 16 12:01:46 
2014
@@ -456,6 +456,43 @@ void SwTxtFld::NotifyContentChange(SwFmt
 }
 
 
+/*static*/
+void SwTxtFld::GetPamForTxtFld(
+const SwTxtFld rTxtFld,
+boost::shared_ptr SwPaM  rPamForTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() == NULL )
+{
+ASSERT( false, SwTxtFld::GetPamForField - missing SwTxtNode );
+return;
+}
+
+const SwTxtNode rTxtNode = rTxtFld.GetTxtNode();
+
+rPamForTxtFld.reset( new SwPaM( rTxtNode,
+( (rTxtFld.End() != NULL) ? 
*(rTxtFld.End()) : ( *(rTxtFld.GetStart()) + 1 ) ),
+rTxtNode,
+*(rTxtFld.GetStart()) ) );
+
+}
+
+
+/*static*/
+void SwTxtFld::DeleteTxtFld( const SwTxtFld rTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() != NULL )
+{
+boost::shared_ptr SwPaM  pPamForTxtFld;
+GetPamForTxtFld( rTxtFld, pPamForTxtFld );
+if ( pPamForTxtFld.get() != NULL )
+{
+rTxtFld.GetTxtNode().GetDoc()-DeleteAndJoin( *pPamForTxtFld );
+}
+}
+}
+
+
+
 // input field in-place editing
 SwTxtInputFld::SwTxtInputFld(
 SwFmtFld  rAttr,

Modified: openoffice/trunk/main/sw/source/core/unocore/unofield.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unofield.cxx?rev=1602850r1=1602849r2=1602850view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unofield.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unofield.cxx Mon Jun 16 
12:01:46 2014
@@ -910,40 +910,37 @@ void SwXFieldMaster::removeVetoableChang
 
 void SwXFieldMaster::dispose(void) throw( 
uno::RuntimeException )
 {
-   vos::OGuard  aGuard(Application::GetSolarMutex());
-SwFieldType* pFldType = GetFldType(sal_True);
-   if(pFldType)
-   {
-   sal_uInt16 nTypeIdx = USHRT_MAX;
-   const SwFldTypes* pTypes = GetDoc()-GetFldTypes();
-   for( sal_uInt16 i = 0; i  pTypes-Count(); i++ )
-   {
-   if((*pTypes)[i] == pFldType)
-   nTypeIdx = i;
-   }
+vos::OGuard aGuard( Application::GetSolarMutex() );
 
-   // zuerst alle Felder loeschen
-   SwIteratorSwFmtFld,SwFieldType aIter( *pFldType );
-   SwFmtFld* pFld = aIter.First();
-   while(pFld)
-   {
-   // Feld im Undo?
-   SwTxtFld *pTxtFld = pFld-GetTxtFld();
-   if(pTxtFld  
pTxtFld-GetTxtNode().GetNodes().IsDocNodes() )
-   {
-   SwTxtNode rTxtNode = 
(SwTxtNode)*pTxtFld-GetpTxtNode();
-   SwPaM aPam(rTxtNode, *pTxtFld-GetStart());
-   aPam.SetMark();
-   aPam.Move();
-   GetDoc()-DeleteAndJoin(aPam

svn commit: r1602856 - in /openoffice/branches/AOO410: ./ main/ main/sw/inc/txtfld.hxx main/sw/source/core/txtnode/atrfld.cxx main/sw/source/core/unocore/unofield.cxx

2014-06-16 Thread orw

Author: orw
Date: Mon Jun 16 12:24:00 2014
New Revision: 1602856

URL: http://svn.apache.org/r1602856
Log:
125086: correct UNO-API implementation for com::sun::star::text::XTextField 
in Writer to reflect changes made for the in-place editing of Input Fields

cherry-picked from trunk


Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx

Propchange: openoffice/branches/AOO410/
--
  Merged /openoffice/trunk:r1602850

Propchange: openoffice/branches/AOO410/main/
--
  Merged /openoffice/trunk/main:r1602850

Modified: openoffice/branches/AOO410/main/sw/inc/txtfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/inc/txtfld.hxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/inc/txtfld.hxx (original)
+++ openoffice/branches/AOO410/main/sw/inc/txtfld.hxx Mon Jun 16 12:24:00 2014
@@ -27,6 +27,8 @@
 #include tools/string.hxx
 #include pam.hxx
 
+#include boost/shared_ptr.hpp
+
 class SwTxtNode;
 
 // ATT_FLD ***
@@ -72,6 +74,13 @@ public:
 // enable notification that field content has changed and needs 
reformatting
 virtual void NotifyContentChange( SwFmtFld rFmtFld );
 
+// deletes the given field via removing the corresponding text selection 
from the document's content
+static void DeleteTxtFld( const SwTxtFld rTxtFld );
+
+// return text selection for the given field
+static void GetPamForTxtFld( const SwTxtFld rTxtFld,
+ boost::shared_ptr SwPaM  rPamForTxtFld );
+
 };
 
 class SwTxtInputFld : public SwTxtFld

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx Mon Jun 
16 12:24:00 2014
@@ -449,6 +449,43 @@ void SwTxtFld::NotifyContentChange(SwFmt
 }
 
 
+/*static*/
+void SwTxtFld::GetPamForTxtFld(
+const SwTxtFld rTxtFld,
+boost::shared_ptr SwPaM  rPamForTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() == NULL )
+{
+ASSERT( false, SwTxtFld::GetPamForField - missing SwTxtNode );
+return;
+}
+
+const SwTxtNode rTxtNode = rTxtFld.GetTxtNode();
+
+rPamForTxtFld.reset( new SwPaM( rTxtNode,
+( (rTxtFld.End() != NULL) ? 
*(rTxtFld.End()) : ( *(rTxtFld.GetStart()) + 1 ) ),
+rTxtNode,
+*(rTxtFld.GetStart()) ) );
+
+}
+
+
+/*static*/
+void SwTxtFld::DeleteTxtFld( const SwTxtFld rTxtFld )
+{
+if ( rTxtFld.GetpTxtNode() != NULL )
+{
+boost::shared_ptr SwPaM  pPamForTxtFld;
+GetPamForTxtFld( rTxtFld, pPamForTxtFld );
+if ( pPamForTxtFld.get() != NULL )
+{
+rTxtFld.GetTxtNode().GetDoc()-DeleteAndJoin( *pPamForTxtFld );
+}
+}
+}
+
+
+
 // input field in-place editing
 SwTxtInputFld::SwTxtInputFld(
 SwFmtFld  rAttr,

Modified: openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx?rev=1602856r1=1602855r2=1602856view=diff
==
--- openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx 
(original)
+++ openoffice/branches/AOO410/main/sw/source/core/unocore/unofield.cxx Mon Jun 
16 12:24:00 2014
@@ -910,40 +910,37 @@ void SwXFieldMaster::removeVetoableChang
 
 void SwXFieldMaster::dispose(void) throw( 
uno::RuntimeException )
 {
-   vos::OGuard  aGuard(Application::GetSolarMutex());
-SwFieldType* pFldType = GetFldType(sal_True);
-   if(pFldType)
-   {
-   sal_uInt16 nTypeIdx = USHRT_MAX;
-   const SwFldTypes* pTypes = GetDoc()-GetFldTypes();
-   for( sal_uInt16 i = 0; i  pTypes-Count(); i++ )
-   {
-   if((*pTypes)[i] == pFldType)
-   nTypeIdx = i;
-   }
+vos::OGuard aGuard( Application::GetSolarMutex() );
 
-   // zuerst alle Felder loeschen
-   SwIteratorSwFmtFld,SwFieldType aIter( *pFldType );
-   SwFmtFld* pFld

svn commit: r1602434 - in /openoffice/trunk/main/sw: inc/txtannotationfld.hxx inc/txtfld.hxx source/core/crsr/crstrvl.cxx source/core/doc/docfld.cxx source/core/txtnode/atrfld.cxx source/core/txtnode/

2014-06-13 Thread orw

Author: orw
Date: Fri Jun 13 14:08:22 2014
New Revision: 1602434

URL: http://svn.apache.org/r1602434
Log:
125044: - use field's content cache on SwTxtFld construction only for 
clipboard documents
- assure invalidation and updates on code to update fields


Modified:
openoffice/trunk/main/sw/inc/txtannotationfld.hxx
openoffice/trunk/main/sw/inc/txtfld.hxx
openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx
openoffice/trunk/main/sw/source/core/doc/docfld.cxx
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
openoffice/trunk/main/sw/source/core/txtnode/thints.cxx

Modified: openoffice/trunk/main/sw/inc/txtannotationfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/txtannotationfld.hxx?rev=1602434r1=1602433r2=1602434view=diff
==
--- openoffice/trunk/main/sw/inc/txtannotationfld.hxx (original)
+++ openoffice/trunk/main/sw/inc/txtannotationfld.hxx Fri Jun 13 14:08:22 2014
@@ -33,7 +33,8 @@ class SwTxtAnnotationFld : public SwTxtF
 public:
 SwTxtAnnotationFld(
 SwFmtFld  rAttr,
-xub_StrLen const nStart );
+xub_StrLen const nStart,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtAnnotationFld();
 

Modified: openoffice/trunk/main/sw/inc/txtfld.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/txtfld.hxx?rev=1602434r1=1602433r2=1602434view=diff
==
--- openoffice/trunk/main/sw/inc/txtfld.hxx (original)
+++ openoffice/trunk/main/sw/inc/txtfld.hxx Fri Jun 13 14:08:22 2014
@@ -39,18 +39,14 @@ class SwTxtFld : public SwTxtAttr
 public:
 SwTxtFld(
 SwFmtFld  rAttr,
-xub_StrLen const nStart );
+xub_StrLen const nStart,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtFld();
 
 void CopyTxtFld( SwTxtFld *pDest ) const;
 
-void ExpandTxtFld() const;
-inline void ExpandAlways()
-{
-m_aExpand += ' '; // changing current value to assure that 
ExpandTxtFld() changes the value.
-ExpandTxtFld();
-}
+void ExpandTxtFld( const bool bForceNotify = false ) const;
 
 // get and set TxtNode pointer
 inline SwTxtNode* GetpTxtNode() const
@@ -80,7 +76,8 @@ public:
 SwTxtInputFld(
 SwFmtFld  rAttr,
 xub_StrLen const nStart,
-xub_StrLen const nEnd );
+xub_StrLen const nEnd,
+const bool bIsClipboardDoc );
 
 virtual ~SwTxtInputFld();
 

Modified: openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx?rev=1602434r1=1602433r2=1602434view=diff
==
--- openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx Fri Jun 13 14:08:22 
2014
@@ -722,7 +722,7 @@ sal_Bool SwCrsrShell::MoveFldType(
 SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
 (SwDateTimeFieldType*)pDoc-GetSysFldType( RES_DATETIMEFLD ) ) 
);
 
-pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() );
+pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(), 
pDoc-IsClipBoard() );
 pTxtFld-ChgTxtNode( pTNd );
 }
 

Modified: openoffice/trunk/main/sw/source/core/doc/docfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docfld.cxx?rev=1602434r1=1602433r2=1602434view=diff
==
--- openoffice/trunk/main/sw/source/core/doc/docfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docfld.cxx Fri Jun 13 14:08:22 2014
@@ -2006,7 +2006,7 @@ void SwDoc::ChangeDBFields( const SvStri
}
 
if (bExpand)
-   pTxtFld-ExpandAlways();
+   pTxtFld-ExpandTxtFld( true );
}
SetModified();
 }

Modified: openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx?rev=1602434r1=1602433r2=1602434view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx Fri Jun 13 14:08:22 
2014
@@ -218,71 +218,76 @@ void SwFmtFld::SwClientNotify( const SwM
 
 void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
-   if( !mpTxtFld )
-   return;
+if ( mpTxtFld == NULL )
+return;
 
-// don't do anything, especially not expand!
-if( pNew  pNew-Which() == RES_OBJECTDYING )
+if( pNew != NULL
+ pNew-Which() == RES_OBJECTDYING )
+{
+// don't do anything, especially not expand!
 return

svn propchange: r1601654 - svn:log

2014-06-10 Thread orw

Author: orw
Revision: 1601654
Modified property: svn:log

Modified: svn:log at Tue Jun 10 14:45:01 2014
--
--- svn:log (original)
+++ svn:log Tue Jun 10 14:45:01 2014
@@ -1,4 +1,4 @@
-125073: method SwFrameProperties_Impl::AnyToItemSet(..) - map given style 
name to corresponding UI name before searching for it.
+125072: method SwFrameProperties_Impl::AnyToItemSet(..) - map given style 
name to corresponding UI name before searching for it.
 
Patch by: Elie Roux  - roux dot elie at gmail dot com

svn commit: r1601656 - /openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx

2014-06-10 Thread orw

Author: orw
Date: Tue Jun 10 14:49:06 2014
New Revision: 1601656

URL: http://svn.apache.org/r1601656
Log:
125072: method SwGraphicProperties_Impl::AnyToItemSet(..) - map given style 
name to corresponding UI name before searching for it.


Modified:
openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx

Modified: openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx?rev=1601656r1=1601655r2=1601656view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx Tue Jun 10 
14:49:06 2014
@@ -991,24 +991,25 @@ inline void lcl_FillMirror ( SfxItemSet 
}
 }
 
-sal_Bool   SwGraphicProperties_Impl::AnyToItemSet(
-   SwDoc* pDoc,
-   SfxItemSet rFrmSet,
-SfxItemSet rGrSet,
-sal_Bool rSizeFound)
+sal_Bool SwGraphicProperties_Impl::AnyToItemSet(
+SwDoc* pDoc,
+SfxItemSet rFrmSet,
+SfxItemSet rGrSet,
+sal_Bool rSizeFound )
 {
-   //Properties fuer alle Frames
-   sal_Bool bRet;
-const ::uno::Any *pStyleName;
-   SwDocStyleSheet* pStyle = NULL;
+sal_Bool bRet = sal_False;
 
-   if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
-   {
-   OUString sStyle;
-   *pStyleName = sStyle;
-   pStyle = 
(SwDocStyleSheet*)pDoc-GetDocShell()-GetStyleSheetPool()-Find(sStyle,
-   
SFX_STYLE_FAMILY_FRAME);
-   }
+SwDocStyleSheet* pStyle = NULL;
+const ::uno::Any *pStyleName;
+if ( GetProperty( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
+{
+OUString sTmpStylename;
+*pStyleName = sTmpStylename;
+String sStylename;
+SwStyleNameMapper::FillUIName( String(sTmpStylename), sStylename, 
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, sal_True );
+pStyle =
+(SwDocStyleSheet*) pDoc-GetDocShell()-GetStyleSheetPool()-Find( 
sStylename, SFX_STYLE_FAMILY_FRAME );
+}
 
 const ::uno::Any* pHEvenMirror = 0;
 const ::uno::Any* pHOddMirror = 0;
@@ -1017,24 +1018,22 @@ sal_BoolSwGraphicProperties_Impl::AnyT
 GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_HORZ_ODD_PAGES, pHOddMirror);
 GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_VERT, pVMirror);
 
-if ( pStyle )
+if ( pStyle != NULL )
 {
 rtl::Reference SwDocStyleSheet  xStyle( new SwDocStyleSheet(*pStyle) 
);
 const :: SfxItemSet *pItemSet = xStyle-GetItemSet();
-//Begin Bug 119922
 sal_Bool bOasis = sal_False;
 {
 const SfxMedium* pMedium = pDoc-GetDocShell()-GetMedium();
-const SfxFilter * pFilter = pMedium
-? pMedium-GetFilter()
-: NULL;
-if ( pMedium  pFilter )
+const SfxFilter * pFilter = pMedium != NULL
+? pMedium-GetFilter()
+: NULL;
+if ( pFilter != NULL )
 {
 bOasis = pFilter-GetVersion()  SOFFICE_FILEFORMAT_60;
 }
 }
 bRet = FillBaseProperties( rFrmSet, *pItemSet, rSizeFound, bOasis );
-//End Bug 119922
 lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, 
pVMirror, bRet );
 }
 else
@@ -1044,38 +1043,38 @@ sal_BoolSwGraphicProperties_Impl::AnyT
 lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, 
pVMirror, bRet );
 }
 
-
-static const :: sal_uInt16 nIDs[] =
-   {
-   RES_GRFATR_CROPGRF,
-   RES_GRFATR_ROTATION,
-   RES_GRFATR_LUMINANCE,
-   RES_GRFATR_CONTRAST,
-   RES_GRFATR_CHANNELR,
-   RES_GRFATR_CHANNELG,
-   RES_GRFATR_CHANNELB,
-   RES_GRFATR_GAMMA,
-   RES_GRFATR_INVERT,
-   RES_GRFATR_TRANSPARENCY,
-   RES_GRFATR_DRAWMODE,
-   0
-   };
+static const ::sal_uInt16 nIDs[] =
+{
+RES_GRFATR_CROPGRF,
+RES_GRFATR_ROTATION,
+RES_GRFATR_LUMINANCE,
+RES_GRFATR_CONTRAST,
+RES_GRFATR_CHANNELR,
+RES_GRFATR_CHANNELG,
+RES_GRFATR_CHANNELB,
+RES_GRFATR_GAMMA,
+RES_GRFATR_INVERT,
+RES_GRFATR_TRANSPARENCY,
+RES_GRFATR_DRAWMODE,
+0
+};
 const ::uno::Any* pAny;
-   for(sal_Int16 nIndex = 0; nIDs[nIndex]; nIndex++)
-   {
-   sal_uInt8 nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? 
CONVERT_TWIPS : 0;
-if(GetProperty(nIDs[nIndex], nMId, pAny ))
-   {
-   SfxPoolItem* pItem = ::GetDfltAttr( nIDs[nIndex] 
)-Clone();
-bRet

svn commit: r1601654 - /openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx

2014-06-10 Thread orw

Author: orw
Date: Tue Jun 10 14:43:28 2014
New Revision: 1601654

URL: http://svn.apache.org/r1601654
Log:
125073: method SwFrameProperties_Impl::AnyToItemSet(..) - map given style 
name to corresponding UI name before searching for it.

Patch by: Elie Roux  - roux dot elie at gmail dot com


Modified:
openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx

Modified: openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx?rev=1601654r1=1601653r2=1601654view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx Tue Jun 10 
14:43:28 2014
@@ -912,44 +912,51 @@ inline void lcl_FillCol ( SfxItemSet rT
rToSet.Put(aCol);
}
 }
-sal_BoolSwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet 
rSet, SfxItemSet, sal_Bool rSizeFound)
+sal_Bool SwFrameProperties_Impl::AnyToItemSet(
+SwDoc *pDoc,
+SfxItemSet rSet,
+SfxItemSet,
+sal_Bool rSizeFound )
 {
-   //Properties fuer alle Frames
-const ::uno::Any *pStyleName;
-   SwDocStyleSheet* pStyle = NULL;
-   sal_Bool bRet;
+sal_Bool bRet = sal_False;
 
-   if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
-   {
-   OUString sStyle;
-   *pStyleName = sStyle;
-   pStyle = 
(SwDocStyleSheet*)pDoc-GetDocShell()-GetStyleSheetPool()-Find(sStyle,
-   
SFX_STYLE_FAMILY_FRAME);
-   }
+SwDocStyleSheet* pStyle = NULL;
+const ::uno::Any *pStyleName;
+if ( GetProperty( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
+{
+OUString sTmpStylename;
+*pStyleName = sTmpStylename;
+String sStylename;
+SwStyleNameMapper::FillUIName( String(sTmpStylename), sStylename, 
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, sal_True );
+pStyle =
+(SwDocStyleSheet*) pDoc-GetDocShell()-GetStyleSheetPool()-Find( 
sStylename, SFX_STYLE_FAMILY_FRAME );
+}
 
 const ::uno::Any* pColumns = NULL;
-GetProperty (RES_COL, MID_COLUMNS, pColumns);
-if ( pStyle )
+GetProperty( RES_COL, MID_COLUMNS, pColumns );
+if ( pStyle != NULL )
 {
-   rtl::Reference SwDocStyleSheet  xStyle( new SwDocStyleSheet( 
*pStyle ) );
-const :: SfxItemSet *pItemSet = xStyle-GetItemSet();
-   bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
-   lcl_FillCol ( rSet, *pItemSet, pColumns );
+rtl::Reference SwDocStyleSheet  xStyle( new SwDocStyleSheet( *pStyle 
) );
+const ::SfxItemSet *pItemSet = xStyle-GetItemSet();
+bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
+lcl_FillCol( rSet, *pItemSet, pColumns );
 }
-   else
-   {
-const :: SfxItemSet *pItemSet = pDoc-GetFrmFmtFromPool( 
RES_POOLFRM_FRAME )-GetAttrSet();
-   bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
-   lcl_FillCol ( rSet, *pItemSet, pColumns );
-   }
+else
+{
+const ::SfxItemSet *pItemSet = pDoc-GetFrmFmtFromPool( 
RES_POOLFRM_FRAME )-GetAttrSet();
+bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
+lcl_FillCol( rSet, *pItemSet, pColumns );
+}
+
 const ::uno::Any* pEdit;
-if(GetProperty(RES_EDIT_IN_READONLY, 0, pEdit))
-   {
-   SfxBoolItem aBool(RES_EDIT_IN_READONLY);
-   ((SfxPoolItem)aBool).PutValue(*pEdit, 0);
-   rSet.Put(aBool);
-   }
-   return bRet;
+if ( GetProperty( RES_EDIT_IN_READONLY, 0, pEdit ) )
+{
+SfxBoolItem aBool( RES_EDIT_IN_READONLY );
+( (SfxPoolItem) aBool ).PutValue( *pEdit, 0 );
+rSet.Put( aBool );
+}
+
+return bRet;
 }
 /
Grafik-Descriptor

svn commit: r1600861 - /openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx

2014-06-06 Thread orw

Author: orw
Date: Fri Jun  6 12:07:49 2014
New Revision: 1600861

URL: http://svn.apache.org/r1600861
Log:
125000: WinSalBitmap::ImplCreateGdiPlusBitmap() - check last status of newly 
created Gdiplus::Bitmap instance before using it.


Modified:
openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx

Modified: openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx?rev=1600861r1=1600860r2=1600861view=diff
==
--- openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx (original)
+++ openoffice/trunk/main/vcl/win/source/gdi/salbmp.cxx Fri Jun  6 12:07:49 2014
@@ -310,24 +310,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreat
 
 if(pRetval)
 {
-sal_uInt8* pSrcRGB(pRGB-mpBits);
-const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
-const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
-const Gdiplus::Rect aAllRect(0, 0, nW, nH);
-Gdiplus::BitmapData aGdiPlusBitmapData;
-pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
-
-// copy data to Gdiplus::Bitmap; format is BGR here in both cases, 
so memcpy is possible
-for(sal_uInt32 y(0); y  nH; y++)
+if ( pRetval-GetLastStatus() == Gdiplus::Ok )
 {
-const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
-sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 
+ (nYInsert * aGdiPlusBitmapData.Stride);
+sal_uInt8* pSrcRGB(pRGB-mpBits);
+const sal_uInt32 nExtraRGB(pRGB-mnScanlineSize - (nW * 3));
+const bool bTopDown(pRGB-mnFormat  BMP_FORMAT_TOP_DOWN);
+const Gdiplus::Rect aAllRect(0, 0, nW, nH);
+Gdiplus::BitmapData aGdiPlusBitmapData;
+pRetval-LockBits(aAllRect, Gdiplus::ImageLockModeWrite, 
PixelFormat24bppRGB, aGdiPlusBitmapData);
 
-memcpy(targetPixels, pSrcRGB, nW * 3);
-pSrcRGB += nW * 3 + nExtraRGB;
-}
+// copy data to Gdiplus::Bitmap; format is BGR here in both 
cases, so memcpy is possible
+for(sal_uInt32 y(0); y  nH; y++)
+{
+const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1);
+sal_uInt8* targetPixels = 
(sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride);
 
-pRetval-UnlockBits(aGdiPlusBitmapData);
+memcpy(targetPixels, pSrcRGB, nW * 3);
+pSrcRGB += nW * 3 + nExtraRGB;
+}
+
+pRetval-UnlockBits(aGdiPlusBitmapData);
+}
+else
+{
+delete pRetval;
+pRetval = NULL;
+}
 }
 }

svn commit: r1600883 - /openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx

2014-06-06 Thread orw

Author: orw
Date: Fri Jun  6 13:31:32 2014
New Revision: 1600883

URL: http://svn.apache.org/r1600883
Log:
124999: As Writer graphics are no longer painted via the graphic manager - see 
SwNoTxtFrm::PaintPicture(..) - it is needed to swap out the Writer graphics 
automatically after a certain amount of time. -- 5000ms


Modified:
openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx

Modified: openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx?rev=1600883r1=1600882r2=1600883view=diff
==
--- openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx Fri Jun  6 13:31:32 
2014
@@ -62,6 +62,11 @@
 using namespace com::sun::star;
 
 
+// As Writer graphics are no longer painted via the graphic manager - see 
SwNoTxtFrm::PaintPicture(..) -
+// it is needed to swap out the Writer graphics automatically after a certain 
amount of time.
+// -- 5000ms
+#define TIMETOSWAPOUTGRAPHICAUTOMATICALLY 5000
+
 // 
 // SwGrfNode
 // 
@@ -78,7 +83,7 @@ SwGrfNode::SwGrfNode(
   mbLinkedInputStreamReady( false ),
   mbIsStreamReadOnly( sal_False )
 {
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
 
 bGrafikArrived = sal_True;
@@ -97,7 +102,7 @@ SwGrfNode::SwGrfNode(
   mbIsStreamReadOnly( sal_False )
 {
 maGrfObj = rGrfObj;
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 if ( rGrfObj.HasUserData()  rGrfObj.IsSwappedOut() )
 maGrfObj.SetSwapState();
 bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
@@ -120,7 +125,7 @@ SwGrfNode::SwGrfNode(
   mbLinkedInputStreamReady( false ),
   mbIsStreamReadOnly( sal_False )
 {
-maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 
 Graphic aGrf;
 aGrf.SetDefaultType();

svn commit: r1600581 - in /openoffice/trunk/main/sw/source/core: crsr/viscrs.cxx inc/rootfrm.hxx layout/trvlfrm.cxx

2014-06-05 Thread orw

Author: orw
Date: Thu Jun  5 10:06:45 2014
New Revision: 1600581

URL: http://svn.apache.org/r1600581
Log:
125024: SwRootFrm::CalcFrmRects(..) - remove code regarding table selection as 
it is not used any more.


Modified:
openoffice/trunk/main/sw/source/core/crsr/viscrs.cxx
openoffice/trunk/main/sw/source/core/inc/rootfrm.hxx
openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx

Modified: openoffice/trunk/main/sw/source/core/crsr/viscrs.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/viscrs.cxx?rev=1600581r1=1600580r2=1600581view=diff
==
--- openoffice/trunk/main/sw/source/core/crsr/viscrs.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/viscrs.cxx Thu Jun  5 10:06:45 
2014
@@ -815,13 +815,15 @@ void SwShellCrsr::SetMark()
 void SwShellCrsr::FillRects()
 {
 // die neuen Rechtecke berechnen
-if( HasMark() 
-GetPoint()-nNode.GetNode().IsCntntNode() 
-GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) 
-(GetMark()-nNode == GetPoint()-nNode ||
-(GetMark()-nNode.GetNode().IsCntntNode() 
-GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) )   ))
-GetShell()-GetLayout()-CalcFrmRects( *this, 
GetShell()-IsTableMode() ); //swmod 071107//swmod 071225
+if ( HasMark()
+  GetPoint()-nNode.GetNode().IsCntntNode()
+  GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() )
+  ( GetMark()-nNode == GetPoint()-nNode
+  || ( GetMark()-nNode.GetNode().IsCntntNode()
+GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm( 
GetShell()-GetLayout() ) ) ) )
+{
+GetShell()-GetLayout()-CalcFrmRects( *this );
+}
 }
 
 

Modified: openoffice/trunk/main/sw/source/core/inc/rootfrm.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/inc/rootfrm.hxx?rev=1600581r1=1600580r2=1600581view=diff
==
--- openoffice/trunk/main/sw/source/core/inc/rootfrm.hxx (original)
+++ openoffice/trunk/main/sw/source/core/inc/rootfrm.hxx Thu Jun  5 10:06:45 
2014
@@ -268,9 +268,7 @@ public:
 // next page border
 const SwPageFrm* GetPageAtPos( const Point rPt, const Size* pSize = 0, 
bool bExtend = false ) const;
 
-void CalcFrmRects(
-SwShellCrsr,
-const sal_Bool bIsTblSel );
+void CalcFrmRects( SwShellCrsr );
 
 // Calculates the cells included from the current selection
 // false: There was no result because of an invalid layout

Modified: openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx?rev=1600581r1=1600580r2=1600581view=diff
==
--- openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx Thu Jun  5 10:06:45 
2014
@@ -2006,8 +2006,7 @@ inline void Sub( SwRegionRects rRegion,
 }
 
 void SwRootFrm::CalcFrmRects(
-SwShellCrsr rCrsr,
-const sal_Bool bIsTblMode )
+SwShellCrsr rCrsr )
 {
 SwPosition *pStartPos = rCrsr.Start(),
*pEndPos   = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() : 
rCrsr.GetPoint();
@@ -2051,523 +2050,513 @@ void SwRootFrm::CalcFrmRects(
 }
 }
 
-//Fall 4: Tabellenselection
-if( bIsTblMode )
+// falls eine nicht erlaubte Selection besteht, dann korrigiere das
+// nicht erlaubt ist Header/Footer/TableHeadline ueber 2 Seiten
+do
+{  // middle check loop
+const SwLayoutFrm* pSttLFrm = pStartFrm-GetUpper();
+const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
+while ( pSttLFrm
+ !( cHdFtTblHd  pSttLFrm-GetType() ) )
+{
+pSttLFrm = pSttLFrm-GetUpper();
+}
+if ( !pSttLFrm )
+break;
+const SwLayoutFrm* pEndLFrm = pEndFrm-GetUpper();
+while ( pEndLFrm
+ !( cHdFtTblHd  pEndLFrm-GetType() ) )
+{
+pEndLFrm = pEndLFrm-GetUpper();
+}
+if ( !pEndLFrm )
+break;
+
+ASSERT( pEndLFrm-GetType() == pSttLFrm-GetType(),
+Selection ueber unterschiedliche Inhalte );
+switch (pSttLFrm-GetType())
+{
+case FRM_HEADER:
+case FRM_FOOTER:
+// auf unterschiedlichen Seiten ??
+// dann immer auf die Start-Seite
+if ( pEndLFrm-FindPageFrm() != pSttLFrm-FindPageFrm() )
+{
+// End- auf den Start-CntntFrame setzen
+if ( pStartPos == rCrsr.GetPoint() )
+pEndFrm = pStartFrm;
+else
+pStartFrm = pEndFrm

svn commit: r1600587 - /openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx

2014-06-05 Thread orw

Author: orw
Date: Thu Jun  5 10:37:14 2014
New Revision: 1600587

URL: http://svn.apache.org/r1600587
Log:
125024: minor follow-up to the fix - remove (German) comment


Modified:
openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx

Modified: openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx?rev=1600587r1=1600586r2=1600587view=diff
==
--- openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx Thu Jun  5 10:37:14 
2014
@@ -1982,9 +1982,6 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCur
  *Ende nach links erweitern, bis Frame-Start Rect berechnen
  *und bei mehr als 2 Frames von allen dazwischen liegenden
  *Frames die PrtArea dazu.
- * 4. Wenn es sich um eine Tabellenselektion handelt wird fuer jeden
- *PaM im Ring der CellFrm besorgt, dessen PrtArea wird zu den
- *Rechtecken addiert.
  *
  * Grosser Umbau wg. der FlyFrm; denn diese muessen ausgespart werden.
  * Ausnahmen: - Der Fly in dem die Selektion stattfindet (wenn sie in einem Fly

svn commit: r1600590 - /openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx

2014-06-05 Thread orw

Author: orw
Date: Thu Jun  5 10:49:57 2014
New Revision: 1600590

URL: http://svn.apache.org/r1600590
Log:
125050: correct text range for comment/annotation at a table cell selection


Modified:
openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx

Modified: openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx?rev=1600590r1=1600589r2=1600590view=diff
==
--- openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx Thu Jun  5 10:49:57 2014
@@ -100,7 +100,10 @@ void SwWrtShell::Insert( SwField rFld )
 GetTblCrs()-Normalize( sal_False );
 const SwPosition rStartPos( 
*(GetTblCrs()-GetMark()-nNode.GetNode().GetCntntNode()), 0 );
 KillPams();
-EndPara();
+if ( !IsEndOfPara() )
+{
+EndPara();
+}
 const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint() 
);
 pAnnotationTextRange = new SwPaM( rStartPos, rEndPos );
 }

svn propchange: r1600630 - svn:log

2014-06-05 Thread orw

Author: orw
Revision: 1600630
Modified property: svn:log

Modified: svn:log at Thu Jun  5 12:36:33 2014
--
--- svn:log (original)
+++ svn:log Thu Jun  5 12:36:33 2014
@@ -1,2 +1,2 @@
-124892: SidebarDockingWindow::GetFocus() - check, if sidebar controller is 
available before accessing it.
+124891: SidebarDockingWindow::GetFocus() - check, if sidebar controller is 
available before accessing it.

svn commit: r1597076 - /openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx

2014-05-23 Thread orw

Author: orw
Date: Fri May 23 12:23:40 2014
New Revision: 1597076

URL: http://svn.apache.org/r1597076
Log:
124877: method SwTxtNode::RstTxtAttr(..) - correct refactoring (made for 
issue 123389) causing serious endless loop


Modified:
openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx

Modified: openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx?rev=1597076r1=1597075r2=1597076view=diff
==
--- openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx Fri May 23 12:23:40 
2014
@@ -640,8 +640,9 @@ void SwTxtNode::RstTxtAttr(
 }
 }
 }
-++i;
 }
+
+++i;
 }
 
 TryDeleteSwpHints();

svn commit: r1597102 - in /openoffice/trunk/main/sw: inc/ndgrf.hxx source/core/graphic/ndgrf.cxx source/filter/xml/xmltexte.cxx

2014-05-23 Thread orw

Author: orw
Date: Fri May 23 14:28:40 2014
New Revision: 1597102

URL: http://svn.apache.org/r1597102
Log:
124946: only apply new embedded stream name for a graphic, if is already has 
one.
- needed correction for the fix made for issue 114361


Modified:
openoffice/trunk/main/sw/inc/ndgrf.hxx
openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx
openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx

Modified: openoffice/trunk/main/sw/inc/ndgrf.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/ndgrf.hxx?rev=1597102r1=1597101r2=1597102view=diff
==
--- openoffice/trunk/main/sw/inc/ndgrf.hxx (original)
+++ openoffice/trunk/main/sw/inc/ndgrf.hxx Fri May 23 14:28:40 2014
@@ -75,7 +75,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwN
 
void InsertLink( const String rGrfName, const String rFltName );
sal_Bool ImportGraphic( SvStream rStrm );
-   sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
 void _GetStreamStorageNames( String rStrmName, String rStgName ) const;
void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
@@ -177,6 +176,7 @@ public:
 // Entfernen der Grafik, um Speicher freizugeben
 short SwapOut();
 
+sal_Bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
 // applying new stream name for embedded graphic - needed as saving the 
document might change this stream name
 void ApplyNewEmbeddedStreamName( const String r )
 {

Modified: openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx?rev=1597102r1=1597101r2=1597102view=diff
==
--- openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx Fri May 23 14:28:40 
2014
@@ -239,7 +239,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGraphic  !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new 
one is set.
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
maGrfObj.SetGraphic( *pGraphic );
@@ -249,7 +249,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGrfObj  !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new 
one is set.
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
maGrfObj = *pGrfObj;
@@ -265,7 +265,7 @@ sal_Bool SwGrfNode::ReRead(
 
else
{
-   if( HasStreamName() )
+   if( HasEmbeddedStreamName() )
DelStreamName();
 
// einen neuen Grafik-Link anlegen
@@ -546,21 +546,16 @@ short SwGrfNode::SwapIn( sal_Bool bWaitF
else
nRet = 1;
}
-   else if( maGrfObj.IsSwappedOut() )
-   {
-   // Die Grafik ist im Storage oder im TempFile drin
-   if( !HasStreamName() )
-   nRet = (short)maGrfObj.SwapIn();
-   else
-   {
+else if ( maGrfObj.IsSwappedOut() )
+{
+// Die Grafik ist im Storage oder im TempFile drin
+if ( !HasEmbeddedStreamName() )
+nRet = (short) maGrfObj.SwapIn();
+else
+{
 
-// -- OD 2005-05-04 #i48434# - usage of new method 
_GetStreamForEmbedGrf(..)
 try
 {
-// -- OD, MAV 2005-08-17 #i53025# - needed correction of new
-// method _GetStreamForEmbedGrf(..)
-//bool bGraphic(false);
-//SvStream* pStrm = _GetStreamForEmbedGrf( bGraphic );
 String aStrmName, aPicStgName;
 _GetStreamStorageNames( aStrmName, aPicStgName );
 uno::Reference  embed::XStorage  refPics = 
_GetDocSubstorageOrRoot( aPicStgName );
@@ -571,34 +566,30 @@ short SwGrfNode::SwapIn( sal_Bool bWaitF
 nRet = 1;
 delete pStrm;
 }
-// --
 }
 catch ( uno::Exception )
 {
-// -- OD 2005-04-25 #i48434#
 ASSERT( false, SwGrfNode::SwapIn(..) - unhandled 
exception! );
-// --
 }
-// --
-   }
+}
 
-   if( 1 == nRet )
-   {
-   SwMsgPoolItem aMsg( RES_GRAPHIC_SWAPIN );
+if ( 1 == nRet )
+{
+SwMsgPoolItem aMsg( RES_GRAPHIC_SWAPIN );
 ModifyNotification( aMsg, aMsg );
-   }
-   }
-   else
-   nRet = 1;
-   DBG_ASSERTWARNING( nRet, Grafik kann nicht

svn commit: r1597109 - /openoffice/trunk/main/svx/source/svdraw/svdograf.cxx

2014-05-23 Thread orw

Author: orw
Date: Fri May 23 14:50:23 2014
New Revision: 1597109

URL: http://svn.apache.org/r1597109
Log:
124966: keep picture format information - GfxLink instance - also for the 
reading of preview picture data
in order to avoid trouble on save in case that the preview data equals 
the picture data


Modified:
openoffice/trunk/main/svx/source/svdraw/svdograf.cxx

Modified: openoffice/trunk/main/svx/source/svdraw/svdograf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdograf.cxx?rev=1597109r1=1597108r2=1597109view=diff
==
--- openoffice/trunk/main/svx/source/svdraw/svdograf.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdograf.cxx Fri May 23 14:50:23 
2014
@@ -1537,9 +1537,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, Graph
 {
 pFilterData = new com::sun::star::uno::Sequence 
com::sun::star::beans::PropertyValue ( 3 );
 
-com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-sal_Bool bAllowPartialStreamRead = sal_True;
-sal_Bool bCreateNativeLink = sal_False;
+const com::sun::star::awt::Size aPreviewSizeHint( 64, 
64 );
+const sal_Bool bAllowPartialStreamRead = sal_True;
+// create GfxLink instance also for previews in 
order to avoid that its corresponding
+// data is cleared in the graphic cache entry in case 
that the preview data equals the complete graphic data
+const sal_Bool bCreateNativeLink = sal_True;
 (*pFilterData)[ 0 ].Name = String( 
RTL_CONSTASCII_USTRINGPARAM( PreviewSizeHint ) );
 (*pFilterData)[ 0 ].Value = aPreviewSizeHint;
 (*pFilterData)[ 1 ].Name = String( 
RTL_CONSTASCII_USTRINGPARAM( AllowPartialStreamRead ) );

svn commit: r1595851 - /openoffice/trunk/main/svtools/source/filter/filter.cxx

2014-05-19 Thread orw

Author: orw
Date: Mon May 19 11:50:38 2014
New Revision: 1595851

URL: http://svn.apache.org/r1595851
Log:
124717: do not mark *.svm graphic files as *.bmp graphic files


Modified:
openoffice/trunk/main/svtools/source/filter/filter.cxx

Modified: openoffice/trunk/main/svtools/source/filter/filter.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/filter/filter.cxx?rev=1595851r1=1595850r2=1595851view=diff
==
--- openoffice/trunk/main/svtools/source/filter/filter.cxx (original)
+++ openoffice/trunk/main/svtools/source/filter/filter.cxx Mon May 19 11:50:38 
2014
@@ -1630,8 +1630,8 @@ sal_uInt16 GraphicFilter::ImportGraphic(
if( !ImportXPM( rIStream, rGraphic ) )
nStatus = GRFILTER_FILTERERROR;
}
-else if( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) ||
-aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) )
+else if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP )
+  || aFilterName.EqualsIgnoreCaseAscii( IMP_SVMETAFILE ) )
 {
 // SV interne Importfilter fuer Bitmaps und MetaFiles
 rIStream  rGraphic;
@@ -1642,8 +1642,11 @@ sal_uInt16 GraphicFilter::ImportGraphic(
 }
 else
 {
-// #15508# added BMP type (checked, works)
-eLinkType = GFX_LINK_TYPE_NATIVE_BMP;
+if ( aFilterName.EqualsIgnoreCaseAscii( IMP_BMP ) )
+{
+// #15508# added BMP type (checked, works)
+eLinkType = GFX_LINK_TYPE_NATIVE_BMP;
+}
 }
 }
 else if( aFilterName.EqualsIgnoreCaseAscii( IMP_WMF ) ||

svn commit: r1592947 - /openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update

2014-05-15 Thread orw

Author: orw
Date: Wed May  7 08:11:16 2014
New Revision: 1592947

URL: http://svn.apache.org/r1592947
Log:
124393: correct translations for text Only for Mac OS X versions 10.7 or 
newer for cz, it and sk


Modified:

openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update

Modified: 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update?rev=1592947r1=1592946r2=1592947view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update
 Wed May  7 08:11:16 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleProduct Update Feed for 3.4.0 instances/title
-updatedMon May  5 14:26:24 UTC 2014 UTC/updated
+updatedWed May  7 07:43:22 UTC 2014 UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -225,7 +225,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_cs label=Apache OpenOffice update/
-summaryPouze pro Mac OS X verze 10.7 nebo novÄjÅ¡Ã/summary
+summaryPouze pro Mac OS verze 10.7 a novÄjÅ¡Ã/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_cs/inst:id
@@ -1215,7 +1215,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_it label=Apache OpenOffice update/
-summarySolo per le versioni di Mac OS X 10.7 o piÃ¹ recente/summary
+summarySolo per Mac OS X 10.7 o superiore/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_it/inst:id
@@ -1941,7 +1941,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_sk label=Apache OpenOffice update/
-summaryIba pre Mac OS X verzia 10.7 alebo novÅ¡Ã/summary
+summaryIba pre Mac OS verzie 10.7 a novÅ¡ie/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_sk/inst:id

svn commit: r1592946 - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/check.Update update34/ProductUpdateService/check.Update update35/ProductUpdateService/check.Update update36/Product

2014-05-11 Thread orw

Author: orw
Date: Wed May  7 08:02:43 2014
New Revision: 1592946

URL: http://svn.apache.org/r1592946
Log:
124393: correct translation for Only for Mac OS X version 10.7 or newer for 
cz, it and sk


Modified:
openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update

openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update

Modified: openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update?rev=1592946r1=1592945r2=1592946view=diff
==
--- openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update 
(original)
+++ openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update Wed 
May  7 08:02:43 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleProduct Update Feed for 3.4.1 instances/title
-updatedMon May  5 14:26:29 UTC 2014 UTC/updated
+updatedWed May  7 07:43:26 UTC 2014 UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -225,7 +225,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_cs label=Apache OpenOffice update/
-summaryPouze pro Mac OS X verze 10.7 nebo novÄjÅ¡Ã/summary
+summaryPouze pro Mac OS verze 10.7 a novÄjÅ¡Ã/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_cs/inst:id
@@ -1215,7 +1215,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_it label=Apache OpenOffice update/
-summarySolo per le versioni di Mac OS X 10.7 o piÃ¹ recente/summary
+summarySolo per Mac OS X 10.7 o superiore/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_it/inst:id
@@ -1941,7 +1941,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_sk label=Apache OpenOffice update/
-summaryIba pre Mac OS X verzia 10.7 alebo novÅ¡Ã/summary
+summaryIba pre Mac OS verzie 10.7 a novÅ¡ie/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_sk/inst:id

Modified: 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update?rev=1592946r1=1592945r2=1592946view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update
 Wed May  7 08:02:43 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleProduct Update Feed for 3.2.0 instances/title
-updatedMon May  5 14:26:07 UTC 2014 UTC/updated
+updatedWed May  7 07:43:04 UTC 2014 UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -225,7 +225,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_cs label=Apache OpenOffice update/
-summaryPouze pro Mac OS X verze 10.7 nebo novÄjÅ¡Ã/summary
+summaryPouze pro Mac OS verze 10.7 a novÄjÅ¡Ã/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_cs/inst:id
@@ -1215,7 +1215,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_it label=Apache OpenOffice update/
-summarySolo per le versioni di Mac OS X 10.7 o piÃ¹ recente/summary
+summarySolo per Mac OS X 10.7 o superiore/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice.org_3_it/inst:id
@@ -1941,7 +1941,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice.org_3_sk label=Apache OpenOffice update/
-summaryIba pre Mac OS X verzia 10.7 alebo novÅ¡Ã/summary
+summaryIba pre Mac OS verzie 10.7 a novÅ¡ie/summary
 content type=application/xml
 inst:description 
xmlns:inst=http

svn commit: r908286 - in /websites/production/ooo-site: cgi-bin/ content/

2014-05-07 Thread orw

Author: orw
Date: Wed May  7 08:05:53 2014
New Revision: 908286

Log:
publish correction of text Only for Mac OS X versions 10.7 or newer for cz, it 
and sk

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r908285, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r908285, websites/staging/ooo-site/trunk/content/

svn commit: r1592944 - in /openoffice/updates-site/trunk: aoo40/check.Update aoo401/check.Update

2014-05-07 Thread orw

Author: orw
Date: Wed May  7 07:54:17 2014
New Revision: 1592944

URL: http://svn.apache.org/r1592944
Log:
124393: correct translation of Only for Mac OS X versions 10.7 or newer for 
cz, it and sk


Modified:
openoffice/updates-site/trunk/aoo40/check.Update
openoffice/updates-site/trunk/aoo401/check.Update

Modified: openoffice/updates-site/trunk/aoo40/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo40/check.Update?rev=1592944r1=1592943r2=1592944view=diff
==
--- openoffice/updates-site/trunk/aoo40/check.Update (original)
+++ openoffice/updates-site/trunk/aoo40/check.Update Wed May  7 07:54:17 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleProduct Update Feed for 4.0.0 instances/title
-updatedMon May  5 14:26:37 UTC 2014 UTC/updated
+updatedWed May  7 07:43:34 UTC 2014 UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -159,7 +159,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_cs label=Apache OpenOffice update/
-summaryPouze pro Mac OS X verze 10.7 nebo novÄjÅ¡Ã/summary
+summaryPouze pro Mac OS verze 10.7 a novÄjÅ¡Ã/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_cs/inst:id
@@ -1149,7 +1149,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_it label=Apache OpenOffice update/
-summarySolo per le versioni di Mac OS X 10.7 o piÃ¹ recente/summary
+summarySolo per Mac OS X 10.7 o superiore/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_it/inst:id
@@ -1875,7 +1875,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_sk label=Apache OpenOffice update/
-summaryIba pre Mac OS X verzia 10.7 alebo novÅ¡Ã/summary
+summaryIba pre Mac OS verzie 10.7 a novÅ¡ie/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_sk/inst:id

Modified: openoffice/updates-site/trunk/aoo401/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo401/check.Update?rev=1592944r1=1592943r2=1592944view=diff
==
--- openoffice/updates-site/trunk/aoo401/check.Update (original)
+++ openoffice/updates-site/trunk/aoo401/check.Update Wed May  7 07:54:17 2014
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 feed xmlns=http://www.w3.org/2005/Atom; xml:lang=en-US
 titleProduct Update Feed for 4.0.1 instances/title
-updatedMon May  5 14:26:41 UTC 2014 UTC/updated
+updatedWed May  7 07:43:39 UTC 2014 UTC/updated
 author
 nameApache OpenOffice project/name
 urihttp://openoffice.org/uri
@@ -159,7 +159,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_cs label=Apache OpenOffice update/
-summaryPouze pro Mac OS X verze 10.7 nebo novÄjÅ¡Ã/summary
+summaryPouze pro Mac OS verze 10.7 a novÄjÅ¡Ã/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_cs/inst:id
@@ -1149,7 +1149,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_it label=Apache OpenOffice update/
-summarySolo per le versioni di Mac OS X 10.7 o piÃ¹ recente/summary
+summarySolo per Mac OS X 10.7 o superiore/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_it/inst:id
@@ -1875,7 +1875,7 @@
 entry
 titleUpdate available/title
 category term=OpenOffice_4_sk label=Apache OpenOffice update/
-summaryIba pre Mac OS X verzia 10.7 alebo novÅ¡Ã/summary
+summaryIba pre Mac OS verzie 10.7 a novÅ¡ie/summary
 content type=application/xml
 inst:description 
xmlns:inst=http://installation.openoffice.org/description;
 inst:idOpenOffice_4_sk/inst:id

svn commit: r1592681 [1/6] - in /openoffice/ooo-site/trunk/content/projects: update/aoo341/ update34/ProductUpdateService/ update35/ProductUpdateService/ update36/ProductUpdateService/ update38/Produc

2014-05-06 Thread orw

Author: orw
Date: Tue May  6 08:03:27 2014
New Revision: 1592681

URL: http://svn.apache.org/r1592681
Log:
124393: Update XML feeds for 3.2.0, 3.2.1, 3.3.0, 3.4.0 and 3.4.1 Mac OS X 
instances to be notified about availability of 4.1.0
text Only for Mac OS X versions 10.7 or newer added


Modified:
openoffice/ooo-site/trunk/content/projects/update/aoo341/check.Update

openoffice/ooo-site/trunk/content/projects/update34/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update36/ProductUpdateService/check.Update

openoffice/ooo-site/trunk/content/projects/update38/ProductUpdateService/check.Update

svn commit: r908065 - in /websites/production/ooo-site: cgi-bin/ content/

2014-05-05 Thread orw

Author: orw
Date: Mon May  5 10:37:57 2014
New Revision: 908065

Log:
publish revert Update XML feeds for 3.2.0, 3.2.1, 3.3.0, 3.4.0 and 3.4.1 Mac OS 
X instances to be notified about availability of 4.0.1

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r908064, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r908064, websites/staging/ooo-site/trunk/content/

svn commit: r1592477 - /openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

2014-05-05 Thread orw

Author: orw
Date: Mon May  5 10:43:47 2014
New Revision: 1592477

URL: http://svn.apache.org/r1592477
Log:
124393: fix typo in Update XML feed for OOo 3.2.1 instances


Modified:

openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update

Modified: 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update?rev=1592477r1=1592476r2=1592477view=diff
==
--- 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 (original)
+++ 
openoffice/ooo-site/trunk/content/projects/update35/ProductUpdateService/check.Update
 Mon May  5 10:43:47 2014
@@ -2425,3 +2425,4 @@
 /entry
 
 
+/feed
\ No newline at end of file

svn commit: r908067 - in /websites/production/ooo-site: cgi-bin/ content/

2014-05-05 Thread orw

Author: orw
Date: Mon May  5 10:46:25 2014
New Revision: 908067

Log:
publish: fix typo in Update XML feed for OOo 3.2.1 instances

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r908066, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r908066, websites/staging/ooo-site/trunk/content/

svn commit: r1591204 - /openoffice/ooo-site/trunk/content/nl/downloaden.html

2014-04-30 Thread orw

Author: orw
Date: Wed Apr 30 06:58:40 2014
New Revision: 1591204

URL: http://svn.apache.org/r1591204
Log:
changes to Dutch websites for AOO 4.1.0 release

Modified:
openoffice/ooo-site/trunk/content/nl/downloaden.html

Modified: openoffice/ooo-site/trunk/content/nl/downloaden.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/nl/downloaden.html?rev=1591204r1=1591203r2=1591204view=diff
==
--- openoffice/ooo-site/trunk/content/nl/downloaden.html (original)
+++ openoffice/ooo-site/trunk/content/nl/downloaden.html Wed Apr 30 06:58:40 
2014
@@ -16,9 +16,9 @@

!-- here is the content pane --
td style=border-width: 0px;
-   h1Apache OpenOffice 4.0.1 in het Nederlands 
downloaden/h1
-   pDe nieuwe Apache OpenOffice, versie 4.0.1, is 
beschikbaar in het Nederlands voor Windows, Linux en Mac OS X./p
-   pHoe krijg je Apache OpenOffice 4.0.1 gemakkelijk 
binnen? Ga naar de a href=http://www.openoffice.org/download/;hoofdpagina 
voor downloaden/a en klik
+   h1Apache OpenOffice 4.1.0 in het Nederlands 
downloaden/h1
+   pDe nieuwe Apache OpenOffice, versie 4.1.0, is 
beschikbaar in het Nederlands voor Windows, Linux en Mac OS X./p
+   pHoe krijg je Apache OpenOffice 4.1.0 gemakkelijk 
binnen? Ga naar de a href=http://www.openoffice.org/download/;hoofdpagina 
voor downloaden/a en klik
op het groene vlak. In de meeste gevallen is de 
juiste variant (voor jouw besturingssysteem en in het Nederlands) al 
geselecteerd./p
pVoor meer keuze kun je ook naar de a 
href=http://www.openoffice.org/download/other.html;overzichtspagina voor 
downloaden/a en daar de variant
van besturingssysteem en taal kiezen die je 
wilt.

1 2 3 4 >

1 - 100 of 371 matches

Mail list logo