#112923# place ole and ooo objects in separate libraries

4 files changed, 112 insertions, 15 deletions

diff --git a/embeddedobj/source/general/makefile.mk b/embeddedobj/source/general/makefile.mk
index ab0bf60fc9cc..9ddb5674bc08 100644
--- a/embeddedobj/source/general/makefile.mk
+++ b/embeddedobj/source/general/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mav $ $Date: 2003-11-28 17:54:17 $
+#   last change: $Author: mav $ $Date: 2003-11-28 18:04:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,7 +78,6 @@ USE_DEFFILE=NO
 SLOFILES =  \
         $(SLO)$/xcreator.obj\
         $(SLO)$/convert.obj\
-        $(SLO)$/closepreventer.obj\
         $(SLO)$/docholder.obj\
         $(SLO)$/intercept.obj
 
@@ -86,7 +85,6 @@ SLOFILES =  \
 EXCEPTIONSFILES= \
         $(SLO)$/xcreator.obj\
         $(SLO)$/convert.obj\
-        $(SLO)$/closepreventer.obj\
         $(SLO)$/docholder.obj\
         $(SLO)$/intercept.obj
 
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
new file mode 100644
index 000000000000..9f0527f777d9
--- /dev/null
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ *  $RCSfile: closepreventer.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: mav $ $Date: 2003-11-28 18:02:11 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library 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 for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "closepreventer.hxx"
+
+void SAL_CALL OClosePreventer::queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership )
+        throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException)
+{
+    throw ::com::sun::star::util::CloseVetoException();
+}
+
+void SAL_CALL OClosePreventer::notifyClosing( const com::sun::star::lang::EventObject& Source )
+        throw (::com::sun::star::uno::RuntimeException)
+{
+    // just a disaster
+    OSL_ENSURE( sal_False, "The object can not be prevented from closing!\n" );
+}
+
+void SAL_CALL OClosePreventer::disposing( const com::sun::star::lang::EventObject& Source )
+        throw (::com::sun::star::uno::RuntimeException)
+{
+    // just a disaster
+    OSL_ENSURE( sal_False, "The object can not be prevented from closing!\n" );
+}
+
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index 6b849ec4a342..e6faff58206a 100644
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mav $ $Date: 2003-11-28 17:54:18 $
+#   last change: $Author: mav $ $Date: 2003-11-28 18:04:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,7 +63,7 @@
 PRJ=..$/..
 
 PRJNAME=embeddedobj
-TARGET=embedobj
+TARGET=emboleobj
 
 
 # --- Settings -----------------------------------------------------
@@ -76,7 +76,12 @@ INCPRE+=$(ATL_INCLUDE)
 
 # --- Files --------------------------------------------------------
 
+SHL1TARGET= $(TARGET)
+
+SHL1IMPLIB= i$(TARGET)
+
 SLOFILES =  \
+        $(SLO)$/closepreventer.obj\
         $(SLO)$/oleregister.obj\
         $(SLO)$/xolefactory.obj\
         $(SLO)$/olecomponent.obj\
@@ -89,6 +94,7 @@ SLOFILES =  \
 
 
 EXCEPTIONSFILES= \
+        $(SLO)$/closepreventer.obj\
         $(SLO)$/oleregister.obj\
         $(SLO)$/xolefactory.obj\
         $(SLO)$/olecomponent.obj\
@@ -99,6 +105,22 @@ EXCEPTIONSFILES= \
         $(SLO)$/olewrapclient.obj\
         $(SLO)$/advisesink.obj
 
+SHL1OBJS= $(SLOFILES)
+
+SHL1STDLIBS=\
+    $(SALLIB)\
+    $(CPPULIB)\
+    $(CPPUHELPERLIB)\
+    ole32.lib\
+    gdi32.lib\
+    uuid.lib\
+    oleaut32.lib
+
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME= $(SHL1TARGET)
+DEF1EXPORTFILE=	exports.dxp
+
 
 # --- Targets -------------------------------------------------------
 
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index 93e5aceda317..289752b4c56f 100644
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mav $ $Date: 2003-11-14 15:24:28 $
+#   last change: $Author: mav $ $Date: 2003-11-28 18:04:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -103,12 +103,6 @@ SHL1STDLIBS=\
     $(CPPULIB)\
     $(CPPUHELPERLIB)
 
-SHL1STDLIBS +=\
-    ole32.lib\
-    gdi32.lib\
-    uuid.lib\
-    oleaut32.lib
-
 SHL1DEF= $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME= $(SHL1TARGET)