cws avmedia102: rebase m83

6 files changed, 27 insertions, 9 deletions

diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index eba5109c7446..5472b32dd62f 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.hxx
@@ -127,7 +127,7 @@ public:
     }
     m_segMap.clear();
   };
-  GrSegRecord * getSegment(ImplLayoutArgs & layoutArgs, bool bIsRtl)
+  GrSegRecord * getSegment(ImplLayoutArgs & layoutArgs, bool bIsRtl, int segCharLimit)
   {
     GrSegRecord * found = NULL;
     // try to find a segment starting at correct place, if not, try to find a
@@ -152,8 +152,6 @@ public:
       if (found->m_seg->startCharacter() <= layoutArgs.mnMinCharPos &&
           found->m_seg->stopCharacter() >= layoutArgs.mnEndCharPos)
       {
-        const size_t seg_char_limit = min(layoutArgs.mnLength, layoutArgs.mnEndCharPos
-          + GraphiteLayout::EXTRA_CONTEXT_LENGTH);
         DBG_ASSERT(found && found->m_seg, "null entry in GraphiteSegmentCache");
         // restore original start character, in case it has changed
         found->m_seg->setTextSourceOffset(found->m_startChar);
@@ -161,7 +159,7 @@ public:
         // interest
         // We could use substr and ==, but substr does a copy,
         // so its probably faster to do it like this
-        for (size_t i = layoutArgs.mnMinCharPos; i < seg_char_limit; i++)
+        for (int i = layoutArgs.mnMinCharPos; i < segCharLimit; i++)
         {
           //if (!found->m_rope->match(rtl::OUString(layoutArgs.mpStr[i], layoutArgs.mnLength), i - found->m_seg->startCharacter()))
           if (found->m_rope->getStr()[i-found->m_seg->startCharacter()] != layoutArgs.mpStr[i])
@@ -171,6 +169,15 @@ public:
         {
             return NULL;
         }
+        if (found->m_seg->stopCharacter() > layoutArgs.mnEndCharPos &&
+            static_cast<int>(found->char2BaseGlyph().size()) > layoutArgs.mnEndCharPos)
+        {
+            // check that the requested end character isn't mid cluster
+            if (found->char2BaseGlyph()[layoutArgs.mnEndCharPos-layoutArgs.mnMinCharPos] == -1)
+            {
+                return NULL;
+            }
+        }
 //        if (found->m_lockCount != 0)
 //          OutputDebugString("Multple users of SegRecord!");
         found->m_lockCount++;
@@ -183,10 +190,8 @@ public:
       // this is expecially needed when editing a large paragraph
       // each edit changes the pointers, but if we don't reuse any segments it gets very
       // slow.
-      const size_t seg_char_limit = min(layoutArgs.mnLength, layoutArgs.mnEndCharPos
-          + GraphiteLayout::EXTRA_CONTEXT_LENGTH);
       rtl::OUString * rope = new rtl::OUString(layoutArgs.mpStr + layoutArgs.mnMinCharPos,
-                                         seg_char_limit - layoutArgs.mnMinCharPos);
+                                         segCharLimit - layoutArgs.mnMinCharPos);
       if (!rope) return NULL;
       size_t nHash = (*(rope)).hashCode();
       GrRMEntry range = m_ropeMap.equal_range(nHash);
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx
index 1fbb11211ca0..520f4620cd90 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/vcl/graphite_layout.hxx
@@ -75,6 +75,14 @@ namespace grutils { class GrFeatureParser; }
 class VCL_DLLPUBLIC GraphiteLayout : public SalLayout
 {
 public:
+    // Mask to allow Word break status to be stored within mvChar2BaseGlyph
+    enum {
+        WORD_BREAK_BEFORE   = 0x40000000,
+        HYPHEN_BREAK_BEFORE = 0x80000000,
+        BREAK_MASK          = 0xC0000000,
+        GLYPH_INDEX_MASK    = 0x3FFFFFFF
+    } LineBreakMask;
+
     class Glyphs : public std::vector<GlyphItem>
     {
     public:
@@ -159,6 +167,7 @@ private:
     std::pair<int,int>    glyph_to_chars(const GlyphItem &) const;
 
     std::pair<long,long>  caret_positions(size_t) const;
+    void expandOrCondense(ImplLayoutArgs &rArgs);
 };
 
 
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 4bca986812ed..30308aa8a723 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -48,6 +48,7 @@ class Window;
 #define QUICKHELP_BOTTOM    ((USHORT)0x0020)
 #define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM)
 #define QUICKHELP_CTRLTEXT  ((USHORT)0x0040)
+#define QUICKHELP_NOEVADEPOINTER ((USHORT)0x4000)
 #define QUICKHELP_BIDI_RTL  ((USHORT)0x8000)
 
 // By changes you must also change: rsc/vclrsc.hxx
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx
index 6ce9f21500b5..a1104bbf4a86 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/vcl/impfont.hxx
@@ -177,7 +177,8 @@ class CmapResult;
 class VCL_DLLPUBLIC ImplFontCharMap
 {
 public:
-   explicit             ImplFontCharMap( const CmapResult& );
+    explicit             ImplFontCharMap( const CmapResult& );
+    virtual              ~ImplFontCharMap();
 
     static ImplFontCharMap* GetDefaultMap( bool bSymbols=false);
 
@@ -201,7 +202,6 @@ public:
     int                 GetGlyphIndex( sal_uInt32 ) const;
 
 private:
-    /*virtual*/         ~ImplFontCharMap();
     int                 ImplFindRangeIndex( sal_uInt32 ) const;
 
     // prevent assignment and copy construction
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 98cd05d999dd..3659e5aee485 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -130,6 +130,7 @@ public:
 
     virtual USHORT      GetEntryPos( const XubString& rStr ) const;
     virtual USHORT      GetEntryPos( const void* pData ) const;
+            Image       GetEntryImage( USHORT nPos ) const;
     virtual XubString   GetEntry( USHORT nPos ) const;
     virtual USHORT      GetEntryCount() const;
 
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index b0e74df9a767..b3a7d9b8775e 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -179,6 +179,8 @@ private:
     SystemWindow (const SystemWindow &);
     SystemWindow & operator= (const SystemWindow &);
 
+    SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin );
+
 protected:
     // Single argument ctors shall be explicit.
     explicit        SystemWindow( WindowType nType );