summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-05-15 08:06:09 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-05-15 08:06:09 +0000
commita944f84ce64875b64dc2d220aa03aeec018961b7 (patch)
tree6ec4ef7ce9bddbf39b640a2df21b7d733ed3f4e4 /framework
parentff1ebc49f6a9e2a848b2e165cd2b65c92b4469cc (diff)
INTEGRATION: CWS oxtsysint01 (1.41.24); FILE MERGED
2008/04/15 13:26:34 dv 1.41.24.2: RESYNC: (1.41-1.42); FILE MERGED 2008/04/10 09:41:20 dv 1.41.24.1: #i85856# Office should handle '.oxt' files
Diffstat (limited to 'framework')
-rw-r--r--framework/source/register/registerservices.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 2cff3ea62a97..cd38ffb2e4cb 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: registerservices.cxx,v $
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
*
* This file is part of OpenOffice.org.
*
@@ -65,6 +65,9 @@
#include <services/frame.hxx>
#include <services/modulemanager.hxx>
+
+#include <dispatch/oxt_handler.hxx>
+
#include <jobs/jobexecutor.hxx>
#include <recording/dispatchrecordersupplier.hxx>
#include <recording/dispatchrecorder.hxx>
@@ -130,6 +133,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT
COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer )
COMPONENTINFO( ::framework::Desktop )
COMPONENTINFO( ::framework::Frame )
+ COMPONENTINFO( ::framework::Oxt_Handler )
COMPONENTINFO( ::framework::JobExecutor )
COMPONENTINFO( ::framework::DispatchRecorderSupplier )
COMPONENTINFO( ::framework::DispatchRecorder )
@@ -185,6 +189,7 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer
COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
IFFACTORY( ::framework::Desktop ) else
IFFACTORY( ::framework::Frame ) else
+ IFFACTORY( ::framework::Oxt_Handler ) else
IFFACTORY( ::framework::JobExecutor ) else
IFFACTORY( ::framework::DispatchRecorderSupplier ) else
IFFACTORY( ::framework::DispatchRecorder ) else
@@ -233,7 +238,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
IFFACTORY( ::framework::SimpleTextStatusbarController ) else
IFFACTORY( ::framework::UriAbbreviation ) else
IFFACTORY( ::framework::PopupMenuDispatcher ) else
- IFFACTORY( ::framework::ImageManager )
+ IFFACTORY( ::framework::ImageManager ) else
IFFACTORY( ::framework::PopupMenuDispatcher ) else
IFFACTORY( ::framework::LangSelectionStatusbarController ) else
IFFACTORY( ::framework::LanguageSelectionMenuController )