diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 725c287d9caa..1d67b65b49aa 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -132,3 +132,5 @@ b53fa6344d033f8b8f03b9274dbdd811251c2c1a
 e02a7a55c23d23dd7afa2627a7e10c70e1cba001
 1c235c1343ed7b88a3e6b923b9b0d6e567054f1c
 5159de5febd02cd5a509e97c93df8ea26af0c65d
+05ba63c6fce1954e52399e01ffbde2ff4f55f19e
+ddb95685dda6b0935322c36fc648e3f4f46a62fe
diff --git a/odk/examples/DevelopersGuide/OfficeBean/Makefile b/odk/examples/DevelopersGuide/OfficeBean/Makefile
index 09c10d05d722..c57c6b6260ac 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -79,7 +79,9 @@ OOoBeanViewer: $(CLASSFILES)
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(CLASSFILES)
-	$(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(subst /,.,$(PACKAGE)).$(basename $@)
+	export SAL_USE_VCLPLUGIN=gen && \
+	export LD_LIBRARY_PATH="$(OO_SDK_JAVA_HOME)/lib" && \
+	$(SDK_JAVA) --enable-native-access=ALL-UNNAMED -classpath "$(SDK_CLASSPATH)" $(subst /,.,$(PACKAGE)).$(basename $@)
 
 %.dbg: $(JAR1_JAR)
 	jdb -classpath "$(SDK_CLASSPATH)" $(subst /,.,$(PACKAGE)).$(basename $@)
diff --git a/odk/examples/DevelopersGuide/OfficeBean/OOoBeanViewer.java b/odk/examples/DevelopersGuide/OfficeBean/OOoBeanViewer.java
index f87eb36786ea..e2fe5540edbf 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/OOoBeanViewer.java
+++ b/odk/examples/DevelopersGuide/OfficeBean/OOoBeanViewer.java
@@ -43,15 +43,15 @@ import java.io.*;
 /* A simple Applet that contains the SimpleBean.
  *
  * This applet is a sample implementation of the
- * OpenOffice.org bean.
- * When initially loaded the applet has two buttons
+ * LibreOffice OfficeBean.
+ * When initially loaded the application has two buttons
  * one for opening an existent file and one to open
  * a blank document of a given type supported by
- * OpenOffice.org eg. Writer, Calc, Impress, ...
+ * LibreOffice eg. Writer, Calc, Impress, ...
  *
  */
 
-public class OOoBeanViewer extends java.applet.Applet
+public class OOoBeanViewer extends java.awt.Panel
 {
 
    /**
@@ -81,7 +81,7 @@ public class OOoBeanViewer extends java.applet.Applet
    private OOoBean aBean;
 
    /**
-    * Initialize the Applet
+    * Initialize the example UI
     */
    public void init()
    {
@@ -302,7 +302,7 @@ public class OOoBeanViewer extends java.applet.Applet
    /**
     * Create a blank document of type <code>desc</code>
     *
-    * @param url The private internal URL of the OpenOffice.org
+    * @param url The private internal URL of the LibreOffice
     *            document describing the document
     * @param desc A description of the document to be created
     */
@@ -341,7 +341,6 @@ public class OOoBeanViewer extends java.applet.Applet
    {
             setVisible(false);
             aBean.stopOOoConnection();
-            stop();
             System.exit(0);
    }
 
@@ -356,7 +355,6 @@ public class OOoBeanViewer extends java.applet.Applet
             }
             catch ( com.sun.star.comp.beans.NoConnectionException aExc ) {} // ignore
             aBean.stopOOoConnection();
-            stop();
             if ( xDesktop != null )
                 xDesktop.terminate();
             System.exit(0);
@@ -390,7 +388,7 @@ public class OOoBeanViewer extends java.applet.Applet
 
    public static void main(String args[])
    {
-       java.awt.Frame frame = new java.awt.Frame("OpenOffice.org Demo");
+       java.awt.Frame frame = new java.awt.Frame("LibreOffice Demo");
        OOoBeanViewer aViewer = new OOoBeanViewer();
 
        frame.setLayout(new java.awt.BorderLayout());
@@ -398,7 +396,6 @@ public class OOoBeanViewer extends java.applet.Applet
        frame.addWindowListener( aViewer.new ExitListener() );
 
        aViewer.init();
-       aViewer.start();
 
        frame.add(aViewer);
        frame.setLocation( 200, 200 );