rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolves: rhbz#1065807 search XDG defined Templates dir

Browse Source
f41
Caolán McNamara 11 years ago
parent 8dd1ed86ec
commit ab15888313
2 changed files with 202 additions and 1 deletions
Show Stats Download Patch File Download Diff File

195
0001-Related-rhbz-1065807-rework-i66157-for-multiple-writ.patch
Unescape View File

@ -0,0 +1,195 @@
From bbf82f684060980d267733ee589d263d6b25340c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 24 Feb 2014 15:27:36 +0000
Subject: [PATCH] Related: rhbz#1065807 rework #i66157# for multiple writable
template dirs
if there are multiple user-level template dirs then we should be able to
remove/rename content in all of them, not just the default writable target.
The target scenario here is to default to ~/Templates when it exists as the
template dir, but to retain ~/.config/libreoffice/user/template in the dir for
any pre-existing templates and to treat both as equivalent in terms of removing
their content etc.
i#66157# wanted to avoid remove extensions templates and other internal
ones, so rework that logic to instead just be hands off internal templates
and allow modification of the remainder
Change-Id: I56afe991d4297ba692e914ae95ea02d68553f60a
---
sfx2/source/doc/doctemplates.cxx | 80 +++++++++++++++++++++++++++++++++-------
1 file changed, 66 insertions(+), 14 deletions(-)
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 574232a..47b8fed 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -67,6 +67,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/util/thePathSettings.hpp>
#include <rtl/ref.hxx>
#include <svtools/templatefoldercache.hxx>
@@ -187,6 +188,7 @@ class SfxDocTplService_Impl
::osl::Mutex maMutex;
Sequence< OUString > maTemplateDirs;
+ Sequence< OUString > maInternalTemplateDirs;
OUString maRootURL;
NameList_Impl maNames;
Locale maLocale;
@@ -271,8 +273,16 @@ class SfxDocTplService_Impl
void updateData( DocTemplates_EntryData_Impl *pData );
+ //See: #i66157# and rhbz#1065807
+ //return which template dir the rURL is a subpath of
+ OUString findParentTemplateDir(const OUString& rURL) const;
+
+ //See: #i66157# and rhbz#1065807
+ //return true if rURL is a path (or subpath of) a dir which is not a user path
+ //which implies neither it or its contents can be removed
+ bool isInternalTemplateDir(const OUString& rURL) const;
public:
- SfxDocTplService_Impl( const uno::Reference< XComponentContext > & xContext );
+ SfxDocTplService_Impl( const uno::Reference< XComponentContext > & xContext );
~SfxDocTplService_Impl();
sal_Bool init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; }
@@ -552,7 +562,7 @@ void SfxDocTplService_Impl::getDirList()
// TODO/LATER: let use service, register listener
INetURLObject aURL;
OUString aDirs = SvtPathOptions().GetTemplatePath();
- sal_uInt16 nCount = comphelper::string::getTokenCount(aDirs, C_DELIM);
+ sal_Int32 nCount = comphelper::string::getTokenCount(aDirs, C_DELIM);
maTemplateDirs = Sequence< OUString >( nCount );
@@ -560,7 +570,7 @@ void SfxDocTplService_Impl::getDirList()
const OUString aPrefix(
"vnd.sun.star.expand:" );
- for ( sal_uInt16 i=0; i<nCount; i++ )
+ for (sal_Int32 i = 0; i < nCount; ++i)
{
aURL.SetSmartProtocol( INET_PROT_FILE );
aURL.SetURL( aDirs.getToken( i, C_DELIM ) );
@@ -578,6 +588,23 @@ void SfxDocTplService_Impl::getDirList()
aValue <<= maTemplateDirs;
+ css::uno::Reference< css::util::XPathSettings > xPathSettings =
+ css::util::thePathSettings::get(mxContext);
+
+ // load internal paths
+ OUString sProp( "Template_internal" );
+ Any aAny = xPathSettings->getPropertyValue( sProp );
+ aAny >>= maInternalTemplateDirs;
+
+ nCount = maInternalTemplateDirs.getLength();
+ for (sal_Int32 i = 0; i < nCount; ++i)
+ {
+ //expand vnd.sun.star.expand: and remove "..." from them
+ //to normalize into the expected url patterns
+ maRelocator.makeRelocatableURL(maInternalTemplateDirs[i]);
+ maRelocator.makeAbsoluteURL(maInternalTemplateDirs[i]);
+ }
+
// Store the template dir list
setProperty( maRootContent, aPropName, aValue );
}
@@ -1538,13 +1565,16 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
if ( !maTemplateDirs.getLength() )
return sal_False;
- OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ];
// check that the fs location is in writeble folder and this is not a "My templates" folder
INetURLObject aGroupParentFolder( aGroupTargetURL );
- if ( !aGroupParentFolder.removeSegment()
- || !::utl::UCBContentHelper::IsSubPath( aGeneralTempPath,
- aGroupParentFolder.GetMainURL( INetURLObject::NO_DECODE ) ) )
+ if (!aGroupParentFolder.removeSegment())
+ return sal_False;
+
+ OUString aGeneralTempPath = findParentTemplateDir(
+ aGroupParentFolder.GetMainURL(INetURLObject::NO_DECODE));
+
+ if (aGeneralTempPath.isEmpty())
return sal_False;
// now get the content of the Group
@@ -1652,14 +1682,14 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
if ( !maTemplateDirs.getLength() )
return sal_False;
- OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ];
// check that the fs location is in writeble folder and this is not a "My templates" folder
INetURLObject aGroupParentFolder( aGroupTargetURL );
- if ( !aGroupParentFolder.removeSegment()
- || !::utl::UCBContentHelper::IsSubPath( aGeneralTempPath,
- aGroupParentFolder.GetMainURL( INetURLObject::NO_DECODE ) ) )
+ if (!aGroupParentFolder.removeSegment() ||
+ isInternalTemplateDir(aGroupParentFolder.GetMainURL(INetURLObject::NO_DECODE)))
+ {
return sal_False;
+ }
// check that the group can be renamed ( all the contents must be in target location )
sal_Bool bCanBeRenamed = sal_False;
@@ -1761,7 +1791,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
aValue >>= aTemplateToRemoveTargetURL;
if ( aGroupTargetURL.isEmpty() || !maTemplateDirs.getLength()
- || (!aTemplateToRemoveTargetURL.isEmpty() && !::utl::UCBContentHelper::IsSubPath( maTemplateDirs[ maTemplateDirs.getLength() - 1 ], aTemplateToRemoveTargetURL )) )
+ || (!aTemplateToRemoveTargetURL.isEmpty() && isInternalTemplateDir(aTemplateToRemoveTargetURL)) )
return sal_False; // it is not allowed to remove the template
}
@@ -2050,6 +2080,29 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
return sal_False;
}
+bool SfxDocTplService_Impl::isInternalTemplateDir(const OUString& rURL) const
+{
+ const sal_Int32 nDirs = maInternalTemplateDirs.getLength();
+ const OUString* pDirs = maInternalTemplateDirs.getConstArray();
+ for (sal_Int32 i = 0; i < nDirs; ++i, ++pDirs)
+ {
+ if (::utl::UCBContentHelper::IsSubPath(*pDirs, rURL))
+ return true;
+ }
+ return false;
+}
+
+OUString SfxDocTplService_Impl::findParentTemplateDir(const OUString& rURL) const
+{
+ const sal_Int32 nDirs = maTemplateDirs.getLength();
+ const OUString* pDirs = maTemplateDirs.getConstArray();
+ for (sal_Int32 i = 0; i < nDirs; ++i, ++pDirs)
+ {
+ if (::utl::UCBContentHelper::IsSubPath(*pDirs, rURL))
+ return *pDirs;
+ }
+ return OUString();
+}
sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
const OUString& rTemplateName )
@@ -2091,8 +2144,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
// delete the target template
if ( !aTargetURL.isEmpty() )
{
- if ( !maTemplateDirs.getLength()
- || !::utl::UCBContentHelper::IsSubPath( maTemplateDirs[ maTemplateDirs.getLength() - 1 ], aTargetURL ) )
+ if (isInternalTemplateDir(aTargetURL))
return sal_False;
removeContent( aTargetURL );
--
1.8.5.3

8
libreoffice.spec
Unescape View File

@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.1 Version: %{libo_version}.1
Release: 1%{?libo_prerelease}%{?dist} Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.libreoffice.org/default/ URL: http://www.libreoffice.org/default/
@ -276,6 +276,9 @@ Patch13: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
Patch14: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch Patch14: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch
Patch15: 0001-disable-firebird-unit-test.patch Patch15: 0001-disable-firebird-unit-test.patch
Patch16: 0001-never-run-autogen.sh.patch Patch16: 0001-never-run-autogen.sh.patch
Patch17: 0001-Related-rhbz-1065807-rework-i66157-for-multiple-writ.patch
Patch18: 0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
Patch19: 0001-explictly-list-common-lang-independant-template-dir.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice
@ -2171,6 +2174,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Tue Feb 25 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.1.1-2
- Resolves: rhbz#1065807 search XDG defined "Templates" dir
* Thu Feb 13 2014 David Tardon <dtardon@redhat.com> - 1:4.2.1.1-1 * Thu Feb 13 2014 David Tardon <dtardon@redhat.com> - 1:4.2.1.1-1
- update to 4.2.1 rc1 - update to 4.2.1 rc1

Write Preview
Loading…
Cancel
Save