date:20131212

buildbot failure in ASF Buildbot on openoffice-linux64-nightly

2013-12-12 Thread buildbot

Hi! , The openoffice-linux64-nightly builder has just completed a run

STATUS: Failure

 Build revision 1550344 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/825

 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: r1550375 - in /openoffice/trunk/main/binaryurp/source: cache.hxx lessoperators.cxx lessoperators.hxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 08:50:55 2013
New Revision: 1550375

URL: http://svn.apache.org/r1550375
Log:
#i122208# replace the binaryurp cache for improved C++ compatibility

The C++ standards allows that the instantiation of incomplete types fails. The
Map::iterator in binaryurp Cache's Entry members had this problem. This rewrite
makes the code work with all compliant C++ compilers/STLs such as clang/libc++.
A Cache variant using an unordered_map is also provided and may be faster.
An interesting alternative would be to use boost's multi_index_container.

Modified:
openoffice/trunk/main/binaryurp/source/cache.hxx
openoffice/trunk/main/binaryurp/source/lessoperators.cxx
openoffice/trunk/main/binaryurp/source/lessoperators.hxx

Modified: openoffice/trunk/main/binaryurp/source/cache.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/source/cache.hxx?rev=1550375r1=1550374r2=1550375view=diff
==
--- openoffice/trunk/main/binaryurp/source/cache.hxx (original)
+++ openoffice/trunk/main/binaryurp/source/cache.hxx Thu Dec 12 08:50:55 2013
@@ -27,7 +27,12 @@
 #include sal/config.h
 
 #include cstddef
-#include map
+#include list
+#ifdef USE_UNORDERED_MAP
+   #include unordered_map
+#else
+   #include map
+#endif
 
 #include boost/noncopyable.hpp
 #include osl/diagnose.h
@@ -41,90 +46,66 @@ enum { size = 256, ignore = 0x };
 
 }
 
