CWS-TOOLING: integrate CWS npower11

2009-01-21 11:00:00 +0100 npower  r266639 : replace ScAddress::CONV_XL_R1C1 with
formula::FormulaGrammar::CONV_XL_R1C1
2009-01-21 10:58:33 +0100 npower  r266638 : fixup access for changes to compiler.[ch]xx
2009-01-21 10:57:46 +0100 npower  r266637 : replace the static with non-static  member ( to align with the latest
m39 ) changes
2009-01-20 11:53:52 +0100 npower  r266562 : CWS-TOOLING: rebase CWS npower11 to trunk@266428 (milestone: DEV300:m39)
2009-01-09 23:31:00 +0100 cloph  r266122 : fix typo (missing "="), initialize variables to avoid WaE breakage
2009-01-09 11:57:20 +0100 npower  r266071 : wae Mac OSX gcc-4.0.1 (PPC)
2009-01-08 11:09:49 +0100 npower  r265986 : wae - Mac OSX gcc-4.0.1 (PPC)
2009-01-07 10:33:20 +0100 npower  r265952 : wae Mac OSX gcc-4.0.1
2008-12-18 19:14:10 +0100 npower  r265712 : wae for wntmsci12 target
2008-12-17 16:14:54 +0100 npower  r265640 : add Outline property for Font, also remove growing list of friend classes
for ScCellRangeObj and replace by a single class.
2008-12-17 16:11:02 +0100 npower  r265639 : fix path variable for 3.1, also tweak the unix logs
2008-12-11 02:39:58 +0100 hanbo  r265233 : fix the vba/vba namespace of constants
2008-11-25 17:05:39 +0100 npower  r264317 : namespace changes
2008-11-25 14:12:37 +0100 npower  r264308 : revert changes made by mistake when migrating cws
2008-11-25 13:30:59 +0100 npower  r264296 : i#93944# namespace changes
2008-11-25 13:29:25 +0100 npower  r264293 : i#93944# namespace changes
2008-11-25 13:27:08 +0100 npower  r264289 : i#93944# namespace changes
2008-11-24 18:24:17 +0100 npower  r264263 : svn migration
2008-11-24 18:22:47 +0100 npower  r264262 : not needed anymore
2008-11-24 18:21:23 +0100 npower  r264261 : svn migration
2008-11-24 18:18:31 +0100 npower  r264260 : svn migration

1 files changed, 16 insertions, 6 deletions

diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index cb30bbcf8a93..53ed2d3bebcb 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -53,12 +53,22 @@ namespace  worksheet
 {
 extern sdecl::ServiceDecl const serviceDecl;
 }
+namespace window
+{
+extern sdecl::ServiceDecl const serviceDecl;
+}
 namespace globals
 {
 extern sdecl::ServiceDecl const serviceDecl;
 }
-
-
+namespace  userform
+{
+extern sdecl::ServiceDecl const serviceDecl;
+}
+namespace hyperlink
+{
+extern sdecl::ServiceDecl const serviceDecl;
+}
 
 extern "C"
 {
@@ -76,7 +86,7 @@ extern "C"
 
     // Component registration
         if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
-        range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl ) )
+        range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
         {
             // Singleton registration
             try
@@ -85,9 +95,9 @@ extern "C"
                     reinterpret_cast< registry::XRegistryKey * >(pRegistryKey);
 
                 Reference< registry::XRegistryKey >xKey = pKey->createKey(
-                    rtl::OUString::createFromAscii( ("org.openoffice.vba.Globals/UNO/SINGLETONS/org.openoffice.vba.theGlobals") ) );
+                    rtl::OUString::createFromAscii( ("ooo.vba.Globals/UNO/SINGLETONS/ooo.vba.theGlobals") ) );
                 xKey->setStringValue( ::rtl::OUString::createFromAscii(
-                    ("org.openoffice.vba.Globals") ) );
+                    ("ooo.vba.Globals") ) );
                 return sal_True;
             }
             catch( uno::Exception& /*e*/ )
@@ -104,7 +114,7 @@ extern "C"
     {
         OSL_TRACE("In component_getFactory for %s", pImplName );
     void* pRet =  component_getFactoryHelper(
-            pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl );
+            pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
     OSL_TRACE("Ret is 0x%x", pRet);
     return pRet;
     }