removetooltypes01: rebase to DEV300_m96

2 files changed, 6 insertions, 59 deletions

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 205043a212fd..768edf4dd2f4 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -34,9 +34,7 @@
 #ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
 #endif
-#include <classes/framelistanalyzer.hxx>
-
-#include <dispatch/interaction.hxx>
+#include <framework/framelistanalyzer.hxx>
 
 #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_
 #include <constant/frameloader.hxx>
@@ -56,7 +54,8 @@
 #include <properties.h>
 #include <protocols.h>
 #include <services.h>
-#include <dispatch/interaction.hxx>
+#include <comphelper/interaction.hxx>
+#include <framework/interaction.hxx>
 
 //_______________________________________________
 // includes of uno interface
@@ -1058,8 +1057,8 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::uno::Any                                                                    aInteraction;
             css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations(2);
 
-            ContinuationAbort*   pAbort   = new ContinuationAbort();
-            ContinuationApprove* pApprove = new ContinuationApprove();
+            comphelper::OInteractionAbort*   pAbort   = new comphelper::OInteractionAbort();
+            comphelper::OInteractionApprove* pApprove = new comphelper::OInteractionApprove();
 
             lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >(
                                     static_cast< css::task::XInteractionContinuation* >(pAbort),
@@ -1071,13 +1070,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = ERRCODE_SFX_NOMOREDOCUMENTSALLOWED;
             aInteraction <<= aErrorCode;
-
-            InteractionRequest* pRequest = new InteractionRequest(aInteraction, lContinuations);
-            css::uno::Reference< css::task::XInteractionRequest > xRequest(
-                static_cast< css::task::XInteractionRequest* >(pRequest),
-                css::uno::UNO_QUERY_THROW);
-
-            xInteraction->handle(xRequest);
+            xInteraction->handle( InteractionRequest::CreateRequest(aInteraction, lContinuations) );
         }
     }
 
diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
deleted file mode 100644
index c68ad8d304cb..000000000000
--- a/framework/source/loadenv/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=             fwk_loadenv
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/loadenv.obj              \
-                    $(SLO)$/targethelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-