diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
| commit | 41bc9ff8d750b4af10d20a36539c57da14695dcf (patch) | |
| tree | dc2ee437c54daba12ac442fd0e10baf97eadf184 /dbaccess/source/ui/app/AppController.cxx | |
| parent | Move OSL_ENSURE(0,...) to OSL_FAIL(...) (diff) | |
| parent | fix mis-merge: no vso3 and use boost for hash (diff) | |
| download | core-41bc9ff8d750b4af10d20a36539c57da14695dcf.tar.gz core-41bc9ff8d750b4af10d20a36539c57da14695dcf.zip | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 6bd3ec193b6f..ee242ea29d33 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -483,10 +483,6 @@ sal_Bool OApplicationController::Construct(Window* _pParent) return sal_False; } - OSL_ENSURE( getView(), "OApplicationController::Construct: have no view!" ); - if ( getView() ) - getView()->enableSeparator( ); - // now that we have a view we can create the clipboard listener m_aSystemClipboard = TransferableDataHelper::CreateFromSystemClipboard( getView() ); m_aSystemClipboard.StartClipboardListening( ); |