dba34c: pulled and merged DEV300.m100

18 files changed, 21 insertions, 476 deletions

diff --git a/svx/source/sdr/animation/makefile.mk b/svx/source/sdr/animation/makefile.mk
deleted file mode 100644
index a6750647f556..000000000000
--- a/svx/source/sdr/animation/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=animation
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/animationstate.obj			\
-        $(SLO)$/objectanimator.obj			\
-        $(SLO)$/scheduler.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk
deleted file mode 100644
index 177654ff1e1c..000000000000
--- a/svx/source/sdr/attribute/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=attribute
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/sdrfilltextattribute.obj			\
-        $(SLO)$/sdrlinefillshadowtextattribute.obj	\
-        $(SLO)$/sdrlineshadowtextattribute.obj		\
-        $(SLO)$/sdrshadowtextattribute.obj			\
-        $(SLO)$/sdrtextattribute.obj				\
-        $(SLO)$/sdrformtextattribute.obj			\
-        $(SLO)$/sdrformtextoutlineattribute.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk
deleted file mode 100644
index 9e4356c4aa52..000000000000
--- a/svx/source/sdr/contact/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=svx
-TARGET=contact
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/viewobjectcontactofunocontrol.obj
-
-SLOFILES=\
-        $(EXCEPTIONSFILES)									\
-        $(SLO)$/displayinfo.obj								\
-        $(SLO)$/viewcontact.obj								\
-        $(SLO)$/viewcontactofe3d.obj						\
-        $(SLO)$/viewcontactofsdrobj.obj						\
-        $(SLO)$/viewcontactofvirtobj.obj					\
-        $(SLO)$/viewcontactoftextobj.obj					\
-        $(SLO)$/viewcontactofsdrrectobj.obj					\
-        $(SLO)$/viewcontactofsdrpathobj.obj					\
-        $(SLO)$/viewcontactofsdrole2obj.obj					\
-        $(SLO)$/viewcontactofsdrcircobj.obj					\
-        $(SLO)$/viewcontactofsdrcaptionobj.obj				\
-        $(SLO)$/viewcontactofsdrmeasureobj.obj				\
-        $(SLO)$/viewcontactofsdredgeobj.obj					\
-        $(SLO)$/viewcontactofsdrpage.obj					\
-        $(SLO)$/viewcontactofmasterpagedescriptor.obj		\
-        $(SLO)$/viewcontactofgroup.obj						\
-        $(SLO)$/viewcontactofe3dscene.obj					\
-        $(SLO)$/viewcontactofe3dcube.obj					\
-        $(SLO)$/viewcontactofe3dextrude.obj					\
-        $(SLO)$/viewcontactofe3dlathe.obj					\
-        $(SLO)$/viewcontactofe3dsphere.obj					\
-        $(SLO)$/viewcontactofe3dpolygon.obj					\
-        $(SLO)$/viewcontactofpageobj.obj					\
-        $(SLO)$/viewcontactofgraphic.obj					\
-        $(SLO)$/viewcontactofsdrobjcustomshape.obj			\
-        $(SLO)$/viewcontactofsdrmediaobj.obj				\
-        $(SLO)$/viewcontactofunocontrol.obj					\
-        $(SLO)$/objectcontact.obj							\
-        $(SLO)$/objectcontacttools.obj						\
-        $(SLO)$/objectcontactofobjlistpainter.obj			\
-        $(SLO)$/objectcontactofpageview.obj					\
-        $(SLO)$/viewobjectcontact.obj						\
-        $(SLO)$/viewobjectcontactofe3d.obj					\
-        $(SLO)$/viewobjectcontactredirector.obj				\
-        $(SLO)$/viewobjectcontactofsdrmediaobj.obj			\
-        $(SLO)$/viewobjectcontactofgroup.obj				\
-        $(SLO)$/viewobjectcontactofe3dscene.obj				\
-        $(SLO)$/viewobjectcontactofsdrpage.obj				\
-        $(SLO)$/viewobjectcontactofsdrobj.obj				\
-        $(SLO)$/viewobjectcontactofpageobj.obj				\
-        $(SLO)$/viewobjectcontactofsdrole2obj.obj			\
-        $(SLO)$/viewobjectcontactofgraphic.obj				\
-        $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj	\
-        $(SLO)$/sdrmediawindow.obj					
-        
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 845f1c813325..1ba774ba378f 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -326,7 +326,7 @@ namespace sdr
             aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue());
             aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue());
             aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01);
-            aLocalGrafInfo.SetTransparency((BYTE)::basegfx::fround(Min(nTrans, (USHORT)100) * 2.55));
+            aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55));
             aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue());
             aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
             aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
