Commits

Anonymous committed ef063af Merge

CWS-TOOLING: integrate CWS calc63

Comments (0)

Files changed (3)

sc/source/core/data/documen4.cxx

 	  && nType != NUMBERFORMAT_TIME && nType != NUMBERFORMAT_DATETIME )
 	{
 		short nPrecision;
-		if ( nFormat )
+        if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
 		{
 			nPrecision = (short)GetFormatTable()->GetFormatPrecision( nFormat );
 			switch ( nType )
 			}
 		}
 		else
+        {
 			nPrecision = (short)GetDocOptions().GetStdPrecision();
+            // #i115512# no rounding for automatic decimals
+            if (nPrecision == static_cast<short>(SvNumberFormatter::UNLIMITED_PRECISION))
+                return fVal;
+        }
 		double fRound = ::rtl::math::round( fVal, nPrecision );
 		if ( ::rtl::math::approxEqual( fVal, fRound ) )
 			return fVal;		// durch Rundung hoechstens Fehler

vcl/aqua/source/app/vclnsapp.mm

 #include "vcl/cmdevt.hxx"
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/impimagetree.hxx"
+
 #include "premac.h"
 #import "Carbon/Carbon.h"
 #import "apple_remote/RemoteControl.h"
     #else // the clean version follows
     return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
     #endif
+    ImplImageTreeSingletonRef()->shutDown();
     return NSTerminateNow;
 }
 

vcl/aqua/source/dtrans/aqua_clipboard.cxx

 
 void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 {
-  DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
-  NSData* pBoardData = NULL;
-  
-  if (dp.get() != NULL)
-  {
-      pBoardData = (NSData*)dp->getSystemData();      
-      [sender setData: pBoardData forType: type];
-  }
+    if( mXClipboardContent.is() )
+    {
+        DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
+        NSData* pBoardData = NULL;
+        
+        if (dp.get() != NULL)
+        {
+            pBoardData = (NSData*)dp->getSystemData();      
+            [sender setData: pBoardData forType: type];
+        }
+    }
 }
 
 
 void SAL_CALL AquaClipboard::flushClipboard() 
   throw(RuntimeException)
 {
-  if (mXClipboardContent.is())
+    if (mXClipboardContent.is())
 	{
 	  	Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();	
 		sal_uInt32 nFlavors = flavorList.getLength();
 		
 		for (sal_uInt32 i = 0; i < nFlavors; i++)
-		  {
+		{
 			NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]);
 			
 			if (sysType != NULL)
-			  {
+			{
 				provideDataForType(mPasteboard, sysType);
-			  }
-		  }
+			}
+		}
+		mXClipboardContent.clear();
 	}
 }