[Libreoffice-commits] .: 3 commits - patches/dev300 patches/ooxml patches/vba
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Oct 27 04:08:24 PDT 2010
patches/dev300/wmf-mm-text.diff | 2
patches/ooxml/buildfix-oox-depends-on-unotools.diff | 7 --
patches/vba/vba-container-controls.diff | 60 ++++++++++----------
3 files changed, 33 insertions(+), 36 deletions(-)
New commits:
commit 73cb2e558e63bdedbc18aaac21662e1e3d876c1f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Oct 27 14:07:22 2010 +0300
Make wmf-mm-text.diff apply again
diff --git a/patches/dev300/wmf-mm-text.diff b/patches/dev300/wmf-mm-text.diff
index 34d0d01..6f997b3 100644
--- a/patches/dev300/wmf-mm-text.diff
+++ b/patches/dev300/wmf-mm-text.diff
@@ -35,7 +35,7 @@ index 9360277..a7910d6 100644
{
fWidth *= 25.40;
@@ -931,6 +943,7 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
- mbFillStyleSelected ( sal_False ),
+ mbComplexClip ( false ),
mnGfxMode ( GM_COMPATIBLE ),
mnMapMode ( MM_TEXT ),
+ mnUnitsPerInch ( 96 ),
commit 3c8df0b5859c28edb60bb3d072f9648e8afa9911
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Oct 27 13:56:58 2010 +0300
Make buildfix-oox-depends-on-unotools.diff apply again after VOS removal
diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools.diff b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
index 7882056..8d7ce11 100644
--- a/patches/ooxml/buildfix-oox-depends-on-unotools.diff
+++ b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
@@ -7,11 +7,8 @@ index 345c72e..60c4b02 100644
--- oox/prj/build.lst
+++ oox/prj/build.lst
@@ -1,4 +1,4 @@
--oox oox : vos cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
-+oox oox : vos cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
+-oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
++oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
oox oox usr1 - all oox_mkout NULL
oox oox\prj get - all oox_prj NULL
oox oox\source\token nmake - all oox_token NULL
---
-1.7.0.1
-
commit 894145b9514bd7aa028771419bd7c56a1848dc92
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Oct 27 13:54:22 2010 +0300
Make vba-container-controls.diff apply again after VOS removal
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index b4fe47a..f8c8a5e 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -2533,7 +2533,7 @@ index 9332a0b..f367f7d 100644
+}
+void SAL_CALL VCLXMultiPage::dispose() throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+
+ ::com::sun::star::lang::EventObject aObj;
+ aObj.Source = (::cppu::OWeakObject*)this;
@@ -2557,7 +2557,7 @@ index 9332a0b..f367f7d 100644
+void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
+throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ Window* pWindow = GetWindow();
+
+ if ( pWindow )
@@ -2583,7 +2583,7 @@ index 9332a0b..f367f7d 100644
+
+uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )",
+ rtl::OUStringToOString( PropertyName,
+ RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -2608,7 +2608,7 @@ index 9332a0b..f367f7d 100644
+ const ::com::sun::star::uno::Any& Value )
+throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", rtl::OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
+
+ TabControl* pTabControl = (TabControl*)GetWindow();
@@ -2708,19 +2708,19 @@ index 9332a0b..f367f7d 100644
+
+void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ maTabListeners.addInterface( xListener );
+}
+
+void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ maTabListeners.addInterface( xListener );
+}
+
+void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ TabControl *pTabControl = getTabControl();
+ if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+ throw lang::IndexOutOfBoundsException();
@@ -2741,7 +2741,7 @@ index 9332a0b..f367f7d 100644
+uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int32 ID )
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ TabControl *pTabControl = getTabControl();
+ if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+ throw lang::IndexOutOfBoundsException();
@@ -2876,7 +2876,7 @@ index 9332a0b..f367f7d 100644
+void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
+throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+ Window* pWindow = GetWindow();
+
+ if ( pWindow )
@@ -2905,7 +2905,7 @@ index 9332a0b..f367f7d 100644
+ const ::com::sun::star::uno::Any& Value )
+throw(::com::sun::star::uno::RuntimeException)
+{
-+ ::vos::OGuard aGuard( GetMutex() );
++ ::osl::MutexGuard aGuard( GetMutex() );
+
+#if OSL_DEBUG_LEVEL > 0
+ sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
@@ -3455,7 +3455,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ UnoControlContainer::createPeer( rxToolkit, rParentPeer );
+
+ uno::Sequence< uno::Reference< awt::XControl > > aCtrls = getControls();
@@ -3905,7 +3905,7 @@ index fa6d50a..7d72e8b 100644
-void UnoDialogControl::ImplInsertControl( Reference< XControlModel >& rxModel, const ::rtl::OUString& rName )
+void UnoDialogContainerControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ UnoControlContainer::createPeer( rxToolkit, rParentPeer );
+}
+
@@ -3954,7 +3954,7 @@ index fa6d50a..7d72e8b 100644
-void UnoDialogControl::dispose() throw(RuntimeException)
+void UnoDialogContainerControl::dispose() throw(RuntimeException)
{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
-
- EventObject aEvt;
- aEvt.Source = static_cast< ::cppu::OWeakObject* >( this );
@@ -4002,7 +4002,7 @@ index fa6d50a..7d72e8b 100644
-sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
+sal_Bool UnoDialogContainerControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
@@ -1649,12 +2332,11 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel )
mxTabController->setModel( xTabbing );
@@ -4017,7 +4017,7 @@ index fa6d50a..7d72e8b 100644
-void UnoDialogControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
+void UnoDialogContainerControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -1674,6 +2356,251 @@ void UnoDialogControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
mxTabController->activateTabOrder();
@@ -4025,7 +4025,7 @@ index fa6d50a..7d72e8b 100644
+void UnoDialogContainerControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+
+ Reference< XControlModel > xModel;
+ ::rtl::OUString aName;
@@ -4037,7 +4037,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoDialogContainerControl::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+
+ Reference< XControlModel > xModel;
+ Event.Element >>= xModel;
@@ -4047,7 +4047,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoDialogContainerControl::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+
+ Reference< XControlModel > xModel;
+ Event.ReplacedElement >>= xModel;
@@ -4105,7 +4105,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoDialogContainerControl::addingControl( const Reference< XControl >& _rxControl )
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ UnoControlContainer::addingControl( _rxControl );
+
+ if ( _rxControl.is() )
@@ -4127,7 +4127,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoDialogContainerControl::removingControl( const Reference< XControl >& _rxControl )
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ UnoControlContainer::removingControl( _rxControl );
+
+ if ( _rxControl.is() )
@@ -4141,7 +4141,7 @@ index fa6d50a..7d72e8b 100644
+
+void SAL_CALL UnoDialogContainerControl::changesOccurred( const ChangesEvent& ) throw (RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ // a tab controller model may have changed
+
+ // #109067# in design mode don't notify the tab controller
@@ -4216,7 +4216,7 @@ index fa6d50a..7d72e8b 100644
+
+void UnoDialogControl::dispose() throw(RuntimeException)
+{
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+
+ EventObject aEvt;
+ aEvt.Source = static_cast< ::cppu::OWeakObject* >( this );
@@ -4262,7 +4262,7 @@ index fa6d50a..7d72e8b 100644
+sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
+{
+ // #Can we move all the Resource stuff to the UnoDialogContainerControl ?
-+ vos::OGuard aSolarGuard( Application::GetSolarMutex() );
++ SolarMutexGuard aSolarGuard;
+ sal_Bool bRet = UnoDialogContainerControl::setModel( rxModel );
+ ImplStartListingForResourceEvents();
+ return bRet;
@@ -4270,7 +4270,7 @@ index fa6d50a..7d72e8b 100644
+
void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException)
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
@@ -1713,53 +2640,21 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes
// can lead to overwrites we have to set the graphic property
// before the propertiesChangeEvents are sent!
@@ -4291,7 +4291,7 @@ index fa6d50a..7d72e8b 100644
-
-void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
-
- Reference< XControlModel > xModel;
- ::rtl::OUString aName;
@@ -4308,7 +4308,7 @@ index fa6d50a..7d72e8b 100644
-void UnoDialogControl::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException)
-{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
-
- Reference< XControlModel > xModel;
- Event.Element >>= xModel;
@@ -4318,7 +4318,7 @@ index fa6d50a..7d72e8b 100644
-
-void UnoDialogControl::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException)
-{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
-
- Reference< XControlModel > xModel;
- Event.ReplacedElement >>= xModel;
@@ -4491,7 +4491,7 @@ index fa6d50a..7d72e8b 100644
-void UnoDialogControl::addingControl( const Reference< XControl >& _rxControl )
-{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
- UnoControlContainer::addingControl( _rxControl );
-
- if ( _rxControl.is() )
@@ -4513,7 +4513,7 @@ index fa6d50a..7d72e8b 100644
-
-void UnoDialogControl::removingControl( const Reference< XControl >& _rxControl )
-{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
- UnoControlContainer::removingControl( _rxControl );
-
- if ( _rxControl.is() )
@@ -4527,7 +4527,7 @@ index fa6d50a..7d72e8b 100644
-
-void SAL_CALL UnoDialogControl::changesOccurred( const ChangesEvent& ) throw (RuntimeException)
-{
-- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+- SolarMutexGuard aSolarGuard;
- // a tab controller model may have changed
-
- // #109067# in design mode don't notify the tab controller
More information about the Libreoffice-commits
mailing list