[Libreoffice-commits] .: toolkit/inc toolkit/source vcl/source

[Noel Power]

 toolkit/inc/toolkit/helper/property.hxx   |    1 -
 toolkit/source/controls/dialogcontrol.cxx |   25 ++++---------------------
 toolkit/source/helper/property.cxx        |    1 -
 vcl/source/window/toolbox2.cxx            |    2 --
 4 files changed, 4 insertions(+), 25 deletions(-)

New commits:
commit 789077c297894979e120aab8dc52ec7f3ab69b3c
Author: Noel Power <noel.power at novell.com>
Date:   Fri Oct 15 13:00:25 2010 +0100

    fix fdo#30856 remove VBAForm property and associated geometry hack

diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index 096ea97..3ca2fdd 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -205,7 +205,6 @@ namespace rtl {
 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE      152
 #define BASEPROPERTY_ITEM_SEPARATOR_POS             153
 #define BASEPROPERTY_GROUPNAME                      154  // ::rtl::OUString
-#define BASEPROPERTY_VBAFORM                        155  // sal_Bool
 
 
 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 9d564ea..fa6d50a 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -290,8 +290,6 @@ UnoControlDialogModel::UnoControlDialogModel()
     aBool <<= (sal_Bool) sal_True;
     ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
     ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
-    aBool <<= (sal_Bool) sal_False;
-    ImplRegisterProperty( BASEPROPERTY_VBAFORM, aBool );
 }
 
 UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel )
@@ -1486,32 +1484,17 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
     xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
     xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
 
-    // Currentley we are simply using MAP_APPFONT ( for normal Dialogs )
-    // and MAP_100TH_MM for imported Userforms
-    MapMode aMode( MAP_APPFONT );
-    sal_Bool bVBAForm = sal_False;
-    Reference< XPropertySet > xDlgModelProps( getModel(), UNO_QUERY );
-    if ( xDlgModelProps.is() )
-    {
-        try
-        {
-            xDlgModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAForm" ) ) ) >>= bVBAForm;
-        }
-        catch( Exception& )
-        {
-        }
-    }
-    if ( bVBAForm )
-        aMode = MapMode( MAP_100TH_MM );
+    // Currentley we are simply using MAP_APPFONT
     OutputDevice*pOutDev = Application::GetDefaultDevice();
+    DBG_ASSERT( pOutDev, "Missing Default Device!" );
     if ( pOutDev )
     {
         ::Size aTmp( nX, nY );
-        aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+        aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
         nX = aTmp.Width();
         nY = aTmp.Height();
         aTmp = ::Size( nWidth, nHeight );
-        aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+        aTmp = pOutDev->LogicToPixel( aTmp, MAP_APPFONT );
         nWidth = aTmp.Width();
         nHeight = aTmp.Height();
     }
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 8f68d16..93d6850 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -286,7 +286,6 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_3     ( "SelectionModel",		    GRID_SELECTIONMODE,     ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ReferenceDevice",        REFERENCE_DEVICE,       Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ),
-            DECL_PROP_2     ( "VBAForm",                VBAFORM,                sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,  sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,         sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 04aabdb..d101122 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -55,8 +55,6 @@ using namespace rtl;
 
 #define TB_SEP_SIZE 			8
 
-ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType );
-
 // -----------------------------------------------------------------------
 
 ImplToolBoxPrivateData::ImplToolBoxPrivateData() :