#i21858# - removal of framework namespace from namespace of

UNO interfaces and services

6 files changed, 26 insertions, 26 deletions

diff --git a/scripting/examples/beanshell/Capitalise/capitalise.bsh b/scripting/examples/beanshell/Capitalise/capitalise.bsh
index 7808db8c1294..1b9e5df4bbc6 100644
--- a/scripting/examples/beanshell/Capitalise/capitalise.bsh
+++ b/scripting/examples/beanshell/Capitalise/capitalise.bsh
@@ -5,7 +5,7 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XWordCursor;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 String getNewString( theString ) {
     String newString;
diff --git a/scripting/examples/beanshell/Highlight/highlighter.bsh b/scripting/examples/beanshell/Highlight/highlighter.bsh
index 2441db13b516..a3989b994c7a 100644
--- a/scripting/examples/beanshell/Highlight/highlighter.bsh
+++ b/scripting/examples/beanshell/Highlight/highlighter.bsh
@@ -4,7 +4,7 @@ import com.sun.star.util.XReplaceDescriptor;
 import com.sun.star.util.XPropertyReplace;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.text.XTextDocument;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 int replaceText(searchKey, color, bold) {
 
diff --git a/scripting/examples/beanshell/Highlight/parcel-descriptor.xml b/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
index a8ddb9ddea5f..a7bf9d25b00f 100755
--- a/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
+++ b/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<parcel language="BeanShell" xmlns:parcel="scripting.dtd">

-

-    <script language="BeanShell">

-        <locale lang="en">

-            <displayname value="Highlighter"/>

-            <description>

-                Text highlighting

-            </description>

-        </locale>

-        <functionname value="highlighter.bsh"/>

-        <logicalname value="Highlighter.BeanShell"/>

-    </script>

-

-</parcel>

+<?xml version="1.0" encoding="UTF-8"?>
+
+<parcel language="BeanShell" xmlns:parcel="scripting.dtd">
+
+    <script language="BeanShell">
+        <locale lang="en">
+            <displayname value="Highlighter"/>
+            <description>
+                Text highlighting
+            </description>
+        </locale>
+        <functionname value="highlighter.bsh"/>
+        <logicalname value="Highlighter.BeanShell"/>
+    </script>
+
+</parcel>
diff --git a/scripting/examples/beanshell/MemoryUsage/memusage.bsh b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
index 9427e194a1b4..809cb5c33e60 100644
--- a/scripting/examples/beanshell/MemoryUsage/memusage.bsh
+++ b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
@@ -5,7 +5,7 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheet;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 addEntry(date, total, free) {
 
diff --git a/scripting/examples/beanshell/WordCount/wordcount.bsh b/scripting/examples/beanshell/WordCount/wordcount.bsh
index 8006f4fed5af..35332799f6ba 100644
--- a/scripting/examples/beanshell/WordCount/wordcount.bsh
+++ b/scripting/examples/beanshell/WordCount/wordcount.bsh
@@ -4,7 +4,7 @@ import com.sun.star.view.XSelectionSupplier;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextRange;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 void doDisplay(numWords) {
     wordsLabel = new JLabel("Word count = " + numWords);
diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java
index ad6c42897ef4..cee28d1c9e43 100644
--- a/scripting/examples/java/selector/ScriptSelector.java
+++ b/scripting/examples/java/selector/ScriptSelector.java
@@ -28,11 +28,11 @@ import com.sun.star.script.XInvocation;
 
 import com.sun.star.lib.uno.helper.PropertySet;
 
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
-import drafts.com.sun.star.script.framework.provider.XScript;
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.provider.XScriptContext;
+import drafts.com.sun.star.script.provider.XScript;
+import drafts.com.sun.star.script.provider.XScriptProvider;
 
 public class ScriptSelector {
 
@@ -329,7 +329,7 @@ public class ScriptSelector {
 
         try {
             String serviceName = "drafts.com.sun.star.script." +
-                "framework.provider.MasterScriptProvider";
+                "provider.MasterScriptProvider";
 
             XComponentContext xcc = ctxt.getComponentContext();
             XMultiComponentFactory xmcf = xcc.getServiceManager();