mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS docking4 (1.2.78); FILE MERGED

Browse Source 
2004/10/22 15:26:44 cd 1.2.78.3: #i34077# Support for toolbar button/sub-toolbar behavior
2004/09/20 13:13:35 cd 1.2.78.2: RESYNC: (1.2-1.3); FILE MERGED
2004/08/16 06:30:46 cd 1.2.78.1: #i32287# Provide key modifier information to dispatch
This commit is contained in:
Oliver Bolte
2004-11-16 14:20:42 +00:00
parent 06fda38730
commit 46e12dcb54
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
svtools/source/uno/toolboxcontroller.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: toolboxcontroller.cxx,v $ * $RCSfile: toolboxcontroller.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: rt $ $Date: 2004-11-09 15:09:52 $ * last change: $Author: obo $ $Date: 2004-11-16 15:20:42 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -99,6 +99,13 @@
#include <miscopt.hxx> #include <miscopt.hxx>
#endif #endif
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
#endif
#ifndef _SV_TOOLBOX_HXX
#include <vcl/toolbox.hxx>
#endif
using namespace ::rtl; using namespace ::rtl;
using namespace ::cppu; using namespace ::cppu;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
@@ -404,7 +411,11 @@ throw (::com::sun::star::uno::RuntimeException)
try try
{ {
com::sun::star::util::URL aTargetURL; com::sun::star::util::URL aTargetURL;
Sequence<PropertyValue> aArgs; Sequence<PropertyValue> aArgs( 1 );
// Provide key modifier information to dispatch function
aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
aArgs[0].Value = makeAny( KeyModifier );
aTargetURL.Complete = aCommandURL; aTargetURL.Complete = aCommandURL;
if ( m_pImpl->m_xUrlTransformer.is() ) if ( m_pImpl->m_xUrlTransformer.is() )
@@ -697,6 +708,22 @@ sal_Bool ToolboxController::hasBigImages() const
return ( eOptSymbolSet == SFX_SYMBOLS_LARGE ); return ( eOptSymbolSet == SFX_SYMBOLS_LARGE );
} }
sal_Bool ToolboxController::isHighContrast() const
{
sal_Bool bHighContrast( sal_False );
Reference< XWindow > xWindow = m_pImpl->m_xParentWindow;
if ( xWindow.is() )
{
vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
bHighContrast = ( ((ToolBox *)pWindow)->GetBackground().GetColor().IsDark() );
}
return bHighContrast;
}
void ToolboxController::updateStatus() void ToolboxController::updateStatus()
{ {
bindListener(); bindListener();