summaryrefslogtreecommitdiff
path: root/sfx2
AgeCommit message (Collapse)AuthorFilesLines
2013-10-11resolved fdo#69948 honor a detected FilterNameEike Rathke1-6/+25
TypeDetection::queryTypeByDescriptor() adds the FilterName property to the MediaDescriptor, use that if present. Strangely enough the sequence returned by XNameAccess::getByName(sType) of the type detection contains an empty PreferredFilter value so that is useless in this scenario. (cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd) Conflicts: sfx2/source/appl/fileobj.cxx Backported. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a Reviewed-on: https://gerrit.libreoffice.org/6208 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2013-07-31fix for fdo#60883 ( macros disabled for documents opened from templates )Noel Power1-1/+4
Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280 (cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d) Reviewed-on: https://gerrit.libreoffice.org/5220 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-08fdo#65055: sfx: fix automatic version on closeMichael Stahl2-3/+6
The parameter "FailOnWarning" is passed around better now, so it arrives in SfxBaseModel::storeSelf() which considers it illegal. (regression from e2799d253b1dc62967693aa5bccd7360a9520967) Change-Id: I2a51a2ecc24e6de506e1840bd28cbe157a8ad6a5 (cherry picked from commit 969bc572441ef8fd43cd7d350a533ffd715b74d3) Reviewed-on: https://gerrit.libreoffice.org/4774 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-03fdo#61429: Stylist: try a little harder to restore "hierarchical"Michael Stahl2-19/+26
Change-Id: I30972224c5a9aa12c4ef4c2b5ca80e7aece0baad (cherry picked from commit 8f04b172c5c78fa80c3692a729f0191425195869) Reviewed-on: https://gerrit.libreoffice.org/4687 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-02Resolves: fdo#66263 calc's protect records doesn't do anything, sid collisionCaolán McNamara1-0/+1
(cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c) Conflicts: include/sfx2/sfxsids.hrc Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef Reviewed-on: https://gerrit.libreoffice.org/4652 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23Resolves: fdo#65501 ensure configured backup dir exists before using itCaolán McNamara1-3/+26
the ucb stuff is the most god awful painful api ever Change-Id: I491d2cb9b7d5d37723b32f0a26a22a09c16bc02e (cherry picked from commit ecdd9d1a47587aa7557c1b151010c78efa90fef2) Reviewed-on: https://gerrit.libreoffice.org/4434 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-30warning C4702: unreachable codeStephan Bergmann1-1/+0
Change-Id: Ica48a91c0b8b55c984e59dbe9771d604bc77cdaf (cherry picked from commit 5a274ac7e0f12829cc0264df7a1f9cc4df776e77) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-05-30MSC fixesStephan Bergmann2-2/+2
Change-Id: I5ea1e75a637e8f4fc51ff31321213267669f8bc9 (cherry picked from commit f5442623090dd535a1a561f1ecfdb09f2dff129b) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-05-24rhbz#961460: Don't needlessly pass URLs through INetURLObjectStephan Bergmann1-8/+7
The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 3986) part, and INetURLObject does not support that (in accordance with RFCs 2818 and 2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a URL, leading to failure when trying to save a document to such a URL. (Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 "CMIS ucp: write documents back to CMIS server.") Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93 (cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348) Reviewed-on: https://gerrit.libreoffice.org/4019 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-05-08fdo#64211 replace "%2F" to "/" in online (wiki) help URLsAndras Timar1-0/+1
It is not possible to create wiki pages with URLs that have %2F in them. Help URLs contain %2F, when invoked from dialogs that are based on .ui files, it seems this is the new HID syntax. For example for Zoom dialog LibreOffice used to call http://help.libreoffice.org/simpress/cui%2Fui%2Fzoomdialog%2Fzoomsb and it did not work. Now it calls http://help.libreoffice.org/simpress/cui/ui/zoomdialog/zoomsb and it works. Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sfx2/source/appl/sfxhelp.cxx Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07
2013-04-22fdo#63659 <sigh> fix brain lapse, missing breakNoel Power1-0/+1
Change-Id: I02ab972cfad577423585d25587b925b5b1153506 (cherry picked from commit ad57664323e3ddf04ae99dba14ddaa22da2aacba) Reviewed-on: https://gerrit.libreoffice.org/3551 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-19fix fdo#63659 restore handling of ZOOM MID, MID_VALUESET & MID_TYPE sub parmasNoel Power1-40/+84
Change-Id: I01eff3bb8b194e1437a263e527cb8e6d2defa4de Reviewed-on: https://gerrit.libreoffice.org/3458 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-15Remove thumbnail from local view if we erase it throught the search view.Rafael Dominguez1-1/+5
Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0 Reviewed-on: https://gerrit.libreoffice.org/3354 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-15Set Template Manager dialog minimum size.Rafael Dominguez1-0/+2
Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba Reviewed-on: https://gerrit.libreoffice.org/3353 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-13Initialize nFilterJulien Nabet1-1/+1
Change-Id: I9a8606a0d6ca36fd6f51267ea385f7fbe874d6d5 (cherry picked from commit 9f27436b84a1ae0ce2689ef27f81698ab9f3642e) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-04-10fdo#61389 - Display Properties, Set as default actions in save mode.Rafael Dominguez2-12/+44
It dosent make sense to display delete action since we are saving a template same for edit. Change-Id: I83368f80a29f60c8d24b47fe3682ca93a2373a98 Reviewed-on: https://gerrit.libreoffice.org/3301 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-10Display correct region name in error messages.Rafael Dominguez3-3/+16
Change-Id: Icf4149272f67df6681bdad711362dd7d3802d04a Reviewed-on: https://gerrit.libreoffice.org/3300 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-10Fetch thumbnails position and id from filter array instead."Rafael Dominguez2-15/+28
Change-Id: I35bd8b47eeba3e2f8e2ea74afbf1fe8e48390bab Reviewed-on: https://gerrit.libreoffice.org/3299 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-10Update template item path when moving it to another folder.Rafael Dominguez1-2/+2
Change-Id: I4de701e32dfe1244ba29704633d7d15f829a9e7a Reviewed-on: https://gerrit.libreoffice.org/3298 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-10Mark thumbnailview item as unselected when updating filter.Rafael Dominguez1-0/+1
Change-Id: Ifc98603045364419a6f76316fea96c2e668c333e Reviewed-on: https://gerrit.libreoffice.org/3297 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fdo#61390 - Thumbnail navigation by shift-click and shift-keyboard.Rafael Dominguez2-10/+189
Change-Id: I0b107d0918e1914709de31fd52cd11480e7fd419 Reviewed-on: https://gerrit.libreoffice.org/3260 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Avoid generating filter list several times.Rafael Dominguez5-50/+63
- Only generate the list after applying a new filter function. - Append item directly to the filtered list if its allowed when appending a new item to the thumbnailview. Change-Id: I408785507ef94908d31e4373b407e9d443f72895 Reviewed-on: https://gerrit.libreoffice.org/3259 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Dont show import action while in save mode.Rafael Dominguez1-1/+2
Change-Id: Iafe814382ed1b52c9119893851c98bd15812fa60 Reviewed-on: https://gerrit.libreoffice.org/3258 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fdo#60844 Remember last open folder and filter in Template Manager.Rafael Dominguez4-3/+104
Change-Id: I4513428e10aad9b8b5c0d739bd763fb2a1f0bf81 Reviewed-on: https://gerrit.libreoffice.org/3257 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Position view below toolbox and search bar when resizing Template dialog.Rafael Dominguez1-16/+10
Change-Id: I94806487f4cebde965652997a595c7263d710338 Reviewed-on: https://gerrit.libreoffice.org/3256 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Dont reload template information after saving.Rafael Dominguez5-8/+74
Change-Id: Ib75bd4561581254f690e6dd4a2b83343c99d65af Reviewed-on: https://gerrit.libreoffice.org/3255 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Display empty folders in Template Manager.Rafael Dominguez1-2/+0
Change-Id: I1cab8c78dc6dc3f1969cd2e4e8bcda0b684a4caa Reviewed-on: https://gerrit.libreoffice.org/3254 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Make template thumbnail sizes appropiate to the content in them.Rafael Dominguez2-2/+5
Change-Id: I785a351a5a936a42b56081a868c01d97e0a6105f Reviewed-on: https://gerrit.libreoffice.org/3253 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Calculate template thumbnail subtitle position to fit drawing area.Rafael Dominguez1-3/+0
Change-Id: Ieaf067f5182c9dc690d028cdc6ba5bc28ac8436f Reviewed-on: https://gerrit.libreoffice.org/3252 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Deselect items when searching for templates to reset toolbars.Rafael Dominguez1-0/+1
Change-Id: I762762f5684287d06a046aca6d7160bce10e3653 Reviewed-on: https://gerrit.libreoffice.org/3251 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Deselect templates when closing the search view.Rafael Dominguez1-0/+1
Change-Id: If187b154a023a9364b6775270ce4c24377a98524 Reviewed-on: https://gerrit.libreoffice.org/3250 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Show search and extra buttons when a template is selected.Rafael Dominguez1-3/+1
Change-Id: Ia3e97f3f540ab07725ae3871251aefe4ba3d5e2d Reviewed-on: https://gerrit.libreoffice.org/3249 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fdo#60581 Import templates into current directory.Rafael Dominguez5-6/+99
Change-Id: I3dfec069c606e61fc49b44e36602804054ca1bca Reviewed-on: https://gerrit.libreoffice.org/3248 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fdo#60581 Display import templates only when its allowed.Rafael Dominguez6-0/+19
Change-Id: Iefe4fdd1484389d0bbbccecdca49e4c0061ec81e Reviewed-on: https://gerrit.libreoffice.org/3247 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Display create template folder only when its allowed.Rafael Dominguez5-0/+17
Change-Id: I892cfd88907ac4588e882e3a89c4feb200ce6744 Reviewed-on: https://gerrit.libreoffice.org/3246 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Update search results when changing template type in Template Manager.Rafael Dominguez1-0/+4
Change-Id: I52f79b5963e331332f02974dc739d631b9c359eb Reviewed-on: https://gerrit.libreoffice.org/3245 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Filter search results by type and keyword in Template Manager.Rafael Dominguez1-4/+44
Change-Id: I612b0b87340a50f0e5ec69ec4e8b2beba13cab36 Reviewed-on: https://gerrit.libreoffice.org/3244 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Get the correct region id view when saving a template.Rafael Dominguez1-1/+1
Change-Id: If3a75fa2d64dd1c912bfa9a7f3ea96e5fd80e594 Reviewed-on: https://gerrit.libreoffice.org/3243 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Fix moving selected search results in Template Manager.Rafael Dominguez1-1/+1
Change-Id: I577f7cc9f56f5309cd6ebccdc73b4072a4ee91a3 Reviewed-on: https://gerrit.libreoffice.org/3242 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Fix exporting selected search results in Template Manager.Rafael Dominguez1-1/+1
Change-Id: I60e517807fec797a99d2f182e41731d515d30dcc Reviewed-on: https://gerrit.libreoffice.org/3241 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Delete the correct template from the selected search results.Rafael Dominguez6-64/+62
Change-Id: I4a594e3c35d4c68da51421c92247b6687d163fe5 Reviewed-on: https://gerrit.libreoffice.org/3240 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Fix deleting templates through Template Manager.Rafael Dominguez1-14/+3
Change-Id: I79c16eb264d957b510a8bf8ee2009e1f55190a0b Reviewed-on: https://gerrit.libreoffice.org/3239 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Separate template region ids from thumbnail ids.Rafael Dominguez7-55/+90
- Update all actions to use the new system. Change-Id: I8aa09a3317eff4cb083c8fc151ea2f93a5a971fe Reviewed-on: https://gerrit.libreoffice.org/3238 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-02coverity#441020 Dereference after null checkJulien Nabet1-1/+1
Change-Id: I39c301a98854d19e849a9e06ffac0657408456fe (cherry picked from commit cab7f6476f7d0f17bf2f1400bf93fb1b7fbd1625)
2013-03-28quickfixStephan Bergmann1-11/+11
Change-Id: Ida36d96982d869553452c8240da7dec363cee4b4 Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2013-03-28Syncronize thumbnails ids with SfxDocumentTemplates when moving.Rafael Dominguez3-46/+61
Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912 (cherry picked from commit dda5fe60ff6dfd61f5f262c61e1d538d20e9c978) Reviewed-on: https://gerrit.libreoffice.org/3091 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-28Fix template manager item selection behaviour with mouse.Rafael Dominguez1-9/+14
Change-Id: Icf63454973b4044443eea1cc583fce3a78c5594d (cherry picked from commit 28d5ced7f9982257d263ffc3e550bd479a9542f8) Reviewed-on: https://gerrit.libreoffice.org/3090 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-28Deselect thumbnailview items when clearing the view.Rafael Dominguez1-0/+10
Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34 (cherry picked from commit 1c9f13f921cb5bf955b8568ffb5d14047738eef9) Reviewed-on: https://gerrit.libreoffice.org/3089 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-28Merge TemplateView into TemplateAbstractView class.Rafael Dominguez15-594/+489
Refactor TemplateView class into TemplateAbstractView so we only have one class that display template thumbnails and not a separate for folders and another for files. This will let us in the future be able to display file system hierarchies in case of the remote repositories and simplify the view handing logic. (cherry picked from commit 448cc5e851acf5136bba01974e570fa0554d0371) Conflicts: sfx2/Library_sfx.mk sfx2/inc/sfx2/templateabstractview.hxx sfx2/inc/sfx2/templateview.hxx sfx2/inc/templatedlg.hxx sfx2/source/control/templateabstractview.cxx Change-Id: Iafc246eeff4c50c12ac9ebec9fe95dcc84991e9e Reviewed-on: https://gerrit.libreoffice.org/3088 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-28Templates Manager: merged the Double Click Handling into TemplateAbstractViewCédric Bosdonnat9-68/+39
(cherry picked from commit 8a2bfe697bf71c8a2ca3c6ba1ef5e6324d4163aa) Conflicts: sfx2/inc/sfx2/templateview.hxx sfx2/source/control/templateabstractview.cxx sfx2/source/control/templatelocalview.cxx sfx2/source/control/templateview.cxx Change-Id: Iafc1650d57d29fbc24921498f18da6c0e510b37a Reviewed-on: https://gerrit.libreoffice.org/3087 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>