1 files changed, 31 insertions, 31 deletions

diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b01caa73f8..60a96b1722 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,10 +44,10 @@
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <tools/config.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/whiter.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <svl/whiter.hxx>
 #include <tools/bigint.hxx>
 #include "fontitem.hxx"
 #include <svx/colritem.hxx>
@@ -59,17 +59,17 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/processfactory.hxx>
 #include <i18npool/lang.h>
 #include <unotools/charclass.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
-#include <vcl/svapp.hxx> //add CHINA001 
+#include <vcl/svapp.hxx> //add CHINA001
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdotable.hxx>
@@ -238,7 +238,7 @@ BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
     if (pObj)
     {
         //#i80528# The old mechanism is completely useless, only taking into account if
-        // in all views the GrafDraft feature is used. This will nearly never have been the 
+        // in all views the GrafDraft feature is used. This will nearly never have been the
         // case since no one ever used this option.
         //
         // A much better (and working) criteria would be the VOC contact count.
@@ -870,41 +870,41 @@ void SvdProgressInfo::ReportError()
 namespace
 {
     bool impGetSdrObjListFillColor(
-        const SdrObjList& rList, 
-        const Point& rPnt, 
-        const SdrPageView& rTextEditPV, 
-        const SetOfByte& rVisLayers, 
+        const SdrObjList& rList,
+        const Point& rPnt,
+        const SdrPageView& rTextEditPV,
+        const SetOfByte& rVisLayers,
         Color& rCol)
     {
-        if(!rList.GetModel()) 
+        if(!rList.GetModel())
             return false;
 
         bool bRet(false);
         bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false);
 
-        for(ULONG no(rList.GetObjCount()); !bRet && no > 0; ) 
+        for(ULONG no(rList.GetObjCount()); !bRet && no > 0; )
         {
             no--;
             SdrObject* pObj = rList.GetObj(no);
             SdrObjList* pOL = pObj->GetSubList();
 
-            if(pOL) 
-            { 
+            if(pOL)
+            {
                 // group object
                 bRet = impGetSdrObjListFillColor(*pOL, rPnt, rTextEditPV, rVisLayers, rCol);
-            } 
-            else 
+            }
+            else
             {
                 SdrTextObj* pText = dynamic_cast< SdrTextObj * >(pObj);
 
                 // #108867# Exclude zero master page object (i.e. background shape) from color query
                 if(pText
-                    && pObj->IsClosedObj() 
+                    && pObj->IsClosedObj()
                     && (!bMaster || (!pObj->IsNotVisibleAsMaster() && 0 != no))
-                    && pObj->GetCurrentBoundRect().IsInside(rPnt) 
-                    && !pText->IsHideContour() 
+                    && pObj->GetCurrentBoundRect().IsInside(rPnt)
+                    && !pText->IsHideContour()
                     && SdrObjectPrimitiveHit(*pObj, rPnt, 0, rTextEditPV, &rVisLayers, false))
-                {   
+                {
                     bRet = GetDraftFillColor(pObj->GetMergedItemSet(), rCol);
                 }
             }
@@ -914,14 +914,14 @@ namespace
     }
 
     bool impGetSdrPageFillColor(
-        const SdrPage& rPage, 
-        const Point& rPnt, 
-        const SdrPageView& rTextEditPV, 
-        const SetOfByte& rVisLayers, 
-        Color& rCol, 
+        const SdrPage& rPage,
+        const Point& rPnt,
+        const SdrPageView& rTextEditPV,
+        const SetOfByte& rVisLayers,
+        Color& rCol,
         bool bSkipBackgroundShape)
     {
-        if(!rPage.GetModel()) 
+        if(!rPage.GetModel())
             return false;
 
         bool bRet(impGetSdrObjListFillColor(rPage, rPnt, rTextEditPV, rVisLayers, rCol));
@@ -933,7 +933,7 @@ namespace
                 SetOfByte aSet(rVisLayers);
                 aSet &= rPage.TRG_GetMasterPageVisibleLayers();
                 SdrPage& rMasterPage = rPage.TRG_GetMasterPage();
-                
+
                 // #108867# Don't fall back to background shape on
                 // master pages. This is later handled by
                 // GetBackgroundColor, and is necessary to cater for
@@ -955,8 +955,8 @@ namespace
     }
 
     Color impCalcBackgroundColor(
-        const Rectangle& rArea, 
-        const SdrPageView& rTextEditPV, 
+        const Rectangle& rArea,
+        const SdrPageView& rTextEditPV,
         const SdrPage& rPage)
     {
         svtools::ColorConfig aColorConfig;