diff --git a/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk
deleted file mode 100644
index ff379af6be2a..000000000000
--- a/svx/source/sdr/event/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=event
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/eventhandler.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk
deleted file mode 100644
index 155053826f0d..000000000000
--- a/svx/source/sdr/overlay/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=overlay
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/overlayanimatedbitmapex.obj				\
-        $(SLO)$/overlaybitmapex.obj						\
-        $(SLO)$/overlaycrosshair.obj					\
-        $(SLO)$/overlayhatchrect.obj					\
-        $(SLO)$/overlayhelpline.obj						\
-        $(SLO)$/overlayline.obj							\
-        $(SLO)$/overlaymanager.obj						\
-        $(SLO)$/overlaymanagerbuffered.obj				\
-        $(SLO)$/overlayobject.obj						\
-        $(SLO)$/overlayobjectcell.obj					\
-        $(SLO)$/overlayobjectlist.obj					\
-        $(SLO)$/overlaypolypolygon.obj					\
-        $(SLO)$/overlayprimitive2dsequenceobject.obj	\
-        $(SLO)$/overlayrollingrectangle.obj				\
-        $(SLO)$/overlayselection.obj					\
-        $(SLO)$/overlaytools.obj						\
-        $(SLO)$/overlaytriangle.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk
deleted file mode 100644
index 078bc4bc977e..000000000000
--- a/svx/source/sdr/primitive2d/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=primitive2d
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/primitivefactory2d.obj				\
-        $(SLO)$/sdrdecompositiontools.obj			\
-        $(SLO)$/sdrattributecreator.obj				\
-        $(SLO)$/sdrellipseprimitive2d.obj			\
-        $(SLO)$/sdrrectangleprimitive2d.obj			\
-        $(SLO)$/sdrcustomshapeprimitive2d.obj		\
-        $(SLO)$/sdrcaptionprimitive2d.obj			\
-        $(SLO)$/sdrgrafprimitive2d.obj				\
-        $(SLO)$/sdrole2primitive2d.obj				\
-        $(SLO)$/sdrolecontentprimitive2d.obj		\
-        $(SLO)$/sdrpathprimitive2d.obj				\
-        $(SLO)$/sdrprimitivetools.obj				\
-        $(SLO)$/sdrmeasureprimitive2d.obj			\
-        $(SLO)$/sdrconnectorprimitive2d.obj			\
-        $(SLO)$/sdrtextprimitive2d.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4ff335a04125..8b86f9dec9ce 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -560,7 +560,7 @@ namespace drawinglayer
         {
             const SfxPoolItem* pGradientItem;
 
-            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, TRUE, &pGradientItem)
+            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem)
                 && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
             {
                 // test if float transparence is completely transparent
diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/source/sdr/primitive3d/makefile.mk
deleted file mode 100644
index c845cadc90a4..000000000000
--- a/svx/source/sdr/primitive3d/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=primitive3d
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/sdrattributecreator3d.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 0f3325a0027e..39b78849ad7e 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -277,7 +277,7 @@ namespace sdr
                         ImpRemoveStyleSheet();
                     }
 
-                    mpItemSet = mpItemSet->Clone(FALSE, pDestPool);
+                    mpItemSet = mpItemSet->Clone(sal_False, pDestPool);
                     GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel);
 
                     // set stylesheet (if used)
@@ -380,7 +380,7 @@ namespace sdr
                             while(pSheet)
                             {
                                 pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask());
