[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - wizards/com

[Michael Stahl]

 wizards/com/sun/star/wizards/ui/ControlScroller.java |   23 -------------------
 1 file changed, 23 deletions(-)

New commits:
commit b6c00fb358cbfcd74d71e99a8fe3b277a1f87a32
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jan 31 17:10:26 2012 +0100

    Fix fdo#42543: Don't paint a frame around the list of edit boxes.
    
    This conflicts with commit efc6b840a0423099d6c3e0d33c14d34637fbba4c that
    reorders painting of windows when they overlap; and in this case, the frame
    image paints over the controls.
    
    The sideeffect is that the dialog looks nicer ;-)
    (cherry picked from commit d26f06b33b6958cb15b16dbfe3e12ab0126c23a7)
    
    Signed-off-by: Lubos Lunak <l.lunak at suse.cz>
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    Signed-off-by: Noel Power <nopower at suse.com>

diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index c9aeee6..a04d1c1 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -39,7 +39,6 @@ public abstract class ControlScroller
 
     protected WizardDialog CurUnoDialog;
     protected XMultiServiceFactory xMSF;
-    private Object oImgControl;
     protected int ncurfieldcount;
     protected int nblockincrement;
     private int nlineincrement;
@@ -113,17 +112,6 @@ public abstract class ControlScroller
         int ScrollHeight = iCompHeight - 2;
         nlineincrement = 1;
         sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "imgBackground");
-        oImgControl = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgBackground" + sIncSuffix,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_BORDER, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    new Short("1"), new Integer(iCompHeight), ICompPosX, new Integer(iCompPosY), IStep, ICompWidth
-                });
-        oImgControl = CurUnoDialog.xDlgContainer.getControl("imgBackground" + sIncSuffix);
-        setComponentMouseTransparent();
         xScrollBar = CurUnoDialog.insertScrollBar("TitleScrollBar" + sIncSuffix, 0,
                 new AdjustmentListenerImpl(),
                 new String[]
@@ -143,17 +131,6 @@ public abstract class ControlScroller
         }
     }
 
-    public void setComponentMouseTransparent()
-    {
-        CurUnoDialog.getPeerConfiguration().setPeerProperties(oImgControl, new String[]
-                {
-                    "MouseTransparent"
-                }, new Boolean[]
-                {
-                    Boolean.TRUE
-                });
-    }
-
     protected void setScrollBarOrientationHorizontal()
     {
         Helper.setUnoPropertyValue(xScrollBar, PropertyNames.ORIENTATION, new Integer(ScrollBarOrientation.HORIZONTAL));