From 0e378dedf3e067ff336dd26b7df1c345a371c640 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 19 Jun 2006 18:37:55 +0000
Subject: INTEGRATION: CWS warnings01 (1.32.70); FILE MERGED 2006/04/07
 18:51:56 sb 1.32.70.2: RESYNC: (1.32-1.33); FILE MERGED 2005/10/24 14:27:10
 pl 1.32.70.1: #i55991# removed warnings for linux platform

---
 vcl/source/window/floatwin.cxx | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'vcl/source/window/floatwin.cxx')

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index d136abef89b7..1ffcb9da5137 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: floatwin.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: hr $ $Date: 2006-01-26 18:10:12 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 19:37:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -770,7 +770,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, ULONG nFlags )
         FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE;
 /*
  *  FLOATWIN_POPUPMODE_NOKEYCLOSE       |
- *  don't set since it diables closing floaters with escape
+ *  don't set since it disables closing floaters with escape
  */
 
     // Flags fuer Positionierung bestimmen
@@ -778,27 +778,10 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, ULONG nFlags )
                      FLOATWIN_POPUPMODE_LEFT | FLOATWIN_POPUPMODE_RIGHT |
                      FLOATWIN_POPUPMODE_NOAUTOARRANGE)) )
     {
-         WindowAlign eAlign = pBox->GetAlign();
          if ( pBox->IsHorizontal() )
-         {
              nFlags |= FLOATWIN_POPUPMODE_DOWN;
-             /*
-             if ( pBox->IsFloatingMode() || (eAlign == WINDOWALIGN_TOP) )
-                 nFlags |= FLOATWIN_POPUPMODE_DOWN;
-             else
-                 nFlags |= FLOATWIN_POPUPMODE_UP;
-             */
-         }
          else
-         {
              nFlags |= FLOATWIN_POPUPMODE_RIGHT;
-             /*
-             if ( eAlign == WINDOWALIGN_LEFT )
-                 nFlags |= FLOATWIN_POPUPMODE_RIGHT;
-             else
-                 nFlags |= FLOATWIN_POPUPMODE_LEFT;
-             */
-         }
     }
 
     // FloatingModus starten
-- 
cgit