diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 9d3fe0747384..a500958a86b8 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -148,7 +148,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe bInfoChanged=false; bPagNumsDirty=false; bMPgNumsDirty=false; - bPageNotValid=false; + bTransportContainer = false; bSavePortable=false; bSaveCompressed=false; bSaveNative=false; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1e51ae6935fb..6304c471dd5d 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1432,7 +1432,7 @@ const Rectangle& SdrObjCustomShape::GetLogicRect() const // state of the ResizeShapeToFitText flag to correctly set TextMinFrameWidth/Height void SdrObjCustomShape::AdaptTextMinSize() { - if(!pModel || !pModel->IsPasteResize()) + if (!pModel || (!pModel->IsCreatingDataObj() && !pModel->IsPasteResize())) { const bool bResizeShapeToFitText(static_cast< const SdrOnOffItem& >(GetObjectItem(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue()); SfxItemSet aSet( diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index d5dc3b970449..b48665dd8197 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1747,12 +1747,7 @@ OString SdrObject::stringify() const //append(maBLIPSizeRectangle). append(mnLayerID); - SvMemoryStream aStream; - SfxItemSet aSet(GetMergedItemSet()); - aSet.InvalidateDefaultItems(); - aSet.Store(aStream, true); - aStream.Flush(); // for correct results from aStream.GetEndOfData() - aString.append(static_cast<const char *>(aStream.GetBuffer()), aStream.GetEndOfData()); + aString.append(GetMergedItemSet().stringify()); return aString.makeStringAndClear(); } |