[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed May 12 07:05:36 PDT 2010
patches/dev300/apply | 20 ++--
patches/dev300/cjk-default-compatibility.diff | 129 ++++++++++++++++++++++++++
patches/dev300/ooxml-autoplay-fix.diff | 26 +++--
patches/dev300/ooxml-filters.diff | 12 +-
4 files changed, 166 insertions(+), 21 deletions(-)
New commits:
commit 635736e0c324739b4cab7735e14b5ba3ec7d25bb
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed May 12 16:03:42 2010 +0200
Fixed OOXMLExportDevel build
* Getting all the ooxml-filters patches in a correct order
* Don't build OOXMLExport321 when building OOXMLExportDevel
* patches/dev300/apply:
* patches/dev300/ooxml-autoplay-fix.diff:
* patches/dev300/ooxml-filters.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7959aea..6b0611e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3228,7 +3228,7 @@ pptx-gfx-layout-fix.diff, thorsten
# handles case where a connector shape is not connected
pptx-fix-connector-crash.diff, n#499129, thorsten
-[ OOXMLExport321 ]
+[ OOXMLExport321 and not OOXMLExportDevel ]
# For the purpose of the 3.2 release, all the pptx and xlsx are done as
# separate libraries as well, so that we are safe wrt. the binary export
# FIXME: Remove this patch (and update the other xlsx patches) after 3.1 is
@@ -3308,12 +3308,6 @@ xlsx-shared-oox-calc-export-sotstorage-init.diff
xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
#xlsx-shared-xlsx-export-perf-rowbuffer.diff
-ooxml-filters.diff, cbosdo
-ooxml-filters-calc.diff, muthu
-
-# depends on pptx-autoplay-fix.diff
-ooxml-autoplay-fix.diff, tml
-
[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
@@ -3334,6 +3328,13 @@ wmf-mm-text-1.diff, n#417818, rodo
sd-create-table-height-fix.diff, i#100275, thorsten
pptx-autoplay-fix.diff, n#485645, thorsten
+[ OOXMLExportDevel ]
+ooxml-filters.diff, cbosdo
+ooxml-filters-calc.diff, muthu
+
+# depends on pptx-autoplay-fix.diff
+ooxml-autoplay-fix.diff, tml
+
[ UbuntuHardyOnly ]
# Add patch to only show local files needed when gnome-vfs/gio is disabled
@@ -3563,7 +3564,7 @@ gnome-screen-saver.diff, i#106372, cmc
[ OOXMLExport ]
oox-pptx-export-update-to-ooo320.diff, rodo
-[ OOXMLExport321 ]
+[ OOXMLExport321 and not OOXMLExportDevel ]
oox-chart-export-part1.diff, Fong
docx-fixes02.diff, n#581604, cbosdo
diff --git a/patches/dev300/ooxml-autoplay-fix.diff b/patches/dev300/ooxml-autoplay-fix.diff
index 8b689cd..378bc05 100644
--- a/patches/dev300/ooxml-autoplay-fix.diff
+++ b/patches/dev300/ooxml-autoplay-fix.diff
@@ -1,17 +1,27 @@
+diff --git filter/source/config/fragments/fcfg_impress.mk filter/source/config/fragments/fcfg_impress.mk
+index 43447cb..b5625ef 100644
--- filter/source/config/fragments/fcfg_impress.mk
+++ filter/source/config/fragments/fcfg_impress.mk
-@@ -16,7 +16,10 @@
- draw8\
- MS_PowerPoint_2007_XML\
+@@ -18,7 +18,8 @@ T4_IMPRESS = \
MS_PowerPoint_2007_XML_AutoPlay\
-- MS_PowerPoint_2007_XML_Template
-+ MS_PowerPoint_2007_XML_Template
-+ impress_OOXML\
-+ impress_OOXML_AutoPlay\
-+ impress_OOXML_Template
+ MS_PowerPoint_2007_XML_Template\
+ impress_OOXML_Presentation\
+- impress_OOXML_Presentation_Template
++ impress_OOXML_Presentation_Template\
++ impress_OOXML_AutoPlay
# -----------------------------------------------
# count = 20
+@@ -38,7 +39,8 @@ F4_IMPRESS = \
+ impress_MS_PowerPoint_2007_XML_AutoPlay\
+ impress_MS_PowerPoint_2007_XML_Template\
+ impress_OOXML\
+- impress_OOXML_Template
++ impress_OOXML_Template\
++ impress_OOXML_AutoPlay
+
+ # -----------------------------------------------
+ # count = 12
--- /dev/null
+++ filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
@@ -0,0 +1,11 @@
diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index d01bed1..5c619d0 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -162,7 +162,7 @@ index d96c1ab..b896a9b 100644
virtual bool importDocument() = 0;
diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx
-index 07c3173..c0da5fa 100644
+index 4dc3451..d360bda 100644
--- oox/source/core/filterbase.cxx
+++ oox/source/core/filterbase.cxx
@@ -28,6 +28,7 @@
@@ -173,15 +173,15 @@ index 07c3173..c0da5fa 100644
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
-@@ -68,6 +69,7 @@ using ::com::sun::star::io::XStream;
- using ::com::sun::star::task::XStatusIndicator;
+@@ -70,6 +71,7 @@ using ::com::sun::star::task::XStatusIndicator;
+ using ::com::sun::star::drawing::XShape;
using ::com::sun::star::task::XInteractionHandler;
using ::com::sun::star::graphic::XGraphic;
+using ::com::sun::star::container::XNameAccess;
using ::comphelper::MediaDescriptor;
using ::comphelper::SequenceAsHashMap;
using ::oox::ole::OleObjectHelper;
-@@ -147,6 +149,7 @@ struct FilterBaseImpl
+@@ -149,6 +151,7 @@ struct FilterBaseImpl
DeviceInfo maDeviceInfo;
OUString maFileUrl;
StorageRef mxStorage;
@@ -189,7 +189,7 @@ index 07c3173..c0da5fa 100644
GraphicHelperRef mxGraphicHelper; /// Graphic and graphic object handling.
ModelObjHelperRef mxModelObjHelper; /// Tables to create new named drawing objects.
-@@ -175,6 +178,7 @@ struct FilterBaseImpl
+@@ -178,6 +181,7 @@ struct FilterBaseImpl
FilterBaseImpl::FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
meDirection( FILTERDIRECTION_UNKNOWN ),
@@ -197,7 +197,7 @@ index 07c3173..c0da5fa 100644
mxGlobalFactory( rxGlobalFactory )
{
OSL_ENSURE( mxGlobalFactory.is(), "FilterBaseImpl::FilterBaseImpl - missing service factory" );
-@@ -289,6 +293,11 @@ bool FilterBase::isExportFilter() const
+@@ -292,6 +296,11 @@ bool FilterBase::isExportFilter() const
return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
}
@@ -209,10 +209,10 @@ index 07c3173..c0da5fa 100644
// ----------------------------------------------------------------------------
Any FilterBase::getArgument( const OUString& rArgName ) const
-@@ -666,6 +675,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
- mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() );
+@@ -675,6 +684,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
+ mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "ParentShape" ), mxImpl->mxParentShape );
+
+ // Check for ISO OOXML
+ OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() );
@@ -235,12 +235,14 @@ index 07c3173..c0da5fa 100644
}
+diff --git filter/source/config/fragments/fcfg_impress.mk filter/source/config/fragments/fcfg_impress.mk
+index 2e354c8..43447cb 100644
--- filter/source/config/fragments/fcfg_impress.mk
+++ filter/source/config/fragments/fcfg_impress.mk
-@@ -17,7 +17,9 @@ T4_IMPRESS = \
- impress8_template\
+@@ -16,7 +16,9 @@ T4_IMPRESS = \
draw8\
MS_PowerPoint_2007_XML\
+ MS_PowerPoint_2007_XML_AutoPlay\
- MS_PowerPoint_2007_XML_Template
+ MS_PowerPoint_2007_XML_Template\
+ impress_OOXML_Presentation\
@@ -248,10 +250,10 @@ index 07c3173..c0da5fa 100644
# -----------------------------------------------
# count = 20
-@@ -35,7 +35,9 @@ F4_IMPRESS = \
- impress8_template\
+@@ -34,7 +36,9 @@ F4_IMPRESS = \
impress8_draw\
impress_MS_PowerPoint_2007_XML\
+ impress_MS_PowerPoint_2007_XML_AutoPlay\
- impress_MS_PowerPoint_2007_XML_Template
+ impress_MS_PowerPoint_2007_XML_Template\
+ impress_OOXML\
@@ -259,7 +261,7 @@ index 07c3173..c0da5fa 100644
# -----------------------------------------------
# count = 12
-@@ -48,7 +48,8 @@ F4_UI_IMPRESS = \
+@@ -47,7 +51,8 @@ F4_UI_IMPRESS = \
impress8_template_ui \
impress8_draw_ui \
impress_MS_PowerPoint_2007_XML_ui \
commit b334b53be3127901b8c10f229471b5ccd65ad2bf
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed May 12 11:08:29 2010 +0200
Fixed ooxml-filters.diff for m17
* patches/dev300/ooxml-filters.diff:
diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index 806e848..d01bed1 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -162,7 +162,7 @@ index d96c1ab..b896a9b 100644
virtual bool importDocument() = 0;
diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx
-index 4dc3451..d360bda 100644
+index 07c3173..c0da5fa 100644
--- oox/source/core/filterbase.cxx
+++ oox/source/core/filterbase.cxx
@@ -28,6 +28,7 @@
@@ -173,15 +173,15 @@ index 4dc3451..d360bda 100644
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
-@@ -70,6 +71,7 @@ using ::com::sun::star::task::XStatusIndicator;
- using ::com::sun::star::drawing::XShape;
+@@ -68,6 +69,7 @@ using ::com::sun::star::io::XStream;
+ using ::com::sun::star::task::XStatusIndicator;
using ::com::sun::star::task::XInteractionHandler;
using ::com::sun::star::graphic::XGraphic;
+using ::com::sun::star::container::XNameAccess;
using ::comphelper::MediaDescriptor;
using ::comphelper::SequenceAsHashMap;
using ::oox::ole::OleObjectHelper;
-@@ -149,6 +151,7 @@ struct FilterBaseImpl
+@@ -147,6 +149,7 @@ struct FilterBaseImpl
DeviceInfo maDeviceInfo;
OUString maFileUrl;
StorageRef mxStorage;
@@ -189,7 +189,7 @@ index 4dc3451..d360bda 100644
GraphicHelperRef mxGraphicHelper; /// Graphic and graphic object handling.
ModelObjHelperRef mxModelObjHelper; /// Tables to create new named drawing objects.
-@@ -178,6 +181,7 @@ struct FilterBaseImpl
+@@ -175,6 +178,7 @@ struct FilterBaseImpl
FilterBaseImpl::FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
meDirection( FILTERDIRECTION_UNKNOWN ),
@@ -197,7 +197,7 @@ index 4dc3451..d360bda 100644
mxGlobalFactory( rxGlobalFactory )
{
OSL_ENSURE( mxGlobalFactory.is(), "FilterBaseImpl::FilterBaseImpl - missing service factory" );
-@@ -292,6 +296,11 @@ bool FilterBase::isExportFilter() const
+@@ -289,6 +293,11 @@ bool FilterBase::isExportFilter() const
return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
}
@@ -209,10 +209,10 @@ index 4dc3451..d360bda 100644
// ----------------------------------------------------------------------------
Any FilterBase::getArgument( const OUString& rArgName ) const
-@@ -675,6 +684,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
+@@ -666,6 +675,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
+ mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() );
mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
- mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "ParentShape" ), mxImpl->mxParentShape );
+
+ // Check for ISO OOXML
+ OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() );
commit 84d613e9d4ab2e8cc72a49a7ec46aac1df847f2f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed May 12 09:34:40 2010 +0200
CJK defaults options change
Compatibility option for expanding spaces with lines containing manual
break is toggled off for CJK locales
* patches/dev300/apply:
* patches/dev300/cjk-default-compatibility.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b8e818e..7959aea 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -327,6 +327,9 @@ cjk-character-units-fix.diff, i#356101, Amelia Wang
cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
cjk-character-units-in-pggrid-fix.diff, Amelia Wang
+# Doesn't expand spaces for lines with manual break for CJK locales
+cjk-default-compatibility.diff, i#54320, cbosdo
+
#[ CJKTemporaryHacks ]
# the following patch is disabled temporary.
# default value of tab stop for Chinese version
diff --git a/patches/dev300/cjk-default-compatibility.diff b/patches/dev300/cjk-default-compatibility.diff
new file mode 100644
index 0000000..703b192
--- /dev/null
+++ b/patches/dev300/cjk-default-compatibility.diff
@@ -0,0 +1,129 @@
+New default values for Asian locales
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ svtools/inc/svtools/compatibility.hxx | 2 ++
+ svtools/source/config/compatibility.cxx | 40 +++++++++++++++++++++++++++++++
+ svx/source/cui/optgdlg.cxx | 6 +++++
+ 3 files changed, 48 insertions(+), 0 deletions(-)
+
+
+diff --git svtools/inc/svtools/compatibility.hxx svtools/inc/svtools/compatibility.hxx
+index b08c317..e24fd8a 100644
+--- svtools/inc/svtools/compatibility.hxx
++++ svtools/inc/svtools/compatibility.hxx
+@@ -153,6 +153,8 @@ class SVL_DLLPUBLIC SvtCompatibilityOptions: public svt::detail::Options
+
+ void Clear();
+
++ void SetDefault( ::rtl::OUString sName, bool bValue );
++
+ /*-****************************************************************************************************//**
+ @short return complete specified list
+ @descr Call it to get all entries of compatibility options.
+diff --git svtools/source/config/compatibility.cxx svtools/source/config/compatibility.cxx
+index ae1982b..b967d90 100644
+--- svtools/source/config/compatibility.cxx
++++ svtools/source/config/compatibility.cxx
+@@ -32,6 +32,7 @@
+ // includes
+ //_________________________________________________________________________________________________________________
+
++#include <vcl/svapp.hxx>
+ #include <svtools/compatibility.hxx>
+ #include <unotools/configmgr.hxx>
+ #include <unotools/configitem.hxx>
+@@ -247,6 +248,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
+ SvtCompatibilityOptions_Impl();
+ ~SvtCompatibilityOptions_Impl();
+
++ void SetDefault( OUString sName, bool bValue );
++
+ //---------------------------------------------------------------------------------------------------------
+ // overloaded methods of baseclass
+ //---------------------------------------------------------------------------------------------------------
+@@ -425,6 +428,12 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
+
+ if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) != sal_False )
+ {
++ const AllSettings& rSettings = Application::GetSettings();
++ com::sun::star::lang::Locale aLocale = rSettings.GetLocale();
++ if ( aLocale.Language.equalsAscii( "zh" ) || aLocale.Language.equalsAscii( "ja" ) ||
++ aLocale.Language.equalsAscii( "ko" ) )
++ aItem.bExpandWordSpace = false;
++
+ m_aDefOptions = aItem;
+ bDefaultFound = true;
+ }
+@@ -443,6 +452,32 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
+ }
+ }
+
++void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue )
++{
++ if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) )
++ m_aDefOptions.SetUsePrtMetrics( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) )
++ m_aDefOptions.SetAddSpacing( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) )
++ m_aDefOptions.SetAddSpacingAtPages( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) )
++ m_aDefOptions.SetUseOurTabStops( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) )
++ m_aDefOptions.SetNoExtLeading( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) )
++ m_aDefOptions.SetUseLineSpacing( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) )
++ m_aDefOptions.SetAddTableSpacing( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) )
++ m_aDefOptions.SetUseObjPos( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) )
++ m_aDefOptions.SetUseOurTextWrapping( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) )
++ m_aDefOptions.SetConsiderWrappingStyle( bValue );
++ else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) )
++ m_aDefOptions.SetExpandWordSpace( bValue );
++}
++
+ //*****************************************************************************************************************
+ // public method
+ //*****************************************************************************************************************
+@@ -680,6 +715,11 @@ void SvtCompatibilityOptions::Clear()
+ m_pDataContainer->Clear();
+ }
+
++void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue )
++{
++ m_pDataContainer->SetDefault( sName, bValue );
++}
++
+ //*****************************************************************************************************************
+ // public method
+ //*****************************************************************************************************************
+diff --git svx/source/cui/optgdlg.cxx svx/source/cui/optgdlg.cxx
+index c5492cf..981e538 100644
+--- svx/source/cui/optgdlg.cxx
++++ svx/source/cui/optgdlg.cxx
+@@ -43,6 +43,7 @@
+ #include <vcl/msgbox.hxx>
+ #include <vcl/mnemonic.hxx>
+ #include <i18npool/mslangid.hxx>
++#include <svtools/compatibility.hxx>
+ #include <svtools/useroptions.hxx>
+ #include <svtools/cacheoptions.hxx>
+ #include <svtools/fontoptions.hxx>
+@@ -1603,6 +1604,11 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+ Application::SetSettings( aSettings );
+ pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
+ rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
++
++ sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale );
++ bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0;
++ SvtCompatibilityOptions aCompatOpts;
++ aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK );
+ }
+
+ //
More information about the ooo-build-commit
mailing list