merged in DEV300_m66

7 files changed, 87 insertions, 32 deletions

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 5206c8ce87ca..c92a69d3fb49 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -221,7 +221,7 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -577,7 +577,14 @@ static void handle_get_focus(::VclWindowEvent const * pEvent)
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -608,7 +615,7 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent)
             }
         }
     }
-    catch( uno::Exception e )
+    catch( const uno::Exception& e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index eff7319d6efc..99a331be2318 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -772,7 +772,10 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
     m_aForeignTopLevelWindow = None;
     m_nStyle = nStyle;
 
-    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION))
+    GtkWindowType eWinType = (  (nStyle & SAL_FRAME_STYLE_FLOAT) &&
+                              ! (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|
+                                           SAL_FRAME_STYLE_FLOAT_FOCUSABLE))
+                              )
         ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
 
     if( nStyle & SAL_FRAME_STYLE_SYSTEMCHILD )
@@ -801,7 +804,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
     bool bDecoHandling =
         ! isChild() &&
         ( ! (nStyle & SAL_FRAME_STYLE_FLOAT) ||
-          (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) );
+          (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) );
 
     /* #i100116# metacity has a peculiar behavior regarding WM_HINT accept focus and _NET_WM_USER_TIME
         at some point that may be fixed in metacity and we will have to revisit this
@@ -832,6 +835,11 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
             lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, true );
             bNoDecor = true;
         }
+        else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
+        {
+            eType = GDK_WINDOW_TYPE_HINT_UTILITY;
+        }
+
         if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) )
         {
             eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
@@ -869,7 +877,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
     if( bDecoHandling )
     {
         gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );
-        if( ( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || bMetaCityToolWindowHack )
+        if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) || bMetaCityToolWindowHack )
             lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, false );
     }
 
@@ -2075,7 +2083,7 @@ void GtkSalFrame::ToTop( USHORT nFlags )
              *  to our window - which it of course won't since our input hint
              *  is set to false.
              */
-            if( (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
+            if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_FLOAT_FOCUSABLE)) )
                 XSetInputFocus( getDisplay()->GetDisplay(), GDK_WINDOW_XWINDOW( m_pWindow->window ), RevertToParent, CurrentTime );
         }
         else
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index a8fc6f65d4ee..c2a147517ac8 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
@@ -242,9 +242,10 @@ class GtkSalFrame : public SalFrame
     bool isFloatGrabWindow() const
     {
         return
-            (m_nStyle & SAL_FRAME_STYLE_FLOAT) &&       // only a float can be floatgrab
-            !(m_nStyle & SAL_FRAME_STYLE_TOOLTIP) &&    // tool tips are not
-            !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION); // toolbars are also not
+            (m_nStyle & SAL_FRAME_STYLE_FLOAT) &&                // only a float can be floatgrab
+            !(m_nStyle & SAL_FRAME_STYLE_TOOLTIP) &&             // tool tips are not
+            !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && // toolbars are also not
+            !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE);       // focusable floats are not
     }
 
     bool isChild( bool bPlug = true, bool bSysChild = true )
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 796350a63d50..202d3dbcd517 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -181,7 +181,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     StyleSettings style( rSettings.GetStyleSettings() );
     BOOL bSetTitleFont = false;
 
-
     // General settings
     QPalette pal = kapp->palette();
 
@@ -214,6 +213,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         pKey = "Theme";
         if ( aGroup.hasKey( pKey ) )
             style.SetPreferredSymbolsStyleName( readEntryUntranslated( &aGroup, pKey ) );
+
+        //toolbar
+        pKey = "toolbarFont";
+        if ( aGroup.hasKey( pKey ) )
+        {
+            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() );
+            style.SetToolFont( aFont );
+        }
     }
 
     Color aFore = toColor( pal.color( QPalette::Active, QPalette::WindowText ) );
@@ -288,7 +295,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     style.SetFloatTitleFont( aFont );
     style.SetMenuFont( aFont ); // will be changed according to pMenuBar
-    style.SetToolFont( aFont ); // will be changed according to pToolBar
+    //style.SetToolFont( aFont ); //already set above
     style.SetLabelFont( aFont );
     style.SetInfoFont( aFont );
     style.SetRadioCheckFont( aFont );
@@ -300,11 +307,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     int flash_time = QApplication::cursorFlashTime();
     style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 
-    KMainWindow qMainWindow;
-
     // Menu
     style.SetSkipDisabledInMenus( TRUE );
-    KMenuBar *pMenuBar = qMainWindow.menuBar();
+    KMenuBar* pMenuBar = new KMenuBar();
     if ( pMenuBar )
     {
         // Color
@@ -337,22 +342,11 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         style.SetMenuFont( aFont );
     }
 
-    // Tool bar
-    KToolBar *pToolBar = qMainWindow.toolBar();
-    if ( pToolBar )
-    {
-        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );
-        style.SetToolFont( aFont );
-    }
+    delete pMenuBar;
 
     // Scroll bar size
     style.SetScrollBarSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarExtent ) );
 
