From 2dfa83a5e434bc381dc7cd94692b4ca9b5078536 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 3 Sep 2013 13:59:12 +0200 Subject: [PATCH] fix wrong memberId -> memberid in opspecs created in EditorSession --- js/editor/EditorSession.js | 14 ++++---- js/webodf-debug.js | 2 +- js/webodf.js | 68 +++++++++++++++++++------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/js/editor/EditorSession.js b/js/editor/EditorSession.js index cc261936..37f7109b 100644 --- a/js/editor/EditorSession.js +++ b/js/editor/EditorSession.js @@ -327,7 +327,7 @@ define("webodf/editor/EditorSession", [ var op = new ops.OpApplyDirectStyling(), selection = self.getCursorSelection(); op.init({ - memberId: localMemberId, + memberid: localMemberId, position: selection.position, length: selection.length, setProperties: value @@ -349,7 +349,7 @@ define("webodf/editor/EditorSession", [ length = Math.abs(length); op.init({ - memberId: localMemberId, + memberid: localMemberId, position: position, length: length, name: localMemberId + Date.now() @@ -362,7 +362,7 @@ define("webodf/editor/EditorSession", [ if (currentNamedStyleName !== value) { op = new ops.OpSetParagraphStyle(); op.init({ - memberId: localMemberId, + memberid: localMemberId, position: self.getCursorPosition(), styleName: value }); @@ -373,7 +373,7 @@ define("webodf/editor/EditorSession", [ this.insertTable = function (initialRows, initialColumns, tableStyleName, tableColumnStyleName, tableCellStyleMatrix) { var op = new ops.OpInsertTable(); op.init({ - memberId: localMemberId, + memberid: localMemberId, position: self.getCursorPosition(), initialRows: initialRows, initialColumns: initialColumns, @@ -413,7 +413,7 @@ define("webodf/editor/EditorSession", [ var op; op = new ops.OpUpdateParagraphStyle(); op.init({ - memberId: localMemberId, + memberid: localMemberId, styleName: styleName, setProperties: setProperties, removedProperties: (!removedProperties) ? {} : removedProperties @@ -451,7 +451,7 @@ define("webodf/editor/EditorSession", [ op = new ops.OpAddParagraphStyle(); op.init({ - memberId: localMemberId, + memberid: localMemberId, styleName: newStyleName, setProperties: setProperties }); @@ -464,7 +464,7 @@ define("webodf/editor/EditorSession", [ var op; op = new ops.OpRemoveParagraphStyle(); op.init({ - memberId: localMemberId, + memberid: localMemberId, styleName: styleName }); session.enqueue(op); diff --git a/js/webodf-debug.js b/js/webodf-debug.js index 926884a6..23169358 100644 --- a/js/webodf-debug.js +++ b/js/webodf-debug.js @@ -11046,7 +11046,7 @@ ops.OpRemoveParagraphStyle = function OpRemoveParagraphStyle() { setAttributes = getStyleReferencingAttributes(otherOpspec.setProperties); if(setAttributes.length > 0) { helperOp = new ops.OpUpdateParagraphStyle; - helperOp.init({styleName:otherOpspec.styleName, removedProperties:{attributes:setAttributes.join(",")}}); + helperOp.init({memberid:memberid, timestamp:timestamp, styleName:otherOpspec.styleName, removedProperties:{attributes:setAttributes.join(",")}}); result = [helperOp, self] } break; diff --git a/js/webodf.js b/js/webodf.js index 95e116f2..3ee1f51d 100644 --- a/js/webodf.js +++ b/js/webodf.js @@ -60,18 +60,18 @@ function(b){return h.parseFromString(b,"text/xml")};this.exit=process.exit;this. function RhinoRuntime(){function m(b,a){var e;void 0!==a?e=b:a=b;"alert"===e&&print("\n!!!!! ALERT !!!!!");print(a);"alert"===e&&print("!!!!! ALERT !!!!!")}var n=this,k=Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),c,a,h="";k.setValidating(!1);k.setNamespaceAware(!0);k.setExpandEntityReferences(!1);k.setSchema(null);a=Packages.org.xml.sax.EntityResolver({resolveEntity:function(b,a){var e=new Packages.java.io.FileReader(a);return new Packages.org.xml.sax.InputSource(e)}});c=k.newDocumentBuilder(); c.setEntityResolver(a);this.ByteArray=function(b){return[b]};this.byteArrayFromArray=function(b){return b};this.byteArrayFromString=function(b,a){var e=[],d,c=b.length;for(d=0;d>>18],b+=q[d>>>12&63],b+=q[d>>>6&63],b+=q[d&63];g===l+1?(d=a[g]<<4,b+=q[d>>>6],b+=q[d&63],b+="=="):g===l&&(d=a[g]<<10|a[g+1]<<2,b+=q[d>>>12],b+=q[d>>>6&63],b+=q[d&63],b+="=");return b}function k(a){a=a.replace(/[^A-Za-z0-9+\/]+/g,"");var d=[],b=a.length%4,g,l=a.length,f;for(g=0;g>16,f>>8&255,f&255);d.length-=[0,0,2,1][b];return d}function c(a){var d=[],b,g=a.length,l;for(b=0;bl?d.push(l):2048>l?d.push(192|l>>>6,128|l&63):d.push(224|l>>>12&15,128|l>>>6&63,128|l&63);return d}function a(a){var d=[],b,g=a.length,l,f,e;for(b=0;bl?d.push(l):(b+=1,f=a[b],224>l?d.push((l&31)<<6|f&63):(b+=1,e=a[b],d.push((l&15)<<12|(f&63)<<6|e&63)));return d}function h(a){return n(m(a))} -function b(a){return String.fromCharCode.apply(String,k(a))}function f(d){return a(m(d))}function e(d){d=a(d);for(var b="",g=0;gd?g+=String.fromCharCode(d):(e+=1,l=a.charCodeAt(e)&255,224>d?g+=String.fromCharCode((d&31)<<6|l&63):(e+=1,f=a.charCodeAt(e)&255,g+=String.fromCharCode((d&15)<<12|(l&63)<<6|f&63)));return g}function t(a,b){function g(){var c= -e+l;c>a.length&&(c=a.length);f+=d(a,e,c);e=c;c=e===a.length;b(f,c)&&!c&&runtime.setTimeout(g,0)}var l=1E5,f="",e=0;a.length>>18],b+=q[d>>>12&63],b+=q[d>>>6&63],b+=q[d&63];g===l+1?(d=a[g]<<4,b+=q[d>>>6],b+=q[d&63],b+="=="):g===l&&(d=a[g]<<10|a[g+1]<<2,b+=q[d>>>12],b+=q[d>>>6&63],b+=q[d&63],b+="=");return b}function k(a){a=a.replace(/[^A-Za-z0-9+\/]+/g,"");var d=[],b=a.length%4,g,l=a.length,c;for(g=0;g>16,c>>8&255,c&255);d.length-=[0,0,2,1][b];return d}function c(a){var d=[],b,g=a.length,l;for(b=0;bl?d.push(l):2048>l?d.push(192|l>>>6,128|l&63):d.push(224|l>>>12&15,128|l>>>6&63,128|l&63);return d}function a(a){var d=[],b,g=a.length,l,c,e;for(b=0;bl?d.push(l):(b+=1,c=a[b],224>l?d.push((l&31)<<6|c&63):(b+=1,e=a[b],d.push((l&15)<<12|(c&63)<<6|e&63)));return d}function h(a){return n(m(a))} +function b(a){return String.fromCharCode.apply(String,k(a))}function f(d){return a(m(d))}function e(d){d=a(d);for(var b="",g=0;gd?g+=String.fromCharCode(d):(e+=1,l=a.charCodeAt(e)&255,224>d?g+=String.fromCharCode((d&31)<<6|l&63):(e+=1,c=a.charCodeAt(e)&255,g+=String.fromCharCode((d&15)<<12|(l&63)<<6|c&63)));return g}function t(a,b){function g(){var f= +e+l;f>a.length&&(f=a.length);c+=d(a,e,f);e=f;f=e===a.length;b(c,f)&&!f&&runtime.setTimeout(g,0)}var l=1E5,c="",e=0;a.length>>8):(va(b&255),va(b>>>8))},pa=function(){r=(r<<5^g[z+3-1]&255)&8191;v=w[32768+r];w[z&32767]=v;w[32768+r]=z},ga=function(a,b){A>16-b?(u|=a<>16-A,A+=b-16):(u|=a<a;a++)g[a]=g[a+32768];R-=32768;z-=32768;x-=32768;for(a=0;8192>a;a++)b=w[32768+a],w[32768+a]=32768<=b?b-32768:0;for(a=0;32768>a;a++)b=w[a],w[a]=32768<=b?b-32768:0;d+=32768}E||(a=Z(g,z+K,d),0>=a?E=!0:K+=a)},qa=function(a){var b=X,d=z,l,e=P,f=32506=ra&&(b>>=2);do if(l=a,g[l+e]===p&&g[l+e-1]===q&&g[l]===g[d]&&g[++l]===g[d+1]){d+=2;l++;do++d;while(g[d]=== -g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&de){R=a;e=l;if(258<=l)break;q=g[d+e-1];p=g[d+e]}a=w[a&32767]}while(a>f&&0!==--b);return e},za=function(a,d){s[T++]=d;0===a?aa[d].fc++:(a--,aa[ca[d]+256+1].fc++,ea[(256>a?ha[a]:ha[256+(a>>7)])&255].fc++,q[ja++]=a,U|=ma);ma<<=1;0===(T&7)&&(ia[la++]=U,U=0,ma=1);if(2l;l++)b+=ea[l].fc*(5+ta[l]);b>>=3;if(ja< -parseInt(T/2,10)&&b>=1,b<<=1;while(0<--d);return b>>1},Ea=function(a,d){var b=[];b.length=16;var g=0,l;for(l=1;15>=l;l++)g=g+I[l-1]<<1,b[l]=g;for(g=0;g<=d;g++)l=a[g].dl,0!==l&&(a[g].fc=Da(b[l]++,l))},Ca=function(a){var d=a.dyn_tree,b=a.static_tree,g=a.elems,l,e=-1,f=g;ba=0;fa=573;for(l= -0;lba;)l=Q[++ba]=2>e?++e:0,d[l].fc=1,N[l]=0,W--,null!==b&&($-=b[l].dl);a.max_code=e;for(l=ba>>1;1<=l;l--)Ba(d,l);do l=Q[1],Q[1]=Q[ba--],Ba(d,1),b=Q[1],Q[--fa]=l,Q[--fa]=b,d[f].fc=d[l].fc+d[b].fc,N[f]=N[l]>N[b]+1?N[l]:N[b]+1,d[l].dl=d[b].dl=f,Q[1]=f++,Ba(d,1);while(2<=ba);Q[--fa]=Q[1];f=a.dyn_tree;l=a.extra_bits;var g=a.extra_base,b=a.max_code,c=a.max_length,q=a.static_tree,p,h,r,k,u=0;for(h=0;15>=h;h++)I[h]=0;f[Q[fa]].dl=0;for(a=fa+1;573>a;a++)p= -Q[a],h=f[f[p].dl].dl+1,h>c&&(h=c,u++),f[p].dl=h,p>b||(I[h]++,r=0,p>=g&&(r=l[p-g]),k=f[p].fc,W+=k*(h+r),null!==q&&($+=k*(q[p].dl+r)));if(0!==u){do{for(h=c-1;0===I[h];)h--;I[h]--;I[h+1]+=2;I[c]--;u-=2}while(0b||(f[l].dl!==h&&(W+=(h-f[l].dl)*f[l].fc,f[l].fc=h),p--)}Ea(d,e)},Fa=function(a,d){var b,g=-1,l,e=a[0].dl,f=0,c=7,h=4;0===e&&(c=138,h=3);a[d+1].dl=65535;for(b=0;b<=d;b++)l=e,e=a[b+1].dl,++f=f?S[17].fc++:S[18].fc++,f=0,g=l,0===e?(c=138,h=3):l===e?(c=6,h=3):(c=7,h=4))},Ga=function(){8b?ha[b]:ha[256+(b>>7)])&255,Y(c,d),h=ta[c],0!==h&&(b-=ka[c],ga(b,h))),f>>=1;while(g=e?(Y(17,S),ga(e-3,3)):(Y(18,S),ga(e-11,7));e=0;g=l;0===f?(c=138,h=3):l===f?(c=6,h=3):(c=7,h=4)}},Ja=function(){var a;for(a=0;286>a;a++)aa[a].fc=0;for(a=0;30>a;a++)ea[a].fc=0;for(a=0;19>a;a++)S[a].fc=0;aa[256].fc=1;U=T=ja=la=W=$=0;ma=1},Aa=function(a){var b,d,l,e;e=z-x;ia[la]=U;Ca(M);Ca(H);Fa(aa,M.max_code);Fa(ea,H.max_code);Ca(F);for(l=18;3<=l&&0===S[J[l]].dl;l--);W+=3*(l+1)+14;b=W+3+7>> -3;d=$+3+7>>3;d<=b&&(b=d);if(e+4<=b&&0<=x)for(ga(0+a,3),Ga(),na(e),na(~e),l=0;lb.len&&(c=b.len);for(p=0;pt-l&&(c=t-l);for(p=0;pq;q++)for(C[q]=h,c=0;c<1<q;q++)for(ka[q]=h,c=0;c<1<>=7;30>q;q++)for(ka[q]=h<<7,c=0;c<1<=c;c++)I[c]=0;for(c=0;143>=c;)O[c++].dl=8,I[8]++;for(;255>=c;)O[c++].dl=9,I[9]++;for(;279>=c;)O[c++].dl=7,I[7]++;for(;287>=c;)O[c++].dl=8,I[8]++;Ea(O,287);for(c=0;30>c;c++)V[c].dl=5,V[c].fc=Da(c,5);Ja()}for(c=0;8192>c;c++)w[32768+c]=0;oa=ua[L].max_lazy;ra=ua[L].good_length;X=ua[L].max_chain;x=z=0;K=Z(g,0,65536);if(0>=K)E=!0,K=0;else{for(E=!1;262>K&& -!E;)wa();for(c=r=0;2>c;c++)r=(r<<5^g[c]&255)&8191}b=null;l=t=0;3>=L?(P=2,y=0):(y=2,G=0);p=!1}e=!0;if(0===K)return p=!0,0}c=Ka(a,d,f);if(c===f)return f;if(p)return c;if(3>=L)for(;0!==K&&null===b;){pa();0!==v&&32506>=z-v&&(y=qa(v),y>K&&(y=K));if(3<=y)if(q=za(z-R,y-3),K-=y,y<=oa){y--;do z++,pa();while(0!==--y);z++}else z+=y,y=0,r=g[z]&255,r=(r<<5^g[z+1]&255)&8191;else q=za(0,g[z]&255),K--,z++;q&&(Aa(0),x=z);for(;262>K&&!E;)wa()}else for(;0!==K&&null===b;){pa();P=y;D=R;y=2;0!==v&&(P=z-v)&& -(y=qa(v),y>K&&(y=K),3===y&&4096K&&!E;)wa()}0===K&&(0!==G&&za(0,g[z-1]&255),Aa(1),p=!0);return c+Ka(a,c+d,f-c)};this.deflate=function(l,c){var p,r;B=l;sa=0;"undefined"===String(typeof c)&&(c=6);(p=c)?1>p?p=1:9a;a++)g[a]=g[a+32768];R-=32768;z-=32768;x-=32768;for(a=0;8192>a;a++)b=w[32768+a],w[32768+a]=32768<=b?b-32768:0;for(a=0;32768>a;a++)b=w[a],w[a]=32768<=b?b-32768:0;d+=32768}E||(a=Z(g,z+K,d),0>=a?E=!0:K+=a)},qa=function(a){var b=X,d=z,l,c=P,e=32506=ra&&(b>>=2);do if(l=a,g[l+c]===p&&g[l+c-1]===q&&g[l]===g[d]&&g[++l]===g[d+1]){d+=2;l++;do++d;while(g[d]=== +g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&g[++d]===g[++l]&&dc){R=a;c=l;if(258<=l)break;q=g[d+c-1];p=g[d+c]}a=w[a&32767]}while(a>e&&0!==--b);return c},za=function(a,d){s[T++]=d;0===a?aa[d].fc++:(a--,aa[ca[d]+256+1].fc++,ea[(256>a?ha[a]:ha[256+(a>>7)])&255].fc++,q[ja++]=a,U|=ma);ma<<=1;0===(T&7)&&(ia[la++]=U,U=0,ma=1);if(2l;l++)b+=ea[l].fc*(5+ta[l]);b>>=3;if(ja< +parseInt(T/2,10)&&b>=1,b<<=1;while(0<--d);return b>>1},Ea=function(a,d){var b=[];b.length=16;var g=0,l;for(l=1;15>=l;l++)g=g+I[l-1]<<1,b[l]=g;for(g=0;g<=d;g++)l=a[g].dl,0!==l&&(a[g].fc=Da(b[l]++,l))},Ca=function(a){var d=a.dyn_tree,b=a.static_tree,g=a.elems,l,c=-1,e=g;ba=0;fa=573;for(l= +0;lba;)l=Q[++ba]=2>c?++c:0,d[l].fc=1,N[l]=0,W--,null!==b&&($-=b[l].dl);a.max_code=c;for(l=ba>>1;1<=l;l--)Ba(d,l);do l=Q[1],Q[1]=Q[ba--],Ba(d,1),b=Q[1],Q[--fa]=l,Q[--fa]=b,d[e].fc=d[l].fc+d[b].fc,N[e]=N[l]>N[b]+1?N[l]:N[b]+1,d[l].dl=d[b].dl=e,Q[1]=e++,Ba(d,1);while(2<=ba);Q[--fa]=Q[1];e=a.dyn_tree;l=a.extra_bits;var g=a.extra_base,b=a.max_code,f=a.max_length,q=a.static_tree,p,h,r,k,u=0;for(h=0;15>=h;h++)I[h]=0;e[Q[fa]].dl=0;for(a=fa+1;573>a;a++)p= +Q[a],h=e[e[p].dl].dl+1,h>f&&(h=f,u++),e[p].dl=h,p>b||(I[h]++,r=0,p>=g&&(r=l[p-g]),k=e[p].fc,W+=k*(h+r),null!==q&&($+=k*(q[p].dl+r)));if(0!==u){do{for(h=f-1;0===I[h];)h--;I[h]--;I[h+1]+=2;I[f]--;u-=2}while(0b||(e[l].dl!==h&&(W+=(h-e[l].dl)*e[l].fc,e[l].fc=h),p--)}Ea(d,c)},Fa=function(a,d){var b,g=-1,l,c=a[0].dl,e=0,f=7,h=4;0===c&&(f=138,h=3);a[d+1].dl=65535;for(b=0;b<=d;b++)l=c,c=a[b+1].dl,++e=e?S[17].fc++:S[18].fc++,e=0,g=l,0===c?(f=138,h=3):l===c?(f=6,h=3):(f=7,h=4))},Ga=function(){8b?ha[b]:ha[256+(b>>7)])&255,Y(f,d),h=ta[f],0!==h&&(b-=ka[f],ga(b,h))),e>>=1;while(g=e?(Y(17,S),ga(e-3,3)):(Y(18,S),ga(e-11,7));e=0;g=l;0===c?(f=138,h=3):l===c?(f=6,h=3):(f=7,h=4)}},Ja=function(){var a;for(a=0;286>a;a++)aa[a].fc=0;for(a=0;30>a;a++)ea[a].fc=0;for(a=0;19>a;a++)S[a].fc=0;aa[256].fc=1;U=T=ja=la=W=$=0;ma=1},Aa=function(a){var b,d,l,c;c=z-x;ia[la]=U;Ca(M);Ca(H);Fa(aa,M.max_code);Fa(ea,H.max_code);Ca(F);for(l=18;3<=l&&0===S[J[l]].dl;l--);W+=3*(l+1)+14;b=W+3+7>> +3;d=$+3+7>>3;d<=b&&(b=d);if(c+4<=b&&0<=x)for(ga(0+a,3),Ga(),na(c),na(~c),l=0;lb.len&&(f=b.len);for(p=0;pt-l&&(f=t-l);for(p=0;pq;q++)for(C[q]=h,f=0;f<1<q;q++)for(ka[q]=h,f=0;f<1<>=7;30>q;q++)for(ka[q]=h<<7,f=0;f<1<=f;f++)I[f]=0;for(f=0;143>=f;)O[f++].dl=8,I[8]++;for(;255>=f;)O[f++].dl=9,I[9]++;for(;279>=f;)O[f++].dl=7,I[7]++;for(;287>=f;)O[f++].dl=8,I[8]++;Ea(O,287);for(f=0;30>f;f++)V[f].dl=5,V[f].fc=Da(f,5);Ja()}for(f=0;8192>f;f++)w[32768+f]=0;oa=ua[L].max_lazy;ra=ua[L].good_length;X=ua[L].max_chain;x=z=0;K=Z(g,0,65536);if(0>=K)E=!0,K=0;else{for(E=!1;262>K&& +!E;)wa();for(f=r=0;2>f;f++)r=(r<<5^g[f]&255)&8191}b=null;l=t=0;3>=L?(P=2,y=0):(y=2,G=0);p=!1}e=!0;if(0===K)return p=!0,0}f=Ka(a,d,c);if(f===c)return c;if(p)return f;if(3>=L)for(;0!==K&&null===b;){pa();0!==v&&32506>=z-v&&(y=qa(v),y>K&&(y=K));if(3<=y)if(q=za(z-R,y-3),K-=y,y<=oa){y--;do z++,pa();while(0!==--y);z++}else z+=y,y=0,r=g[z]&255,r=(r<<5^g[z+1]&255)&8191;else q=za(0,g[z]&255),K--,z++;q&&(Aa(0),x=z);for(;262>K&&!E;)wa()}else for(;0!==K&&null===b;){pa();P=y;D=R;y=2;0!==v&&(P=z-v)&& +(y=qa(v),y>K&&(y=K),3===y&&4096K&&!E;)wa()}0===K&&(0!==G&&za(0,g[z-1]&255),Aa(1),p=!0);return f+Ka(a,f+d,c-f)};this.deflate=function(l,c){var p,r;B=l;sa=0;"undefined"===String(typeof c)&&(c=6);(p=c)?1>p?p=1:9p;p++)aa[p]=new m;ea=[];ea.length=61;for(p=0;61>p;p++)ea[p]=new m;O=[];O.length=288;for(p=0;288>p;p++)O[p]=new m;V=[];V.length=30;for(p=0;30>p;p++)V[p]=new m;S=[];S.length=39;for(p=0;39>p;p++)S[p]=new m;M=new n;H=new n;F=new n;I=[];I.length=16;Q=[];Q.length=573;N=[];N.length=573;ca=[];ca.length=256;ha=[];ha.length=512;C=[];C.length=29;ka=[];ka.length=30;ia=[];ia.length=1024}var k=Array(1024),u=[],v=[];for(p=La(k,0,k.length);0r&&(c=r);for(X=1<(X-=f[k])){this.status=2;this.m=c;return}if(0>(X-=f[r]))this.status=2,this.m=c;else{f[r]+=X;A[1]=k=0;m=f;n=1;for(v=2;0<--r;)A[v++]=k+=m[n++];m=a;r=n=0;do 0!=(k=m[n++])&&(q[A[k]++]=r);while(++rx+s[1+q];){x+=s[1+q];q++;z=(z=h-x)>c?c:z;if((p=1<<(k=u-x))>a+1)for(p-=a+1,v=u;++ke&&x>x-s[q],t[q-1][k].e=w.e,t[q-1][k].b=w.b,t[q-1][k].n=w.n,t[q-1][k].t=w.t)}w.b=u-x;n>=b?w.e=99:m[n]m[n]?16:15,w.n=m[n++]): +0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],G=function(){this.list=this.next=null},y=function(){this.n=this.b=this.e=0;this.t=null},P=function(a,b,d,l,g,f){this.BMAX=16;this.N_MAX=288;this.status=0;this.root=null;this.m=0;var c=Array(this.BMAX+1),e,p,h,q,r,k,u,s=Array(this.BMAX+1),m,n,v,w=new y,t=Array(this.BMAX);q=Array(this.N_MAX);var x,A=Array(this.BMAX+1),X,z,D;D=this.root=null;for(r=0;rr&&(f=r);for(X=1<(X-=c[k])){this.status=2;this.m=f;return}if(0>(X-=c[r]))this.status=2,this.m=f;else{c[r]+=X;A[1]=k=0;m=c;n=1;for(v=2;0<--r;)A[v++]=k+=m[n++];m=a;r=n=0;do 0!=(k=m[n++])&&(q[A[k]++]=r);while(++rx+s[1+q];){x+=s[1+q];q++;z=(z=h-x)>f?f:z;if((p=1<<(k=u-x))>a+1)for(p-=a+1,v=u;++ke&&x>x-s[q],t[q-1][k].e=w.e,t[q-1][k].b=w.b,t[q-1][k].n=w.n,t[q-1][k].t=w.t)}w.b=u-x;n>=b?w.e=99:m[n]m[n]?16:15,w.n=m[n++]): (w.e=g[m[n]-d],w.n=l[m[n++]-d]);p=1<>x;k>=1)r^=k;for(r^=k;(r&(1<>=a;b-=a},K=function(a,b,c){var e,h,r;if(0==c)return 0;for(r=0;;){z(g);h=l.list[R(g)];for(e=h.e;16 e;e++)m[D[e]]=0;g=7;e=new P(m,19,19,null,null,g);if(0!=e.status)return-1;l=e.root;g=e.m;h=u+s;for(c=f=0;ce)m[c++]=f=e;else if(16==e){z(2);e=3+R(2);E(2);if(c+e>h)return-1;for(;0h)return-1;for(;0q?n("File '"+m+"' cannot be read.",u):runtime.read(m,q-22,22,function(a,d){a||null===n||null===d?n(a,u):b(d,n)})})}; +function(a,b){f(a,function(a,d){if(a||null===d)return b(a,null);var g=runtime.byteArrayToString(d,"utf8");b(null,g)})};this.loadAsDOM=function(a,b){u.loadAsString(a,function(a,d){if(a||null===d)b(a,null);else{var g=(new DOMParser).parseFromString(d,"text/xml");b(null,g)}})};this.loadAsDataURL=function(a,b,d){f(a,function(a,g){if(a)return d(a,null);var c=0,l;b||(b=80===g[1]&&78===g[2]&&71===g[3]?"image/png":255===g[0]&&216===g[1]&&255===g[2]?"image/jpeg":71===g[0]&&73===g[1]&&70===g[2]?"image/gif": +"");for(l="data:"+b+";base64,";cq?n("File '"+m+"' cannot be read.",u):runtime.read(m,q-22,22,function(a,d){a||null===n||null===d?n(a,u):b(d,n)})})}; // Input 18 core.CSSUnits=function(){var m={"in":1,cm:2.54,mm:25.4,pt:72,pc:12};this.convert=function(n,k,c){return n*m[c]/m[k]};this.convertMeasure=function(m,k){var c,a;m&&k?(c=parseFloat(m),a=m.replace(c.toString(),""),c=this.convert(c,a,k)):c="";return c.toString()};this.getUnits=function(m){return m.substr(m.length-2,m.length)}}; // Input 19 @@ -271,7 +271,7 @@ e:h}).e}]);2=c.length)return b;0===g&&(g=0);for(var l=c.item(g);l.namespaceURI===d;){g+=1;if(g>=c.length)return b;l=c.item(g)}return l=f(a,b.attDeriv(a,c.item(g)),c,g+1)}function e(a,b,d){d.e[0].a?(a.push(d.e[0].text),b.push(d.e[0].a.ns)):e(a,b,d.e[0]);d.e[1].a?(a.push(d.e[1].text),b.push(d.e[1].a.ns)): e(a,b,d.e[1])}var d="http://www.w3.org/2000/xmlns/",t,l,p,g,q,s,w,u,A,x,r={type:"notAllowed",nullable:!1,hash:"notAllowed",textDeriv:function(){return r},startTagOpenDeriv:function(){return r},attDeriv:function(){return r},startTagCloseDeriv:function(){return r},endTagDeriv:function(){return r}},v={type:"empty",nullable:!0,hash:"empty",textDeriv:function(){return r},startTagOpenDeriv:function(){return r},attDeriv:function(){return r},startTagCloseDeriv:function(){return v},endTagDeriv:function(){return r}}, @@ -424,7 +424,7 @@ k.xlinkns="http://www.w3.org/1999/xlink";k.xmlns="http://www.w3.org/XML/1998/nam // Input 28 runtime.loadClass("xmldom.XPath"); odf.StyleInfo=function(){function m(a,b){for(var c=p[a.localName],d=c&&c[a.namespaceURI],g=d?d.length:0,e,c=0;c=b.value||"%"===b.unit)?null:b;return b||q(a)};this.parseFoLineHeight=function(a){var b;b=(b=g(a))&&(0>b.value|| "%"===b.unit)?null:b;return b||q(a)};this.getImpactedParagraphs=function(a){var b=a.commonAncestorContainer,c=[];for(b.nodeType===Node.ELEMENT_NODE&&(c=x.getElementsByTagNameNS(b,w,"p").concat(x.getElementsByTagNameNS(b,w,"h")));b&&!m(b);)b=b.parentNode;b&&c.push(b);return c.filter(function(b){return x.rangeIntersectsNode(a,b)})};this.getTextNodes=function(a,b){var c=a.startContainer.ownerDocument.createRange(),d;d=x.getNodesInRange(a,function(d){c.selectNodeContents(d);if(d.nodeType===Node.TEXT_NODE){if(b&& -x.rangesIntersect(a,c)||x.containsRange(a,c))return Boolean(n(d)&&(!k(d.textContent)||p(d,0)))?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_REJECT}else if(x.rangesIntersect(a,c)&&s(d))return NodeFilter.FILTER_SKIP;return NodeFilter.FILTER_REJECT});c.detach();return d};this.getTextElements=function(b,d){var g=b.startContainer.ownerDocument.createRange(),e;e=x.getNodesInRange(b,function(e){var h=e.nodeType;g.selectNodeContents(e);if(h===Node.TEXT_NODE){if(x.containsRange(b,g)&&(d||Boolean(n(e)&&(!k(e.textContent)|| +x.rangesIntersect(a,c)||x.containsRange(a,c))return Boolean(n(d)&&(!k(d.textContent)||p(d,0)))?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_REJECT}else if(x.rangesIntersect(a,c)&&s(d))return NodeFilter.FILTER_SKIP;return NodeFilter.FILTER_REJECT});c.detach();return d};this.getTextElements=function(b,d){var g=b.startContainer.ownerDocument.createRange(),e;e=x.getNodesInRange(b,function(e){var f=e.nodeType;g.selectNodeContents(e);if(f===Node.TEXT_NODE){if(x.containsRange(b,g)&&(d||Boolean(n(e)&&(!k(e.textContent)|| p(e,0)))))return NodeFilter.FILTER_ACCEPT}else if(a(e)){if(x.containsRange(b,g))return NodeFilter.FILTER_ACCEPT}else if(s(e)||c(e))return NodeFilter.FILTER_SKIP;return NodeFilter.FILTER_REJECT});g.detach();return e};this.getParagraphElements=function(a){var b=a.startContainer.ownerDocument.createRange(),d;d=x.getNodesInRange(a,function(d){b.selectNodeContents(d);if(m(d)){if(x.rangesIntersect(a,b))return NodeFilter.FILTER_ACCEPT}else if(s(d)||c(d))return NodeFilter.FILTER_SKIP;return NodeFilter.FILTER_REJECT}); b.detach();return d}}; // Input 30 @@ -1411,8 +1411,8 @@ memberid:k,timestamp:c,styleName:a,setProperties:h}}}; @source: http://www.webodf.org/ @source: http://gitorious.org/webodf/webodf/ */ -ops.OpRemoveParagraphStyle=function(){function m(c){var b=[];c&&["style:parent-style-name","style:next-style-name"].forEach(function(f){c[f]===a&&b.push(f)});return b}var n=this,k,c,a;this.init=function(h){k=h.memberid;c=h.timestamp;a=h.styleName};this.transform=function(c,b){var f=c.spec(),e,d;e=[n];switch(f.optype){case "RemoveParagraphStyle":f.styleName===a&&(e=[]);break;case "AddParagraphStyle":case "UpdateParagraphStyle":d=m(f.setProperties);0