Tag: cws_src680_so3deadcorpses User: fs Date: 2007-09-08 12:45:05+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/control/toolboxcontroller.cxx
Log: #i75189# so3 is dead 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.44&r2=1.44.24.1 Delta lines: +11 -12 --------------------- --- AppController.cxx 2007-08-03 12:47:47+0000 1.44 +++ AppController.cxx 2007-09-08 12:45:02+0000 1.44.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.44.24.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 12:47:47 $ + * last change: $Author: fs $ $Date: 2007/09/08 12:45:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -224,9 +224,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 @@ -1012,17 +1011,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 { Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/toolboxcontroller.cxx?r1=1.12&r2=1.12.46.1 Delta lines: +3 -6 ------------------- --- toolboxcontroller.cxx 2007-07-06 08:08:29+0000 1.12 +++ toolboxcontroller.cxx 2007-09-08 12:45:02+0000 1.12.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.46.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:08:29 $ + * last change: $Author: fs $ $Date: 2007/09/08 12:45:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,9 +89,6 @@ #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" #endif -#ifndef _PASTEDLG_HXX -#include <so3/pastedlg.hxx> -#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