-    // #i59364# high contrast mode
-    BOOL bHC = ( style.GetFaceColor().IsDark() ||
-                 style.GetWindowColor().IsDark() );
-    style.SetHighContrastMode( bHC );
-
     rSettings.SetStyleSettings( style );
 }
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 2e8f0dcad96b..1c9882923b43 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -513,10 +513,12 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     }
     else if (type == CTRL_FRAME)
     {
+        pixmap.fill(KApplication::palette().color(QPalette::Window));
         lcl_drawFrame( widgetRect, painter, QStyle::PE_Frame, nControlState, value );
     }
     else if (type == CTRL_FIXEDBORDER)
     {
+        pixmap.fill(KApplication::palette().color(QPalette::Window));
         lcl_drawFrame( widgetRect, painter, QStyle::PE_FrameWindow, nControlState, value );
     }
     else if (type == CTRL_WINDOW_BACKGROUND)
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 70b1796df7f0..dedda64d157e 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -77,24 +77,30 @@ void KDEXLib::Init()
     pInputMethod->SetLocale();
     XrmInitialize();
 
-    KAboutData *kAboutData = new KAboutData( "OpenOffice.org",
-            "OpenOffice.org",
+    KAboutData *kAboutData = new KAboutData("OpenOffice.org",
+            "kdelibs4",
             ki18n( "OpenOffice.org" ),
             "3.0.0",
             ki18n( "OpenOffice.org with KDE Native Widget Support." ),
             KAboutData::License_LGPL,
-            ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008 Novell, Inc"),
+            ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc"),
             ki18n( "OpenOffice.org is an office suite.\n" ),
             "http://kde.openoffice.org/index.html",
             "dev@kde.openoffice.org" );
+
     kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
             ki18n( "Original author and maintainer of the KDE NWF." ),
             "kendy@artax.karlin.mff.cuni.cz",
             "http://artax.karlin.mff.cuni.cz/~kendy" );
+    kAboutData->addAuthor( ki18n("Roman Shtylman"),
+            ki18n( "Porting to KDE 4." ),
+            "shtylman@gmail.com", "http://shtylman.com" );
     kAboutData->addAuthor( ki18n("Eric Bischoff"),
             ki18n( "Accessibility fixes, porting to KDE 4." ),
             "bischoff@kde.org" );
 
+    //kAboutData->setProgramIconName("OpenOffice");
+
     m_nFakeCmdLineArgs = 1;
     USHORT nIdx;
     vos::OExtCommandLine aCommandLine;
@@ -135,6 +141,7 @@ void KDEXLib::Init()
 
     m_pApplication = new VCLKDEApplication();
     kapp->disableSessionManagement();
+    KApplication::setQuitOnLastWindowClosed(false);
 
     Display* pDisp = QX11Info::display();
     SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp);
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 3f7dfc2df709..c6036ae4f78e 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -219,28 +219,64 @@ SelectionManager::SelectionManager() :
         m_aWindow( None ),
         m_nSelectionTimeout( 0 ),
         m_nSelectionTimestamp( CurrentTime ),
+        m_bDropEnterSent( true ),
         m_aCurrentDropWindow( None ),
+        m_nDropTime( None ),
+        m_nLastDropAction( 0 ),
+        m_nLastX( 0 ),
+        m_nLastY( 0 ),
+        m_nDropTimestamp( 0 ),
         m_bDropWaitingForCompletion( false ),
         m_aDropWindow( None ),
         m_aDropProxy( None ),
         m_aDragSourceWindow( None ),
+        m_nLastDragX( 0 ),
+        m_nLastDragY( 0 ),
         m_nNoPosX( 0 ),
         m_nNoPosY( 0 ),
         m_nNoPosWidth( 0 ),
         m_nNoPosHeight( 0 ),
+        m_nDragButton( 0 ),
+        m_nUserDragAction( 0 ),
+        m_nTargetAcceptAction( 0 ),
+        m_nSourceActions( 0 ),
         m_bLastDropAccepted( false ),
         m_bDropSuccess( false ),
         m_bDropSent( false ),
         m_bWaitingForPrimaryConversion( false ),
+        m_nDragTimestamp( None ),
         m_aMoveCursor( None ),
         m_aCopyCursor( None ),
         m_aLinkCursor( None ),
         m_aNoneCursor( None ),
         m_aCurrentCursor( None ),
-        m_nCurrentProtocolVersion( nXdndProtocolRevision )
+        m_nCurrentProtocolVersion( nXdndProtocolRevision ),
+        m_nCLIPBOARDAtom( None ),
+        m_nTARGETSAtom( None ),
+        m_nTIMESTAMPAtom( None ),
+        m_nTEXTAtom( None ),
+        m_nINCRAtom( None ),
+        m_nCOMPOUNDAtom( None ),
+        m_nMULTIPLEAtom( None ),
+        m_nUTF16Atom( None ),
+        m_nImageBmpAtom( None ),
+        m_nXdndAware( None ),
+        m_nXdndEnter( None ),
+        m_nXdndLeave( None ),
+        m_nXdndPosition( None ),
+        m_nXdndStatus( None ),
+        m_nXdndDrop( None ),
+        m_nXdndFinished( None ),
+        m_nXdndSelection( None ),
+        m_nXdndTypeList( None ),
+        m_nXdndProxy( None ),
+        m_nXdndActionCopy( None ),
+        m_nXdndActionMove( None ),
+        m_nXdndActionLink( None ),
+        m_nXdndActionAsk( None ),
+        m_nXdndActionPrivate( None )
 {
     m_aDropEnterEvent.data.l[0] = None;
-    m_bDropEnterSent            = true;
     m_aDragRunning.reset();
 }