Tag: cws_src680_dba202c User: oj Date: 05/12/05 02:20:11 Modified: /dba/dbaccess/source/ui/app/ AppControllerDnD.cxx, AppDetailView.cxx, AppSwapWindow.cxx, AppView.cxx
Log: #i52615# system color File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.13&r2=1.13.22.1 Delta lines: +8 -3 ------------------- --- AppControllerDnD.cxx 24 Oct 2005 08:30:33 -0000 1.13 +++ AppControllerDnD.cxx 5 Dec 2005 10:20:06 -0000 1.13.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerDnD.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.22.1 $ * - * last change: $Author: rt $ $Date: 2005/10/24 08:30:33 $ + * last change: $Author: oj $ $Date: 2005/12/05 10:20:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -781,6 +781,10 @@ { // the concrete query Reference< XPropertySet > xQuery; + Reference<XQueryDefinitionsSupplier> xSourceQuerySup(getDataSourceByName_displayError( m_xDatabaseContext, sDataSourceName, getView(), getORB(), true ),UNO_QUERY); + if ( xSourceQuerySup.is() ) + xQueries.set(xSourceQuerySup->getQueryDefinitions(),UNO_QUERY); + if ( xQueries.is() && xQueries->hasByName(sCommand) ) { xQuery.set(xQueries->getByName(sCommand),UNO_QUERY); @@ -796,6 +800,7 @@ xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= sUpdateCatalogName; bSuccess = sal_True; } + xQueries.clear(); } } catch(SQLException&) { throw; } // caught and handled by the outer catch File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.12.50.1&r2=1.12.50.2 Delta lines: +7 -7 ------------------- --- AppDetailView.cxx 1 Dec 2005 13:23:20 -0000 1.12.50.1 +++ AppDetailView.cxx 5 Dec 2005 10:20:07 -0000 1.12.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.cxx,v $ * - * $Revision: 1.12.50.1 $ + * $Revision: 1.12.50.2 $ * - * last change: $Author: oj $ $Date: 2005/12/01 13:23:20 $ + * last change: $Author: oj $ $Date: 2005/12/05 10:20:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -406,8 +406,8 @@ m_aHelpText.SetTextFillColor(); m_aDescription.SetTextColor( rStyleSettings.GetFieldTextColor() ); m_aDescription.SetTextFillColor(); - m_aFL.SetTextColor( rStyleSettings.GetFieldTextColor() ); - m_aFL.SetTextFillColor(); + //m_aFL.SetTextColor( rStyleSettings.GetFieldTextColor() ); + //m_aFL.SetTextFillColor(); } if( bBackground ) @@ -415,7 +415,7 @@ SetBackground( rStyleSettings.GetFieldColor() ); m_aHelpText.SetBackground( rStyleSettings.GetFieldColor() ); m_aDescription.SetBackground( rStyleSettings.GetFieldColor() ); - m_aFL.SetBackground( rStyleSettings.GetFieldColor() ); + //m_aFL.SetBackground( rStyleSettings.GetFieldColor() ); } Font aFont = m_aDescription.GetControlFont(); @@ -593,9 +593,9 @@ SetBackground( rStyleSettings.GetFieldColor() ); //SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) ); - m_aHorzSplitter.SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) ); + m_aHorzSplitter.SetBackground( rStyleSettings.GetDialogColor() ); m_aHorzSplitter.SetFillColor( rStyleSettings.GetDialogColor() ); - m_aHorzSplitter.SetTextFillColor( rStyleSettings.GetDialogColor() ); + m_aHorzSplitter.SetTextFillColor(rStyleSettings.GetDialogColor() ); } // ----------------------------------------------------------------------- void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt ) File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.6.50.1&r2=1.6.50.2 Delta lines: +2 -21 -------------------- --- AppSwapWindow.cxx 1 Dec 2005 13:23:21 -0000 1.6.50.1 +++ AppSwapWindow.cxx 5 Dec 2005 10:20:07 -0000 1.6.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppSwapWindow.cxx,v $ * - * $Revision: 1.6.50.1 $ + * $Revision: 1.6.50.2 $ * - * last change: $Author: oj $ $Date: 2005/12/01 13:23:21 $ + * last change: $Author: oj $ $Date: 2005/12/05 10:20:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,25 +116,6 @@ void OApplicationSwapWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); -/* - if ( bFont ) - { - Font aFont = rStyleSettings.GetAppFont(); - if ( IsControlFont() ) - aFont.Merge( GetControlFont() ); - SetPointFont( aFont ); - } - - if ( bFont || bForeground ) - { - Color aTextColor = rStyleSettings.GetButtonTextColor(); - if ( IsControlForeground() ) - aTextColor = GetControlForeground(); - SetTextColor( aTextColor ); - } - - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetWindowColor() ) ); -*/ if( bFont ) { Font aFont; File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.11.50.1&r2=1.11.50.2 Delta lines: +4 -3 ------------------- --- AppView.cxx 1 Dec 2005 13:23:21 -0000 1.11.50.1 +++ AppView.cxx 5 Dec 2005 10:20:08 -0000 1.11.50.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppView.cxx,v $ * - * $Revision: 1.11.50.1 $ + * $Revision: 1.11.50.2 $ * - * last change: $Author: oj $ $Date: 2005/12/01 13:23:21 $ + * last change: $Author: oj $ $Date: 2005/12/05 10:20:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -241,7 +241,8 @@ } if( true ) - SetBackground( rStyleSettings.GetFieldColor() ); + SetBackground( rStyleSettings.GetDialogColor() ); + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
