From 6be255b70ed61eeba0035d6b03bf4455d0ce6cac Mon Sep 17 00:00:00 2001

From: Miklos Vajna <vmiklos@collabora.co.uk>

Date: Tue, 10 Nov 2015 09:40:10 +0100

Subject: [PATCH 290/398] lokdocview: assert that loading of handle bitmaps

 succeeded

A number of such bitmaps were removed by accident in commit

74463457b39c9def1add630b7b0581dc195549c8 (android: chanhe handles to use

alias, tint handles with color, 2015-11-01).

Change-Id: I253c4b5790e82de32e6fd06896645adf360fa586

(cherry picked from commit c044e51b9983d373cf3ea74aec0ffd37752f07a0)

---

 android/source/res/drawable/handle_end.png    | Bin 0 -> 1734 bytes

 android/source/res/drawable/handle_middle.png | Bin 0 -> 1850 bytes

 android/source/res/drawable/handle_start.png  | Bin 0 -> 1676 bytes

 libreofficekit/source/gtk/lokdocview.cxx      |  13 +++++++++++++

 4 files changed, 13 insertions(+)

 create mode 100644 android/source/res/drawable/handle_end.png

 create mode 100644 android/source/res/drawable/handle_middle.png

 create mode 100644 android/source/res/drawable/handle_start.png

diff --git a/android/source/res/drawable/handle_end.png b/android/source/res/drawable/handle_end.png

new file mode 100644

index 0000000000000000000000000000000000000000..32b77dfa6e26a4560c1e921110e2ce0b4ed5bd76

GIT binary patch

literal 1734

zcmbVNX;2eq7!C-?AyNcvsU6$~wO}F1=2()2NOLVv4WxkzqZJIv0uhppn}sCcNbwd$

zbgDu@6qxb0D5%v6Rk0{q1PW9Hybu&3LO}&7OdY#Hu>NrT(VgA>zVF@ldER?=t1LXk

z+3{0H3Weev7AlsLs~7qB+1rtCe4V`wxp)$i7$Oo&APfo|r3h45JPL$q6p5%DRj5p>

zZ=gXG%CsbPR16U#T>>jH4NYOup&2zg5>2551sin=Wim

zkusz@5t^h9O~=v5^zbNUda{zIq6RMlf{ZXppg{=*VAP~&^{|moo#2JZy+ur?0uw4k

zGN1a!sTipY5Mek9aA+)lB?ANj2%>>(4g`UI0FwbS=?wCQ{6RL%fna6;FnLi)Yq%-_

zmWz=|TjYsPO(F;#Os5+R2AY9I!|+5p$m8)W989J^so}3TX$ghVU#s_?Vi2QxC9c*H

zYD^1Q7!~nYD#53cp1uh|qmxSC5^MF7i6T=*H!5^=kj9{EG?us~wDp7>{m+f}YU`s+

zI+QL)^;jydB

zfXxVCG9WGpav59}B4qLeJduRSWPwv0@52fpkjv(<*g}NI20;nP6Y(If7~ygStN;lY

zVNPMgw0c6JRiaaN)ui1?EbD_<ScIbr0>h&)EM=+#WJwr->60)WAc}+lAE`pA)>;I<

zmIA$rSB&E7G*pG)m

