Kaydet (Commit) de2beb35 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Resolves: #i123672# Made data used in ScPrintFunc to prepare...

print preview dynamic

(cherry picked from commit 51dac483)

Conflicts:
	sc/source/ui/inc/printfun.hxx
	sc/source/ui/view/printfun.cxx

Change-Id: I1ec4b29821a958f8ca95d8e770de9971fbc47bae
üst 978fb3ed
...@@ -188,9 +188,10 @@ private: ...@@ -188,9 +188,10 @@ private:
SCCOL nEndCol; SCCOL nEndCol;
SCROW nEndRow; SCROW nEndRow;
SCCOL* pPageEndX; // page layout std::vector< SCCOL > maPageEndX;
SCROW* pPageEndY; std::vector< SCROW > maPageEndY;
ScPageRowEntry* pPageRows; std::vector< ScPageRowEntry> maPageRows;
size_t nPagesX; size_t nPagesX;
size_t nPagesY; size_t nPagesY;
size_t nTotalY; size_t nTotalY;
......
...@@ -842,7 +842,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) ...@@ -842,7 +842,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
} }
else else
{ {
GetShapePropertySet(); if(!pShapePropertySet) //performance consideration
GetShapePropertySet();
if (pShapePropertySet) if (pShapePropertySet)
aAny = pShapePropertySet->getPropertyValue( aPropertyName ); aAny = pShapePropertySet->getPropertyValue( aPropertyName );
} }
......
This diff is collapsed.
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