[Libreoffice-commits] .: 2 commits - desktop/source

[Libreoffice Gerrit user]

 desktop/source/app/app.cxx                 |    5 -----
 desktop/source/deployment/misc/dp_misc.src |    4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 98f97b45f576f1872cbf8f81df94cd4c48e0fc54
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 20 08:43:53 2012 +0100

    These should talk about "OpenOffice.org" after all
    
    Change-Id: I43ddfad9a91484551763fd6e3a89f17382b7a392

diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 8a7ec25..b6facff 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -23,11 +23,11 @@ String RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN {
 };
 
 String RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN {
-    Text[en-US] = "Extension requires at least LibreOffice reference version %VERSION";
+    Text[en-US] = "Extension requires at least OpenOffice.org reference version %VERSION";
 };
 
 String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX {
-    Text[en-US] = "Extension does not support LibreOffice reference versions greater than %VERSION";
+    Text[en-US] = "Extension does not support OpenOffice.org reference versions greater than %VERSION";
 };
 
 String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN {
commit fecd6bc21dca9d2eb04cb7bc0463e571bdf72ab3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 20 08:43:22 2012 +0100

    Remove merge junk
    
    Change-Id: I291baa1e78d0033d242b407f96f37cdbab9fe62b

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bc6667b..622f5ae 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -95,11 +95,6 @@
 
 #include "langselect.hxx"
 
-#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/deployment/XExtensionManager.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "cppuhelper/compbase3.hxx"
-
 #ifdef ENABLE_TELEPATHY
 #include <tubes/manager.hxx>
 #endif