merge with m44

4 files changed, 44 insertions, 12 deletions

diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 1c209053bfb8..48a982d78d31 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -234,19 +234,44 @@ void CmdBaseStream::Write( comm_ULONG nNr )
 void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars )
 {
     *pCommStream << comm_USHORT(BinString);
-    *pCommStream << nLenInChars;
+
+    comm_USHORT n;
+
+    // remove BiDi and zero-width-markers    0x200B - 0x200F
+    // remove BiDi and paragraph-markers     0x2028 - 0x202E
+
+    comm_UniChar* aNoBiDiString;
+    aNoBiDiString = new comm_UniChar [nLenInChars];
+    comm_USHORT nNewLenInChars = 0;
+    for ( n = 0 ; n < nLenInChars ; n++ )
+    {
+        comm_UniChar c = aString[ n ];
+        if (  ((c >= 0x200B) && (c <= 0x200F))
+            ||((c >= 0x2028) && (c <= 0x202E)) )
+        {   //Ignore character
+        }
+        else
+        {
+            aNoBiDiString[ nNewLenInChars ] = c;
+            nNewLenInChars++;
+        }
+    }
+
+    *pCommStream << nNewLenInChars;
+
 #ifdef OSL_BIGENDIAN
     // we have to change the byteorder
     comm_UniChar* aNewString;
-    aNewString = new comm_UniChar [nLenInChars];
-    comm_USHORT n;
-    for ( n = 0 ; n < nLenInChars ; n++ )
-        aNewString[ n ] = aString[ n ] >> 8 | aString[ n ] << 8;
-    pCommStream->Write( aNewString, ((comm_ULONG)nLenInChars) * sizeof( comm_UniChar ) );
+    aNewString = new comm_UniChar [nNewLenInChars];
+    for ( n = 0 ; n < nNewLenInChars ; n++ )
+        aNewString[ n ] = aNoBiDiString[ n ] >> 8 | aNoBiDiString[ n ] << 8;
+    pCommStream->Write( aNewString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
     delete [] aNewString;
 #else
-    pCommStream->Write( aString, ((comm_ULONG)nLenInChars) * sizeof( comm_UniChar ) );
+    pCommStream->Write( aNoBiDiString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
 #endif
+
+    delete [] aNoBiDiString;
 }
 
 void CmdBaseStream::Write( comm_BOOL bBool )
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 9c76533c7758..49f6f7608ef0 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -180,7 +180,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
             }
             if ( m_bLog )
             {
-                LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
+//  HACK Too many KeyEvents generated              LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
             }
             // cleanup
             aKeyString.Erase();
@@ -682,8 +682,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                 aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
                                 if ( m_bLog )
                                 {
-                                    if ( aKeyString.Len() == 0 )
-                                        LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
+//   HACK Too many KeyEvents generated                                 if ( aKeyString.Len() == 0 )
+//   HACK Too many KeyEvents generated                                     LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
                                 }
                                 if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
                                       (( aKeyCode.GetGroup() == KEYGROUP_NUM)   ||
@@ -706,7 +706,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                     aKeyString += sal_Unicode(1);   // mask it
                                     // extra for '>' which is coded as <SHIFT GREATER>
                                     if ( pKeyEvent->GetCharCode() == '>' )
-                                        aKeyString += sal_Unicode( KEY_GREATER | aKeyCode.GetAllModifier() & ~KEY_SHIFT );
+                                        aKeyString += sal_Unicode( KEY_GREATER | (aKeyCode.GetAllModifier() & ~KEY_SHIFT) );
                                     else
                                         aKeyString += sal_Unicode( aKeyCode.GetCode() | aKeyCode.GetAllModifier() );
                                 }
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 12fbc883964d..e068530459a8 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2535,7 +2535,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                                 long aMS = long( aDiff.GetMSFromTime() );
                                 if ( Abs( aMS - nWait ) > 100 )
                                 {
-                                    DBG_ERROR1("Wait was off limit by %i", aDiff.GetMSFromTime() - nWait )
+                                    DBG_ERROR1("Wait was off limit by %i", aDiff.GetMSFromTime() - nWait );
                                 }
 #endif
                             }
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 408e6d892a27..3d936164bff9 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -170,6 +170,9 @@ APP1STDLIBS+= \
             $(SOTLIB) \
             $(BASICLIB) \
             $(SIMPLECMLIB) \
+            $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
+            $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
+            $(SALHELPERLIB) $(XMLSCRIPTLIB) \
             $(COMMUNILIB)
 
 .IF "$(GUI)"=="UNX"
@@ -229,6 +232,10 @@ APP3STDLIBS= \
             $(TOOLSLIB) \
             $(SVTOOLLIB) \
             $(VCLLIB) \
+                        $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(I18NUTILLIB) \
+                        $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB) $(JVMFWKLIB) $(JVMACCESSLIB) \
+                        $(SALHELPERLIB) $(UNOTOOLSLIB) $(SVLLIB) $(BASICLIB) $(SOTLIB) \
+                        $(XMLSCRIPTLIB) \
             $(SJLIB)
 
 .IF "$(GUI)"=="UNX"