diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2011-03-21 17:02:20 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2011-03-21 17:02:20 +0100 |
| commit | ad42e0ddf26623b7091610cb7b1888947458abdd (patch) | |
| tree | 0cf86c01ae500c31c3042a83f4a0fe785f6de1d9 /sfx2 | |
| parent | 61879c218dd0e6e94884e7c6e06e3c5c18540b4a (diff) | |
| parent | 221cca20be4a9c79bb4373f632eec833651c0ecf (diff) | |
CWS-TOOLING: integrate CWS dba34c
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 2a54e5b1c638..0bde76cb44b1 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -131,7 +131,7 @@ void SfxUnoControllerItem::UnBind() void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException ) { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - DBG_ASSERT( pCtrlItem, "Dispatch hat den StatusListener nicht entfern!" ); + DBG_ASSERT( pCtrlItem, "dispatch implementation didn't respect our previous removeStatusListener call!" ); if ( rEvent.Requery ) { diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 0f3b35648061..eb6373b5b998 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1566,7 +1566,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, // the item should remain only if it was set by the dialog rpSet->ClearItem( SID_SELECTION ); - if( mbExport ) + if( mbExport && mbHasSelectionBox ) { try { |