summaryrefslogtreecommitdiff
path: root/svx/source/form/fmtextcontrolshell.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-26 14:51:32 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-26 14:51:32 +0000
commit3650da116ce73c0ba11e3e7e26af36ff4fea524c (patch)
treeeebe39aaecd51d7a7ef6bc8f218d50fe71ad8733 /svx/source/form/fmtextcontrolshell.cxx
parent9b1358934d44a7dc3a3f7d376546588b01288f11 (diff)
CWS-TOOLING: integrate CWS calc31stopper4
2009-03-25 11:52:59 +0100 nn r270010 : GetHTMLRangeNameList: call ScHTMLImport static method, not same method again (bug-id not available yet) 2009-03-20 14:24:51 +0100 er r269808 : #i100416# makeExternalRefStrImpl: don't care about a second sheet name if not needed 2009-03-20 13:14:30 +0100 er r269803 : carry along row position also for non-existing (empty) rows 2009-03-20 11:26:33 +0100 er r269790 : SUNWS12: declarator required in declaration; removed SC_DLLPRIVATE from inner class declaration 2009-03-19 19:40:09 +0100 er r269767 : #i100300# save only referenced tables of external data cache 2009-03-19 14:45:05 +0100 dr r269746 : #i100346# more places where checking docshell is needed 2009-03-19 14:13:20 +0100 fs r269744 : #i100349# do not delete the pool before all instances knowing it have been deleted 2009-03-19 11:35:45 +0100 dr r269735 : #i100346# always check docshell, is missing when pasting from clipboard 2009-03-19 09:39:49 +0100 dr r269728 : #i100332# remove debug statement, patch from kohei
Diffstat (limited to 'svx/source/form/fmtextcontrolshell.cxx')
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index e53a3966c6..d298de960b 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -677,21 +677,21 @@ namespace svx
SfxItemPool* pPool = EditEngine::CreatePool();
pPool->FreezeIdRanges();
- SfxItemSet aPureItems( *pPool );
+ ::std::auto_ptr< SfxItemSet > pPureItems( new SfxItemSet( *pPool ) );
// put the current states of the items into the set
- SfxAllItemSet aCurrentItems( aPureItems );
- transferFeatureStatesToItemSet( m_aControlFeatures, aCurrentItems );
+ ::std::auto_ptr< SfxAllItemSet > pCurrentItems( new SfxAllItemSet( *pPureItems ) );
+ transferFeatureStatesToItemSet( m_aControlFeatures, *pCurrentItems );
// additional items, which we are not responsible for at the SfxShell level,
// but which need to be forwarded to the dialog, anyway
ControlFeatures aAdditionalFestures;
fillFeatureDispatchers( m_xActiveControl, pDialogSlots, aAdditionalFestures );
- transferFeatureStatesToItemSet( aAdditionalFestures, aCurrentItems, true );
+ transferFeatureStatesToItemSet( aAdditionalFestures, *pCurrentItems, true );
::std::auto_ptr< SfxTabDialog > pDialog ( _eSet == eCharAttribs
- ? static_cast< SfxTabDialog* >( new TextControlCharAttribDialog( NULL, aCurrentItems, *pFontList ) )
- : static_cast< SfxTabDialog* >( new TextControlParaAttribDialog( NULL, aCurrentItems ) ) );
+ ? static_cast< SfxTabDialog* >( new TextControlCharAttribDialog( NULL, *pCurrentItems, *pFontList ) )
+ : static_cast< SfxTabDialog* >( new TextControlParaAttribDialog( NULL, *pCurrentItems ) ) );
if ( RET_OK == pDialog->Execute() )
{
const SfxItemSet& rModifiedItems = *pDialog->GetOutputItemSet();
@@ -728,9 +728,9 @@ namespace svx
Sequence< PropertyValue > aArgs;
// temporarily put the modified item into a "clean" set,
// and let TransformItems calc the respective UNO parameters
- aPureItems.Put( *pModifiedItem );
- TransformItems( nSlotForItemSet, aPureItems, aArgs );
- aPureItems.ClearItem( nWhich );
+ pPureItems->Put( *pModifiedItem );
+ TransformItems( nSlotForItemSet, *pPureItems, aArgs );
+ pPureItems->ClearItem( nWhich );
if ( ( nSlotForItemSet == SID_ATTR_PARA_HANGPUNCTUATION )
|| ( nSlotForItemSet == SID_ATTR_PARA_FORBIDDEN_RULES )
@@ -775,6 +775,9 @@ namespace svx
_rReq.Done( rModifiedItems );
}
+ pDialog.reset();
+ pCurrentItems.reset();
+ pPureItems.reset();
SfxItemPool::Free(pPool);
}