buildbot failure in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Failure Build revision 1484083 on branch openoffice/branches/ia2 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/165 Build reason was: The Nightly scheduler named 'aoo-win7-ia2' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-rat
Hi! , The openoffice-linux64-rat builder has just completed a run STATUS: Success Build revision 1502412 on branch openoffice/branches/AOO400 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/48 Build reason was: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
[CONF] Apache OpenOffice Community > 4.0 Release Dashboard
4.0 Release Dashboard Page edited by Rob Weir Changes (1) ... | Website \\ | Download scripts \\ | {note} yellow {note} | in progress, scripting in general is ready but needs testing on SourceForge due to complete new file name + directory structure | 2013-07-08 (marcus) | | Website \\ | Update service \\ | {tip} green {tip} | everything is prepared and in place, have to be activated only | | | Marketing | Blog post / press release | {tip} {note} yellow {tip} {note} | Not started, dependent on contents of final Release Notes. Two days should be enough to write and review. | 2013-07-09 (robweir) | | Marketing \\ | Update social media with new logo \\ | {tip} green {tip} \\ | Will coordinate to release date of AOO 4.0. \\ | 2013-07-03 (robweir) | | L10N \\ | Translation - Arabic \\ | {warning} red {warning} | no visible translation activity \\ ... Full Content Area Item Status (Red/ Yellow/ Green) Details Last Updated Release Manager Overall Status green 2013-07-10 (jsc) Dev Feature Development green all planned or finally started feature development work is finished Dev Release blocker fixes yellow 86 granted showstopper issues, 2 issue open 122620 is fixed but kept open until it is verified on all platforms 121754 patch integrated and build verification ongoing, seems to be fixed 2013-07-10 (jsc) Dev New Logo Integration green new log and related images and icons are updated. Application and document icons will probably integrated for a 4.1 only, not available yet and no final design decision Dev Release Notes yellow in progress, needs further updates and polishing QA Testing - New Features QA Testing - Regression QA Testing - Fix Verification QA Testing - Bug Confirmation Doc Updated User Guides Doc Installation Instructions, System Requirements yellow Review in progress. 2013-07-09 (kschenk) Website Download scripts yellow in progress, scripting in general is ready but needs testing on SourceForge due to complete new file name + directory structure 2013-07-08 (marcus) Website Update service green everything is prepared and in place, have to be activated only Marketing Blog post / press release yellow Not started, dependent on contents of final Release Notes. Two days should be enough to write and review. 2013-07-09 (robweir) Marketing Update social media with new logo green Will coordinate to release date of AOO 4.0. 2013-07-03 (robweir) L10N Translation - Arabic red no visible translation activity not release critical, will be released when available in a potential language update 2013-07-09 (jsc) Translation - Asturian green 122670, 100% UI + ?? Help Translation - Basque red no visible translation Translation - Chinese, Simplified green 122661, 100% UI + 100% Help 2013-07-08 (liushenf) Translation - Chinese, Traditional red no visible translation activity not release critical, will be released when available in a potential language update 2013-07-09 (jsc) Translation - Czech green 122660, 100% + 91% Help Translation - Danish red no real visible translation activity not release critical, will be released when available in a potential language update 2013-07-09 (jsc) Translation - Dutch green 122467, 100% UI + 100% Help Translation - English-GB green 122469 100% UI + 100% Help 2013-07-05 (sswales) Translation - English-US green 100% UI + 100 % Help -> source language Translation - Finnish green 122568, 100% UI + 100% Help Translation - French green 122584, 100% UI + 100% Help Translation - Gaelic. Scottish green 122631, 100% UI + English Help Translation - Galician green 122689, 100% UI + 55% Help Translation - German green 122468, 100% UI + 100 % Help Translation - Greek green 122653, 100% UI + 95% Help Translation - Hungarian green 122360, 100% UI + 100% Help Translation - Italian green 122588, 100% UI + 100% Help 2013-07-03 (paolopoz + other volunteers) Translation - Japanese green 122474, 100 UI + 100% Help Translation - Khmer red no visible translation activity not release critical, will be released when available in a potential language update 2013-07-09 (jsc) Translation - Korean green 122488, 100% UI + 100% Help Translation - Norwegian, Bokmål red no visible translation activity not release critical, will be relea
svn commit: r869129 - /websites/production/openoffice/content/
Author: robweir Date: Thu Jul 11 15:18:08 2013 New Revision: 869129 Log: Publishing svnmucc operation to openoffice site by robweir Added: websites/production/openoffice/content/ - copied from r869128, websites/staging/openoffice/trunk/content/
svn commit: r869128 - in /websites/staging/openoffice/trunk/content: ./ get-involved.html
Author: buildbot Date: Thu Jul 11 15:17:33 2013 New Revision: 869128 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/get-involved.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Jul 11 15:17:33 2013 @@ -1 +1 @@ -1500543 +1502242 Modified: websites/staging/openoffice/trunk/content/get-involved.html == --- websites/staging/openoffice/trunk/content/get-involved.html (original) +++ websites/staging/openoffice/trunk/content/get-involved.html Thu Jul 11 15:17:33 2013 @@ -85,8 +85,7 @@ Project Management PMC http://blogs.apache.org/OOo/";>Project Blog -PMC FAQs - +PMC FAQs The Apache Software Foundation @@ -105,7 +104,7 @@ like OpenOffice. Some of the more commo To help reduce the "digital divide" by ensuring continued access to free high-quality free productivity applications world-wide. -To help bring the benefits of OpenOffice to you country or region +To help bring the benefits of OpenOffice to your country or region To "give back" to open source To learn or practice a new skill To enhance a résumé or portfolio, showcasing the work you've done in this project @@ -138,8 +137,7 @@ the community. We welcome and encourage as easy as possible for people to get involved. How to get started OpenOffice is a large, complex open source project, with a culture developed over -many years as an independent project, combined with our experience at Apache. - +many years as an independent project, combined with our experience at Apache. If you are familiar with Apache-style open source development then you might just jump in. Subscribe to a relevant project http://openoffice.apache.org/mailing-lists.html";>mailing list and introduce yourself. We'll help you get started.
svn commit: r1502242 - /openoffice/site/trunk/content/get-involved.mdtext
Author: robweir Date: Thu Jul 11 15:17:30 2013 New Revision: 1502242 URL: http://svn.apache.org/r1502242 Log: Bug report by: v...@teksavvy.com Modified: openoffice/site/trunk/content/get-involved.mdtext Modified: openoffice/site/trunk/content/get-involved.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/get-involved.mdtext?rev=1502242&r1=1502241&r2=1502242&view=diff == --- openoffice/site/trunk/content/get-involved.mdtext (original) +++ openoffice/site/trunk/content/get-involved.mdtext Thu Jul 11 15:17:30 2013 @@ -23,7 +23,7 @@ like OpenOffice. Some of the more commo - To help reduce the "digital divide" by ensuring continued access to free high-quality free productivity applications world-wide. - - To help bring the benefits of OpenOffice to you country or region + - To help bring the benefits of OpenOffice to your country or region - To "give back" to open source - To learn or practice a new skill - To enhance a résumé or portfolio, showcasing the work you've done in this project
svn propchange: r1480203 - svn:log
Author: hdu Revision: 1480203 Modified property: svn:log Modified: svn:log at Thu Jul 11 15:14:56 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 15:14:56 2013 @@ -1 +1 @@ -i12246 Corrected three basic problems in the metafile breaker +i122246 Corrected three basic problems in the metafile breaker
svn commit: r1502202 - /openoffice/devtools/scripts/svnlog2info.py
Author: hdu Date: Thu Jul 11 12:21:41 2013 New Revision: 1502202 URL: http://svn.apache.org/r1502202 Log: svnlog2info: treat verified and closed issues as resolved Modified: openoffice/devtools/scripts/svnlog2info.py Modified: openoffice/devtools/scripts/svnlog2info.py URL: http://svn.apache.org/viewvc/openoffice/devtools/scripts/svnlog2info.py?rev=1502202&r1=1502201&r2=1502202&view=diff == --- openoffice/devtools/scripts/svnlog2info.py (original) +++ openoffice/devtools/scripts/svnlog2info.py Thu Jul 11 12:21:41 2013 @@ -165,7 +165,7 @@ def revs2info( htmlname, detail_level, a priority = bug[ "priority"] if ("status" in bug): bug_status = bug[ "status"] - if bug_status == "RESOLVED": + if bug_status in ["RESOLVED","VERIFIED","CLOSED"]: bug_status = bug[ "resolution"] else: bug_status = "UNKNOWN"
buildbot success in ASF Buildbot on openoffice-linux64-rat
Hi! , The openoffice-linux64-rat builder has just completed a run STATUS: Success Build revision 1502199 on branch openoffice/branches/AOO400 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/47 Build reason was: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn propchange: r1363127 - svn:log
Author: hdu Revision: 1363127 Modified property: svn:log Modified: svn:log at Thu Jul 11 11:55:43 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 11:55:43 2013 @@ -1 +1 @@ -i150733: cast double to sal_Int64 can throw a EXCEPTION_FLT_INVALID_OPERATION on Windows. +i120312: cast double to sal_Int64 can throw a EXCEPTION_FLT_INVALID_OPERATION on Windows
svn propchange: r1366950 - svn:log
Author: hdu Revision: 1366950 Modified property: svn:log Modified: svn:log at Thu Jul 11 11:50:20 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 11:50:20 2013 @@ -1,3 +1,3 @@ -#i550055# Simplify pythonscript.py code +#i55055# Simplify pythonscript.py code author:hanya
svn propchange: r1353552 - svn:log
Author: hdu Revision: 1353552 Modified property: svn:log Modified: svn:log at Thu Jul 11 11:41:23 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 11:41:23 2013 @@ -1,4 +1,4 @@ -#1200074# memory leak by not freeing helper class instances of StyleReplaceData. +#120074# memory leak by not freeing helper class instances of StyleReplaceData. Patch by: Chao Huang Found by: Chao Huang Review by: alg
svn propchange: r1461102 - svn:log
Author: hdu Revision: 1461102 Modified property: svn:log Modified: svn:log at Thu Jul 11 11:38:18 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 11:38:18 2013 @@ -1 +1 @@ -i1457158 - Revert revision 1457160 and revision 1457158 +i121872 - Revert revision 1457160 and revision 1457158
svn propchange: r1489719 - svn:log
Author: hdu Revision: 1489719 Modified property: svn:log Modified: svn:log at Thu Jul 11 11:34:12 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 11:34:12 2013 @@ -1 +1 @@ -#122122355# update AOO4.0 translation for Slovak (sk) +#122355# update AOO4.0 translation for Slovak (sk)
svn commit: r1502189 - /openoffice/devtools/scripts/svnlog2info.py
Author: hdu Date: Thu Jul 11 11:29:25 2013 New Revision: 1502189 URL: http://svn.apache.org/r1502189 Log: svnlog2info: show bug status also for unresolved issues Modified: openoffice/devtools/scripts/svnlog2info.py Modified: openoffice/devtools/scripts/svnlog2info.py URL: http://svn.apache.org/viewvc/openoffice/devtools/scripts/svnlog2info.py?rev=1502189&r1=1502188&r2=1502189&view=diff == --- openoffice/devtools/scripts/svnlog2info.py (original) +++ openoffice/devtools/scripts/svnlog2info.py Thu Jul 11 11:29:25 2013 @@ -162,8 +162,13 @@ def revs2info( htmlname, detail_level, a bug_desc = bug[ "summary"] bug_type = bug[ "cf_bug_type"] bug_target = bug[ "target_milestone"] - bug_status = bug[ "resolution"] priority = bug[ "priority"] + if ("status" in bug): + bug_status = bug[ "status"] + if bug_status == "RESOLVED": + bug_status = bug[ "resolution"] + else: + bug_status = "UNKNOWN" colortype = bug_type[0]+priority[1] if colortype in type2color:
svn commit: r1502186 - in /openoffice/trunk/main: default_images/introabout/intro.png desktop/source/splash/splash.cxx desktop/source/splash/splash.hxx instsetoo_native/util/openoffice.lst scp2/source
Author: af Date: Thu Jul 11 11:07:44 2013 New Revision: 1502186 URL: http://svn.apache.org/r1502186 Log: 122620: Tweeked the splash screen a little. Modified: openoffice/trunk/main/default_images/introabout/intro.png openoffice/trunk/main/desktop/source/splash/splash.cxx openoffice/trunk/main/desktop/source/splash/splash.hxx openoffice/trunk/main/instsetoo_native/util/openoffice.lst openoffice/trunk/main/scp2/source/ooo/common_brand.scp Modified: openoffice/trunk/main/default_images/introabout/intro.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/introabout/intro.png?rev=1502186&r1=1502185&r2=1502186&view=diff == Binary files - no diff available. Modified: openoffice/trunk/main/desktop/source/splash/splash.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/splash/splash.cxx?rev=1502186&r1=1502185&r2=1502186&view=diff == --- openoffice/trunk/main/desktop/source/splash/splash.cxx (original) +++ openoffice/trunk/main/desktop/source/splash/splash.cxx Thu Jul 11 11:07:44 2013 @@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Referen : IntroWindow() , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED)) +, _bShowProgressFrame(true) , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED)) , _bNativeProgress(true) , _iMax(100) @@ -303,6 +304,8 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) ); OUString sNativeProgress = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) ); +OUString sShowProgressFrame = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowProgressFrame" ) ) ); // Determine full screen splash mode @@ -334,6 +337,11 @@ void SplashScreen::loadConfig() } } +if (sShowProgressFrame.getLength() > 0) +{ +_bShowProgressFrame = sShowProgressFrame.toBoolean(); +} + if ( sProgressBarColor.getLength() ) { sal_uInt8 nRed = 0; @@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangl if (_bPaintBitmap) _vdev.DrawBitmapEx( Point(), _aIntroBmp ); - if (_bPaintProgress) { + if (_bPaintProgress) +{ // draw progress... - long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace); - if (length < 0) length = 0; - - // border - _vdev.SetFillColor(); - _vdev.SetLineColor( _cProgressFrameColor ); - _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); - _vdev.SetFillColor( _cProgressBarColor ); - _vdev.SetLineColor(); - _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace)); + long length = (_iProgress * _barwidth / _iMax); +if (_bShowProgressFrame) +length -= (2 * _barspace); + if (length < 0) +length = 0; + +if (_bShowProgressFrame) +{ +// border +_vdev.SetFillColor(); +_vdev.SetLineColor( _cProgressFrameColor ); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); +_vdev.SetFillColor( _cProgressBarColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace)); +_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER ); +} +else +{ +// Show flat progress bar without frame. + +// border +_vdev.SetFillColor( _cProgressFrameColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); + +_vdev.SetFillColor( _cProgressBarColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length, _tly+_barheight)); +} + _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER ); } Size aSize = GetOutputSizePixel(); Modified: openoffice/trunk/main/desktop/source/splash/splash.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/splash/splash.hxx?rev=1502186&r1=1502185&r2=1502186&view=diff == --- openoffice/trunk/main/desktop/source/splash/splash.hxx (original) +++ openoffice/trunk
svn commit: r1502185 - in /openoffice/branches/AOO400/main: default_images/introabout/intro.png desktop/source/splash/splash.cxx desktop/source/splash/splash.hxx instsetoo_native/util/openoffice.lst s
Author: af Date: Thu Jul 11 11:03:16 2013 New Revision: 1502185 URL: http://svn.apache.org/r1502185 Log: 122620: Tweeked the splash screen a little. Modified: openoffice/branches/AOO400/main/default_images/introabout/intro.png openoffice/branches/AOO400/main/desktop/source/splash/splash.cxx openoffice/branches/AOO400/main/desktop/source/splash/splash.hxx openoffice/branches/AOO400/main/instsetoo_native/util/openoffice.lst openoffice/branches/AOO400/main/scp2/source/ooo/common_brand.scp Modified: openoffice/branches/AOO400/main/default_images/introabout/intro.png URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/default_images/introabout/intro.png?rev=1502185&r1=1502184&r2=1502185&view=diff == Binary files - no diff available. Modified: openoffice/branches/AOO400/main/desktop/source/splash/splash.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/desktop/source/splash/splash.cxx?rev=1502185&r1=1502184&r2=1502185&view=diff == --- openoffice/branches/AOO400/main/desktop/source/splash/splash.cxx (original) +++ openoffice/branches/AOO400/main/desktop/source/splash/splash.cxx Thu Jul 11 11:03:16 2013 @@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Referen : IntroWindow() , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED)) +, _bShowProgressFrame(true) , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED)) , _bNativeProgress(true) , _iMax(100) @@ -303,6 +304,8 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) ); OUString sNativeProgress = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) ); +OUString sShowProgressFrame = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowProgressFrame" ) ) ); // Determine full screen splash mode @@ -334,6 +337,11 @@ void SplashScreen::loadConfig() } } +if (sShowProgressFrame.getLength() > 0) +{ +_bShowProgressFrame = sShowProgressFrame.toBoolean(); +} + if ( sProgressBarColor.getLength() ) { sal_uInt8 nRed = 0; @@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangl if (_bPaintBitmap) _vdev.DrawBitmapEx( Point(), _aIntroBmp ); - if (_bPaintProgress) { + if (_bPaintProgress) +{ // draw progress... - long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace); - if (length < 0) length = 0; - - // border - _vdev.SetFillColor(); - _vdev.SetLineColor( _cProgressFrameColor ); - _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); - _vdev.SetFillColor( _cProgressBarColor ); - _vdev.SetLineColor(); - _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace)); + long length = (_iProgress * _barwidth / _iMax); +if (_bShowProgressFrame) +length -= (2 * _barspace); + if (length < 0) +length = 0; + +if (_bShowProgressFrame) +{ +// border +_vdev.SetFillColor(); +_vdev.SetLineColor( _cProgressFrameColor ); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); +_vdev.SetFillColor( _cProgressBarColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace)); +_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER ); +} +else +{ +// Show flat progress bar without frame. + +// border +_vdev.SetFillColor( _cProgressFrameColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight)); + +_vdev.SetFillColor( _cProgressBarColor ); +_vdev.SetLineColor(); +_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length, _tly+_barheight)); +} + _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER ); } Size aSize = GetOutputSizePixel(); Modified: openoffice/branches/AOO400/main/desktop/source/splash/splash.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/desktop/source/splash/splash.hxx?rev=1502185&r1=1502184&r2=1502185&view=diff ===
svn commit: r1502173 - in /openoffice/trunk/main/setup_native/source/win32/nsis: ooobitmap.bmp ooosdkbitmap.bmp
Author: jsc Date: Thu Jul 11 10:03:55 2013 New Revision: 1502173 URL: http://svn.apache.org/r1502173 Log: merge change from aoo400 branch, problem with bmp's Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1502173&r1=1502172&r2=1502173&view=diff == Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1502173&r1=1502172&r2=1502173&view=diff == Binary files - no diff available.
svn commit: r1502172 - in /openoffice/trunk/main: instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/ instsetoo_native/inc_openoffice/windows/msi_templates/Binary/ instsetoo_native/inc_sdko
Author: jsc Date: Thu Jul 11 10:02:30 2013 New Revision: 1502172 URL: http://svn.apache.org/r1502172 Log: merge change from aoo400 branch, problem with bmp's Modified: openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbanner.bmp Modified: openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1502172&r1=1502171&r2=1502172&view=diff == Binary files - no diff available. Modified: openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp?rev=1502172&r1=1502171&r2=1502172&view=diff == Binary files - no diff available. Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp?rev=1502172&r1=1502171&r2=1502172&view=diff == Binary files - no diff available. Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbanner.bmp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbanner.bmp?rev=1502172&r1=1502171&r2=1502172&view=diff == Binary files - no diff available.
svn commit: r1502171 - /openoffice/branches/AOO400/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
Author: jsc Date: Thu Jul 11 09:49:30 2013 New Revision: 1502171 URL: http://svn.apache.org/r1502171 Log: #122620# correct problems with bmp files Modified: openoffice/branches/AOO400/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp Modified: openoffice/branches/AOO400/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1502171&r1=1502170&r2=1502171&view=diff == Binary files - no diff available.
svn commit: r1502170 - in /openoffice/branches/AOO400/main: instsetoo_native/inc_openoffice/windows/msi_templates/Binary/ instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/ setup_native/source/w
Author: jsc Date: Thu Jul 11 09:43:45 2013 New Revision: 1502170 URL: http://svn.apache.org/r1502170 Log: #122620# correct problems with bmp files Modified: openoffice/branches/AOO400/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp openoffice/branches/AOO400/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooobitmap.bmp openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbanner.bmp openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp Modified: openoffice/branches/AOO400/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp?rev=1502170&r1=1502169&r2=1502170&view=diff == Binary files - no diff available. Modified: openoffice/branches/AOO400/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp?rev=1502170&r1=1502169&r2=1502170&view=diff == Binary files - no diff available. Modified: openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooobitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1502170&r1=1502169&r2=1502170&view=diff == Binary files - no diff available. Modified: openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbanner.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbanner.bmp?rev=1502170&r1=1502169&r2=1502170&view=diff == Binary files - no diff available. Modified: openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1502170&r1=1502169&r2=1502170&view=diff == Binary files - no diff available.
buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1502004 on branch openoffice/branches/AOO400 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/686 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1502164 - in /openoffice/branches/AOO400/main/cui: ./ source/tabpages/swpossizetabpage.cxx source/tabpages/textattr.cxx source/tabpages/transfrm.cxx
Author: alg Date: Thu Jul 11 09:23:13 2013 New Revision: 1502164 URL: http://svn.apache.org/r1502164 Log: i121917 secure SdrTextObj casts in cui Modified: openoffice/branches/AOO400/main/cui/ (props changed) openoffice/branches/AOO400/main/cui/source/tabpages/swpossizetabpage.cxx openoffice/branches/AOO400/main/cui/source/tabpages/textattr.cxx openoffice/branches/AOO400/main/cui/source/tabpages/transfrm.cxx Propchange: openoffice/branches/AOO400/main/cui/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 11 09:23:13 2013 @@ -0,0 +1,7 @@ +/incubator/ooo/branches/AOO34/main/cui:1346776-1346777,1347535,1348052,1348914,1350569,1352456,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968,1369110,1371068 +/incubator/ooo/branches/alg/linecap/main/cui:1226811-1232461 +/incubator/ooo/branches/alg/svgreplacement/main/cui:1205420-1220782 +/incubator/ooo/branches/writer001/main/cui:1356067-1386577 +/openoffice/branches/alg/clibboard/main/cui:1428975-1437368 +/openoffice/branches/sidebar/main/cui:1415095-1466374 +/openoffice/trunk/main/cui:1502162 Modified: openoffice/branches/AOO400/main/cui/source/tabpages/swpossizetabpage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/cui/source/tabpages/swpossizetabpage.cxx?rev=1502164&r1=1502163&r2=1502164&view=diff == --- openoffice/branches/AOO400/main/cui/source/tabpages/swpossizetabpage.cxx (original) +++ openoffice/branches/AOO400/main/cui/source/tabpages/swpossizetabpage.cxx Thu Jul 11 09:23:13 2013 @@ -1932,7 +1932,9 @@ void SvxSwPosSizeTabPage::SetView( const SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); if( ( pObj->GetObjInventor() == SdrInventor ) && ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && -( (SdrTextObj*) pObj )->HasText() ) +// #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText() ) { DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } Modified: openoffice/branches/AOO400/main/cui/source/tabpages/textattr.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/cui/source/tabpages/textattr.cxx?rev=1502164&r1=1502163&r2=1502164&view=diff == --- openoffice/branches/AOO400/main/cui/source/tabpages/textattr.cxx (original) +++ openoffice/branches/AOO400/main/cui/source/tabpages/textattr.cxx Thu Jul 11 09:23:13 2013 @@ -547,7 +547,9 @@ void SvxTextAttrPage::Construct() case OBJ_OUTLINETEXT : case OBJ_CAPTION : { - if ( ((SdrTextObj*)pObj)->HasText() ) + if( // #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText() ) { // Konturfluss ist NICHT bei reinen Textobjekten m�glich bContourEnabled = sal_False; Modified: openoffice/branches/AOO400/main/cui/source/tabpages/transfrm.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/cui/source/tabpages/transfrm.cxx?rev=1502164&r1=1502163&r2=1502164&view=diff == --- openoffice/branches/AOO400/main/cui/source/tabpages/transfrm.cxx (original) +++ openoffice/branches/AOO400/main/cui/source/tabpages/transfrm.cxx Thu Jul 11 09:23:13 2013 @@ -840,7 +840,11 @@ void SvxPositionSizeTabPage::Construct() const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && ((SdrTextObj*)pObj)->HasText()) + if((pObj->GetObjInventor() == SdrInventor) && +(OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && +// #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText()) { mbAdjustDisabled = false; maFlAdjust.Enable();
svn commit: r1502162 - in /openoffice/trunk/main/cui/source/tabpages: swpossizetabpage.cxx textattr.cxx transfrm.cxx
Author: alg Date: Thu Jul 11 09:19:43 2013 New Revision: 1502162 URL: http://svn.apache.org/r1502162 Log: i121917 secure SdrTextObj casts in cui Modified: openoffice/trunk/main/cui/source/tabpages/swpossizetabpage.cxx openoffice/trunk/main/cui/source/tabpages/textattr.cxx openoffice/trunk/main/cui/source/tabpages/transfrm.cxx Modified: openoffice/trunk/main/cui/source/tabpages/swpossizetabpage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/swpossizetabpage.cxx?rev=1502162&r1=1502161&r2=1502162&view=diff == --- openoffice/trunk/main/cui/source/tabpages/swpossizetabpage.cxx (original) +++ openoffice/trunk/main/cui/source/tabpages/swpossizetabpage.cxx Thu Jul 11 09:19:43 2013 @@ -1932,7 +1932,9 @@ void SvxSwPosSizeTabPage::SetView( const SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); if( ( pObj->GetObjInventor() == SdrInventor ) && ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && -( (SdrTextObj*) pObj )->HasText() ) +// #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText() ) { DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } Modified: openoffice/trunk/main/cui/source/tabpages/textattr.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/textattr.cxx?rev=1502162&r1=1502161&r2=1502162&view=diff == --- openoffice/trunk/main/cui/source/tabpages/textattr.cxx (original) +++ openoffice/trunk/main/cui/source/tabpages/textattr.cxx Thu Jul 11 09:19:43 2013 @@ -547,7 +547,9 @@ void SvxTextAttrPage::Construct() case OBJ_OUTLINETEXT : case OBJ_CAPTION : { - if ( ((SdrTextObj*)pObj)->HasText() ) + if( // #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText() ) { // Konturfluss ist NICHT bei reinen Textobjekten m�glich bContourEnabled = sal_False; Modified: openoffice/trunk/main/cui/source/tabpages/transfrm.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/transfrm.cxx?rev=1502162&r1=1502161&r2=1502162&view=diff == --- openoffice/trunk/main/cui/source/tabpages/transfrm.cxx (original) +++ openoffice/trunk/main/cui/source/tabpages/transfrm.cxx Thu Jul 11 09:19:43 2013 @@ -840,7 +840,11 @@ void SvxPositionSizeTabPage::Construct() const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && ((SdrTextObj*)pObj)->HasText()) + if((pObj->GetObjInventor() == SdrInventor) && +(OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && +// #121917# The original ((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer +0 != dynamic_cast< const SdrTextObj* >(pObj) && +static_cast< const SdrTextObj* >(pObj)->HasText()) { mbAdjustDisabled = false; maFlAdjust.Enable();
svn propchange: r1493049 - svn:log
Author: hdu Revision: 1493049 Modified property: svn:log Modified: svn:log at Thu Jul 11 08:57:35 2013 -- --- svn:log (original) +++ svn:log Thu Jul 11 08:57:35 2013 @@ -1 +1 @@ -i12525 use X and Y for unit evaluation +i122525 use X and Y for unit evaluation
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1502106 on branch openoffice/branches/AOO400 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/664 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot