Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/query.src URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/query.src?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/query.src (original) +++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/query.src Wed Jul 24 08:46:07 2013 @@ -371,14 +371,12 @@ String STR_QUERY_SAVEMODIFIED String STR_ERROR_PARSING_STATEMENT { - Text [ en-US ] = "$object$ is based on an SQL command which could not be parsed." - "(except \"SQL command\", which doesn't make sense here) will be inserted."; + Text [ en-US ] = "$object$ is based on an SQL command which could not be parsed."; }; String STR_INFO_OPENING_IN_SQL_VIEW { - Text [ en-US ] = "$object$ will be opened in SQL view." - "(except \"SQL command\", which doesn't make sense here) will be inserted."; + Text [ en-US ] = "$object$ will be opened in SQL view."; }; Resource RSC_QUERY_OBJECT_TYPE
Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Wed Jul 24 08:46:07 2013 @@ -549,10 +549,15 @@ DataFlavor DataFlavorMapper::systemToOpe return oOOFlavor; } +<<<<<<< .working const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& oOOFlavor, bool& rbInternal) const +======= +NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor, bool& rbInternal) const +>>>>>>> .merge-right.r1505621 { const NSString* sysFlavor = NULL; rbInternal = false; + rbInternal = false; for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i ) { @@ -720,7 +725,11 @@ NSArray* DataFlavorMapper::flavorSequenc } else { +<<<<<<< .working const NSString* str = openOfficeToSystemFlavor(flavors[i], bNeedDummyInternalFlavor); +======= + NSString* str = openOfficeToSystemFlavor(flavors[i], bNeedDummyInternalFlavor); +>>>>>>> .merge-right.r1505621 if (str != NULL) { Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx Wed Jul 24 08:46:07 2013 @@ -85,7 +85,11 @@ public: If there is no suiteable mapping available NULL will be returned. */ +<<<<<<< .working const NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const; +======= + NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const; +>>>>>>> .merge-right.r1505621 /* Select the best available image data type If there is no suiteable mapping available NULL will Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx Wed Jul 24 08:46:07 2013 @@ -347,7 +347,11 @@ void SAL_CALL AquaClipboard::flushClipbo for (sal_uInt32 i = 0; i < nFlavors; i++) { +<<<<<<< .working const NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal); +======= + NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal); +>>>>>>> .merge-right.r1505621 if (sysType != NULL) { Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm Wed Jul 24 08:46:07 2013 @@ -170,8 +170,13 @@ try { const SEL setCollectionBehavior = @selector(setCollectionBehavior:); if( bAllowFullScreen && [pNSWindow respondsToSelector: setCollectionBehavior]) { +<<<<<<< .working const int bMode = (bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary); [pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode]; +======= + const int bMode= (bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary); + [pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode]; +>>>>>>> .merge-right.r1505621 } // disable OSX>=10.7 window restoration until we support it directly Modified: openoffice/branches/rejuvenate01/main/vcl/source/gdi/salmisc.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/gdi/salmisc.cxx?rev=1506444&r1=1506443&r2=1506444&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/gdi/salmisc.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/gdi/salmisc.cxx Wed Jul 24 08:46:07 2013 @@ -428,13 +428,13 @@ BitmapBuffer* StretchAndConvert( return NULL; } - // horizontal mapping table - if( nDstDX != nSrcDX ) + // horizontal mapping table + if( (nDstDX != nSrcDX) && (nDstDX != 0) ) { - const double fFactorX = ( nDstDX > 1 ) ? (double) ( nSrcDX - 1 ) / ( nDstDX - 1 ) : 0.0; + const double fFactorX = (double)nSrcDX / nDstDX; for( i = 0L; i < nDstDX; i++ ) - pMapX[ i ] = nSrcX + FRound( i * fFactorX ); + pMapX[ i ] = nSrcX + static_cast<int>( i * fFactorX ); } else { @@ -443,12 +443,12 @@ BitmapBuffer* StretchAndConvert( } // vertical mapping table - if( nDstDY != nSrcDY ) + if( (nDstDY != nSrcDY) && (nDstDY != 0) ) { - const double fFactorY = ( nDstDY > 1 ) ? (double) ( nSrcDY - 1 ) / ( nDstDY - 1 ) : 0.0; + const double fFactorY = (double)nSrcDY / nDstDY; for( i = 0L; i < nDstDY; i++ ) - pMapY[ i ] = nSrcY + FRound( i * fFactorY ); + pMapY[ i ] = nSrcY + static_cast<int>( i * fFactorY ); } else { Propchange: openoffice/branches/rejuvenate01/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1504852-1506442 Propchange: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1504852-1506442
