1 files changed, 8 insertions, 11 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index a9df9762ad927..eb067cc61c71a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: column.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,12 +36,12 @@
 
 #include "hintids.hxx"
 #include <svx/htmlmode.hxx>
-#include <svx/borderline.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/sizeitem.hxx>
-#include "svx/frmdiritem.hxx"
-#include <svtools/ctloptions.hxx>
+#include <editeng/borderline.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include "editeng/frmdiritem.hxx"
+#include <svl/ctloptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <swmodule.hxx>
@@ -125,7 +122,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
     FreeResource();
 
     SwRect aRect;
-    rWrtShell.CalcBoundRect(aRect, FLY_IN_CNTNT);
+    rWrtShell.CalcBoundRect(aRect, FLY_AS_CHAR);
 
     nSelectionWidth = aRect.Width();