cmcfixes71: merge with DEV300 m71

2 files changed, 2 insertions, 21 deletions

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 33acb232821a..45871b718026 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -34,12 +34,6 @@
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
-// #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
-// #include <com/sun/star/lang/Locale.hpp>
-// #endif
-// #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_
-// #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-// #endif
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
@@ -49,9 +43,6 @@
 #include <svl/svstdarr.hxx>
 #include <svl/aeitem.hxx>
 
-// #ifndef _FILTER_HXX
-// #include <svtools/filter.hxx>
-// #endif
 #include <SwStyleNameMapper.hxx>
 #include <docary.hxx>
 #include <hintids.hxx>
@@ -69,12 +60,8 @@
 #include <svx/viewlayoutitem.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/htmlmode.hxx>
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
@@ -94,9 +81,7 @@
 #include <svl/whiter.hxx>
 #include <svl/ptitem.hxx>
 #include <svx/linkmgr.hxx>
-#ifndef __RSC //autogen
 #include <tools/errinf.hxx>
-#endif
 #include <tools/urlobj.hxx>
 #include <svx/svdview.hxx>
 #include <swtypes.hxx>
@@ -148,10 +133,6 @@
 #include <PostItMgr.hxx>
 #include <postit.hxx>
 
-// #ifndef _FRMMGR_HXX
-// #include <frmmgr.hxx>
-// #endif
-
 #include <ndtxt.hxx> //#outline level,added by zhaojianwei
 
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 316156d0112d..b7528a025b2d 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -347,7 +347,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             if(aSize.GetWidthPercent())
             {
                 SwRect aRect;
-                rSh.CalcBoundRect(aRect, FLY_IN_CNTNT);
+                rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
                 long nPrtWidth = aRect.Width();
                 aSize.SetWidthPercent(BYTE((nPageWidth - aLongLR.GetLeft() - aLongLR.GetRight()) * 100 /nPrtWidth));
             }
@@ -472,7 +472,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             if(aSize.GetHeightPercent())
             {
                 SwRect aRect;
-                rSh.CalcBoundRect(aRect, FLY_IN_CNTNT);
+                rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
                 long nPrtHeight = aRect.Height();
                 aSize.SetHeightPercent(BYTE(nHeight * 100 /nPrtHeight));
             }