From 5a7ee0fbf9f6183319571cad6e60652a8addd655 Mon Sep 17 00:00:00 2001 From: "Daniel Rentz [dr]" Date: Fri, 25 Mar 2011 10:40:25 +0100 Subject: calcvba: #164410# improve VBA compatibility implementation in various areas: Excel symbols, MSForms symbols, document and forms event handling --- comphelper/inc/comphelper/servicedecl.hxx | 31 +++++++++++-------------------- toolkit/source/controls/dialogcontrol.cxx | 5 ++++- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index 5ea7972e29a2..a7d51824f7c0 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.hxx @@ -27,26 +27,17 @@ #if ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED) #define COMPHELPER_SERVICEDECL_HXX_INCLUDED -#if ! defined(INCLUDED_COMPHELPERDLLAPI_H) -#include "comphelper/comphelperdllapi.h" -#endif -#if ! defined(_CPPUHELPER_IMPLBASE1_HXX_) -#include "cppuhelper/implbase1.hxx" -#endif -#if ! defined(_COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_) -#include "com/sun/star/uno/XComponentContext.hpp" -#endif -#if ! defined(_COM_SUN_STAR_LANG_XSERVICEINFO_HPP_) -#include "com/sun/star/lang/XServiceInfo.hpp" -#endif -#if ! defined(_COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_) -#include "com/sun/star/registry/XRegistryKey.hpp" -#endif -#include "boost/utility.hpp" -#include "boost/function.hpp" -#include "boost/preprocessor/cat.hpp" -#include "boost/preprocessor/repetition.hpp" -#include "boost/preprocessor/seq/enum.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace comphelper { namespace service_decl { diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 556acbf5d0d2..069e1d497324 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -338,7 +338,10 @@ throw (::com::sun::star::uno::RuntimeException) Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW ); Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), UNO_QUERY ); OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" ); - if ( xDialogDevice.is() ) + + // #i87592 In design mode the drawing layer works with sizes with decoration. + // Therefore we have to substract them before writing back to the properties (model). + if ( xDialogDevice.is() && mbDesignMode ) { DeviceInfo aDeviceInfo( xDialogDevice->getInfo() ); aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset; -- cgit v1.2.3