move CloseVeto from dbaccess to unotools

7 files changed, 16 insertions, 16 deletions

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 0f7ca599a7da..0419c297b368 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -107,7 +107,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/app/AppSwapWindow \
     dbaccess/source/ui/app/AppTitleWindow \
     dbaccess/source/ui/app/AppView \
-    dbaccess/source/ui/app/closeveto \
     dbaccess/source/ui/app/subcomponentmanager \
     dbaccess/source/ui/browser/AsyncronousLink \
     dbaccess/source/ui/browser/brwctrlr \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 7a9117aa1cbd..3c6bfb265da4 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -125,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/app/AppSwapWindow \
 	dbaccess/source/ui/app/AppTitleWindow \
 	dbaccess/source/ui/app/AppView \
-	dbaccess/source/ui/app/closeveto \
 	dbaccess/source/ui/app/subcomponentmanager \
 	dbaccess/source/ui/browser/genericcontroller \
 	dbaccess/source/ui/browser/dsbrowserDnD \
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index e02e1874f400..e530eae10acb 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -33,7 +33,6 @@
 #include "dbustrings.hrc"
 #include "advancedsettingsdlg.hxx"
 #include "subcomponentmanager.hxx"
-#include "closeveto.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -104,6 +103,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/lstbox.hxx>
 
+#include <unotools/closeveto.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/internaloptions.hxx>
@@ -1962,7 +1962,7 @@ IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType )
 // -----------------------------------------------------------------------------
 void OApplicationController::newElementWithPilot( ElementType _eType )
 {
-    CloseVeto aKeepDoc( getFrame() );
+    utl::CloseVeto aKeepDoc( getFrame() );
         // prevent the document being closed while the wizard is open
 
     OSL_ENSURE( getContainer(), "OApplicationController::newElementWithPilot: without a view?" );
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 9d9770849546..3937493899d5 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
     unotools/source/i18n/textsearch \
     unotools/source/i18n/transliterationwrapper \
     unotools/source/misc/atom \
+    unotools/source/misc/closeveto \
     unotools/source/misc/componentresmodule \
     unotools/source/misc/datetime \
     unotools/source/misc/desktopterminationobserver \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index d1e177ddaa43..2c62667b8d74 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cacheoptions.hxx,uno
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/calendarwrapper.hxx,unotools/calendarwrapper.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/caserotate.hxx,unotools/caserotate.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/charclass.hxx,unotools/charclass.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/closeveto.hxx,unotools/closeveto.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cmdoptions.hxx,unotools/cmdoptions.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/collatorwrapper.hxx,unotools/collatorwrapper.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/compatibility.hxx,unotools/compatibility.hxx))
diff --git a/dbaccess/source/ui/app/closeveto.hxx b/unotools/inc/unotools/closeveto.hxx
index a9f1d6bf6c66..1fddd439ca04 100644
--- a/dbaccess/source/ui/app/closeveto.hxx
+++ b/unotools/inc/unotools/closeveto.hxx
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef DBACCESS_CLOSEVETO_HXX
-#define DBACCESS_CLOSEVETO_HXX
+#ifndef UNOTOOLS_CLOSEVETO_HXX
+#define UNOTOOLS_CLOSEVETO_HXX
 
-#include "dbaccessdllapi.h"
+#include "unotools/unotoolsdllapi.h"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/uno/XInterface.hpp>
@@ -37,7 +37,7 @@
 #include <boost/scoped_ptr.hpp>
 
 //......................................................................................................................
-namespace dbaui
+namespace utl
 {
 //......................................................................................................................
 
@@ -51,7 +51,7 @@ namespace dbaui
         If closing has been requested and vetoed while the <code>CloseVeto</code> instance is alive, and the ownership
         went to the <code>CloseVeto</code> instance, then it will close the component in its dtor.
     */
-    class DBACCESS_DLLPRIVATE CloseVeto
+    class UNOTOOLS_DLLPUBLIC CloseVeto
     {
     public:
         CloseVeto( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_closeable );
@@ -65,6 +65,6 @@ namespace dbaui
 } // namespace dbaui
 //......................................................................................................................
 
-#endif // DBACCESS_CLOSEVETO_HXX
+#endif // UNOTOOLS_CLOSEVETO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index 588bdae48832..7a61a891fbd5 100644
--- a/dbaccess/source/ui/app/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -25,9 +25,9 @@
  *
  ************************************************************************/
 
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_unotools.hxx"
 
-#include "closeveto.hxx"
+#include <unotools/closeveto.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/util/XCloseable.hpp>
@@ -38,7 +38,7 @@
 #include <tools/diagnose_ex.h>
 
 //......................................................................................................................
-namespace dbaui
+namespace utl
 {
 //......................................................................................................................
 
@@ -65,7 +65,7 @@ namespace dbaui
     //==================================================================================================================
     typedef ::cppu::WeakImplHelper1 <   XCloseListener
                                     >   CloseListener_Base;
-    class DBACCESS_DLLPRIVATE CloseListener_Impl : public CloseListener_Base
+    class SAL_DLLPRIVATE CloseListener_Impl : public CloseListener_Base
     {
     public:
         CloseListener_Impl()
@@ -117,7 +117,7 @@ namespace dbaui
     //==================================================================================================================
     //= CloseVeto_Data
     //==================================================================================================================
-    struct DBACCESS_DLLPRIVATE CloseVeto_Data
+    struct SAL_DLLPRIVATE CloseVeto_Data
     {
         Reference< XCloseable >                 xCloseable;
         ::rtl::Reference< CloseListener_Impl >  pListener;
@@ -177,7 +177,7 @@ namespace dbaui
     }
 
 //......................................................................................................................
-} // namespace dbaui
+} // namespace utl
 //......................................................................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */