Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts: set_soenv.in
2011-03-17 16:06:07 +01:00
parent e175056684 064a0b4957
commit 61a4bf5a07
199 changed files with 16675 additions and 5300 deletions
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -48,9 +48,7 @@ File gid_File_Lib_Pythonloader
  #else
    Name = "pythonloader.uno.dll";
  #endif
-    RegistryID = gid_Starregistry_Services_Rdb;
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End

 File gid_File_Py_Unohelper