[Libreoffice-commits] core.git: 3 commits - bean/com include/osl include/vcl sc/source vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Fri Feb 5 03:44:58 UTC 2016
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 4 +---
bean/com/sun/star/comp/beans/OfficeConnection.java | 4 +---
include/osl/signal.h | 1 -
include/vcl/apptypes.hxx | 5 +----
sc/source/ui/app/scmod.cxx | 2 +-
vcl/source/app/svapp.cxx | 1 -
vcl/source/app/svmain.cxx | 5 -----
7 files changed, 4 insertions(+), 18 deletions(-)
New commits:
commit 001272c9d443bf49be1f8f1f7f96ef9e6356a3ef
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Feb 5 14:02:01 2016 +1100
officebeans: RVP no longer used, only local used now
Change-Id: I5f09d25a6e267c793c469c08e8f7f46521fdcd49
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 93ca72b..12f1458 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -226,9 +226,7 @@ public class LocalOfficeConnection
}
/**
- * Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
+ * Creates an office java.awt.Canvas based window.
*
* @param container This is an AWT container.
* @return The office window instance.
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 98afca3..08bcff3 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -57,9 +57,7 @@ public interface OfficeConnection
XComponentContext getComponentContext();
/**
- * Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
+ * Creates an office java.awt.Canvas based window.
*
* This method does not add the office window to its container.
*
commit 365aa206f026e15e4fcc82fc0f754e46fb15ac53
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Feb 5 13:56:08 2016 +1100
vcl: Remove unneeded exception constants
EXC_USER and EXC_REMOTE are not used. EXC_REMOTE was actually used for the
RVP (Remote Visualization Protocol), but that was apparently removed when
Sun opensourced StarView!
Change-Id: Icc644146d18d1ba2f6503c6fdbd9acc85cb9e75c
diff --git a/include/osl/signal.h b/include/osl/signal.h
index 39d0ff0..539ae0d 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -33,7 +33,6 @@ extern "C" {
#define OSL_SIGNAL_USER_RESOURCEFAILURE (OSL_SIGNAL_USER_RESERVED - 1)
#define OSL_SIGNAL_USER_X11SUBSYSTEMERROR (OSL_SIGNAL_USER_RESERVED - 2)
-#define OSL_SIGNAL_USER_RVPCONNECTIONERROR (OSL_SIGNAL_USER_RESERVED - 3)
typedef void* oslSignalHandler;
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index ba028e3..f63602e 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
@@ -26,8 +26,6 @@
#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100)
#define EXC_SYSTEM ((sal_uInt16)0x0300)
#define EXC_DISPLAY ((sal_uInt16)0x0400)
-#define EXC_REMOTE ((sal_uInt16)0x0500)
-#define EXC_USER ((sal_uInt16)0x1000)
#define EXC_MAJORTYPE ((sal_uInt16)0xFF00)
#define EXC_MINORTYPE ((sal_uInt16)0x00FF)
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c36b722..1e75afb 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -284,7 +284,6 @@ void Application::Exception( sal_uInt16 nError )
// System has precedence (so do nothing)
case EXC_SYSTEM:
case EXC_DISPLAY:
- case EXC_REMOTE:
break;
#ifdef DBG_UTIL
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 9c18519..7631df2 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -122,11 +122,6 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
(pInfo->UserSignal == OSL_SIGNAL_USER_X11SUBSYSTEMERROR) )
nVCLException = EXC_DISPLAY;
- // Remote-Client
- if ((pInfo->Signal == osl_Signal_User) &&
- (pInfo->UserSignal == OSL_SIGNAL_USER_RVPCONNECTIONERROR) )
- nVCLException = EXC_REMOTE;
-
if ( nVCLException )
{
bIn = true;
commit 836320f64f8704dd150f72734192fcebebce89dd
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Feb 5 13:26:16 2016 +1100
vcl: remove VCL_INPUT_MOUSEANDKEYBOARD, not necessary
Change-Id: Ia5b9581d06f6884d6a06abde9cb4039b64c29a05
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index 9fd7a1a..ba028e3 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
@@ -45,8 +45,7 @@ namespace o3tl
template<> struct typed_flags<VclInputFlags> : is_typed_flags<VclInputFlags, 0x003f> {};
}
-#define VCL_INPUT_MOUSEANDKEYBOARD (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD)
-#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT)
+#define VCL_INPUT_ANY (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT)
#endif // INCLUDED_VCL_APPTYPES_HXX
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index b5ca139..0ac4315 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1828,7 +1828,7 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell )
IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void)
{
- if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) )
+ if ( Application::AnyInput( VclInputFlags::MOUSE | VclInputFlags::KEYBOARD ) )
{
aIdleTimer.Start(); // Timeout unchanged
return;
More information about the Libreoffice-commits
mailing list