icon-themes/breeze/cmd/lc_commentchangetracking.png |binary icon-themes/breeze/cmd/lc_freezepanes.png |binary icon-themes/breeze/cmd/lc_insertmultiindex.png |binary icon-themes/breeze/cmd/sc_commentchangetracking.png |binary icon-themes/breeze/cmd/sc_freezepanes.png |binary icon-themes/breeze/cmd/sc_insertmultiindex.png |binary icon-themes/breeze/sd/res/graphic.png |binary icon-themes/galaxy/cmd/lc_insertmultiindex.png |binary icon-themes/galaxy/cmd/sc_insertmultiindex.png |binary include/tools/urlobj.hxx | 1 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 + tools/source/fsys/urlobj.cxx | 26 ---------- 12 files changed, 3 insertions(+), 27 deletions(-)
New commits: commit 123c7c1464d434db1070179aef2fa42aaeb41e41 Author: andreas_k <[email protected]> Date: Tue Apr 7 01:16:16 2015 +0200 Breeze: update for index and changes Change-Id: Ic2b956e168b5dfeff13d3a1130ec9a0289712683 Reviewed-on: https://gerrit.libreoffice.org/15178 Tested-by: Jenkins <[email protected]> Reviewed-by: Yousuf Philips <[email protected]> diff --git a/icon-themes/breeze/cmd/lc_commentchangetracking.png b/icon-themes/breeze/cmd/lc_commentchangetracking.png index b02102b..ce5e3a6 100644 Binary files a/icon-themes/breeze/cmd/lc_commentchangetracking.png and b/icon-themes/breeze/cmd/lc_commentchangetracking.png differ diff --git a/icon-themes/breeze/cmd/lc_freezepanes.png b/icon-themes/breeze/cmd/lc_freezepanes.png new file mode 100644 index 0000000..061f618 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_freezepanes.png differ diff --git a/icon-themes/breeze/cmd/lc_insertmultiindex.png b/icon-themes/breeze/cmd/lc_insertmultiindex.png index b2372f2..886f610 100644 Binary files a/icon-themes/breeze/cmd/lc_insertmultiindex.png and b/icon-themes/breeze/cmd/lc_insertmultiindex.png differ diff --git a/icon-themes/breeze/cmd/sc_commentchangetracking.png b/icon-themes/breeze/cmd/sc_commentchangetracking.png index d6e1c96..289a6c7 100644 Binary files a/icon-themes/breeze/cmd/sc_commentchangetracking.png and b/icon-themes/breeze/cmd/sc_commentchangetracking.png differ diff --git a/icon-themes/breeze/cmd/sc_freezepanes.png b/icon-themes/breeze/cmd/sc_freezepanes.png new file mode 100644 index 0000000..ae5cbd9 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_freezepanes.png differ diff --git a/icon-themes/breeze/cmd/sc_insertmultiindex.png b/icon-themes/breeze/cmd/sc_insertmultiindex.png index e19b28c..f0895e9 100644 Binary files a/icon-themes/breeze/cmd/sc_insertmultiindex.png and b/icon-themes/breeze/cmd/sc_insertmultiindex.png differ diff --git a/icon-themes/breeze/sd/res/graphic.png b/icon-themes/breeze/sd/res/graphic.png index ee2944b..e0fca82 100644 Binary files a/icon-themes/breeze/sd/res/graphic.png and b/icon-themes/breeze/sd/res/graphic.png differ commit ea0d69837a713893087f07a19c91e43fbfd8312e Author: Yousuf Philips <[email protected]> Date: Wed Apr 8 01:28:30 2015 +0400 BREEZE: Enable 'Indexes and Tables' entry in Writer Change-Id: I398da79925bd51fa543d2c56b529178f7e820539 Reviewed-on: https://gerrit.libreoffice.org/15193 Tested-by: Yousuf Philips <[email protected]> Reviewed-by: Yousuf Philips <[email protected]> diff --git a/icon-themes/galaxy/cmd/lc_insertmultiindex.png b/icon-themes/galaxy/cmd/lc_insertmultiindex.png new file mode 100644 index 0000000..b2372f2 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_insertmultiindex.png differ diff --git a/icon-themes/galaxy/cmd/sc_insertmultiindex.png b/icon-themes/galaxy/cmd/sc_insertmultiindex.png new file mode 100644 index 0000000..e19b28c Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_insertmultiindex.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index eef5cf1..630e411 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -111,6 +111,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Indexes and Tables...</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> </node> <node oor:name=".uno:InsertAuthoritiesEntry" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> commit 9eed05b7d6c6389dea07ab1437674dee8974fa0e Author: Stephan Bergmann <[email protected]> Date: Tue Apr 7 23:32:44 2015 +0200 Remove dead INetProtocol::Out Change-Id: I8333e8b58e85d7ba148adce32f87ea105776b4c9 diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index ddab9f2..6a3c3a1 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -79,7 +79,6 @@ enum class INetProtocol Javascript, Data, Cid, - Out, VndSunStarHier, Uno, Component, diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index f00b12b..330d90d 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -159,11 +159,6 @@ using namespace css; ; private - out-url = "OUT:///~" name ["/" *uric] - name = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / ":" / ";" / "=" / "?" / "@" / "_" / "~" - - - ; private vnd-sun-star-hier-url = "VND.SUN.STAR.HIER:" ["//"reg_name] *("/" *pchar) reg_name = 1*(escaped / alphanum / "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / ":" / ";" / "=" / "@" / "_" / "~") @@ -364,9 +359,6 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme) "cid", "cid:", 0, false, false, false, false, false, false, false, false}, SchemeInfo{ - "out", "out://", 0, true, false, false, false, false, false, false, - false}, - SchemeInfo{ "vnd.sun.star.hier", "vnd.sun.star.hier:", 0, true, false, false, false, false, false, true, false}, SchemeInfo{ @@ -2109,8 +2101,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& { "macro:", "staroffice.macro:", INetProtocol::Macro, PrefixInfo::INTERNAL }, { "mailto:";, 0, INetProtocol::Mailto, PrefixInfo::OFFICIAL }, - { "out:", "staroffice.out:", INetProtocol::Out, - PrefixInfo::INTERNAL }, { "private:", "staroffice.private:", INetProtocol::PrivSoffice, PrefixInfo::INTERNAL }, { "private:factory/", "staroffice.factory:", @@ -2140,8 +2130,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& PrefixInfo::EXTERNAL }, { "staroffice.macro:", "macro:", INetProtocol::Macro, PrefixInfo::EXTERNAL }, - { "staroffice.out:", "out:", INetProtocol::Out, - PrefixInfo::EXTERNAL }, { "staroffice.private:", "private:", INetProtocol::PrivSoffice, PrefixInfo::EXTERNAL }, { "staroffice.searchfolder:", "private:searchfolder:", @@ -3050,20 +3038,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme, } break; - case INetProtocol::Out: - if (pEnd - pPos < 2 || *pPos++ != '/' || *pPos++ != '~') - return false; - aTheSynPath.append("/~"); - while (pPos < pEnd && *pPos != nFragmentDelimiter) - { - EscapeType eEscapeType; - sal_uInt32 nUTF32 = getUTF32(pPos, pEnd, bOctets, eMechanism, - eCharset, eEscapeType); - appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets, - PART_URIC, eCharset, true); - } - break; - case INetProtocol::VndSunStarHier: case INetProtocol::VndSunStarPkg: if (pPos < pEnd && *pPos != '/' _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
