Tag: cws_src680_dba24a User: oj Date: 2007-08-09 09:01:55+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: #i78257# make use of abstract factory from svx File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.42.14.3&r2=1.42.14.4 Delta lines: +10 -11 --------------------- --- AppController.cxx 2007-08-06 06:38:49+0000 1.42.14.3 +++ AppController.cxx 2007-08-09 09:01:52+0000 1.42.14.4 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.42.14.3 $ + * $Revision: 1.42.14.4 $ * - * last change: $Author: oj $ $Date: 2007/08/06 06:38:49 $ + * last change: $Author: oj $ $Date: 2007/08/09 09:01:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -225,9 +225,8 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" #endif -#ifndef _PASTEDLG_HXX -#include <so3/pastedlg.hxx> -#endif +#include <svx/svxdlg.hxx> +#include <svtools/insdlg.hxx> #ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> #endif @@ -1039,17 +1038,17 @@ { if ( !aArgs.getLength() ) { - SvPasteObjectDialog aDlg; + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + ::std::auto_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() )); ::std::vector<SotFormatStringId> aFormatIds; getSupportedFormats(getContainer()->getElementType(),aFormatIds); - ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end(); + const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end(); + ::rtl::OUString sEmpty; for (::std::vector<SotFormatStringId>::iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) - { - aDlg.Insert(*aIter,SvPasteObjectDialog::GetSotFormatUIName(*aIter)); - } + pDlg->Insert(*aIter,sEmpty); const TransferableDataHelper& rClipboard = getViewClipboard(); - pasteFormat(aDlg.Execute(getView(),rClipboard.GetTransferable())); + pasteFormat(pDlg->GetFormat(rClipboard.GetTransferable())); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
