Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	i18npool/inc/i18npool/lang.h
	i18npool/source/isolang/isolang.cxx
	svtools/source/filter/exportdialog.cxx
	svtools/source/graphic/grfmgr.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/window/salframe.cxx
	vcl/inc/sft.hxx
	vcl/inc/unx/pspgraphics.h
	vcl/inc/vcl/cursor.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/prj/d.lst
	vcl/source/app/settings.cxx
	vcl/source/control/edit.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/window/cursor.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/fontmanager/fontconfig.cxx
	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
	vcl/unx/kde4/KDESalGraphics.cxx

1 files changed, 29 insertions, 9 deletions

diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 455e7c64c6a4..cfb4d5e62454 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -28,18 +28,19 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "vclnsapp.h"
-#include "salinst.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salframeview.h"
+#include "rtl/ustrbuf.hxx"
 
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/cmdevt.hxx"
-#include "rtl/ustrbuf.hxx"
 
-#include "vcl/impimagetree.hxx"
+#include "aqua/vclnsapp.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salframeview.h"
+
+#include "impimagetree.hxx"
 
 #include "premac.h"
 #import "Carbon/Carbon.h"
@@ -52,6 +53,7 @@
 {
     // do nothing, this is just to start an NSThread and therefore put
     // Cocoa into multithread mode
+    (void)param;
 }
 @end
 
@@ -284,11 +286,13 @@
  
 -(NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
+    (void)sender;
     return AquaSalInstance::GetDynamicDockMenu();
 }
 
 -(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile
 {
+    (void)app;
     const rtl::OUString aFile( GetOUString( pFile ) );
     if( ! AquaSalInstance::isOnCommandLine( aFile ) )
     {
@@ -301,6 +305,7 @@
 
 -(void)application: (NSApplication*) app openFiles: (NSArray*)files
 {
+    (void)app;
     rtl::OUStringBuffer aFileList( 256 );
     
     NSEnumerator* it = [files objectEnumerator];
@@ -330,6 +335,7 @@
 
 -(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile
 {
+    (void)app;
     const rtl::OUString aFile( GetOUString( pFile ) );
 	const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(),
                                                 APPEVENT_PRINT_STRING, aFile );
@@ -338,6 +344,9 @@
 }
 -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels
 {
+    (void)app;
+    (void)printSettings;
+    (void)bShowPrintPanels;
     // currently ignores print settings an bShowPrintPanels
     rtl::OUStringBuffer aFileList( 256 );
     
@@ -360,6 +369,7 @@
 
 -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app
 {
+    (void)app;
     NSApplicationTerminateReply aReply = NSTerminateNow;
     {
         YIELD_GUARD;
@@ -387,6 +397,7 @@
 
 -(void)systemColorsChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
     
     const SalData* pSalData = GetSalData();
@@ -396,6 +407,7 @@
 
 -(void)screenParametersChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
     
     SalData* pSalData = GetSalData();
@@ -408,11 +420,13 @@
 
 -(void)scrollbarVariantChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     GetSalData()->mpFirstInstance->delayedSettingsChanged( true );
 }
 
 -(void)scrollbarSettingsChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     GetSalData()->mpFirstInstance->delayedSettingsChanged( false );
 }
 
@@ -436,7 +450,9 @@
 
 #pragma mark -
 #pragma mark NSApplication Delegates
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification {
+- (void)applicationWillBecomeActive:(NSNotification *)pNotification
+{
+    (void)pNotification;
     if (GetSalData()->mpMainController->remoteControl) {
 
         // [remoteControl startListening: self];
@@ -452,7 +468,9 @@
     }
 }
 
-- (void)applicationWillResignActive:(NSNotification *)aNotification {
+- (void)applicationWillResignActive:(NSNotification *)pNotification
+{
+    (void)pNotification;
     if (GetSalData()->mpMainController->remoteControl) {
 
         // [remoteControl stopListening: self];
@@ -470,6 +488,8 @@
 
 - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
 {
+    (void)pApp;
+    (void)bWinVisible;
     NSObject* pHdl = GetSalData()->mpDockIconClickHandler;
     if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] )
     {