summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-06 08:31:01 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:22 +0200
commitef61173187d99e75fd5ce0a70994325a17e2c21a (patch)
tree0de654b24126c031abe0ade6faeb0fc75feb51ee
parent0277baf97670598c83009869fdcc326552a58fd0 (diff)
svx: sal_Bool->bool
Change-Id: Idfffbcad1a51192c5ccad28a16c4e613060fc2dc
-rw-r--r--include/svx/sdr/properties/attributeproperties.hxx4
-rw-r--r--include/svx/sdr/properties/captionproperties.hxx2
-rw-r--r--include/svx/sdr/properties/circleproperties.hxx2
-rw-r--r--include/svx/sdr/properties/connectorproperties.hxx2
-rw-r--r--include/svx/sdr/properties/customshapeproperties.hxx4
-rw-r--r--include/svx/sdr/properties/defaultproperties.hxx4
-rw-r--r--include/svx/sdr/properties/e3dcompoundproperties.hxx2
-rw-r--r--include/svx/sdr/properties/e3dproperties.hxx2
-rw-r--r--include/svx/sdr/properties/e3dsceneproperties.hxx4
-rw-r--r--include/svx/sdr/properties/emptyproperties.hxx4
-rw-r--r--include/svx/sdr/properties/graphicproperties.hxx2
-rw-r--r--include/svx/sdr/properties/groupproperties.hxx6
-rw-r--r--include/svx/sdr/properties/measureproperties.hxx2
-rw-r--r--include/svx/sdr/properties/properties.hxx8
-rw-r--r--include/svx/sdr/properties/rectangleproperties.hxx2
-rw-r--r--include/svx/sdr/properties/textproperties.hxx2
-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
-rw-r--r--svx/source/table/cell.cxx4
33 files changed, 61 insertions, 61 deletions
diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx
index 3309500871c3..00957837b3ca 100644
--- a/include/svx/sdr/properties/attributeproperties.hxx
+++ b/include/svx/sdr/properties/attributeproperties.hxx
@@ -34,7 +34,7 @@ namespace sdr
class SVX_DLLPUBLIC AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
{
// add style sheet, do all the necessary handling
- void ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ void ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// remove StyleSheet, do all the necessary handling
void ImpRemoveStyleSheet();
@@ -66,7 +66,7 @@ namespace sdr
virtual ~AttributeProperties();
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx
index 1ce6903d3da9..609546741c79 100644
--- a/include/svx/sdr/properties/captionproperties.hxx
+++ b/include/svx/sdr/properties/captionproperties.hxx
@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx
index 4ac0dc5bfc63..63b95089a073 100644
--- a/include/svx/sdr/properties/circleproperties.hxx
+++ b/include/svx/sdr/properties/circleproperties.hxx
@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx
index dbd3b49b52c5..3b86c026d161 100644
--- a/include/svx/sdr/properties/connectorproperties.hxx
+++ b/include/svx/sdr/properties/connectorproperties.hxx
@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx
index 14a558414b99..23a0181e7432 100644
--- a/include/svx/sdr/properties/customshapeproperties.hxx
+++ b/include/svx/sdr/properties/customshapeproperties.hxx
@@ -37,7 +37,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item
- virtual sal_Bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
// react on ItemSet changes
virtual void ItemSetChanged(const SfxItemSet& rSet);
@@ -55,7 +55,7 @@ namespace sdr
public:
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 4e372c2042c6..0ed222cea03e 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -39,7 +39,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item
- virtual sal_Bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
// Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
@@ -83,7 +83,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx
index db04b384c1bc..8480e75791bf 100644
--- a/include/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx
@@ -59,7 +59,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet().
- virtual void SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
+ virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx
index c2ba41c9bf2f..c55f40b53421 100644
--- a/include/svx/sdr/properties/e3dproperties.hxx
+++ b/include/svx/sdr/properties/e3dproperties.hxx
@@ -52,7 +52,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx
index 9d14a5ae8529..2767dd2b135e 100644
--- a/include/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/include/svx/sdr/properties/e3dsceneproperties.hxx
@@ -58,7 +58,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet().
- virtual void SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
+ virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false);
// Set a single item, iterate over hierarchies if necessary.
virtual void SetMergedItem(const SfxPoolItem& rItem);
@@ -67,7 +67,7 @@ namespace sdr
virtual void ClearMergedItem(const sal_uInt16 nWhich = 0);
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx
index 7498f0422b55..ce13b8307f8c 100644
--- a/include/svx/sdr/properties/emptyproperties.hxx
+++ b/include/svx/sdr/properties/emptyproperties.hxx
@@ -39,7 +39,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item
- virtual sal_Bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
// Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
@@ -83,7 +83,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx
index 1232ec7e9f9b..b380fbeb8f0e 100644
--- a/include/svx/sdr/properties/graphicproperties.hxx
+++ b/include/svx/sdr/properties/graphicproperties.hxx
@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx
index ee12bd2a0bfd..da0e15493ff3 100644
--- a/include/svx/sdr/properties/groupproperties.hxx
+++ b/include/svx/sdr/properties/groupproperties.hxx
@@ -35,7 +35,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item
- virtual sal_Bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const;
// Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
@@ -70,7 +70,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet().
- virtual void SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
+ virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false);
// set single item
virtual void SetObjectItem(const SfxPoolItem& rItem);
@@ -95,7 +95,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the local StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx
index 234aca895e8d..038c99f63d69 100644
--- a/include/svx/sdr/properties/measureproperties.hxx
+++ b/include/svx/sdr/properties/measureproperties.hxx
@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index e754d9e4c081..ef88aacd9727 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -66,7 +66,7 @@ namespace sdr
// Test changeability for a single item. If a implementation wants to prevent
// changing an item this method may be overloaded.
- virtual sal_Bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0;
// Do the internal ItemChange. If only nWhich is given, the item needs to be cleared.
// Also needs to handle if nWhich and pNewItem is 0, which means to clear all items.
@@ -110,7 +110,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet) = 0;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet().
- virtual void SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
+ virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false);
// Set single item at the local ItemSet. Uses AllowItemChange(),
// ItemChange(), PostItemChange() and ItemSetChanged() calls.
@@ -139,7 +139,7 @@ namespace sdr
// Set a new StyleSheet. Registers as listener at the StyleSheet to get knowledge
// of StyleSheet changes.
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) = 0;
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) = 0;
// Get the installed StyleSheet.
virtual SfxStyleSheet* GetStyleSheet() const = 0;
@@ -164,7 +164,7 @@ namespace sdr
// will be changed these broadcasts will no longer be needed.
//void SetItemAndBroadcast(const SfxPoolItem& rItem);
//void ClearItemAndBroadcast(const sal_uInt16 nWhich = 0);
- void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
+ void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems = false);
// Just a convenient shortcut for GetObjectItemSet().Get(nWhich).
const SfxPoolItem& GetItem(const sal_uInt16 nWhich) const;
diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx
index aa464546c7e4..f53b34c5dc65 100644
--- a/include/svx/sdr/properties/rectangleproperties.hxx
+++ b/include/svx/sdr/properties/rectangleproperties.hxx
@@ -49,7 +49,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx
index 0894af0d6d80..78de4949642a 100644
--- a/include/svx/sdr/properties/textproperties.hxx
+++ b/include/svx/sdr/properties/textproperties.hxx
@@ -63,7 +63,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
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();
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c58b18175453..e2722f0555bc 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -170,7 +170,7 @@ namespace sdr
void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem);
- void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
sdr::table::CellRef mxCell;
@@ -322,7 +322,7 @@ namespace sdr
AttributeProperties::ItemChange( nWhich, pNewItem );
}
- void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+ void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
}