z?eR{#Oo_-Iv~1rtKY4gNKB$(Q8JrxB<em|7Qmu!>#DXYeM}K}}gqy&<_CbGI2`zYW

z!GcyQa(t`(mFiG8!K|-l)~pw@&DF(Tp&4CWSJ#(*pKt7RksU+aa;Dq9p5?M>{j&`R

zx5V$f(z+?lux6Ubvz2

zw+=kai`BJ3)hFs6b@3i-OLVEkhAM9V6Ca+ng3}yrPGTeXBZjw+t%|Z8yj7eBJEWCV

zF1|ju&(N446by_PKHCvpRPviwRa{o=<9X+2)W+eS4t

zJmc>Chy4lGiMBs3I2yA5R>b()R%G0|rCX%w9hhBYzqH0t*dlY#r=Nn$UY

zxy=_=&)FugaGnVtA*zoY-y$%uW@P4@O{zTe%b_0kueZky7iTQR99G?y5hnvhsfDG-

z(>|(FIM!$X)t_`;kv_C4a_6?@r#><6D}Kewq2`RF-?PonXFIs9u&t>mEnFkZH#^D?

z`&=kHl-iWj`z7qu5?^Q@f8kN|c+4kT>vwl(^~uuH=t%o`v%eiR?^R^(=8g`7Tal(N

zb}6ynboSi0IY<cYuDf_N_m>*sf)Y`>uQO78@`r1K+M7dlVa;p*%*=cq{$lH$h(-7A

zdF)#jDyWFEZpS}kFFQDo$c#Ta*J;$)_+&@t*^Qjga?m@?CRp+~=VpC<fy(Nh>k{Ye

z9f|QRm*+gKWj5U4Qp;YqS?Q;bI-Pjb)jvH3C%ghL!XDKUo$Gfty*5vGYdqV|j9i}m

z#f6ZeeRh|kTk@~AQP6=JPE7j~&%7bOs(o1o$E+;xJu>xt&z1b5

z1LM29M|_97%~ltu0n3+I?QQBd$NdrPoj5-_H+6W>ys$Bs9UJ1f{Y*nOIBbe-@a&th

z`BmpBj~BV=`>%B@9(u{vcX)4F*7Z8bFL+_^?TU?Fr)7t^#Gc2yt~cqkZuIPR8x@xH

q=o0^KFFy1WUpP>3-qaCiWk(S+KZ*OMysydfX9<&pi_3&7*Zm8TgRNQs

literal 0

HcmV?d00001

diff --git a/android/source/res/drawable/handle_middle.png b/android/source/res/drawable/handle_middle.png

new file mode 100644

index 0000000000000000000000000000000000000000..751eb898b136ab9814248a83df833d43f0e778dc

GIT binary patch

literal 1850

zcmbVNdss|q7$0(}q-eJimSduXxtzJ2xzrfbTrx2u(;%|yG;^joo4J^CG*hUAHe1NL

zC9xH1TO=$|(p4^N*5ev-%i3)Tg<PLjdxo<9@c3iTbI$p`?>+DD_uikgI$Rk#*mbxo

zi9{MKpDIxi>nP%x

zk(~6XIuegmOy_G%1}f~(q1p^)0!<<X3vFgt6OZ6PEE0zr1?2Y1YBGRo1>`ww1zlkl

zBYJddk_CxKQmQpc@fx0%ESwAk+xP^50l{IwW>{#%_%;FgJujcwJH#|H@LmOv7mz

z6{!dZ#3l;@u&GRnh7N)N1W`d28-l<|0D}%PXmsL+C?Jc^hWHE)&~uRqYZk4Juad}m

zY!N2`S&!ppK8

zMmW~A7#ENUPd|iUFe?-viH%rKqKK5yY_ORIQt32

zGcC4gh<fP!dcj2QzHG>$NO;4aVL^$azzZcN&0+&$#N`qJnfOB0qFTO;%aMT~hehWw

z=nxkKxpXd57Q*0(cw#Ao!329bK8F=SAd?M=cp)+#3k0PgPt1e35*e2(VsfNh8KV~~

zH)1$!)F8cfQNnHymit94Uu;2O++

zcqNDhO+d6Vi^%}I&oCeTj0d0uf*=u73d%l-9FnoPAd@5GF<9gttoHw8jYc>_bF{}N

z?b0hEdeE``*!;xd

z>|<Y_H507Q3h^G(DJnRv?krfUpID#@$)Mumva$U#YgG05#qU<+pIVSqGSH=>#L#wY

z_M%(2u-rpSWa$+9+|cM79+P#y^X|M!ZVlS9wY@AmPwTAyH70Ah!qe3!H!N%wa-hz?

z4>F*_gMIkwu?52F#QVX40ZwrzLzYmzuZ((LV<=8`oAuZJgvk~2Z|1n=c{x>Gc*09M

zKEJvA6y5&!g@BDax7FTe*tb`ns2hHu!=6fMc(7@6+Qql^=>ZAPv!<^pqL)jjoDmq(

zeTzy%no=HTRff5BMaTFZc)A_`M!y&G2s(EtjP2TxkEiqv#8#~5sC`FUSrx8

zt&Kq9w=>HRH$JOFw_Yk*KAM^8=`m1mCbbrwN4HgNhGS>Ez3{HE_PfG>

zS}M)-PA(J{EE@A-UWZ>?V_``Z72DYP$Fht*6Hn`_2JZ8Yu39`^I59^P(>0QHu;ns1

zq`x4p^{kt2L-LhBD=(p!pV?Cp?Xn+UMd9BnUKaFiQ|%DR@>>*-)v=+E

zip_hVnbmD+XNu_U_NygN-poHAe8g*=99kVY((@I3_mNz<j&lE4it$cF)Mll$%h>No

zPUi$^O7W8X)7}#}znv6+)pGLXROHS$>wZ=3S<iL8^(nwnS;DT$UFCJYhSM>p){mss

z&mLFzFsCGAQ({o#+8rleln%PrYR>H%`+8N}+uX-Z)7

zYi{u

ztlP!Rg^BL**ABNkC1xIEJ!D<e)jpki={07*n89v#Zv@Nyhwe>%?2~SZY~ktPxRovI

zI+T6N^RV4Dfo9jdzQr}&e#2Z!W1F-4HFR}*bqSoG*V5^#`qjdFucC(NR=rr7lsQmX

zGwq4Ttsi%O&kAh)NxL`NXAJlC&;>4yo=zKlI(2<-W5e&ZH+UZ0nMXDAm3NwIc6Ere

zQR;=@to8b$Gi+?fB^TvC8-1KY$4{EF#;2)ro_`?xkU51n6mAglbEDICMg5Yox_byR

z$;HpVtvakpbQV>v4E?#WX_)35NAiG_AW0rXC%v=zxu;IQa@+AYlS`G7(vX<6e*p&9

B)mZ=l

literal 0

HcmV?d00001

diff --git a/android/source/res/drawable/handle_start.png b/android/source/res/drawable/handle_start.png

new file mode 100644

index 0000000000000000000000000000000000000000..cf12a0dcdcf3b27566fb4a4cd990306965759d3d

GIT binary patch

literal 1676

zcmbVNeNfY87%wP_D7RCl4n&PX5T~?FKhid%Vrd%%DOAd8k&Ppyfo9OAwxJ)K?65eo

zIAuef2yQy3%&KE@Zf*yDP8i3;0dooiJUwOV2E(0-4w>Cj1m_=~e=L{eecva~@ArIP

z-0I{N!9ig`EEX#`VWlFKS?4j&(!fc~+u{nG$Sk3>Qb%j39NLaq2$oDwWfMSx5z8e~

z2~6)?*FwaySQ89nnvT|~k`SCSvN4|y+hH^_Xcj9r&SA#zJc0(YiCoeo1@AVT0Rd7k

z1=k2wT$Nc)7|4}{7D7{)oQ4<X;SxO<w+x7NAPj+#pfSK<%r{vPhZG#;MVP%$%mIN>

z6*^A}K6Of`QUh|zLI6TGKL+PQ5CFq$NFan^Xeq$sLOc$ax#1W{fCyoPCj!PUkg;ab

z=OC#Hbj%iWl7a@BHX|I4-EL>w`E1IP%Yh^kiI0QFi(xcktWFb+IbuxKh;ar5VZ|+^

znI<U{;A6zHsRCLGGM+vS!Dv>go)Md@V~Ju?#&KX~4#ehij7DEvquN$FmH5w%7iwG6

zoMwWPN?54^3(nLdCt@7T

zL;|je$A!fZB<70wXgp6MlgO1k9v>R#co9|xLtL4dD~LxW0tiw<61fBxD^Rgm#uq8Y

zC~q8_V6xJf2`9$wl8oIkEdQlgL~bE4nzE!(RQ`Aes0|cNSq+pKkZWKdT7}`H$tPIs

zE6~$;6@-Pf5qi`@8G+FZBjgJ_fD|wc%lJwNeJ*ks6^J3e2$k>z;22i_f3n75oZ

z<GFSj7co8P+dgZ4=J0HM2op0i7G^lS4e1>$mVbSMLYC&};;j@~3z5CroNE(ZJ}`xp

z|1ArvD~s8&_H__;)s@AaeQ-;b5p*Izc5>*3a^T#g!=e;#bk`w~bhvZkD?ypv2RsYD

z?wQ}M&uxD6k-L`MwQwXNllNz2!}-CHzEi^$&d?tui*CslN6vfy&~NpdliZHDX?IR#

zl-zFJp6QD8JGkn;Xt0JIURc^0|H+0|iowzdziXf0_Pn=5UWkB2P0oWs+Sp

z^J;m{rp(|*IAnU{mtXv}*HBa9O4pv$wT*mJnxZOi;y>va!ZAr(V2|gq=hD<;enm+2

z$sLIsGaqi+^6`Qye8-x=5+_UZVO^ir1F0Li9ozFXEiz~AqRP+S_0HXQ^kMqmj4Z+G

zK-E`byVE=1zSp?=A6|d^Dx~kPwi0!J+%{VfTzyAaX;}FC1^(XJduXP1Pn98OsrLk@

ze%^|Zmi48gu;q1Ai{R?;Q<53$J9>sX6&I&9?RMYOMp=UM;niVD0uup>&gF!}xZFRA

zaIhf@m(K4E9js1l;@gt+lLyM&RRME)(xZxs9^WW_(B)>1mkyTZ&O%ePQQMA%-`|;7

zj}ENawIM*b^K!t=wyGJLxbjl#)ubc&=8Kpu(EDb4zl-Qq_GRxj9Jv14JH?;sevN;U

zy5#%Q9_x1n_A4PHE#10`fUdg*lcUpHhrN@#`Uj5-i{WpBO(i|ouWTqt4zy2kHH6#@

zcHQsMTaUya(uhx&uhX7rDM#1N_eQN+w*1O=scgmv;d`31YOba2KiyVQUUSz!^bhIK

zlyl9bIxc!r&>Ii@;fy)^i1yj)S(O=OO(jnC@?L6-ZFBcgfh|RMYi9f5&1Wc&&@Ut8

z(c$xFj?bKqs~RsKP2BoRL9y#b>;A&^St7jEJX;!dw&Cp0k0xmRDwH+03vW&B+$i2A

fy{_GQ&3_te*fBRN_wAw#-~S;&nXIUd&vN|>yUu?=

literal 0

HcmV?d00001

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx

index 8f0a053677fa..9dfa2f3b44a6 100644

--- a/libreofficekit/source/gtk/lokdocview.cxx

+++ b/libreofficekit/source/gtk/lokdocview.cxx

@@ -12,6 +12,7 @@

 #include <string.h>

 #include <vector>

 #include <string>

+#include <iostream>

 #include <boost/property_tree/json_parser.hpp>

 #include <com/sun/star/awt/Key.hpp>

@@ -1059,7 +1060,10 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)

         // Have a cursor, but no selection: we need the middle handle.

         gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_middle.png", NULL);

         if (!priv->m_pHandleMiddle)

+        {

             priv->m_pHandleMiddle = cairo_image_surface_create_from_png(handleMiddlePath);

+            assert(cairo_surface_status(priv->m_pHandleMiddle) == CAIRO_STATUS_SUCCESS);

+        }

         g_free (handleMiddlePath);

         renderHandle(pDocView, pCairo, priv->m_aVisibleCursor, priv->m_pHandleMiddle, priv->m_aHandleMiddleRect);

     }

@@ -1084,7 +1088,10 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)

             // Have a start position: we need a start handle.

             gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_start.png", NULL);

             if (!priv->m_pHandleStart)

+            {

                 priv->m_pHandleStart = cairo_image_surface_create_from_png(handleStartPath);

+                assert(cairo_surface_status(priv->m_pHandleStart) == CAIRO_STATUS_SUCCESS);

+            }

             renderHandle(pDocView, pCairo, priv->m_aTextSelectionStart, priv->m_pHandleStart, priv->m_aHandleStartRect);

             g_free (handleStartPath);

         }

@@ -1093,7 +1100,10 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)

             // Have a start position: we need an end handle.

             gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_end.png", NULL);

             if (!priv->m_pHandleEnd)

+            {

                 priv->m_pHandleEnd = cairo_image_surface_create_from_png(handleEndPath);

+                assert(cairo_surface_status(priv->m_pHandleEnd) == CAIRO_STATUS_SUCCESS);

+            }

             renderHandle(pDocView, pCairo, priv->m_aTextSelectionEnd, priv->m_pHandleEnd, priv->m_aHandleEndRect);

             g_free (handleEndPath);

         }

@@ -1103,7 +1113,10 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)

     {

         gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_graphic.png", NULL);

         if (!priv->m_pGraphicHandle)

+        {

             priv->m_pGraphicHandle = cairo_image_surface_create_from_png(handleGraphicPath);

+            assert(cairo_surface_status(priv->m_pGraphicHandle) == CAIRO_STATUS_SUCCESS);

+        }

         renderGraphicHandle(pDocView, pCairo, priv->m_aGraphicSelection, priv->m_pGraphicHandle);

         g_free (handleGraphicPath);

     }

-- 

2.12.0