summaryrefslogtreecommitdiff
path: root/svx/source/sdr/properties
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/sdr/properties')
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx16
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx2
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx2
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx2
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx4
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx6
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx4
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx6
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx2
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx8
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx4
-rw-r--r--svx/source/sdr/properties/rectangleproperties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx2
16 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 484a1d1e475a..f173f8b8a2d9 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -49,7 +49,7 @@ namespace sdr
{
namespace properties
{
- void AttributeProperties::ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void AttributeProperties::ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
// test if old StyleSheet is cleared, else it would be lost
// after this method -> memory leak (!)
@@ -137,7 +137,7 @@ namespace sdr
{
if(rProps.GetStyleSheet())
{
- ImpAddStyleSheet(rProps.GetStyleSheet(), sal_True);
+ ImpAddStyleSheet(rProps.GetStyleSheet(), true);
}
}
@@ -232,7 +232,7 @@ namespace sdr
}
}
- void AttributeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void AttributeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
ImpRemoveStyleSheet();
ImpAddStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
@@ -279,7 +279,7 @@ namespace sdr
if(pStyleSheetPool == pDestPool)
{
// just re-set stylesheet
- ImpAddStyleSheet(pStySheet, sal_True);
+ ImpAddStyleSheet(pStySheet, true);
}
else
{
@@ -300,7 +300,7 @@ namespace sdr
// document. Use the default as a fallback.
pNewStyleSheet = pNewModel->GetDefaultStyleSheet();
}
- ImpAddStyleSheet(pNewStyleSheet, sal_True);
+ ImpAddStyleSheet(pNewStyleSheet, true);
}
}
@@ -407,7 +407,7 @@ namespace sdr
if(GetStyleSheet() != pForThisObject)
{
ImpRemoveStyleSheet();
- ImpAddStyleSheet((SfxStyleSheet*)pForThisObject, sal_True);
+ ImpAddStyleSheet((SfxStyleSheet*)pForThisObject, true);
}
}
else
@@ -471,7 +471,7 @@ namespace sdr
if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading())
{
GetObjectItemSet(); // #118414 force ItemSet to allow style to be set
- SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True);
+ SetStyleSheet(pNewModel->GetDefaultStyleSheet(), true);
}
}
}
@@ -574,7 +574,7 @@ namespace sdr
if(pNewStSh)
{
- ImpAddStyleSheet(pNewStSh, sal_True);
+ ImpAddStyleSheet(pNewStSh, true);
}
break;
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 8e9f856ededb..cd80b357beed 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -80,7 +80,7 @@ namespace sdr
RectangleProperties::ItemSetChanged(rSet);
}
- void CaptionProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void CaptionProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrCaptionObj& rObj = (SdrCaptionObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 7b80fdbafb54..4afbc3ed0473 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -82,7 +82,7 @@ namespace sdr
rObj.ImpSetAttrToCircInfo();
}
- void CircleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void CircleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrCircObj& rObj = (SdrCircObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 76b1c71e0911..804e083d6749 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -80,7 +80,7 @@ namespace sdr
rObj.ImpSetAttrToEdgeInfo();
}
- void ConnectorProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void ConnectorProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrEdgeObj& rObj = (SdrEdgeObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 0cc2ab1a89c1..13f167cf2a2d 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -67,7 +67,7 @@ namespace sdr
// end
0, 0));
}
- sal_Bool CustomShapeProperties::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem ) const
+ bool CustomShapeProperties::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem ) const
{
sal_Bool bAllowItemChange = sal_True;
if ( !pNewItem )
@@ -140,7 +140,7 @@ namespace sdr
rObj.InvalidateRenderGeometry();
}
- void CustomShapeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void CustomShapeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
UpdateTextFrameStatus();
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 0679dc38abce..d3806c4090df 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -181,9 +181,9 @@ namespace sdr
{
}
- sal_Bool DefaultProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
+ bool DefaultProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
- return sal_True;
+ return true;
}
void DefaultProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
@@ -196,7 +196,7 @@ namespace sdr
CleanupFillProperties(*mpItemSet);
}
- void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, sal_Bool /*bDontRemoveHardAttr*/)
+ void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{
// no StyleSheet in DefaultProperties
}
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index d116e88bb706..1089613e5ff2 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -74,7 +74,7 @@ namespace sdr
return E3dProperties::GetMergedItemSet();
}
- void E3dCompoundProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+ void E3dCompoundProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{
// Set scene specific items at scene
E3dCompoundObject& rObj = (E3dCompoundObject&)GetSdrObject();
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 49a39caea9a6..736bd8b0cd78 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -75,7 +75,7 @@ namespace sdr
rObj.StructureChanged();
}
- void E3dProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void E3dProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
// call parent
AttributeProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index b6a22e3cb8a3..58d1acecfe7d 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -111,7 +111,7 @@ namespace sdr
return E3dProperties::GetMergedItemSet();
}
- void E3dSceneProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+ void E3dSceneProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{
// Set SDRATTR_3DOBJ_ range at contained objects.
const SdrObjList* pSub = ((const E3dScene&)GetSdrObject()).GetSubList();
@@ -236,7 +236,7 @@ namespace sdr
}
}
- void E3dSceneProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void E3dSceneProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
const SdrObjList* pSub = ((const E3dScene&)GetSdrObject()).GetSubList();
const sal_uInt32 nCount(pSub->GetObjCount());
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 2db4aa294333..6c76e6221eef 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -110,10 +110,10 @@ namespace sdr
DBG_ASSERT(false, "EmptyProperties::ItemSetChanged() should never be called (!)");
}
- sal_Bool EmptyProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
+ bool EmptyProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
DBG_ASSERT(false, "EmptyProperties::AllowItemChange() should never be called (!)");
- return sal_True;
+ return true;
}
void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
@@ -126,7 +126,7 @@ namespace sdr
DBG_ASSERT(false, "EmptyProperties::PostItemChange() should never be called (!)");
}
- void EmptyProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, sal_Bool /*bDontRemoveHardAttr*/)
+ void EmptyProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{
DBG_ASSERT(false, "EmptyProperties::SetStyleSheet() should never be called (!)");
}
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index d2c193f2dbb1..f90b1a2a87ae 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -89,7 +89,7 @@ namespace sdr
RectangleProperties::ItemSetChanged(rSet);
}
- void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrGrafObj& rObj = (SdrGrafObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 6b449e5dc0ca..2336fddfa95a 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -110,7 +110,7 @@ namespace sdr
return *mpItemSet;
}
- void GroupProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+ void GroupProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{
// iterate over contained SdrObjects
const SdrObjList* pSub = ((const SdrObjGroup&)GetSdrObject()).GetSubList();
@@ -184,10 +184,10 @@ namespace sdr
DBG_ASSERT(false, "GroupProperties::ItemSetChanged() should never be called (!)");
}
- sal_Bool GroupProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
+ bool GroupProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
DBG_ASSERT(false, "GroupProperties::AllowItemChange() should never be called (!)");
- return sal_False;
+ return false;
}
void GroupProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
@@ -228,7 +228,7 @@ namespace sdr
return pRetval;
}
- void GroupProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void GroupProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
const SdrObjList* pSub = ((const SdrObjGroup&)GetSdrObject()).GetSubList();
const sal_uInt32 nCount(pSub->GetObjCount());
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index a172f9d08922..44a7efa68bad 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -87,7 +87,7 @@ namespace sdr
rObj.SetTextDirty();
}
- void MeasureProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void MeasureProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrMeasureObj& rObj = (SdrMeasureObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 2057a21e0bbf..4388deb40793 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -50,7 +50,7 @@ namespace sdr
return GetObjectItemSet();
}
- void BaseProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+ void BaseProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{
// clear items if requested
if(bClearAllItems)
@@ -99,7 +99,7 @@ namespace sdr
// Overload where an ItemSet is implemented.
}
- void BaseProperties::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+ void BaseProperties::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems)
{
ItemChangeBroadcaster aC(GetSdrObject());
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index dcd6e943ef54..7794a3d1daa6 100644
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
@@ -57,7 +57,7 @@ namespace sdr
}
// set a new StyleSheet and broadcast
- void RectangleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void RectangleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrRectObj& rObj = (SdrRectObj&)GetSdrObject();
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index b2b32d3222ec..487718836f21 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -230,7 +230,7 @@ namespace sdr
return static_cast<const SdrTextObj&>(GetSdrObject());
}
- void TextProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void TextProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrTextObj& rObj = (SdrTextObj&)GetSdrObject();