-                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), FALSE);
+                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False);
 
                                 if(bScaleUnitChanged)
                                 {
@@ -451,7 +451,7 @@ namespace sdr
 
                                 while(nWhich)
                                 {
-                                    if(mpItemSet->GetItemState(nWhich, FALSE) == SFX_ITEM_SET)
+                                    if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET)
                                     {
                                         pNewSet->Put(mpItemSet->Get(nWhich));
                                     }
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 005ba0b19789..7d51b26a0051 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -62,7 +62,7 @@ namespace sdr
         {
             if(rProps.mpItemSet)
             {
-                mpItemSet = rProps.mpItemSet->Clone(TRUE);
+                mpItemSet = rProps.mpItemSet->Clone(sal_True);
 
                 // do not keep parent info, this may be changed by later construrtors.
                 // This class just copies the ItemSet, ignore parent.
@@ -162,7 +162,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem))
                 {
                     if(AllowItemChange(nWhich, pPoolItem))
                     {
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 3ee3189ac4a8..6fbf34968f3c 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
                         // and always equal.
                         if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
                         {
-                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                             {
                                 mpItemSet->InvalidateItem(nWhich);
                             }
                             else
                             {
-                                mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                                mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                             }
                         }
 
@@ -131,7 +131,7 @@ namespace sdr
             {
                 // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
                 // #i50808# Leak fix, Clone produces a new instance and we get ownership here
-                SfxItemSet* pNewSet = rSet.Clone(TRUE);
+                SfxItemSet* pNewSet = rSet.Clone(sal_True);
                 DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
 
                 for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
@@ -319,13 +319,13 @@ namespace sdr
             Camera3D aSceneCam(rObj.GetCamera());
 
             // ProjectionType
-            mpItemSet->Put(Svx3DPerspectiveItem((UINT16)aSceneCam.GetProjection()));
+            mpItemSet->Put(Svx3DPerspectiveItem((sal_uInt16)aSceneCam.GetProjection()));
 
             // CamPos
-            mpItemSet->Put(Svx3DDistanceItem((UINT32)(aSceneCam.GetPosition().getZ() + 0.5)));
+            mpItemSet->Put(Svx3DDistanceItem((sal_uInt32)(aSceneCam.GetPosition().getZ() + 0.5)));
 
             // FocalLength
-            mpItemSet->Put(Svx3DFocalLengthItem((UINT32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
+            mpItemSet->Put(Svx3DFocalLengthItem((sal_uInt32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
         }
     } // end of namespace properties
 } // end of namespace sdr
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 76eacd537c27..3afdb66c6daf 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -128,7 +128,7 @@ namespace sdr
             mpItemSet->Put( SdrGrafBlueItem( 0 ) );
             mpItemSet->Put( SdrGrafGamma100Item( 100 ) );
             mpItemSet->Put( SdrGrafTransparenceItem( 0 ) );
-            mpItemSet->Put( SdrGrafInvertItem( FALSE ) );
+            mpItemSet->Put( SdrGrafInvertItem( sal_False ) );
             mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) );
             mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
 
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 9761946d15b3..d55d8dcb1a16 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
 
                 while(nWhich)
                 {
-                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                     {
                         mpItemSet->InvalidateItem(nWhich);
                     }
                     else
                     {
-                        mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                        mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                     }
 
                     nWhich = aIter.NextWhich();
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 37678966bc07..1e804b9716df 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -127,7 +127,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem))
                 {
                     if(pItem->HasMetrics())
                     {
diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk
deleted file mode 100644
index 5296765769b1..000000000000
--- a/svx/source/sdr/properties/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=properties
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/properties.obj				\
-        $(SLO)$/emptyproperties.obj			\
-        $(SLO)$/pageproperties.obj			\
-        $(SLO)$/defaultproperties.obj		\
-        $(SLO)$/attributeproperties.obj		\
-        $(SLO)$/textproperties.obj			\
-        $(SLO)$/customshapeproperties.obj	\
-        $(SLO)$/rectangleproperties.obj		\
-        $(SLO)$/oleproperties.obj			\
-        $(SLO)$/captionproperties.obj		\
-        $(SLO)$/circleproperties.obj		\
-        $(SLO)$/connectorproperties.obj		\
-        $(SLO)$/e3dproperties.obj			\
-        $(SLO)$/e3dcompoundproperties.obj	\
-        $(SLO)$/e3dextrudeproperties.obj	\
-        $(SLO)$/e3dlatheproperties.obj		\
-        $(SLO)$/e3dsceneproperties.obj		\
-        $(SLO)$/e3dsphereproperties.obj		\
-        $(SLO)$/graphicproperties.obj		\
-        $(SLO)$/groupproperties.obj			\
-        $(SLO)$/measureproperties.obj		\
-        $(SLO)$/itemsettools.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 8c935c2700f0..522f3e44e686 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -117,9 +117,9 @@ namespace sdr
             GetObjectItemSet();
 
             //#71958# by default, the show units Bool-Item is set as hard
-            // attribute to TRUE to aviod confusion when copying SdrMeasureObj's
+            // attribute to sal_True to aviod confusion when copying SdrMeasureObj's
             // from one application to another
-            mpItemSet->Put(SdrMeasureShowUnitItem(TRUE));
+            mpItemSet->Put(SdrMeasureShowUnitItem(sal_True));
 
             basegfx::B2DPolygon aNewPolygon;
             aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 091656e1f261..b7f2cc5474e6 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -488,7 +488,7 @@ namespace sdr
                                     if(bHasURL)
                                     {
                                         SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR );
-                                        aColorSet.Put(aSet, FALSE);
+                                        aColorSet.Put(aSet, sal_False);
 
                                         ESelection aSel((sal_uInt16)nPara, 0);
 
@@ -519,7 +519,7 @@ namespace sdr
 
                                 }
 
-                                aSet.Put(aParaSet, FALSE);
+                                aSet.Put(aParaSet, sal_False);
 
                                 if(bHasURL)
                                 {