Skip to content

C
core
Kaydet (Commit) af80ccd5 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

SwXStyle::getPropertySetInfo: split world's stupidest static 

... variable into 2.

Change-Id: Ib0e2cdeb4ee6124b4ead532a168bb472dfdc6f7a
üst 3d9bb8e8
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
sw/source/core/unocore/unostyle.cxx
Dosyayı görüntüle @ af80ccd5
...@@ -1522,13 +1522,16 @@ static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyl ...@@ -1522,13 +1522,16 @@ static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyl
break; break;
case SFX_STYLE_FAMILY_PARA: case SFX_STYLE_FAMILY_PARA:
{ {
static uno::Reference< beans::XPropertySetInfo > xCondParaRef;
static uno::Reference< beans::XPropertySetInfo > xParaRef; static uno::Reference< beans::XPropertySetInfo > xParaRef;
if(!xParaRef.is()) if(!xParaRef.is())
{ {
sal_uInt16 nMapId = bIsConditional ? PROPERTY_MAP_CONDITIONAL_PARA_STYLE : PROPERTY_MAP_PARA_STYLE; xCondParaRef = aSwMapProvider.GetPropertySet(
xParaRef = aSwMapProvider.GetPropertySet(nMapId)->getPropertySetInfo(); PROPERTY_MAP_CONDITIONAL_PARA_STYLE)->getPropertySetInfo();
xParaRef = aSwMapProvider.GetPropertySet(
PROPERTY_MAP_PARA_STYLE)->getPropertySetInfo();
} }
xRet = xParaRef; xRet = bIsConditional ? xCondParaRef : xParaRef;
} }
break; break;
case SFX_STYLE_FAMILY_PAGE : case SFX_STYLE_FAMILY_PAGE :
......
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