Kaydet (Commit) ef611731 authored tarafından Noel Grandin's avatar Noel Grandin

svx: sal_Bool->bool

Change-Id: Idfffbcad1a51192c5ccad28a16c4e613060fc2dc
üst 0277baf9
...@@ -34,7 +34,7 @@ namespace sdr ...@@ -34,7 +34,7 @@ namespace sdr
class SVX_DLLPUBLIC AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser class SVX_DLLPUBLIC AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
{ {
// add style sheet, do all the necessary handling // 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 // remove StyleSheet, do all the necessary handling
void ImpRemoveStyleSheet(); void ImpRemoveStyleSheet();
...@@ -66,7 +66,7 @@ namespace sdr ...@@ -66,7 +66,7 @@ namespace sdr
virtual ~AttributeProperties(); virtual ~AttributeProperties();
// set a new StyleSheet and broadcast // 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 // get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const; virtual SfxStyleSheet* GetStyleSheet() const;
......
...@@ -51,7 +51,7 @@ namespace sdr ...@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -51,7 +51,7 @@ namespace sdr ...@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -51,7 +51,7 @@ namespace sdr ...@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 properties
} // end of namespace sdr } // end of namespace sdr
......
...@@ -37,7 +37,7 @@ namespace sdr ...@@ -37,7 +37,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item // 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 // react on ItemSet changes
virtual void ItemSetChanged(const SfxItemSet& rSet); virtual void ItemSetChanged(const SfxItemSet& rSet);
...@@ -55,7 +55,7 @@ namespace sdr ...@@ -55,7 +55,7 @@ namespace sdr
public: public:
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -39,7 +39,7 @@ namespace sdr ...@@ -39,7 +39,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item // 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 // Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
...@@ -83,7 +83,7 @@ namespace sdr ...@@ -83,7 +83,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet); virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet and broadcast // 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 // get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const; virtual SfxStyleSheet* GetStyleSheet() const;
......
...@@ -59,7 +59,7 @@ namespace sdr ...@@ -59,7 +59,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const; virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet(). // 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 properties
} // end of namespace sdr } // end of namespace sdr
......
...@@ -52,7 +52,7 @@ namespace sdr ...@@ -52,7 +52,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 properties
} // end of namespace sdr } // end of namespace sdr
......
...@@ -58,7 +58,7 @@ namespace sdr ...@@ -58,7 +58,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const; virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet(). // 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. // Set a single item, iterate over hierarchies if necessary.
virtual void SetMergedItem(const SfxPoolItem& rItem); virtual void SetMergedItem(const SfxPoolItem& rItem);
...@@ -67,7 +67,7 @@ namespace sdr ...@@ -67,7 +67,7 @@ namespace sdr
virtual void ClearMergedItem(const sal_uInt16 nWhich = 0); virtual void ClearMergedItem(const sal_uInt16 nWhich = 0);
// set a new StyleSheet and broadcast // 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 // get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const; virtual SfxStyleSheet* GetStyleSheet() const;
......
...@@ -39,7 +39,7 @@ namespace sdr ...@@ -39,7 +39,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item // 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 // Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
...@@ -83,7 +83,7 @@ namespace sdr ...@@ -83,7 +83,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet); virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet and broadcast // 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 // get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const; virtual SfxStyleSheet* GetStyleSheet() const;
......
...@@ -51,7 +51,7 @@ namespace sdr ...@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -35,7 +35,7 @@ namespace sdr ...@@ -35,7 +35,7 @@ namespace sdr
virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool);
// test changeability for a single item // 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 // Do the ItemChange, may do special handling
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
...@@ -70,7 +70,7 @@ namespace sdr ...@@ -70,7 +70,7 @@ namespace sdr
virtual const SfxItemSet& GetMergedItemSet() const; virtual const SfxItemSet& GetMergedItemSet() const;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet(). // 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 // set single item
virtual void SetObjectItem(const SfxPoolItem& rItem); virtual void SetObjectItem(const SfxPoolItem& rItem);
...@@ -95,7 +95,7 @@ namespace sdr ...@@ -95,7 +95,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet); virtual void SetObjectItemSet(const SfxItemSet& rSet);
// set a new StyleSheet // set a new StyleSheet
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr); virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// get the local StyleSheet // get the local StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const; virtual SfxStyleSheet* GetStyleSheet() const;
......
...@@ -51,7 +51,7 @@ namespace sdr ...@@ -51,7 +51,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -66,7 +66,7 @@ namespace sdr ...@@ -66,7 +66,7 @@ namespace sdr
// Test changeability for a single item. If a implementation wants to prevent // Test changeability for a single item. If a implementation wants to prevent
// changing an item this method may be overloaded. // 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. // 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. // Also needs to handle if nWhich and pNewItem is 0, which means to clear all items.
...@@ -110,7 +110,7 @@ namespace sdr ...@@ -110,7 +110,7 @@ namespace sdr
virtual void SetObjectItemSet(const SfxItemSet& rSet) = 0; virtual void SetObjectItemSet(const SfxItemSet& rSet) = 0;
// Set merged ItemSet. Normally, this maps to SetObjectItemSet(). // 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(), // Set single item at the local ItemSet. Uses AllowItemChange(),
// ItemChange(), PostItemChange() and ItemSetChanged() calls. // ItemChange(), PostItemChange() and ItemSetChanged() calls.
...@@ -139,7 +139,7 @@ namespace sdr ...@@ -139,7 +139,7 @@ namespace sdr
// Set a new StyleSheet. Registers as listener at the StyleSheet to get knowledge // Set a new StyleSheet. Registers as listener at the StyleSheet to get knowledge
// of StyleSheet changes. // of StyleSheet changes.
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) = 0; virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) = 0;
// Get the installed StyleSheet. // Get the installed StyleSheet.
virtual SfxStyleSheet* GetStyleSheet() const = 0; virtual SfxStyleSheet* GetStyleSheet() const = 0;
...@@ -164,7 +164,7 @@ namespace sdr ...@@ -164,7 +164,7 @@ namespace sdr
// will be changed these broadcasts will no longer be needed. // will be changed these broadcasts will no longer be needed.
//void SetItemAndBroadcast(const SfxPoolItem& rItem); //void SetItemAndBroadcast(const SfxPoolItem& rItem);
//void ClearItemAndBroadcast(const sal_uInt16 nWhich = 0); //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). // Just a convenient shortcut for GetObjectItemSet().Get(nWhich).
const SfxPoolItem& GetItem(const sal_uInt16 nWhich) const; const SfxPoolItem& GetItem(const sal_uInt16 nWhich) const;
......
...@@ -49,7 +49,7 @@ namespace sdr ...@@ -49,7 +49,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 properties
} // end of namespace sdr } // end of namespace sdr
......
...@@ -63,7 +63,7 @@ namespace sdr ...@@ -63,7 +63,7 @@ namespace sdr
virtual BaseProperties& Clone(SdrObject& rObj) const; virtual BaseProperties& Clone(SdrObject& rObj) const;
// set a new StyleSheet and broadcast // 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 // force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
......
...@@ -49,7 +49,7 @@ namespace sdr ...@@ -49,7 +49,7 @@ namespace sdr
{ {
namespace properties 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 // test if old StyleSheet is cleared, else it would be lost
// after this method -> memory leak (!) // after this method -> memory leak (!)
...@@ -137,7 +137,7 @@ namespace sdr ...@@ -137,7 +137,7 @@ namespace sdr
{ {
if(rProps.GetStyleSheet()) if(rProps.GetStyleSheet())
{ {
ImpAddStyleSheet(rProps.GetStyleSheet(), sal_True); ImpAddStyleSheet(rProps.GetStyleSheet(), true);
} }
} }
...@@ -232,7 +232,7 @@ namespace sdr ...@@ -232,7 +232,7 @@ namespace sdr
} }
} }
void AttributeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void AttributeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
ImpRemoveStyleSheet(); ImpRemoveStyleSheet();
ImpAddStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); ImpAddStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
...@@ -279,7 +279,7 @@ namespace sdr ...@@ -279,7 +279,7 @@ namespace sdr
if(pStyleSheetPool == pDestPool) if(pStyleSheetPool == pDestPool)
{ {
// just re-set stylesheet // just re-set stylesheet
ImpAddStyleSheet(pStySheet, sal_True); ImpAddStyleSheet(pStySheet, true);
} }
else else
{ {
...@@ -300,7 +300,7 @@ namespace sdr ...@@ -300,7 +300,7 @@ namespace sdr
// document. Use the default as a fallback. // document. Use the default as a fallback.
pNewStyleSheet = pNewModel->GetDefaultStyleSheet(); pNewStyleSheet = pNewModel->GetDefaultStyleSheet();
} }
ImpAddStyleSheet(pNewStyleSheet, sal_True); ImpAddStyleSheet(pNewStyleSheet, true);
} }
} }
...@@ -407,7 +407,7 @@ namespace sdr ...@@ -407,7 +407,7 @@ namespace sdr
if(GetStyleSheet() != pForThisObject) if(GetStyleSheet() != pForThisObject)
{ {
ImpRemoveStyleSheet(); ImpRemoveStyleSheet();
ImpAddStyleSheet((SfxStyleSheet*)pForThisObject, sal_True); ImpAddStyleSheet((SfxStyleSheet*)pForThisObject, true);
} }
} }
else else
...@@ -471,7 +471,7 @@ namespace sdr ...@@ -471,7 +471,7 @@ namespace sdr
if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading())
{ {
GetObjectItemSet(); // #118414 force ItemSet to allow style to be set 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 ...@@ -574,7 +574,7 @@ namespace sdr
if(pNewStSh) if(pNewStSh)
{ {
ImpAddStyleSheet(pNewStSh, sal_True); ImpAddStyleSheet(pNewStSh, true);
} }
break; break;
......
...@@ -80,7 +80,7 @@ namespace sdr ...@@ -80,7 +80,7 @@ namespace sdr
RectangleProperties::ItemSetChanged(rSet); RectangleProperties::ItemSetChanged(rSet);
} }
void CaptionProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void CaptionProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
SdrCaptionObj& rObj = (SdrCaptionObj&)GetSdrObject(); SdrCaptionObj& rObj = (SdrCaptionObj&)GetSdrObject();
......
...@@ -82,7 +82,7 @@ namespace sdr ...@@ -82,7 +82,7 @@ namespace sdr
rObj.ImpSetAttrToCircInfo(); rObj.ImpSetAttrToCircInfo();
} }
void CircleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void CircleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
SdrCircObj& rObj = (SdrCircObj&)GetSdrObject(); SdrCircObj& rObj = (SdrCircObj&)GetSdrObject();
......
...@@ -80,7 +80,7 @@ namespace sdr ...@@ -80,7 +80,7 @@ namespace sdr
rObj.ImpSetAttrToEdgeInfo(); rObj.ImpSetAttrToEdgeInfo();
} }
void ConnectorProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void ConnectorProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
SdrEdgeObj& rObj = (SdrEdgeObj&)GetSdrObject(); SdrEdgeObj& rObj = (SdrEdgeObj&)GetSdrObject();
......
...@@ -67,7 +67,7 @@ namespace sdr ...@@ -67,7 +67,7 @@ namespace sdr
// end // end
0, 0)); 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; sal_Bool bAllowItemChange = sal_True;
if ( !pNewItem ) if ( !pNewItem )
...@@ -140,7 +140,7 @@ namespace sdr ...@@ -140,7 +140,7 @@ namespace sdr
rObj.InvalidateRenderGeometry(); rObj.InvalidateRenderGeometry();
} }
void CustomShapeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void CustomShapeProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr ); TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
UpdateTextFrameStatus(); UpdateTextFrameStatus();
......
...@@ -181,9 +181,9 @@ namespace sdr ...@@ -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*/) void DefaultProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
...@@ -196,7 +196,7 @@ namespace sdr ...@@ -196,7 +196,7 @@ namespace sdr
CleanupFillProperties(*mpItemSet); CleanupFillProperties(*mpItemSet);
} }
void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, sal_Bool /*bDontRemoveHardAttr*/) void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{ {
// no StyleSheet in DefaultProperties // no StyleSheet in DefaultProperties
} }
......
...@@ -74,7 +74,7 @@ namespace sdr ...@@ -74,7 +74,7 @@ namespace sdr
return E3dProperties::GetMergedItemSet(); 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 // Set scene specific items at scene
E3dCompoundObject& rObj = (E3dCompoundObject&)GetSdrObject(); E3dCompoundObject& rObj = (E3dCompoundObject&)GetSdrObject();
......
...@@ -75,7 +75,7 @@ namespace sdr ...@@ -75,7 +75,7 @@ namespace sdr
rObj.StructureChanged(); rObj.StructureChanged();
} }
void E3dProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void E3dProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
// call parent // call parent
AttributeProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); AttributeProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
......
...@@ -111,7 +111,7 @@ namespace sdr ...@@ -111,7 +111,7 @@ namespace sdr
return E3dProperties::GetMergedItemSet(); 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. // Set SDRATTR_3DOBJ_ range at contained objects.
const SdrObjList* pSub = ((const E3dScene&)GetSdrObject()).GetSubList(); const SdrObjList* pSub = ((const E3dScene&)GetSdrObject()).GetSubList();
...@@ -236,7 +236,7 @@ namespace sdr ...@@ -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 SdrObjList* pSub = ((const E3dScene&)GetSdrObject()).GetSubList();
const sal_uInt32 nCount(pSub->GetObjCount()); const sal_uInt32 nCount(pSub->GetObjCount());
......
...@@ -110,10 +110,10 @@ namespace sdr ...@@ -110,10 +110,10 @@ namespace sdr
DBG_ASSERT(false, "EmptyProperties::ItemSetChanged() should never be called (!)"); 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 (!)"); DBG_ASSERT(false, "EmptyProperties::AllowItemChange() should never be called (!)");
return sal_True; return true;
} }
void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
...@@ -126,7 +126,7 @@ namespace sdr ...@@ -126,7 +126,7 @@ namespace sdr
DBG_ASSERT(false, "EmptyProperties::PostItemChange() should never be called (!)"); 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 (!)"); DBG_ASSERT(false, "EmptyProperties::SetStyleSheet() should never be called (!)");
} }
......
...@@ -89,7 +89,7 @@ namespace sdr ...@@ -89,7 +89,7 @@ namespace sdr
RectangleProperties::ItemSetChanged(rSet); RectangleProperties::ItemSetChanged(rSet);
} }
void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
SdrGrafObj& rObj = (SdrGrafObj&)GetSdrObject(); SdrGrafObj& rObj = (SdrGrafObj&)GetSdrObject();
......
...@@ -110,7 +110,7 @@ namespace sdr ...@@ -110,7 +110,7 @@ namespace sdr
return *mpItemSet; return *mpItemSet;
} }
void GroupProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems) void GroupProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{ {
// iterate over contained SdrObjects // iterate over contained SdrObjects
const SdrObjList* pSub = ((const SdrObjGroup&)GetSdrObject()).GetSubList(); const SdrObjList* pSub = ((const SdrObjGroup&)GetSdrObject()).GetSubList();
...@@ -184,10 +184,10 @@ namespace sdr ...@@ -184,10 +184,10 @@ namespace sdr
DBG_ASSERT(false, "GroupProperties::ItemSetChanged() should never be called (!)"); 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 (!)"); DBG_ASSERT(false, "GroupProperties::AllowItemChange() should never be called (!)");
return sal_False; return false;
} }
void GroupProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) void GroupProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
...@@ -228,7 +228,7 @@ namespace sdr ...@@ -228,7 +228,7 @@ namespace sdr
return pRetval; 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 SdrObjList* pSub = ((const SdrObjGroup&)GetSdrObject()).GetSubList();
const sal_uInt32 nCount(pSub->GetObjCount()); const sal_uInt32 nCount(pSub->GetObjCount());
......
...@@ -87,7 +87,7 @@ namespace sdr ...@@ -87,7 +87,7 @@ namespace sdr
rObj.SetTextDirty(); rObj.SetTextDirty();
} }
void MeasureProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void MeasureProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
SdrMeasureObj& rObj = (SdrMeasureObj&)GetSdrObject(); SdrMeasureObj& rObj = (SdrMeasureObj&)GetSdrObject();
......
...@@ -50,7 +50,7 @@ namespace sdr ...@@ -50,7 +50,7 @@ namespace sdr
return GetObjectItemSet(); return GetObjectItemSet();
} }
void BaseProperties::SetMergedItemSet(const SfxItemSet& rSet, sal_Bool bClearAllItems) void BaseProperties::SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems)
{ {
// clear items if requested // clear items if requested
if(bClearAllItems) if(bClearAllItems)
...@@ -99,7 +99,7 @@ namespace sdr ...@@ -99,7 +99,7 @@ namespace sdr
// Overload where an ItemSet is implemented. // 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()); ItemChangeBroadcaster aC(GetSdrObject());
......
...@@ -57,7 +57,7 @@ namespace sdr ...@@ -57,7 +57,7 @@ namespace sdr
} }
// set a new StyleSheet and broadcast // 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(); SdrRectObj& rObj = (SdrRectObj&)GetSdrObject();
......
...@@ -230,7 +230,7 @@ namespace sdr ...@@ -230,7 +230,7 @@ namespace sdr
return static_cast<const SdrTextObj&>(GetSdrObject()); 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(); SdrTextObj& rObj = (SdrTextObj&)GetSdrObject();
......
...@@ -170,7 +170,7 @@ namespace sdr ...@@ -170,7 +170,7 @@ namespace sdr
void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem); 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; sdr::table::CellRef mxCell;
...@@ -322,7 +322,7 @@ namespace sdr ...@@ -322,7 +322,7 @@ namespace sdr
AttributeProperties::ItemChange( nWhich, pNewItem ); AttributeProperties::ItemChange( nWhich, pNewItem );
} }
void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{ {
TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr ); TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment