buildbot success in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Success Build revision 1579114 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/682 Build reason was: The Nightly scheduler named 'openoffice-linux32-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: r1579168 - /openoffice/tags/SNAPSHOT/
Author: jsc Date: Wed Mar 19 08:22:13 2014 New Revision: 1579168 URL: http://svn.apache.org/r1579168 Log: prepare snapshot based on aoo410 branch Removed: openoffice/tags/SNAPSHOT/
svn commit: r1579169 - /openoffice/tags/SNAPSHOT/
Author: jsc Date: Wed Mar 19 08:24:02 2014 New Revision: 1579169 URL: http://svn.apache.org/r1579169 Log: new snapshot based on aoo410 branch, rev. 1578821 Added: openoffice/tags/SNAPSHOT/ (props changed) - copied from r1578821, openoffice/branches/AOO410/ Propchange: openoffice/tags/SNAPSHOT/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Mar 19 08:24:02 2014 @@ -0,0 +1,5 @@ +/openoffice/branches/AOO400:1503684 +/openoffice/branches/ia2:1417739-1541842 +/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 +/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 +/openoffice/trunk:1571617,1571677,1572577,1572587,1574058,1574101,1576748,1578786
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1579131 on branch openoffice/trunk 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/923 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
svn commit: r1579184 [2/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/k
Modified: openoffice/branches/alg_writerframes/extras/l10n/source/de/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/extras/l10n/source/de/localize.sdf?rev=1579184r1=1579183r2=1579184view=diff == --- openoffice/branches/alg_writerframes/extras/l10n/source/de/localize.sdf (original) +++ openoffice/branches/alg_writerframes/extras/l10n/source/de/localize.sdf Wed Mar 19 10:14:42 2014 @@ -1744,11 +1744,11 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:SheetRightToLeft Label 0 de Tabelle ~rechts-nach-links 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:SheetRightToLeft ContextLabel0 de ~Rechts-nach-links 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:Show Label 0 de Tabellen ~einblenden... 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:Show ContextLabel 0 de ~Anzeigen...20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:Show ContextLabel 0 de ~Einblenden... 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowChanges Label 0 de Ãnderungen an~zeigen... 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowChanges ContextLabel 0 de An~zeigen... 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowChanges ContextLabel 0 de Ein~blenden... 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowColumn Label 0 de Spalten ~einblenden 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowColumn ContextLabel 0 de An~zeigen 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowColumn ContextLabel 0 de Ein~blenden 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowDependents Label 0 de Spur zum ~Nachfolger 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowErrors Label 0 de Spur zum Fehler 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Commands..uno:ShowInvalid Label 0 de ~Ungültige Daten markieren 20130618 17:22:18 @@ -2386,7 +2386,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Effects.ooo-emphasis-grow-and-shrinkLabel 0 de VergröÃern und Verkleinern 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Effects.ooo-emphasis-line-color Label 0 de Linienfarbe ändern 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Effects.ooo-emphasis-spin Label 0 de Rotieren20130618 17:22:18 -officecfg
svn commit: r1579184 [8/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/k
Modified: openoffice/branches/alg_writerframes/extras/l10n/source/nb/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/extras/l10n/source/nb/localize.sdf?rev=1579184r1=1579183r2=1579184view=diff == --- openoffice/branches/alg_writerframes/extras/l10n/source/nb/localize.sdf (original) +++ openoffice/branches/alg_writerframes/extras/l10n/source/nb/localize.sdf Wed Mar 19 10:14:42 2014 @@ -20688,7 +20688,7 @@ helpcontent2source\text\swriter\01\0115 helpcontent2 source\text\swriter\01\0115.xhp 0 help par_id3149691 8 0 nb \ahelp hid=\SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL\\Behandler alle postene i databasen.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\0115.xhp 0 help hd_id31551869 0 nb Utvalgte poster 20130618 17:22:18 helpcontent2 source\text\swriter\01\0115.xhp 0 help par_id3149483 10 0 nb \ahelp hid=\SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED\\Behandler bare de valgte postene i databasen. Dette er bare mulig hvis du allerede har valgt de ønskede postene i databasen.\/ahelp\ 20130618 17:22:18 -helpcontent2 source\text\swriter\01\0115.xhp 0 help hd_id314981923 0 nb From 20130618 17:22:18 +helpcontent2 source\text\swriter\01\0115.xhp 0 help hd_id314981923 0 nb Fra 20130618 17:22:18 helpcontent2 source\text\swriter\01\0115.xhp 0 help par_id3149104 24 0 nb \ahelp hid=\SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM\\Velg hvilke poster du vil ha med i brevflettingen.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\0115.xhp 0 help hd_id315126011 0 nb Fra: 20130618 17:22:18 helpcontent2 source\text\swriter\01\0115.xhp 0 help par_id3149034 12 0 nb \ahelp hid=\SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM\\Angir nummeret på den første posten som skal skrives ut.\/ahelp\ 20130618 17:22:18 @@ -20856,7 +20856,7 @@ helpcontent2source\text\swriter\01\0211 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN107AF0 nb \ahelp hid=\.\ visibility=\hidden\\Bruk denne knappen til å bla gjennom OLE-objekter.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN107C60 nb \ahelp hid=\.\ visibility=\hidden\\Bruk denne knappen til å bla gjennom overskrifter.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN107DD0 nb \ahelp hid=\.\ visibility=\hidden\\Bruk denne knappen til å bla gjennom sider.\/ahelp\ 20130618 17:22:18 -helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN107F40 nb \ahelp hid=\.\ visibility=\hidden\\Select this icon to browse through comments.\/ahelp\ 20130618 17:22:18 +helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN107F40 nb \ahelp hid=\.\ visibility=\hidden\\Velg dette ikonet for å bla gjennom kommentarer.\/ahelp\20130618 17:22:18 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN1080B0 nb \ahelp hid=\.\ visibility=\hidden\\Plasserer skrivemerket ved det forrige objektet av den valgte typen.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN108290 nb \ahelp hid=\.\ visibility=\hidden\\Bruk denne knappen til å bla gjennom bolker.\/ahelp\ 20130618 17:22:18 helpcontent2 source\text\swriter\01\02110100.xhp 0 help par_idN108400 nb \ahelp hid=\.\ visibility=\hidden\\Bruk denne knappen til å bla gjennom utvalg.\/ahelp\ 20130618 17:22:18 @@ -20972,13 +20972,13 @@ helpcontent2 source\text\swriter\01\0214 helpcontent2 source\text\swriter\01\0214.xhp 0 help hd_id314955624 0 nb Forskyvning 20130618 17:22:18
svn commit: r1579184 [22/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/
Modified:
openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
---
openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
(original)
+++
openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
Wed Mar 19 10:14:42 2014
@@ -71,6 +71,12 @@ SidebarDockingWindow::~SidebarDockingWin
void SidebarDockingWindow::DoDispose (void)
{
+Referencelang::XComponent xComponent
(static_castXWeak*(mpSidebarController.get()), UNO_QUERY);
+mpSidebarController.clear();
+if (xComponent.is())
+{
+xComponent-dispose();
+}
}
Modified:
openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
--- openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx
(original)
+++ openoffice/branches/alg_writerframes/main/sfx2/source/sidebar/TabBar.cxx
Wed Mar 19 10:14:42 2014
@@ -198,7 +198,7 @@ void TabBar::Layout (void)
Theme::GetInteger(Theme::Int_TabItemHeight));
// Place the menu button and the separator.
-if (mpMenuButton != NULL)
+if( bool(mpMenuButton))
{
mpMenuButton-SetPosSizePixel(
Point(nX,nY),
Modified:
openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
---
openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
(original)
+++
openoffice/branches/alg_writerframes/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
Wed Mar 19 10:14:42 2014
@@ -494,7 +494,7 @@ namespace /* private */ {
/RecentFiles
*/
-extern C void add_to_recently_used_file_list(const rtl::OUString file_url,
const rtl::OUString mime_type)
+extern C void SAL_DLLPUBLIC_EXPORT add_to_recently_used_file_list( const
rtl::OUString file_url, const rtl::OUString mime_type)
{
try
{
Modified:
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
---
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx
(original)
+++
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animatedsprite.cxx
Wed Mar 19 10:14:42 2014
@@ -157,7 +157,7 @@ namespace slideshow
}
}
- return mpSprite;
+ return (mpSprite.get() != NULL);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize
rPixelOffset )
Modified:
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
---
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx
(original)
+++
openoffice/branches/alg_writerframes/main/slideshow/source/engine/animationnodes/basecontainernode.cxx
Wed Mar 19 10:14:42 2014
@@ -154,7 +154,7 @@ void BaseContainerNode::showState() cons
for( std::size_t i=0; imaChildren.size(); ++i )
{
BaseNodeSharedPtr pNode =
-boost::shared_dynamic_castBaseNode(maChildren[i]);
+boost::dynamic_pointer_castBaseNode(maChildren[i]);
VERBOSE_TRACE(
Node connection: n0x%X - n0x%X,
(const char*)this+debugGetCurrentOffset(),
Modified:
openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx?rev=1579184r1=1579183r2=1579184view=diff
==
---
openoffice/branches/alg_writerframes/main/slideshow/source/engine/shapes/viewshape.cxx
(original)
+++
svn commit: r1579210 - in /openoffice/trunk/main: filter/source/graphicfilter/itiff/ccidecom.cxx filter/source/graphicfilter/itiff/ccidecom.hxx filter/source/graphicfilter/itiff/itiff.cxx vcl/source/g
Author: alg
Date: Wed Mar 19 12:34:44 2014
New Revision: 1579210
URL: http://svn.apache.org/r1579210
Log:
i122984 Avoid too many Print JobSetups, be more tolerant with last line TIFF
imports
Modified:
openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.cxx
openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.hxx
openoffice/trunk/main/filter/source/graphicfilter/itiff/itiff.cxx
openoffice/trunk/main/vcl/source/gdi/print.cxx
Modified: openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.cxx?rev=1579210r1=1579209r2=1579210view=diff
==
--- openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.cxx
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.cxx Wed
Mar 19 12:34:44 2014
@@ -629,7 +629,7 @@ void CCIDecompressor::StartDecompression
}
-sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits )
+sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits, bool bLastLine )
{
sal_uInt16 i;
sal_uInt8 * pSrc,* pDst;
@@ -714,6 +714,12 @@ sal_Bool CCIDecompressor::DecompressScan
for ( i = 0; i nLastLineSize; i++ ) *(pDst++)=*(pSrc++);
}
+// #122984#
+if( !bStatus bLastLine )
+{
+bStatus = sal_True;
+}
+
if ( pIStream-GetError() )
bStatus = sal_False;
Modified: openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.hxx?rev=1579210r1=1579209r2=1579210view=diff
==
--- openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.hxx
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itiff/ccidecom.hxx Wed
Mar 19 12:34:44 2014
@@ -58,7 +58,7 @@ public:
void StartDecompression( SvStream rIStream );
- sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits
);
+ sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits,
bool bLastLine );
private:
Modified: openoffice/trunk/main/filter/source/graphicfilter/itiff/itiff.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itiff/itiff.cxx?rev=1579210r1=1579209r2=1579210view=diff
==
--- openoffice/trunk/main/filter/source/graphicfilter/itiff/itiff.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itiff/itiff.cxx Wed Mar
19 12:34:44 2014
@@ -564,7 +564,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong
pTIFF-Seek( pStripOffsets[ nStrip ] );
aCCIDecom.StartDecompression( *pTIFF );
}
- if ( aCCIDecom.DecompressScanline( pMap[ np ],
nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes ) == sal_False )
+ if ( aCCIDecom.DecompressScanline( pMap[ np ],
nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes )
== sal_False )
return sal_False;
if ( pTIFF-GetError() )
return sal_False;
Modified: openoffice/trunk/main/vcl/source/gdi/print.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/print.cxx?rev=1579210r1=1579209r2=1579210view=diff
==
--- openoffice/trunk/main/vcl/source/gdi/print.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/print.cxx Wed Mar 19 12:34:44 2014
@@ -1224,11 +1224,25 @@ sal_Bool Printer::SetPaperSizeUser( cons
if ( mbInPrintPage )
return sal_False;
- SizeaPixSize = LogicToPixel( rSize );
- SizeaPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
- if ( (maJobSetup.ImplGetConstData()-mePaperFormat != PAPER_USER)
||
-(maJobSetup.ImplGetConstData()-mnPaperWidth !=
aPageSize.Width()) ||
-(maJobSetup.ImplGetConstData()-mnPaperHeight !=
aPageSize.Height()) )
+const Size aPixSize = LogicToPixel( rSize );
+const Size aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
+bool bNeedToChange(maJobSetup.ImplGetConstData()-mnPaperWidth !=
aPageSize.Width() ||
+maJobSetup.ImplGetConstData()-mnPaperHeight != aPageSize.Height());
+
+if(!bNeedToChange)
+{
+// #122984# only need to change when Paper is different from
PAPER_USER and
+// the mapped Paper which will created below in the call to
svn commit: r1579216 - in /openoffice/branches/AOO410/main/oox/source/ppt: presentationfragmenthandler.cxx slidefragmenthandler.cxx
Author: jsc
Date: Wed Mar 19 12:45:05 2014
New Revision: 1579216
URL: http://svn.apache.org/r1579216
Log:
#124456# add null pointer check to avoid usage of not initialzed theme, add
comment for missing theme support in notes page
Modified:
openoffice/branches/AOO410/main/oox/source/ppt/presentationfragmenthandler.cxx
openoffice/branches/AOO410/main/oox/source/ppt/slidefragmenthandler.cxx
Modified:
openoffice/branches/AOO410/main/oox/source/ppt/presentationfragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/oox/source/ppt/presentationfragmenthandler.cxx?rev=1579216r1=1579215r2=1579216view=diff
==
---
openoffice/branches/AOO410/main/oox/source/ppt/presentationfragmenthandler.cxx
(original)
+++
openoffice/branches/AOO410/main/oox/source/ppt/presentationfragmenthandler.cxx
Wed Mar 19 12:45:05 2014
@@ -273,6 +273,9 @@ void PresentationFragmentHandler::endDoc
SlidePersistPtr
pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/*sal_False*/,
sal_True, xNotesPage,
ShapePtr( new
PPTShape( Slide, com.sun.star.drawing.GroupShape ) ), mpTextListStyle ) );
FragmentHandlerRef
xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(),
aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );
+
+// TODO: Theme support is missing, theme pointer
in SlidePersist is null and used later
+
importSlide(
xNotesMasterFragmentHandler, pNotesMasterPersistPtr );
pNotesMasterPersistPtr-createXShapes( rFilter );
pNotesPersistPtr-setMasterPersist(pNotesMasterPersistPtr);
Modified:
openoffice/branches/AOO410/main/oox/source/ppt/slidefragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/oox/source/ppt/slidefragmenthandler.cxx?rev=1579216r1=1579215r2=1579216view=diff
==
--- openoffice/branches/AOO410/main/oox/source/ppt/slidefragmenthandler.cxx
(original)
+++ openoffice/branches/AOO410/main/oox/source/ppt/slidefragmenthandler.cxx Wed
Mar 19 12:45:05 2014
@@ -141,10 +141,15 @@ Reference XFastContextHandler SlideFr
case PPT_TOKEN( bgRef )://
a:CT_StyleMatrixReference
{
- FillPropertiesPtr pFillPropertiesPtr( new
FillProperties(
- *mpSlidePersistPtr-getTheme()-getFillStyle(
xAttribs-getOptionalValue( XML_idx ).toInt32() ) ) );
- xRet.set( new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() ) );
- mpSlidePersistPtr-setBackgroundProperties(
pFillPropertiesPtr );
+oox::drawingml::ThemePtr pTheme = mpSlidePersistPtr-getTheme();
+if (pTheme)
+{
+FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
+ *pTheme-getFillStyle(
xAttribs-getOptionalValue( XML_idx ).toInt32() ) ) );
+mpSlidePersistPtr-setBackgroundProperties( pFillPropertiesPtr
);
+}
+xRet.set( new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() ) );
+
}
break;
svn commit: r1579217 - in /openoffice/trunk/main/oox/source/ppt: presentationfragmenthandler.cxx slidefragmenthandler.cxx
Author: jsc
Date: Wed Mar 19 12:47:53 2014
New Revision: 1579217
URL: http://svn.apache.org/r1579217
Log:
#124456# merge from aoo410 branch, add null pointer check to avoid usage of not
initialzed theme, add comment for missing theme support in notes page
Modified:
openoffice/trunk/main/oox/source/ppt/presentationfragmenthandler.cxx
openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
Modified: openoffice/trunk/main/oox/source/ppt/presentationfragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ppt/presentationfragmenthandler.cxx?rev=1579217r1=1579216r2=1579217view=diff
==
--- openoffice/trunk/main/oox/source/ppt/presentationfragmenthandler.cxx
(original)
+++ openoffice/trunk/main/oox/source/ppt/presentationfragmenthandler.cxx Wed
Mar 19 12:47:53 2014
@@ -273,6 +273,9 @@ void PresentationFragmentHandler::endDoc
SlidePersistPtr
pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/*sal_False*/,
sal_True, xNotesPage,
ShapePtr( new
PPTShape( Slide, com.sun.star.drawing.GroupShape ) ), mpTextListStyle ) );
FragmentHandlerRef
xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(),
aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );
+
+// TODO: Theme support is missing, theme pointer
in SlidePersist is null and used later
+
importSlide(
xNotesMasterFragmentHandler, pNotesMasterPersistPtr );
pNotesMasterPersistPtr-createXShapes( rFilter );
pNotesPersistPtr-setMasterPersist(pNotesMasterPersistPtr);
Modified: openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx?rev=1579217r1=1579216r2=1579217view=diff
==
--- openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx (original)
+++ openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx Wed Mar 19
12:47:53 2014
@@ -141,10 +141,15 @@ Reference XFastContextHandler SlideFr
case PPT_TOKEN( bgRef )://
a:CT_StyleMatrixReference
{
- FillPropertiesPtr pFillPropertiesPtr( new
FillProperties(
- *mpSlidePersistPtr-getTheme()-getFillStyle(
xAttribs-getOptionalValue( XML_idx ).toInt32() ) ) );
- xRet.set( new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() ) );
- mpSlidePersistPtr-setBackgroundProperties(
pFillPropertiesPtr );
+oox::drawingml::ThemePtr pTheme = mpSlidePersistPtr-getTheme();
+if (pTheme)
+{
+FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
+ *pTheme-getFillStyle(
xAttribs-getOptionalValue( XML_idx ).toInt32() ) ) );
+mpSlidePersistPtr-setBackgroundProperties( pFillPropertiesPtr
);
+}
+xRet.set( new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() ) );
+
}
break;
svn commit: r1579246 - /openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx
Author: alg
Date: Wed Mar 19 14:51:18 2014
New Revision: 1579246
URL: http://svn.apache.org/r1579246
Log:
i124452 correct svg:viewBox for EnhancedCustomShape geometry import when no
width and no height are given
Modified:
openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx
Modified: openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx?rev=1579246r1=1579245r2=1579246view=diff
==
--- openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx (original)
+++ openoffice/trunk/main/xmloff/source/draw/ximpcustomshape.cxx Wed Mar 19
14:51:18 2014
@@ -52,6 +52,7 @@
#include com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp
#include com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp
#include com/sun/star/drawing/ProjectionMode.hpp
+#include basegfx/vector/b2dvector.hxx
#include hash_map
using namespace ::com::sun::star;
@@ -853,7 +854,48 @@ void XMLEnhancedCustomShapeContext::Star
case EAS_viewBox :
{
SdXMLImExViewBox aViewBox( rValue,
GetImport().GetMM100UnitConverter() );
- awt::Rectangle aRect( aViewBox.GetX(),
aViewBox.GetY(), aViewBox.GetWidth(), aViewBox.GetHeight() );
+awt::Rectangle aRect(
+basegfx::fround(aViewBox.GetX()),
+basegfx::fround(aViewBox.GetY()),
+basegfx::fround(aViewBox.GetWidth()),
+basegfx::fround(aViewBox.GetHeight()));
+
+if(0 == aRect.Width 0 == aRect.Height)
+{
+// #124452# If in svg:viewBox no width and height is
given the objects should normally
+// not be visible at all, but in this case it is a bug
in LO to write empty svg:viewBox
+// entries for CustomShapes. To allow for a better ODF
user experience, just correct this
+// here by getting the real object scale from the
already set transformation from the xShape.
+// Hopefully LO will fix that bug (but this will still
leave the files with the error), but
+// even when not this will do no harm as long noone
uses this state explicitely for some
+// purpose (e.g. to really have CustomShapes without
content, but unlikely).
+// When they do fix this they will need this fix
anyways to read their own misformed ODF files
+// again, so I guess it will be taken, too...
+uno::Reference beans::XPropertySet xProps(mrxShape,
uno::UNO_QUERY_THROW);
+uno::Any aObjectTransform =
xProps-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Transformation)));
+drawing::HomogenMatrix3 aTransformMatrix;
+aObjectTransform = aTransformMatrix;
+basegfx::B2DHomMatrix aMatrix;
+
+aMatrix.set(0, 0, aTransformMatrix.Line1.Column1);
+aMatrix.set(0, 1, aTransformMatrix.Line1.Column2);
+aMatrix.set(0, 2, aTransformMatrix.Line1.Column3);
+aMatrix.set(1, 0, aTransformMatrix.Line2.Column1);
+aMatrix.set(1, 1, aTransformMatrix.Line2.Column2);
+aMatrix.set(1, 2, aTransformMatrix.Line2.Column3);
+aMatrix.set(2, 0, aTransformMatrix.Line3.Column1);
+aMatrix.set(2, 1, aTransformMatrix.Line3.Column2);
+aMatrix.set(2, 2, aTransformMatrix.Line3.Column3);
+
+basegfx::B2DVector aScale, aTranslate;
+double fRotate, fShearX;
+
+aMatrix.decompose(aScale, aTranslate, fRotate,
fShearX);
+
+aRect.Width = basegfx::fround(fabs(aScale.getX()));
+aRect.Height = basegfx::fround(fabs(aScale.getY()));
+}
+
beans::PropertyValue aProp;
aProp.Name = EASGet( EAS_ViewBox );
aProp.Value = aRect;
svn commit: r1579284 - /openoffice/branches/alg_writerframes/
Author: alg Date: Wed Mar 19 16:22:01 2014 New Revision: 1579284 URL: http://svn.apache.org/r1579284 Log: Delete branch alg_writerframes, reintegrated to trunk in r1579280 Removed: openoffice/branches/alg_writerframes/
svn commit: r1579306 - /openoffice/site/trunk/content/developer-faqs.mdtext
Author: kschenk Date: Wed Mar 19 17:37:06 2014 New Revision: 1579306 URL: http://svn.apache.org/r1579306 Log: Removed information on Raphael's and Ariel's builds as per Andrea's suggestion. Modified: openoffice/site/trunk/content/developer-faqs.mdtext Modified: openoffice/site/trunk/content/developer-faqs.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/developer-faqs.mdtext?rev=1579306r1=1579305r2=1579306view=diff == --- openoffice/site/trunk/content/developer-faqs.mdtext (original) +++ openoffice/site/trunk/content/developer-faqs.mdtext Wed Mar 19 17:37:06 2014 @@ -117,13 +117,6 @@ Development snapshots, which are manuall [the Unofficial Development Snapshots page](https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds) -Additionally -- - -Raphael Bircher posts occasional -developer snapshot builds for other platforms on his [personal website][14]. - -Ariel Constenla-Haile had previously posted a set of unofficial, unstable, untested developer builds [here][15]. - Also, please see the [Planning Area of the Project Wiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Project+Planning) for additional information on current and future releases.
svn commit: r1579280 [3/8] - in /openoffice/trunk: ./ main/boost/ main/chart2/source/controller/main/ main/comphelper/inc/comphelper/ main/comphelper/source/property/ main/cui/source/factory/ main/cui
Modified:
openoffice/trunk/main/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx?rev=1579280r1=1579279r2=1579280view=diff
==
---
openoffice/trunk/main/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
(original)
+++
openoffice/trunk/main/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
Wed Mar 19 16:17:02 2014
@@ -45,270 +45,285 @@ using namespace com::sun::star;
namespace drawinglayer
{
- namespace primitive3d
- {
- Primitive3DSequence
HatchTexturePrimitive3D::impCreate3DDecomposition() const
- {
- Primitive3DSequence aRetval;
-
- if(getChildren().hasElements())
- {
- const Primitive3DSequence
aSource(getChildren());
- const sal_uInt32
nSourceCount(aSource.getLength());
- std::vector Primitive3DReference
aDestination;
-
- for(sal_uInt32 a(0); a nSourceCount; a++)
- {
- // get reference
- const Primitive3DReference
xReference(aSource[a]);
-
- if(xReference.is())
- {
- // try to cast to
BasePrimitive2D implementation
- const BasePrimitive3D*
pBasePrimitive = dynamic_cast const BasePrimitive3D* (xReference.get());
-
- if(pBasePrimitive)
- {
- // it is a
BasePrimitive3D implementation, use getPrimitive3DID() call for switch
- // not all content is
needed, remove transparencies and ModifiedColorPrimitives
-
switch(pBasePrimitive-getPrimitive3DID())
- {
- case
PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D :
- {
- //
polyPolygonMaterialPrimitive3D, check texturing and hatching
- const
PolyPolygonMaterialPrimitive3D rPrimitive = static_cast const
PolyPolygonMaterialPrimitive3D (*pBasePrimitive);
- const
basegfx::B3DPolyPolygon aFillPolyPolygon(rPrimitive.getB3DPolyPolygon());
-
-
if(maHatch.isFillBackground())
- {
-
// add original primitive for background
-
aDestination.push_back(xReference);
- }
-
-
if(aFillPolyPolygon.areTextureCoordinatesUsed())
- {
-
const sal_uInt32 nPolyCount(aFillPolyPolygon.count());
-
basegfx::B2DPolyPolygon aTexPolyPolygon;
-
basegfx::B2DPoint a2N;
-
basegfx::B2DVector a2X, a2Y;
-
basegfx::B3DPoint a3N;
-
basegfx::B3DVector a3X, a3Y;
-
bool b2N(false), b2X(false), b2Y(false);
-
-
for(sal_uInt32 b(0); b nPolyCount; b++)
-
{
-
const basegfx::B3DPolygon aPartPoly(aFillPolyPolygon.getB3DPolygon(b));
-
svn commit: r1579280 [8/8] - in /openoffice/trunk: ./ main/boost/ main/chart2/source/controller/main/ main/comphelper/inc/comphelper/ main/comphelper/source/property/ main/cui/source/factory/ main/cui
Modified: openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx?rev=1579280r1=1579279r2=1579280view=diff
==
--- openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx Wed Mar 19 16:17:02 2014
@@ -250,7 +250,14 @@ SwTemplateDlg::SwTemplateDlg(Window*
p
SwWrapTabPage::GetRanges );
DBG_ASSERT(pFact-GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ),
GetTabPageCreatorFunc fail!);
DBG_ASSERT(pFact-GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ),
GetTabPageRangesFunc fail!);
-AddTabPage(TP_BACKGROUND, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_BACKGROUND ), pFact-GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )
);
+
+// remove?
+//AddTabPage(TP_BACKGROUND, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_BACKGROUND ), pFact-GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )
);
+
+// add Area and Transparence TabPages
+AddTabPage(RID_SVXPAGE_AREA);
+AddTabPage(RID_SVXPAGE_TRANSPARENCE);
+
DBG_ASSERT(pFact-GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
GetTabPageCreatorFunc fail!);
DBG_ASSERT(pFact-GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
GetTabPageRangesFunc fail!);
AddTabPage(TP_BORDER, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), pFact-GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
@@ -510,6 +517,8 @@ void SwTemplateDlg::PageCreated( sal_uIn
((SwColumnPage)rPage).SetFormatUsed( sal_True );
break;
+// do not remove; many other style dialog combinations still use
the SfxTabPage
+// for the SvxBrushItem (see RID_SVXPAGE_BACKGROUND)
case TP_BACKGROUND:
{
sal_Int32 nFlagType = 0;
@@ -633,8 +642,34 @@ void SwTemplateDlg::PageCreated( sal_uIn
rPage.PageCreated(aSet);
break;
- }
-}
+// inits for Area and Transparency TabPages
+// The selection attribute lists (XPropertyList derivates, e.g.
XColorList for
+// the color table) need to be added as items (e.g. SvxColorTableItem)
to make
+// these pages find the needed attributes for fill style suggestions.
+// These are added in SwDocStyleSheet::GetItemSet() for the
SFX_STYLE_FAMILY_PARA on
+// demand, but could also be directly added from the DrawModel.
+case RID_SVXPAGE_AREA:
+{
+SfxItemSet aNew(*aSet.GetPool(),
+SID_COLOR_TABLE, SID_BITMAP_LIST,
+SID_OFFER_IMPORT, SID_OFFER_IMPORT, 0, 0);
+
+aNew.Put(GetStyleSheet().GetItemSet());
+
+// add flag for direct graphic content selection
+aNew.Put(SfxBoolItem(SID_OFFER_IMPORT, true));
+rPage.PageCreated(aNew);
+}
+break;
+
+case RID_SVXPAGE_TRANSPARENCE:
+{
+rPage.PageCreated(GetStyleSheet().GetItemSet());
+}
+break;
+ }
+}
+// eof
Modified: openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.src?rev=1579280r1=1579279r2=1579280view=diff
==
--- openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.src (original)
+++ openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.src Wed Mar 19 16:17:02 2014
@@ -305,12 +305,29 @@ TabDialog DLG_TEMPLATE_3
Text [ en-US ] = Wrap ;
PageResID = TP_FRM_WRAP ;
};
- PageItem
- {
- Identifier = TP_BACKGROUND ;
- Text [ en-US ] = Background ;
- PageResID = TP_BACKGROUND ;
- };
+
+// new Area and Transparence TabPages
+PageItem
+{
+Identifier = RID_SVXPAGE_AREA;
+PageResID = RID_SVXPAGE_AREA;
+Text [ en-US ] = Area ;
+};
+PageItem
+{
+Identifier = RID_SVXPAGE_TRANSPARENCE;
+PageResID = RID_SVXPAGE_TRANSPARENCE;
+Text [ en-US ] = Transparency ;
+};
+
+// Remove?
+//PageItem
+//{
+//Identifier = TP_BACKGROUND ;
+//Text [ en-US ] = Background ;
+//PageResID = TP_BACKGROUND ;
+//};
+
PageItem
{
Identifier = TP_BORDER ;
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
Hi! , The openoffice-fbsd-nightly builder has just completed a run STATUS: Failure Build revision 1579536 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-fbsd2_64bit Build results at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/215 Build reason was: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Failure Build revision 1579506 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/683 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Failure Build revision 1579280 on branch openoffice/trunk 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/976 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
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Failure Build revision 1579533 on branch openoffice/trunk 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/924 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
