[ooo-build-commit] Branch 'ooo-build-3-1' - 2 commits - patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Mon Aug 17 07:52:22 PDT 2009
patches/dev300/apply | 41 +++------
patches/dev300/normalize-template-paths-fix.diff | 100 +++++++++++++++++++++++
2 files changed, 115 insertions(+), 26 deletions(-)
New commits:
commit 8cda34462d59a7454dac6c3592a90d5b7e3b1eea
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Aug 17 16:50:47 2009 +0200
Expand path placeholders early; correctly normalize paths
* patches/dev300/apply: added the patch
* patches/dev300/normalize-template-paths-fix.diff: fixes two problems. first, the template dialog did not expand path placeholders (like OOO_BASEDIR etc.) before normalization. Second, the OfficeInstallationDirectories::makeRelocatableURL() method replaced the OOo dir in the wrong string.
Backports of Thorsten Behrens's patch from:
http://cgit.freedesktop.org/ooo-build/ooo-build/commit/?h=ooo-build-3-1-1&id=e6f28b61ba8bcf89d84f62e90f43e5cb19bd1390
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 62e5fcb..5abd72c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3054,6 +3054,9 @@ configmgr-validate-removedtree.diff, n#505704
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
+# expand path placeholders early in template dialog
+normalize-template-paths-fix.diff, n#512146, thorsten
+
[ UnusedMethodsRemoval ]
# Patches in this section remove unused methods identified by callcatcher.
diff --git a/patches/dev300/normalize-template-paths-fix.diff b/patches/dev300/normalize-template-paths-fix.diff
new file mode 100644
index 0000000..b67e16b
--- /dev/null
+++ b/patches/dev300/normalize-template-paths-fix.diff
@@ -0,0 +1,100 @@
+fix template path bug
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ .../officeinstallationdirectories.cxx | 12 +++----
+ sfx2/source/doc/doctemplates.cxx | 35 ++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 6 deletions(-)
+
+
+diff --git comphelper/source/officeinstdir/officeinstallationdirectories.cxx comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+index cd09ff6..bcbae52 100644
+--- comphelper/source/officeinstdir/officeinstallationdirectories.cxx
++++ comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+@@ -207,9 +207,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
+ if ( nIndex != -1 )
+ {
+ return rtl::OUString(
+- URL.replaceAt( nIndex,
+- m_pOfficeDir->getLength(),
+- m_aOfficeDirMacro ) );
++ aCanonicalURL.replaceAt( nIndex,
++ m_pOfficeDir->getLength(),
++ m_aOfficeDirMacro ) );
+ }
+ else
+ {
+@@ -217,9 +217,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
+ if ( nIndex != -1 )
+ {
+ return rtl::OUString(
+- URL.replaceAt( nIndex,
+- m_pUserDir->getLength(),
+- m_aUserDirMacro ) );
++ aCanonicalURL.replaceAt( nIndex,
++ m_pUserDir->getLength(),
++ m_aUserDirMacro ) );
+ }
+ }
+ }
+diff --git sfx2/source/doc/doctemplates.cxx sfx2/source/doc/doctemplates.cxx
+index c23ef53..63734a5 100644
+--- sfx2/source/doc/doctemplates.cxx
++++ sfx2/source/doc/doctemplates.cxx
+@@ -51,6 +51,7 @@
+ #include <com/sun/star/beans/XPropertySetInfo.hpp>
+ #include <com/sun/star/beans/XPropertyContainer.hpp>
+ #include <com/sun/star/beans/StringPair.hpp>
++#include <com/sun/star/util/XMacroExpander.hpp>
+ #include <com/sun/star/container/XContainerQuery.hpp>
+ #include <com/sun/star/document/XTypeDetection.hpp>
+ #include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
+@@ -601,11 +602,45 @@ void SfxDocTplService_Impl::getDirList()
+
+ maTemplateDirs = Sequence< OUString >( nCount );
+
++ uno::Reference< XComponentContext > xCtx;
++ uno::Reference< util::XMacroExpander > xExpander;
++ uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY );
++ const rtl::OUString aPrefix(
++ RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) );
++
++ if ( xPropSet.is() )
++ {
++ xPropSet->getPropertyValue(
++ rtl::OUString(
++ RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) )
++ >>= xCtx;
++ }
++
++ if ( xCtx.is() )
++ {
++ xCtx->getValueByName(
++ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
++ "/singletons/com.sun.star.util.theMacroExpander" ) ) )
++ >>= xExpander;
++
++ OSL_ENSURE( xExpander.is(),
++ "Unable to obtain macro expander singleton!" );
++ }
++
+ for ( USHORT i=0; i<nCount; i++ )
+ {
+ aURL.SetSmartProtocol( INET_PROT_FILE );
+ aURL.SetURL( aDirs.GetToken( i, C_DELIM ) );
+ maTemplateDirs[i] = aURL.GetMainURL( INetURLObject::NO_DECODE );
++
++ sal_Int32 nIndex = maTemplateDirs[i].indexOf( aPrefix );
++ if ( nIndex != -1 && xExpander.is() )
++ {
++ maTemplateDirs[i] = maTemplateDirs[i].replaceAt(nIndex,
++ aPrefix.getLength(),
++ rtl::OUString());
++ maTemplateDirs[i] = xExpander->expandMacros( maTemplateDirs[i] );
++ }
+ }
+
+ aValue <<= maTemplateDirs;
commit 77fa562c05aab4ff3070cbda38400666f530b86f
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Aug 17 16:30:47 2009 +0200
Expand path placeholders early; correctly normalize paths
* patches/dev300/apply: added the patch
* patches/dev300/normalize-template-paths-fix.diff: fixes two
problems. first, the template dialog did not expand path
placeholders (like OOO_BASEDIR etc.) before normalization.
Second, the OfficeInstallationDirectories::makeRelocatableURL()
method replaced the OOo dir in the wrong string.
Conflicts:
patches/dev300/apply
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 75cde3c..62e5fcb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -71,7 +71,7 @@ SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
# Slackware
Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess, CairoFonts
# Debian
-DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL, Gcc44
+DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
@@ -85,7 +85,7 @@ UbuntuL10n : UbuntuBased, UbuntuL10nOnly
DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
DroplineGNOME64 : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
# Ark Linux
-Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, KDE4, Gcc44
+Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, KDE4
# www.pld-linux.org
PLDBase: LinuxCommon, NotDebian, CairoFonts, PLDOnly
PLD: PLDBase
@@ -730,11 +730,8 @@ vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
# protected. Also to support encryption on Excel file export.
cws-scsheetprotection02-sfx2.diff, i#97515, kohei
cws-scsheetprotection02-svx.diff, i#97515, kohei
-cws-scsheetprotection02-sc.diff, i#97515, kohei
-
-# fix a crasher when loading xls doc with unsupported encryption.
-calc-xls-decryption-crash-fix.diff, i#102906, kohei
+cws-scsheetprotection02-sc.diff, i#97515, kohei
# Unit conversion fixes in ScDrawLayer.
sc-drwlayer-units.diff, i#83735, jonp
# overwrite character level font attributes when changing them at cell level.
@@ -1467,7 +1464,7 @@ boost-patch.diff, tml
2005-express-stl-remove.diff, noelpwer, i#71404
# This enables building multi language installsets with new (Windows SDK) problematic msitrans.exe
-msitrans-problemchecksum.diff, kami
+msitrans-problemchecksum.diff
[ MultilanguageWin32Only ]
# Multi-language installer stuff
@@ -1957,7 +1954,6 @@ calc-remove-merge-flags-on-row-insert.diff, n#484599, i#101047, kohei
# quick editing of field member visibilities via popup window.
calc-dp-hide-list-menu.diff, n#483379, i#100619, kohei
calc-dp-hide-list-menu-bugfix.diff, n#483379, i#100619, kohei
-calc-dp-hide-list-menu-crash-fix.diff, n#520556, i#103512, kohei
# disable autofilter within datapilot output.
calc-dp-disable-autofilter.diff, n#484600, i#101048, kohei
@@ -3022,26 +3018,19 @@ calc-perf-page-and-manual-breaks.diff, n#503482, kohei
# Speed up selection of large area, cursor placement in split view.
calc-perf-lazy-overlay-objects.diff, n#511006, kohei
-# crash on deleting cells with notes.
-calc-delete-note-cell-crasher.diff, n#517566, kohei
-
[ CalcExperimental ]
-# support alternative language & number options for csv import.
-calc-csv-import-custom-lang-sc.diff, n#510168, i#97416, kohei
-calc-csv-import-custom-lang-officecfg.diff, n#510168, i#97416, kohei
+# speed up sheet switch operation.
+calc-perf-sheet-switch.diff, n#495140, kohei
-calc-formula-externref-countif-fix.diff, n#521624, i#102750, kohei
+# support custom sort in datapilot tables.
+calc-dp-custom-sort.diff, n#443361, kohei
-calc-xls-import-shared-formula-refwrap.diff, n#522833, i#103861, kohei
+# support ods import/export of sheet options and password hash.
+calc-ods-sheet-protection-sc.diff, i#60305, i#71468, kohei
+calc-ods-sheet-protection-xmloff.diff, i#60305, i#71468, kohei
+calc-ods-sheet-protection-svtools.diff, i#60305, i#71468, kohei
-# when reading csv file, don't read multiple physical lines for one logical
-# line even if matching quotes are on separate lines.
-stream-read-csv-always-single-line.diff, n#523517, kohei
-
-# set cell format to Text when a string format is requested, and don't
-# prepend ' in front of the value.
-calc-html-csv-import-force-text-cell.diff, n#523414, kohei
[ UbuntuHardyOnly ]
# Add patch to only show local files needed when gnome-vfs/gio is disabled
@@ -3063,9 +3052,6 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
configmgr-validate-removedtree.diff, n#505704
-[ OOXMLExport ]
-oox-calc-export-export-pivot-content.diff, n#505917, janneke
-
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
[ UnusedMethodsRemoval ]
More information about the ooo-build-commit
mailing list