-template typename T  class Cache: private boost::noncopyable {
+template typename T  class Cache : private boost::noncopyable {
 public:
+typedef sal_uInt16 IdxType;
+
 explicit Cache(std::size_t size):
-size_(size), first_(map_.end()), last_(map_.end())
+size_(size)
 {
 OSL_ASSERT(size  cache::ignore);
 }
 
-sal_uInt16 add(T const  content, bool * found) {
-OSL_ASSERT(found != 0);
-typename Map::iterator i(map_.find(content));
-*found = i != map_.end();
-if (i == map_.end()) {
-typename Map::size_type n = map_.size();
-if (n  size_) {
-i =
-(map_.insert(
-typename Map::value_type(
-content,
-Entry(
-static_cast sal_uInt16 (n), map_.end(),
-first_.
-first;
-if (first_ == map_.end()) {
-last_ = i;
-} else {
-first_-second.prev = i;
-}
-first_ = i;
-} else if (last_ != map_.end()) {
-i =
-(map_.insert(
-typename Map::value_type(
-content,
-Entry(last_-second.index, map_.end(), first_.
-first;
-first_-second.prev = i;
-first_ = i;
-typename Map::iterator j(last_);
-last_ = last_-second.prev;
-last_-second.next = map_.end();
-map_.erase(j);
-} else {
-// Reached iff size_ == 0:
-return cache::ignore;
-}
-} else if (i != first_) {
-// Move to front (reached only if size_  1):
-i-second.prev-second.next = i-second.next;
-if (i-second.next == map_.end()) {
-last_ = i-second.prev;
-} else {
-i-second.next-second.prev = i-second.prev;
-}
-i-second.prev = map_.end();
-i-second.next = first_;
-first_-second.prev = i;
-first_ = i;
-}
-return i-second.index;
+IdxType add( const T rContent, bool* pbFound) {
+   OSL_ASSERT( pbFound != NULL);
+   if( !size_) {
+   *pbFound = false;
+   return cache::ignore;
+   }
+   // try to insert into the map
+   list_.push_front( rContent); // create a temp entry
+   typedef std::pairtypename LruList::iterator, IdxType MappedType;
+   typedef std::pairtypename LruItMap::iterator,bool MapPair;
+   MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
+   *pbFound = !aMP.second;
+   
+   if( !aMP.second) { // insertion not needed = found the entry
+   list_.pop_front(); // remove the temp entry
+   list_.splice( list_.begin(), list_, aMP.first-first); // the 
found entry is moved to front
+   return aMP.first-second;
+   }
+
+   // test insertion successful = it was new so we keep it
+   IdxType n = static_castIdxType( map_.size() - 1);
+   if( n = size_) { // cache full = replace the LRU entry
+   // find the least recently used element in the map
+   typename LruItMap::iterator it = map_.find( --list_.end());
+   n =

svn commit: r1550381 - in /openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64: except.cxx share.hxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 09:23:56 2013
New Revision: 1550381

URL: http://svn.apache.org/r1550381
Log:
#i122195# fix leak when handling exceptions in the UNO bridge for OSX 64bit

Modified:
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx

Modified: 
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx?rev=1550381r1=1550380r2=1550381view=diff
==
--- openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx 
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx 
Thu Dec 12 09:23:56 2013
@@ -213,8 +213,6 @@ type_info * RTTI::getRTTI( typelib_Compo
 static void deleteException( void * pExc )
 {
 __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-if( !header-exceptionType) // TODO: remove this when getRTTI() always 
returns non-NULL
-return; // NOTE: leak for now
 typelib_TypeDescription * pTD = 0;
 OUString unoName( toUNOname( header-exceptionType-name() ) );
 ::typelib_typedescription_getByName( pTD, unoName.pData );

Modified: 
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx?rev=1550381r1=1550380r2=1550381view=diff
==
--- openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx 
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx 
Thu Dec 12 09:23:56 2013
@@ -40,7 +40,7 @@ struct _Unwind_Exception
 void * exception_cleanup;
 uintptr_t private_1;
 uintptr_t private_2;
-} __attribute__((__aligned__));
+};
 
 struct __cxa_exception
 {

svn commit: r1550388 - /openoffice/trunk/main/configmgr/source/modifications.hxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 09:48:15 2013
New Revision: 1550388

URL: http://svn.apache.org/r1550388
Log:
#i122208# force boost *map for configmgr's Modifications Node structure

The C++ standards allows that the instantiation of incomplete types fails. The
Node structure had this problem because it contained a map of Node structures
itself. Boost containers explicitly allow recursive types so they solve that.

Modified:
openoffice/trunk/main/configmgr/source/modifications.hxx

Modified: openoffice/trunk/main/configmgr/source/modifications.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/source/modifications.hxx?rev=1550388r1=1550387r2=1550388view=diff
==
--- openoffice/trunk/main/configmgr/source/modifications.hxx (original)
+++ openoffice/trunk/main/configmgr/source/modifications.hxx Thu Dec 12 
09:48:15 2013
@@ -26,20 +26,19 @@
 
 #include sal/config.h
 
-#include map
+#include boost/unordered_map.hpp // using the boost container because it 
explicitly allows recursive types
 
 #include boost/noncopyable.hpp
 
 #include path.hxx
-
-namespace rtl { class OUString; }
+#include rtl/ustring.hxx
 
 namespace configmgr {
 
 class Modifications: private boost::noncopyable {
 public:
 struct Node {
-typedef std::map rtl::OUString, Node  Children;
+typedef boost::unordered_map rtl::OUString, Node, rtl::OUStringHash  
Children;
 
 Children children;
 };

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

2013-12-12 Thread buildbot

Hi! , The openoffice-linux32-nightly builder has just completed a run

STATUS: Failure

 Build revision 1550344 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/583

 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 success in ASF Buildbot on aoo-win7

2013-12-12 Thread buildbot

Hi! , The aoo-win7 builder has just completed a run

STATUS: Success

 Build revision 1550158 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/871

 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: r1550389 - /openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 10:08:52 2013
New Revision: 1550389

URL: http://svn.apache.org/r1550389
Log:
#i122195# provide a uno_purpenvhelpers map file for the OSX 64bit UNO bridge

almost a verbatim copy of the uno_purpenvhelpers map for generic gcc3 targets
which works because the mangled symbol names match for the OSX 64bit target.

Added:
openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map
  - copied, changed from r1550372, 
openoffice/trunk/main/cppu/util/uno_purpenvhelpergcc3.map

Copied: openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map (from 
r1550372, openoffice/trunk/main/cppu/util/uno_purpenvhelpergcc3.map)
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map?p2=openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.mapp1=openoffice/trunk/main/cppu/util/uno_purpenvhelpergcc3.mapr1=1550372r2=1550389rev=1550389view=diff
==
--- openoffice/trunk/main/cppu/util/uno_purpenvhelpergcc3.map (original)
+++ openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map Thu Dec 12 
10:08:52 2013
@@ -7,22 +7,24 @@
 #  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.
-#  
+# 
 ###
+
 UDK_3_0_0 {
global:
-
_ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
+
_ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
 
_ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
 
local:
*;
 };
+

svn commit: r1550416 - in /openoffice/trunk/main/vcl/aqua/source/dtrans: DataFlavorMapping.cxx DataFlavorMapping.hxx aqua_clipboard.cxx aqua_clipboard.hxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 13:37:51 2013
New Revision: 1550416

URL: http://svn.apache.org/r1550416
Log:
#i123841# fix constness issues in OSX 64bit clipboard handling

Modified:
openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
openoffice/trunk/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
openoffice/trunk/main/vcl/aqua/source/dtrans/aqua_clipboard.hxx

Modified: openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1550416r1=1550415r2=1550416view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx 
(original)
+++ openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Thu Dec 
12 13:37:51 2013
@@ -64,7 +64,7 @@ namespace // private
 
   typedef vectorsal_Unicode UnicodeBuffer;
 
-  OUString NSStringToOUString(NSString* cfString)
+  OUString NSStringToOUString( const NSString* cfString)
   {
BOOST_ASSERT(cfString  Invalid parameter);
 
@@ -113,7 +113,7 @@ namespace // private
 
   struct FlavorMap
   {
-   NSString* SystemFlavor;
+   const NSString* SystemFlavor;
const char* OOoFlavor;
const char* HumanPresentableName;
Type DataType;
@@ -121,7 +121,7 @@ namespace // private
 
   /* At the moment it appears as if only MS Office pastes public.html to the 
clipboard. 
*/
-  FlavorMap flavorMap[] =
+  static const FlavorMap flavorMap[] =
{
  { NSStringPboardType, text/plain;charset=utf-16, Unicode Text 
(UTF-16), CPPUTYPE_OUSTRING },
  { NSRTFPboardType, text/richtext, Rich Text Format, 
CPPUTYPE_SEQINT8 },
@@ -521,13 +521,13 @@ DataFlavorMapper::~DataFlavorMapper()
 }
 }
 
-DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* 
systemDataFlavor) const
+DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* 
systemDataFlavor) const
 {
   DataFlavor oOOFlavor;
 
   for (size_t i = 0; i  SIZE_FLAVOR_MAP; i++)
{
- if ([systemDataFlavor caseInsensitiveCompare: 
flavorMap[i].SystemFlavor] == NSOrderedSame)
+ if ([systemDataFlavor 
caseInsensitiveCompare:const_castNSString*(flavorMap[i].SystemFlavor)] == 
NSOrderedSame)
{
  oOOFlavor.MimeType = OUString::createFromAscii( 
flavorMap[i].OOoFlavor);
  oOOFlavor.HumanPresentableName = OUString::createFromAscii( 
flavorMap[i].HumanPresentableName);
@@ -549,9 +549,10 @@ DataFlavor DataFlavorMapper::systemToOpe
return oOOFlavor;
 }
 
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor 
oOOFlavor, bool rbInternal) const
+const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor 
oOOFlavor, bool rbInternal) const
 {
-NSString* sysFlavor = NULL;
+const NSString* sysFlavor = NULL;
+rbInternal = false;
 rbInternal = false;
 
for( size_t i = 0; i  SIZE_FLAVOR_MAP; ++i )
@@ -583,7 +584,7 @@ NSString* DataFlavorMapper::openOfficeIm
 return sysFlavor;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, 
ReferenceXTransferable rTransferable) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, ReferenceXTransferable rTransferable) const
 {
   DataProviderPtr_t dp;
 
@@ -639,12 +640,12 @@ DataProviderPtr_t DataFlavorMapper::getD
   return dp;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
/*systemFlavor*/, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
/*systemFlavor*/, NSArray* systemData) const
 {
   return DataProviderPtr_t(new FileListDataProvider(systemData));
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* 
systemFlavor, NSData* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* 
systemFlavor, NSData* systemData) const
 {
   DataProviderPtr_t dp;
 
@@ -708,7 +709,7 @@ NSArray* DataFlavorMapper::flavorSequenc
   }
   else
   {
-  NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
+  const NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
   
   if (str != NULL)
   {

Modified: openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx?rev=1550416r1=1550415r2=1550416view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx 
(original)
+++ openoffice/trunk/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx Thu Dec 
12 13:37:51 2013
@@ -78,14 +78,14 @@ public:
 mapping

svn commit: r1550420 - /openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 14:08:12 2013
New Revision: 1550420

URL: http://svn.apache.org/r1550420
Log:
#i123840# fix narrowing conversions in CoreGraphic's array initializers

C++11 says that narrowing conversions in array initializers are illegal.
This often happened for signed/unsigned and 32bit/64bit mismatches when
initializing CoreGraphics elementary types. Using CoreGraphic helper
methods for primitives solves these problems and is recommended anyway.

Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1550420r1=1550419r2=1550420view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Thu Dec 12 14:08:12 
2013
@@ -592,7 +592,7 @@ bool AquaSalGraphics::setClipRegion( con
 
 if(nH)
 {
-CGRect aRect = {{ aRectIter-Left(), aRectIter-Top() }, { 
nW, nH }};
+const CGRect aRect = CGRectMake( aRectIter-Left(), 
aRectIter-Top(), nW, nH);
 CGPathAddRect( mxClipPath, NULL, aRect );
 }
 }
@@ -676,7 +676,7 @@ void AquaSalGraphics::ImplDrawPixel( lon
// overwrite the fill color
CGContextSetFillColor( mrContext, rColor.AsArray() );
// draw 1x1 rect, there is no pixel drawing in Quartz
-   CGRect aDstRect = {{nX,nY,},{1,1}};
+   const CGRect aDstRect = CGRectMake( nX, nY, 1, 1);
CGContextFillRect( mrContext, aDstRect );
 RefreshRect( aDstRect );
 // reset the fill color
@@ -1133,7 +1133,7 @@ void AquaSalGraphics::copyBits( const Sa
 
DBG_ASSERT( pSrc-mxLayer!=NULL, AquaSalGraphics::copyBits() from 
non-layered graphics );
 
-   const CGPoint aDstPoint = { +rPosAry.mnDestX - rPosAry.mnSrcX, 
rPosAry.mnDestY - rPosAry.mnSrcY };
+   const CGPoint aDstPoint = CGPointMake( +rPosAry.mnDestX - 
rPosAry.mnSrcX, rPosAry.mnDestY - rPosAry.mnSrcY);
if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth  rPosAry.mnSrcHeight 
== rPosAry.mnDestHeight) 
(!mnBitmapDepth || (aDstPoint.x + pSrc-mnWidth) = mnWidth) ) // 
workaround a Quartz crasher
 {
@@ -1145,7 +1145,7 @@ void AquaSalGraphics::copyBits( const Sa
xCopyContext = mpXorEmulation-GetTargetContext();
 
CGContextSaveGState( xCopyContext );
-   const CGRect aDstRect = { {rPosAry.mnDestX, rPosAry.mnDestY}, 
{rPosAry.mnDestWidth, rPosAry.mnDestHeight} };
+   const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, 
rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
CGContextClipToRect( xCopyContext, aDstRect );
 
// draw at new destination
@@ -1211,10 +1211,10 @@ void AquaSalGraphics::copyArea( long nDs
CGLayerRef xSrcLayer = mxLayer;
// TODO: if( mnBitmapDepth  0 )
{
-   const CGSize aSrcSize = { nSrcWidth, nSrcHeight };
+   const CGSize aSrcSize = CGSizeMake( nSrcWidth, nSrcHeight);
xSrcLayer = ::CGLayerCreateWithContext( xCopyContext, aSrcSize, 
NULL );
const CGContextRef xSrcContext = CGLayerGetContext( xSrcLayer );
-   CGPoint aSrcPoint = { -nSrcX, -nSrcY };
+   CGPoint aSrcPoint = CGPointMake( -nSrcX, -nSrcY);
if( IsFlipped() )
{
::CGContextTranslateCTM( xSrcContext, 0, +nSrcHeight );
@@ -1225,7 +1225,7 @@ void AquaSalGraphics::copyArea( long nDs
}
 
// draw at new destination
-   const CGPoint aDstPoint = { +nDstX, +nDstY };
+   const CGPoint aDstPoint = CGPointMake( +nDstX, +nDstY);
::CGContextDrawLayerAtPoint( xCopyContext, aDstPoint, xSrcLayer );
 
// cleanup
@@ -1249,7 +1249,7 @@ void AquaSalGraphics::drawBitmap( const 
if( !xImage )
return;
 
-   const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, 
{rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
+   const CGRect aDstRect = CGRectMake( rPosAry.mnDestX, rPosAry.mnDestY, 
rPosAry.mnDestWidth, rPosAry.mnDestHeight);
CGContextDrawImage( mrContext, aDstRect, xImage );
CGImageRelease( xImage );
RefreshRect( aDstRect );
@@ -1259,7 +1259,7 @@ void AquaSalGraphics::drawBitmap( const 
 
 void AquaSalGraphics::drawBitmap( const SalTwoRect rPosAry, const SalBitmap 
rSalBitmap,SalColor )
 {
-   DBG_ERROR(not implemented for color masking!);
+   DBG_ERROR( not implemented for color masking!);
drawBitmap( rPosAry, rSalBitmap );
 }
 
@@ -1276,7 +1276,7 @@ void AquaSalGraphics::drawBitmap( const 
if( !xMaskedImage )
return;
 
-   const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, 
{rPosAry.mnDestWidth,

svn commit: r1550421 - /openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 14:14:49 2013
New Revision: 1550421

URL: http://svn.apache.org/r1550421
Log:
#i123840# fix a 64-32bit narrowing conversion in nss/ciphercontext.cxx

Modified:
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx

Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx?rev=1550421r1=1550420r2=1550421view=diff
==
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx 
(original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx Thu 
Dec 12 14:14:49 2013
@@ -38,11 +38,11 @@ uno::Reference xml::crypto::XCipherCont
 xResult-m_pSlot = PK11_GetBestSlot( nNSSCipherID, NULL );
 if ( xResult-m_pSlot )
 {
-SECItem aKeyItem = { siBuffer, const_cast unsigned char* ( 
reinterpret_cast const unsigned char* ( aKey.getConstArray() ) ), 
aKey.getLength() };
+SECItem aKeyItem = { siBuffer, const_cast unsigned char* ( 
reinterpret_cast const unsigned char* ( aKey.getConstArray() ) ), 
static_castunsigned(aKey.getLength()) };
 xResult-m_pSymKey = PK11_ImportSymKey( xResult-m_pSlot, 
nNSSCipherID, PK11_OriginDerive, bEncryption ? CKA_ENCRYPT : CKA_DECRYPT, 
aKeyItem, NULL );
 if ( xResult-m_pSymKey )
 {
-SECItem aIVItem = { siBuffer, const_cast unsigned char* ( 
reinterpret_cast const unsigned char* ( aInitializationVector.getConstArray() 
) ), aInitializationVector.getLength() };
+SECItem aIVItem = { siBuffer, const_cast unsigned char* ( 
reinterpret_cast const unsigned char* ( aInitializationVector.getConstArray() 
) ), static_castunsigned(aInitializationVector.getLength()) };
 xResult-m_pSecParam = PK11_ParamFromIV( nNSSCipherID, aIVItem );
 if ( xResult-m_pSecParam )
 {

svn commit: r1550424 - /openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 14:25:58 2013
New Revision: 1550424

URL: http://svn.apache.org/r1550424
Log:
#i123840# fix narrow conversions when initializing SC's szMSFilterNames array

Modified:
openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx

Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx?rev=1550424r1=1550423r2=1550424view=diff
==
--- openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx Thu Dec 12 14:25:58 
2013
@@ -204,7 +204,7 @@ namespace
 static const struct
 {
 const char * mpFilterName;
-unsigned mnFilterNameLen;
+size_t mnFilterNameLen;
 } szMSFilterNames [] = 
 {
 { pFilterExcel4, strlen( pFilterExcel4 ) },

svn propchange: r1550424 - svn:log

2013-12-12 Thread hdu

Author: hdu
Revision: 1550424
Modified property: svn:log

Modified: svn:log at Thu Dec 12 14:31:36 2013
--
--- svn:log (original)
+++ svn:log Thu Dec 12 14:31:36 2013
@@ -1 +1 @@
-#i123840# fix narrow conversions when initializing SC's szMSFilterNames array
+#i123840# fix narrowing conversions when initializing SC's szMSFilterNames 
array

svn commit: r1550447 [1/6] - in /openoffice/branches/rejuvenate01: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/binaryurp/source/ main/bridges/so

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 16:29:00 2013
New Revision: 1550447

URL: http://svn.apache.org/r1550447
Log:
updated rejuvenate branch to trunk (as of 2013/12/12, r550446)

Modified:
openoffice/branches/rejuvenate01/   (props changed)
openoffice/branches/rejuvenate01/extras/l10n/source/bg/localize.sdf
openoffice/branches/rejuvenate01/extras/l10n/source/de/localize.sdf
openoffice/branches/rejuvenate01/extras/l10n/source/nb/localize.sdf
openoffice/branches/rejuvenate01/extras/l10n/source/th/localize.sdf
openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx

openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx

openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map

Propchange: openoffice/branches/rejuvenate01/
--
  Merged /openoffice/trunk:r1550069-1550446

svn commit: r1550447 [6/6] - in /openoffice/branches/rejuvenate01: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/binaryurp/source/ main/bridges/so

2013-12-12 Thread hdu

Modified: openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx?rev=1550447r1=1550446r2=1550447view=diff
==
--- openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx (original)
+++ openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx Thu Dec 12 
16:29:00 2013
@@ -94,7 +94,7 @@ private:
 #ifdef URPCACHE_USES_UNORDERED_MAP
 struct HashT{ size_t operator()( const LruListIt rA) const { return 
hash(*rA;);};
 struct EqualT{ bool operator()( const LruListIt rA, const LruListIt rB) 
const { return *rA==*rB;}};
-typedef ::std::hash_map LruListIt, IdxType, HashT, EqualT  LruItMap; // 
a map into a LruList
+typedef ::std::unordered_map LruListIt, IdxType, HashT, EqualT  
LruItMap; // a map into a LruList
 #else
 struct CmpT{ bool operator()( const LruListIt rA, const LruListIt rB) 
const { return (*rA*rB);}};
 typedef ::std::map LruListIt, IdxType, CmpT  LruItMap; // a map into a 
LruList

Modified: 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx?rev=1550447r1=1550446r2=1550447view=diff
==
--- 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
 (original)
+++ 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
 Thu Dec 12 16:29:00 2013
@@ -213,8 +213,6 @@ type_info * RTTI::getRTTI( typelib_Compo
 static void deleteException( void * pExc )
 {
 __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-if( !header-exceptionType) // TODO: remove this when getRTTI() always 
returns non-NULL
-return; // NOTE: leak for now
 typelib_TypeDescription * pTD = 0;
 OUString unoName( toUNOname( header-exceptionType-name() ) );
 ::typelib_typedescription_getByName( pTD, unoName.pData );

Modified: 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx?rev=1550447r1=1550446r2=1550447view=diff
==
--- 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
 (original)
+++ 
openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
 Thu Dec 12 16:29:00 2013
@@ -40,7 +40,7 @@ struct _Unwind_Exception
 void * exception_cleanup;
 uintptr_t private_1;
 uintptr_t private_2;
-} __attribute__((__aligned__));
+};
 
 struct __cxa_exception
 { 

Modified: 
openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map
URL: 
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map?rev=1550447r1=1550446r2=1550447view=diff
==
--- openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map 
(original)
+++ openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map 
Thu Dec 12 16:29:00 2013
@@ -7,17 +7,18 @@
 #  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.
-#  
+# 
 ###
+
 UDK_3_0_0 {
global:
 
_ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
@@ -26,3 +27,4 @@ UDK_3_0_0 {
local:
*;
 };
+

svn commit: r1550457 - /openoffice/trunk/main/instsetoo_native/util/makefile.mk

2013-12-12 Thread hdu

Author: hdu
Date: Thu Dec 12 17:38:18 2013
New Revision: 1550457

URL: http://svn.apache.org/r1550457
Log:
#i123532# avoid build breaker when pkgformat contains an archive target

If the configure option --with-package-format contains an archive target
then instset_native makefile.mk has two build targets with the same name.
This breaks the build. The temporary fix here disables the second recipe
to allow the buildbots to work again.

Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk

Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1550457r1=1550456r2=1550457view=diff
==
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Dec 12 17:38:18 
2013
@@ -259,14 +259,14 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
$(PRJ)$/util$/update.xml\
 $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,L,$(alllangiso) openoffice_$L.archive) :
-   $(MAKE_INSTALLER_COMMAND)   \
-   -p Apache_OpenOffice\
-   -msitemplate $(MSIOFFICETEMPLATEDIR)
-   $(GEN_UPDATE_INFO_COMMAND)  \
-   --product Apache_OpenOffice \
-   $(PRJ)$/util$/update.xml\
-$(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+#$(foreach,L,$(alllangiso) openoffice_$L.archive) :
+#  $(MAKE_INSTALLER_COMMAND)   \
+#  -p Apache_OpenOffice\
+#  -msitemplate $(MSIOFFICETEMPLATEDIR)
+#  $(GEN_UPDATE_INFO_COMMAND)  \
+#  --product Apache_OpenOffice \
+#  $(PRJ)$/util$/update.xml\
+#   $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 #openofficewithjre_%{$(PKGFORMAT:^.)} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) 
openofficewithjre_$L.$P)) .PHONY :

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

2013-12-12 Thread buildbot

Hi! , The openoffice-fbsd-nightly builder has just completed a run

STATUS: Failure

 Build revision 1550631 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/119

 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

svn commit: r1550645 - in /openoffice/trunk/main/svx/source: accessibility/AccessibleShape.cxx table/accessibletableshape.cxx

2013-12-12 Thread steve_y

Author: steve_y
Date: Fri Dec 13 05:20:32 2013
New Revision: 1550645

URL: http://svn.apache.org/r1550645
Log:
fixes for issues checked out by coverity

Modified:
openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
openoffice/trunk/main/svx/source/table/accessibletableshape.cxx

Modified: openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx?rev=1550645r1=1550644r2=1550645view=diff
==
--- openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx 
(original)
+++ openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx Fri Dec 
13 05:20:32 2013
@@ -435,19 +435,18 @@ uno::ReferenceXAccessibleRelationSet S
 throw (::com::sun::star::uno::RuntimeException)
 {
 ::osl::MutexGuard aGuard (maMutex);
-::utl::AccessibleRelationSetHelper* pRelationSet = new 
utl::AccessibleRelationSetHelper;
-uno::Sequence uno::Reference uno::XInterface   aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+::utl::AccessibleRelationSetHelper* pRelationSet = new 
utl::AccessibleRelationSetHelper;
 
 //this mxshape is the captioned shape, only for sw
-if(aSequence[0].get())
-{
-pRelationSet-AddRelation( 
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, 
aSequence ) );
-}
-
 if (pRelationSet != NULL)
 {
+   uno::Sequence uno::Reference uno::XInterface   aSequence(1);
+   aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+   if(aSequence[0].get())
+   {
+   pRelationSet-AddRelation( 
+   AccessibleRelation( 
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
+   }
 return uno::ReferenceXAccessibleRelationSet (
 new ::utl::AccessibleRelationSetHelper (*pRelationSet));
 }
@@ -455,8 +454,6 @@ uno::ReferenceXAccessibleRelationSet S
 {
 return uno::ReferenceXAccessibleRelationSet(NULL);
 }
-
-return uno::ReferenceXAccessibleRelationSet();
 }
 
 /**Return a copy of the state set.

Modified: openoffice/trunk/main/svx/source/table/accessibletableshape.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/table/accessibletableshape.cxx?rev=1550645r1=1550644r2=1550645view=diff
==
--- openoffice/trunk/main/svx/source/table/accessibletableshape.cxx (original)
+++ openoffice/trunk/main/svx/source/table/accessibletableshape.cxx Fri Dec 13 
05:20:32 2013
@@ -328,6 +328,7 @@ void SAL_CALL AccessibleTableShapeImpl::
 AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo 
rShapeInfo, const AccessibleShapeTreeInfo rShapeTreeInfo)
 : AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
 , mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
+, mnPreviousSelectionCount(0)
 {
 }
 
@@ -342,8 +343,7 @@ AccessibleTableShape::~AccessibleTableSh
 void AccessibleTableShape::Init()
 {
try
-   {
-   mnPreviousSelectionCount = 0;
+   {   
Reference XPropertySet  xSet( mxShape, UNO_QUERY_THROW );
Reference XTable  xTable( 
xSet-getPropertyValue(C2U(Model)), UNO_QUERY_THROW );

buildbot failure in ASF Buildbot on openoffice-linux64-nightly

svn commit: r1550375 - in /openoffice/trunk/main/binaryurp/source: cache.hxx lessoperators.cxx lessoperators.hxx

svn commit: r1550381 - in /openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64: except.cxx share.hxx

svn commit: r1550388 - /openoffice/trunk/main/configmgr/source/modifications.hxx

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

buildbot success in ASF Buildbot on aoo-win7

svn commit: r1550389 - /openoffice/trunk/main/cppu/util/uno_purpenvhelpers5abi.map

svn commit: r1550416 - in /openoffice/trunk/main/vcl/aqua/source/dtrans: DataFlavorMapping.cxx DataFlavorMapping.hxx aqua_clipboard.cxx aqua_clipboard.hxx

svn commit: r1550420 - /openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx

svn commit: r1550421 - /openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx

svn commit: r1550424 - /openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx

svn propchange: r1550424 - svn:log

svn commit: r1550447 [1/6] - in /openoffice/branches/rejuvenate01: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/binaryurp/source/ main/bridges/so

svn commit: r1550447 [6/6] - in /openoffice/branches/rejuvenate01: ./ extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/ extras/l10n/source/th/ main/binaryurp/source/ main/bridges/so

svn commit: r1550457 - /openoffice/trunk/main/instsetoo_native/util/makefile.mk

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

svn commit: r1550645 - in /openoffice/trunk/main/svx/source: accessibility/AccessibleShape.cxx table/accessibletableshape.cxx

17 matches

Site Navigation

Mail list logo

Footer information