diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 16:19:58 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 16:19:58 +0200 |
| commit | 776573c6b33f13f290112036ce3c6d6f23eae085 (patch) | |
| tree | a9d1ec8a9442b95a833b1dd04796fa44b8956f4e | |
| parent | 079d1736256cf2b2b344160e4fcef70b4e323df1 (diff) | |
| parent | d081ecea333ef5c528d498f57152981eda2b0bc5 (diff) | |
Merge remote branch 'origin/libreoffice-3-3-2' into libreoffice-3-3
Conflicts:
patches/dev300/instsetoo_native-win32-packaging.diff
| -rw-r--r-- | NEWS | 22 | ||||
| -rwxr-xr-x | configure.in | 11 | ||||
| -rw-r--r-- | patches/vba/vba-container-controls.diff | 11 |
3 files changed, 40 insertions, 4 deletions
@@ -1,4 +1,24 @@ -libreoffice-3.3.1.2 (3.3.2rc1) +libreoffice-3.3.2.2 (3.3.2rc2) + ++ NEWS generated using bin/lo-commit-stat . 'libreoffice-3.3.2.1..HEAD' ++ build + + delete fallback strings which were translated between rc1 and rc2 [Andras Timar] + + fix download for all 3.3.x source release [Gökçen Eraslan] + + fix non-working VBA container controls [Noel Power] + + l10n: update translations from Pootle [Andras Timar] + + win32 packaging for release as patch [Fridrich Štrba] ++ l10n + + l10n: update translations from Pootle [Andras Timar] ++ libs-extern-sys + + l10n: update de_CH and de_AT dictionaries (fdo#33751) [Andras Timar] ++ libs-gui + + hidden tabs in Impress tasks panel (fdo#34718) [Radek Doulik] ++ ure + + prefer gcc __sync functions over pthread [Jani Monoses] + + +libreoffice-3.3.2.1 (3.3.2rc1) + + NEWS generated using bin/lo-commit-stat . 'libreoffice-3.3.1.2..HEAD' + bootstrap diff --git a/configure.in b/configure.in index 787ff4f02..e0bcca78d 100755 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(libreoffice-build, 3.3.2.1) +AC_INIT(libreoffice-build, 3.3.2.2) AC_PREREQ(2.51) AC_CONFIG_SRCDIR(bin/build-ooo) AC_PREFIX_DEFAULT(/usr) @@ -1883,8 +1883,13 @@ To build run: $warn_use_download make bin/ooinstall <path-to-install> - This is 'libreoffice-3-3' - the stable branch for the 3.3 release. - If you want to build something cool, unstable, and risky, use master. + This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release. + Every commit has to be reviewed by three people. + + If you want to commit more complicated fix for the next 3.3.x release, + please use the 'libreoffice-3-3' branch. + + If you want to build something cool, unstable, and risky, use master. " if test "$BUILD_WIN32" != "yes" -a "$ENABLE_ICECREAM" != "yes"; then diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff index 928f06e2f..1e0746f87 100644 --- a/patches/vba/vba-container-controls.diff +++ b/patches/vba/vba-container-controls.diff @@ -1161,6 +1161,17 @@ index 5e6e0ff..add8f8e 100755 member. Do not create the Basic library, if there are no modules specified. */ if( !aModules.empty() ) try +@@ -374,7 +374,9 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap + // set library container to VBA compatibility mode + try + { +- Reference< XVBACompatibility >( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True ); ++ Reference< XVBACompatibility > xVBACompat( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW ); ++ xVBACompat->setVBACompatibilityMode( sal_True ); ++ xVBACompat->setProjectName( maPrjName ); + } + catch( Exception& ) + { diff --git oox/source/token/properties.txt oox/source/token/properties.txt index 2a7960a..cb18e82 100644 --- oox/source/token/properties.txt |