[Libreoffice-commits] .: 2 commits - avmedia/source basic/source

[Christina Rossmanith]

 avmedia/source/java/WindowAdapter.java |   12 ------------
 basic/source/app/app.cxx               |    3 ---
 basic/source/inc/runtime.hxx           |    8 --------
 basic/source/runtime/iosys.cxx         |    4 ----
 basic/source/runtime/methods.cxx       |    3 ---
 5 files changed, 30 deletions(-)

New commits:
commit 5e6b83daf2b35e42c59c997ce75c954db9caf999
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue Mar 29 12:06:47 2011 +0200

    Remove dead code in libs-core/avmedia

diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index 053b37e..276cd6e 100755
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/WindowAdapter.java
@@ -164,21 +164,9 @@ public class WindowAdapter
             case( java.awt.event.KeyEvent.VK_MULTIPLY ):    nRet = com.sun.star.awt.Key.MULTIPLY; break;
             case( java.awt.event.KeyEvent.VK_DIVIDE ):      nRet = com.sun.star.awt.Key.DIVIDE; break;
             case( java.awt.event.KeyEvent.VK_DECIMAL ):     nRet = com.sun.star.awt.Key.POINT; break;
-            // case( java.awt.event.KeyEvent.VK_ COMMA; break;
             case( java.awt.event.KeyEvent.VK_LESS ):        nRet = com.sun.star.awt.Key.LESS; break;
             case( java.awt.event.KeyEvent.VK_GREATER ):     nRet = com.sun.star.awt.Key.GREATER; break;
             case( java.awt.event.KeyEvent.VK_EQUALS ):      nRet = com.sun.star.awt.Key.EQUAL; break;
-            // case( java.awt.event.KeyEvent.VK_ OPEN; break;
-            // case( java.awt.event.KeyEvent.VK_ CUT; break;
-            // case( java.awt.event.KeyEvent.VK_ COPY; break;
-            // case( java.awt.event.KeyEvent.VK_ PASTE; break;
-            // case( java.awt.event.KeyEvent.VK_ UNDO; break;
-            // case( java.awt.event.KeyEvent.VK_ REPEAT; break;
-            // case( java.awt.event.KeyEvent.VK_ FIND; break;
-            // case( java.awt.event.KeyEvent.VK_ PROPERTIES; break;
-            // case( java.awt.event.KeyEvent.VK_ FRONT; break;
-            // case( java.awt.event.KeyEvent.VK_ CONTEXTMENU; break;
-            // case( java.awt.event.KeyEvent.VK_ HELP; break;
 
             default:
             break;
commit 21041f9853d46aeaf86e97d584fb899b574e5a89
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Tue Mar 29 12:03:25 2011 +0200

    Removed always #defined _USE_UNO

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 70dc125..97106af 100755
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -58,7 +58,6 @@
 #include "runtime.hxx"
 #include "sbintern.hxx"
 
-#ifdef _USE_UNO
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/configurationkeys.hxx>
 #include <comphelper/regpathhelper.hxx>
@@ -83,8 +82,6 @@ using namespace com::sun::star::beans;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 
-#endif /* _USE_UNO */
-
 IMPL_GEN_RES_STR;
 
 #ifdef DBG_UTIL
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index ba932f2..59aeffc 100755
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -33,10 +33,6 @@
 
 #include "sb.hxx"
 
-// Define activates class UCBStream in iosys.cxx
-#define _USE_UNO
-
-#ifdef _USE_UNO
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/file.hxx>
@@ -65,8 +61,6 @@ public:
 
 }
 
-#endif /* _USE_UNO */
-
 class SbiInstance;					// aktiver StarBASIC-Prozess
 class SbiRuntime;					// aktive StarBASIC-Prozedur-Instanz
 
@@ -143,9 +137,7 @@ public:
     String sFullNameToBeChecked;
     WildCard* pWildCard;
 
-#ifdef _USE_UNO
     Sequence< ::rtl::OUString > aDirSeq;
-#endif /* _USE_UNO */
 
     SbiRTLData();
     ~SbiRTLData();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 266d4bf..9caeff7 100755
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -40,8 +40,6 @@
 
 #include "runtime.hxx"
 
-#ifdef _USE_UNO
-
 #include <sal/alloca.h>
 
 #include <ctype.h>
@@ -72,8 +70,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::io;
 using namespace com::sun::star::bridge;
 
-#endif /* _USE_UNO */
-
 #include "iosys.hxx"
 #include "sbintern.hxx"
 
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 88e5dd0..6a846eb 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -58,7 +58,6 @@
 #endif
 #include "errobject.hxx"
 
-#ifdef _USE_UNO
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
@@ -81,8 +80,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::io;
 using namespace com::sun::star::script;
 
-#endif /* _USE_UNO */
-
 #include "stdobj.hxx"
 #include <basic/sbstdobj.hxx>
 #include "rtlproto.hxx"