Skip to content

C
core
Kaydet (Commit) 865bd9ae authored tarafından Pascal Junck's avatar Pascal Junck
Dosyalara gözat
Seçenekler

INTEGRATION: CWS aw019 (1.3.430); FILE MERGED 

2004/09/28 15:53:10 aw 1.3.430.1: #i11190#
üst 1d1b2ef0
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 102 deletions
svx/source/sdr/properties/captionproperties.cxx
Dosyayı görüntüle @ 865bd9ae
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: captionproperties.cxx,v $ * $RCSfile: captionproperties.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: vg $ $Date: 2003-12-16 13:09:08 $ * last change: $Author: pjunck $ $Date: 2004-11-03 10:47:57 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -99,12 +99,12 @@ namespace sdr ...@@ -99,12 +99,12 @@ namespace sdr
return *(new SfxItemSet(rPool, return *(new SfxItemSet(rPool,
// range from SdrAttrObj // range from SdrAttrObj
SDRATTR_START, SDRATTRSET_SHADOW, SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTRSET_OUTLINER, SDRATTRSET_MISC, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
// range from SdrCaptionObj // range from SdrCaptionObj
SDRATTR_CAPTION_FIRST, SDRATTRSET_CAPTION, SDRATTR_CAPTION_FIRST, SDRATTR_CAPTION_LAST,
// range from SdrTextObj // range from SdrTextObj
EE_ITEMS_START, EE_ITEMS_END, EE_ITEMS_START, EE_ITEMS_END,
...@@ -154,35 +154,35 @@ namespace sdr ...@@ -154,35 +154,35 @@ namespace sdr
rObj.ImpRecalcTail(); rObj.ImpRecalcTail();
} }
void CaptionProperties::PreProcessSave() //BFS01 void CaptionProperties::PreProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
RectangleProperties::PreProcessSave(); //BFS01 RectangleProperties::PreProcessSave();
//BFS01
// force ItemSet //BFS01 // force ItemSet
GetObjectItemSet(); //BFS01 GetObjectItemSet();
//BFS01
// prepare SetItems for storage //BFS01 // prepare SetItems for storage
const SfxItemSet& rSet = *mpItemSet; //BFS01 const SfxItemSet& rSet = *mpItemSet;
const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L; //BFS01 const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L;
//BFS01
SdrCaptionSetItem aCaptAttr(rSet.GetPool()); //BFS01 SdrCaptionSetItem aCaptAttr(rSet.GetPool());
aCaptAttr.GetItemSet().Put(rSet); //BFS01 aCaptAttr.GetItemSet().Put(rSet);
aCaptAttr.GetItemSet().SetParent(pParent); //BFS01 aCaptAttr.GetItemSet().SetParent(pParent);
mpItemSet->Put(aCaptAttr); //BFS01 mpItemSet->Put(aCaptAttr);
} //BFS01 }
void CaptionProperties::PostProcessSave() //BFS01 void CaptionProperties::PostProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
RectangleProperties::PostProcessSave(); //BFS01 RectangleProperties::PostProcessSave();
//BFS01
// remove SetItems from local itemset //BFS01 // remove SetItems from local itemset
if(mpItemSet) //BFS01 if(mpItemSet)
{ //BFS01 {
mpItemSet->ClearItem(SDRATTRSET_CAPTION); //BFS01 mpItemSet->ClearItem(SDRATTRSET_CAPTION);
} //BFS01 }
} //BFS01 }
void CaptionProperties::ForceDefaultAttributes() void CaptionProperties::ForceDefaultAttributes()
{ {
......
svx/source/sdr/properties/circleproperties.cxx
Dosyayı görüntüle @ 865bd9ae
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: circleproperties.cxx,v $ * $RCSfile: circleproperties.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: vg $ $Date: 2003-12-16 13:09:23 $ * last change: $Author: pjunck $ $Date: 2004-11-03 10:48:13 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
#include <svx/sdr/properties/circleproperties.hxx> #include <svx/sdr/properties/circleproperties.hxx>
#endif #endif
#ifndef _SFXITEMSET_HXX
#include <svtools/itemset.hxx>
#endif
#ifndef _SFXSTYLE_HXX #ifndef _SFXSTYLE_HXX
#include <svtools/style.hxx> #include <svtools/style.hxx>
#endif #endif
...@@ -107,12 +111,12 @@ namespace sdr ...@@ -107,12 +111,12 @@ namespace sdr
return *(new SfxItemSet(rPool, return *(new SfxItemSet(rPool,
// range from SdrAttrObj // range from SdrAttrObj
SDRATTR_START, SDRATTRSET_SHADOW, SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTRSET_OUTLINER, SDRATTRSET_MISC, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
// range from SdrCircObj // range from SdrCircObj
SDRATTR_CIRC_FIRST, SDRATTRSET_CIRC, SDRATTR_CIRC_FIRST, SDRATTR_CIRC_LAST,
// range from SdrTextObj // range from SdrTextObj
EE_ITEMS_START, EE_ITEMS_END, EE_ITEMS_START, EE_ITEMS_END,
...@@ -165,35 +169,35 @@ namespace sdr ...@@ -165,35 +169,35 @@ namespace sdr
rObj.ImpSetAttrToCircInfo(); rObj.ImpSetAttrToCircInfo();
} }
void CircleProperties::PreProcessSave() //BFS01 void CircleProperties::PreProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
RectangleProperties::PreProcessSave(); //BFS01 RectangleProperties::PreProcessSave();
//BFS01
// force ItemSet //BFS01 // force ItemSet
GetObjectItemSet(); //BFS01 GetObjectItemSet();
//BFS01
// prepare SetItems for storage //BFS01 // prepare SetItems for storage
const SfxItemSet& rSet = *mpItemSet; //BFS01 const SfxItemSet& rSet = *mpItemSet;
const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L; //BFS01 const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L;
//BFS01
SdrCircSetItem aCircAttr(rSet.GetPool()); //BFS01 SdrCircSetItem aCircAttr(rSet.GetPool());
aCircAttr.GetItemSet().Put(rSet); //BFS01 aCircAttr.GetItemSet().Put(rSet);
aCircAttr.GetItemSet().SetParent(pParent); //BFS01 aCircAttr.GetItemSet().SetParent(pParent);
mpItemSet->Put(aCircAttr); //BFS01 mpItemSet->Put(aCircAttr);
} //BFS01 }
void CircleProperties::PostProcessSave() //BFS01 void CircleProperties::PostProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
RectangleProperties::PostProcessSave(); //BFS01 RectangleProperties::PostProcessSave();
//BFS01
// remove SetItems from local itemset //BFS01 // remove SetItems from local itemset
if(mpItemSet) //BFS01 if(mpItemSet)
{ //BFS01 {
mpItemSet->ClearItem(SDRATTRSET_CIRC); //BFS01 mpItemSet->ClearItem(SDRATTRSET_CIRC);
} //BFS01 }
} //BFS01 }
void CircleProperties::ForceDefaultAttributes() void CircleProperties::ForceDefaultAttributes()
{ {
......
svx/source/sdr/properties/connectorproperties.cxx
Dosyayı görüntüle @ 865bd9ae
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: connectorproperties.cxx,v $ * $RCSfile: connectorproperties.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: vg $ $Date: 2003-12-16 13:09:39 $ * last change: $Author: pjunck $ $Date: 2004-11-03 10:48:29 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
#include <svx/sdr/properties/connectorproperties.hxx> #include <svx/sdr/properties/connectorproperties.hxx>
#endif #endif
#ifndef _SFXITEMSET_HXX
#include <svtools/itemset.hxx>
#endif
#ifndef _SFXSTYLE_HXX #ifndef _SFXSTYLE_HXX
#include <svtools/style.hxx> #include <svtools/style.hxx>
#endif #endif
...@@ -95,12 +99,12 @@ namespace sdr ...@@ -95,12 +99,12 @@ namespace sdr
return *(new SfxItemSet(rPool, return *(new SfxItemSet(rPool,
// range from SdrAttrObj // range from SdrAttrObj
SDRATTR_START, SDRATTRSET_SHADOW, SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTRSET_OUTLINER, SDRATTRSET_MISC, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
// range from SdrEdgeObj // range from SdrEdgeObj
SDRATTR_EDGE_FIRST, SDRATTRSET_EDGE, SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST,
// range from SdrTextObj // range from SdrTextObj
EE_ITEMS_START, EE_ITEMS_END, EE_ITEMS_START, EE_ITEMS_END,
...@@ -150,35 +154,35 @@ namespace sdr ...@@ -150,35 +154,35 @@ namespace sdr
rObj.ImpSetAttrToEdgeInfo(); rObj.ImpSetAttrToEdgeInfo();
} }
void ConnectorProperties::PreProcessSave() //BFS01 void ConnectorProperties::PreProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
TextProperties::PreProcessSave(); //BFS01 TextProperties::PreProcessSave();
//BFS01
// force ItemSet //BFS01 // force ItemSet
GetObjectItemSet(); //BFS01 GetObjectItemSet();
//BFS01
// prepare SetItems for storage //BFS01 // prepare SetItems for storage
const SfxItemSet& rSet = *mpItemSet; //BFS01 const SfxItemSet& rSet = *mpItemSet;
const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L; //BFS01 const SfxItemSet* pParent = mpStyleSheet ? &(mpStyleSheet->GetItemSet()) : 0L;
//BFS01
SdrEdgeSetItem aEdgeAttr(rSet.GetPool()); //BFS01 SdrEdgeSetItem aEdgeAttr(rSet.GetPool());
aEdgeAttr.GetItemSet().Put(rSet); //BFS01 aEdgeAttr.GetItemSet().Put(rSet);
aEdgeAttr.GetItemSet().SetParent(pParent); //BFS01 aEdgeAttr.GetItemSet().SetParent(pParent);
mpItemSet->Put(aEdgeAttr); //BFS01 mpItemSet->Put(aEdgeAttr);
} //BFS01 }
void ConnectorProperties::PostProcessSave() //BFS01 void ConnectorProperties::PostProcessSave()
{ //BFS01 {
// call parent //BFS01 // call parent
TextProperties::PostProcessSave(); //BFS01 TextProperties::PostProcessSave();
//BFS01
// remove SetItems from local itemset //BFS01 // remove SetItems from local itemset
if(mpItemSet) //BFS01 if(mpItemSet)
{ //BFS01 {
mpItemSet->ClearItem(SDRATTRSET_EDGE); //BFS01 mpItemSet->ClearItem(SDRATTRSET_EDGE);
} //BFS01 }
} //BFS01 }
} // end of namespace properties } // end of namespace properties
} // end of namespace sdr } // end of namespace sdr
......
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