ooo-build r15059 - in trunk: . patches/dev300
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15059 - in trunk: . patches/dev300
- Date: Mon, 12 Jan 2009 15:24:07 +0000 (UTC)
Author: jannieuw
Date: Mon Jan 12 15:24:07 2009
New Revision: 15059
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15059&view=rev
Log:
2009-01-12 Jan Nieuwenhuizen <janneke gnu org>
* patches/dev300/layout-simple-dialogs-sw.diff:
* patches/dev300/layout-simple-dialogs-toolkit.diff: Remove whitespace
fixes / adapt for whitespace fixes now also in upstream.
* patches/dev300/apply (LayoutDialogs): Re-enable
layout-simple-dialog patches.
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/layout-simple-dialogs-sw.diff
trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Jan 12 15:24:07 2009
@@ -2320,23 +2320,23 @@
layout-tab-svx.diff
# convert some simple dialogs to layout engine
-#layout-simple-dialogs-offapi.diff
-#layout-simple-dialogs-sc.diff
-#layout-simple-dialogs-scp2.diff
-#layout-simple-dialogs-scripting.diff
-#layout-simple-dialogs-sd.diff
-#layout-simple-dialogs-sfx2.diff
-#layout-simple-dialogs-solenv.diff
-#layout-simple-dialogs-starmath.diff
-#layout-simple-dialogs-svx.diff
-#layout-simple-dialogs-sw.diff
-#layout-simple-dialogs-toolkit.diff
-#layout-simple-dialogs-vcl.diff
-#layout-tab-sfx2-fix.diff, thorsten
+layout-simple-dialogs-offapi.diff
+layout-simple-dialogs-sc.diff
+layout-simple-dialogs-scp2.diff
+layout-simple-dialogs-scripting.diff
+layout-simple-dialogs-sd.diff
+layout-simple-dialogs-sfx2.diff
+layout-simple-dialogs-solenv.diff
+layout-simple-dialogs-starmath.diff
+layout-simple-dialogs-svx.diff
+layout-simple-dialogs-sw.diff
+layout-simple-dialogs-toolkit.diff
+layout-simple-dialogs-vcl.diff
+layout-tab-sfx2-fix.diff, thorsten
# FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)
# on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team
-#toolkit-layout-gcc-4.3.2-hack.diff, pmladek
+toolkit-layout-gcc-4.3.2-hack.diff, pmladek
# These merge with the layoutdialogs2 cws
#layout-disable-experimental.diff
Modified: trunk/patches/dev300/layout-simple-dialogs-sw.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sw.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-sw.diff Mon Jan 12 15:24:07 2009
@@ -112,36 +112,6 @@
static USHORT GetMoveType();
static void SetMoveType(USHORT nSet);
-diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
-index 2a6f89a..db053a4 100644
---- sw/source/ui/uiview/srcview.cxx
-+++ sw/source/ui/uiview/srcview.cxx
-@@ -128,7 +128,6 @@
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::i18n;
- using namespace ::com::sun::star::lang;
--using namespace ::com::sun::star::util;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::i18n;
-@@ -181,7 +180,7 @@ void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const S
- Size aSz = pPrinter->GetOutputSize();
- short nBorder = BORDERPRN;
-
-- Color aOldFillColor( pPrinter->GetFillColor() );
-+ Color aOldFillColor( pPrinter->GetFillColor() );
- Font aOldFont( pPrinter->GetFont() );
-
- pPrinter->SetFillColor( Color(COL_TRANSPARENT) );
-@@ -690,7 +689,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
- pTextView->SetSelection( TextSelection( aPaM, aPaM ));
- }
-
-- SearchOptions aSearchOpt( rSearchItem.GetSearchOptions() );
-+ util::SearchOptions aSearchOpt( rSearchItem.GetSearchOptions() );
- aSearchOpt.Locale = SvxCreateLocale(
- static_cast< LanguageType >( GetAppLanguage() ) );
-
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index b09c566..e19915e 100644
--- sw/source/ui/uiview/viewsrch.cxx
Modified: trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-toolkit.diff (original)
+++ trunk/patches/dev300/layout-simple-dialogs-toolkit.diff Mon Jan 12 15:24:07 2009
@@ -1002,9 +1002,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: layoutcore.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -1146,22 +1146,6 @@
+..\source\layout\vcl\*.hxx %_DEST%\inc%_EXT%\layout\vcl\*.hxx
+
+..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-diff --git a/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx
-index c3f5f24..7dc9278 100644
---- toolkit/source/awt/forward.hxx
-+++ toolkit/source/awt/forward.hxx
-@@ -67,4 +67,11 @@
- return aReturn; \
- }
-
-+#if defined (_MSC_VER) && (_MSC_VER <= 1310)
-+// Windows .Net2003 build fix
-+#define W3K_EXPLICIT_CAST(x) static_cast <XWindow2*> (&x)
-+#else // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
-+#define W3K_EXPLICIT_CAST(x) x
-+#endif // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
-+
- #endif /*AWT_FORWARD_HXX*/
diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
index 8a851c5..033264a 100644
--- toolkit/source/awt/makefile.mk
@@ -1193,15 +1177,6 @@
index 98de970..76e3993 100644
--- toolkit/source/awt/vclxdialog.cxx
+++ toolkit/source/awt/vclxdialog.cxx
-@@ -109,7 +109,7 @@ void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeExceptio
- ::vos::OGuard aGuard( GetMutex() );
-
- ::com::sun::star::lang::EventObject aDisposeEvent;
-- aDisposeEvent.Source = *this;
-+ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- // maTabListeners.disposeAndClear( aDisposeEvent );
- }
-
@@ -211,6 +211,15 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
pWindow->SetText( Title );
}
@@ -1254,19 +1229,6 @@
};
-diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
-index 10c631d..68385ed 100644
---- toolkit/source/awt/vclxfixedline.cxx
-+++ toolkit/source/awt/vclxfixedline.cxx
-@@ -69,7 +69,7 @@ void SAL_CALL VCLXFixedLine::dispose( ) throw(RuntimeException)
- ::vos::OGuard aGuard( GetMutex() );
-
- EventObject aDisposeEvent;
-- aDisposeEvent.Source = *this;
-+ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- }
-
- VCLXWindow::dispose();
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index f17552a..8145174 100644
--- toolkit/source/awt/vclxplugin.cxx
@@ -1289,19 +1251,6 @@
}
VCLXWindow::dispose();
-diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
-index 9e5674e..b532161 100644
---- toolkit/source/awt/vclxscroller.cxx
-+++ toolkit/source/awt/vclxscroller.cxx
-@@ -75,7 +75,7 @@ void SAL_CALL VCLXScroller::dispose( ) throw(RuntimeException)
- ::vos::OGuard aGuard( GetMutex() );
-
- EventObject aDisposeEvent;
-- aDisposeEvent.Source = *this;
-+ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- // maTabListeners.disposeAndClear( aDisposeEvent );
- }
-
diff --git a/toolkit/source/awt/vclxscroller.hxx b/toolkit/source/awt/vclxscroller.hxx
index 3f5c199..b2169a0 100644
--- toolkit/source/awt/vclxscroller.hxx
@@ -1315,19 +1264,6 @@
#include <toolkit/awt/vclxwindow.hxx>
class ScrollBar;
-diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
-index f2efbb3..5530e46 100644
---- toolkit/source/awt/vclxsplitter.cxx
-+++ toolkit/source/awt/vclxsplitter.cxx
-@@ -113,7 +113,7 @@ void SAL_CALL VCLXSplitter::dispose( ) throw(RuntimeException)
- ::vos::OGuard aGuard( GetMutex() );
-
- EventObject aDisposeEvent;
-- aDisposeEvent.Source = *this;
-+ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- // maTabListeners.disposeAndClear( aDisposeEvent );
- }
-
diff --git a/toolkit/source/awt/vclxsplitter.hxx b/toolkit/source/awt/vclxsplitter.hxx
index 6fd186d..21a1b04 100644
--- toolkit/source/awt/vclxsplitter.hxx
@@ -1345,7 +1281,7 @@
index 9ef31ca..782b3a8 100644
--- toolkit/source/awt/vclxtabcontrol.cxx
+++ toolkit/source/awt/vclxtabcontrol.cxx
-@@ -43,16 +43,14 @@
+@@ -43,9 +43,7 @@
namespace layoutimpl
{
@@ -1355,25 +1291,6 @@
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
- VCLXTabControl::ChildProps::ChildProps( VCLXTabControl::ChildData *pData )
-- {
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "Title" ),
-- ::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
-+{
-+ addProp( RTL_CONSTASCII_USTRINGPARAM( "Title" ),
-+ ::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
- &(pData->maTitle) );
- }
-
-@@ -66,7 +64,7 @@ VCLXTabControl::ChildData*
- VCLXTabControl::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
- {
- return new ChildData( xChild );
-- }
-+}
-
- VCLXTabControl::ChildProps*
- VCLXTabControl::createChildProps( Box_Base::ChildData *pData )
@@ -76,12 +74,19 @@ VCLXTabControl::createChildProps( Box_Base::ChildData *pData )
DBG_NAME( VCLXTabControl );
@@ -1383,7 +1300,7 @@
+#endif /* !__GNUC__ */
+
VCLXTabControl::VCLXTabControl()
--: VCLXWindow()
+- : VCLXWindow()
- , VCLXTabControl_Base()
+ : VCLXWindow()
+ , VCLXTabControl_Base()
@@ -1397,7 +1314,7 @@
DBG_CTOR( VCLXTabControl, NULL );
}
-@@ -94,13 +99,13 @@ IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXTabControl, VCLXWindow, Container, VCLXTabC
+@@ -94,9 +99,9 @@ IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXTabControl, VCLXWindow, Container, VCLXTabC
IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Base );
@@ -1408,27 +1325,22 @@
::vos::OGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
-- aDisposeEvent.Source = *this;
-+ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
- // maTabListeners.disposeAndClear( aDisposeEvent );
- }
-
-@@ -108,38 +113,38 @@ void SAL_CALL VCLXTabControl::dispose( ) throw(RuntimeException)
+@@ -108,46 +113,46 @@ void SAL_CALL VCLXTabControl::dispose( ) throw(RuntimeException)
}
#if 0
-void SAL_CALL VCLXTabControl::addTabListener( const Reference< XTabListener >& listener ) throw (RuntimeException)
+void SAL_CALL VCLXTabControl::addTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
{
- if ( listener.is() )
- maTabListeners.addInterface( listener );
+ if ( listener.is() )
+ maTabListeners.addInterface( listener );
}
-void SAL_CALL VCLXTabControl::removeTabListener( const Reference< XTabListener >& listener ) throw (RuntimeException)
+void SAL_CALL VCLXTabControl::removeTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
{
- if ( listener.is() )
- maTabListeners.removeInterface( listener );
+ if ( listener.is() )
+ maTabListeners.removeInterface( listener );
}
#endif
@@ -1459,7 +1371,7 @@
{
TabControl *pTabControl = getTabControl();
if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
-@@ -147,7 +152,7 @@ void SAL_CALL VCLXTabControl::removeTab( sal_Int32 ID ) throw (RuntimeException,
+ throw IndexOutOfBoundsException();
pTabControl->RemovePage( sal::static_int_cast< USHORT >( ID ) );
}
@@ -1575,8 +1487,7 @@
{
mIdMap[ xChild ] = insertTab();
Box_Base::addChild( xChild );
-- }
-+}
+ }
-void SAL_CALL VCLXTabControl::removeChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > &xChild )
- throw (::com::sun::star::uno::RuntimeException)
@@ -1758,7 +1669,7 @@
listener->removed( page );
break;
case VCLEVENT_TABPAGE_REMOVEDALL:
-- for( int i = 1; i < mnNextTabId; i++)
+- for ( int i = 1; i < mnNextTabId; i++)
+ for ( int i = 1; i < mTabId; i++)
{
if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( i ) ) )
@@ -1770,10 +1681,8 @@
-void SAL_CALL VCLXTabControl::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
+void SAL_CALL VCLXTabControl::setProperty( const ::rtl::OUString& PropertyName, const uno::Any &Value ) throw(uno::RuntimeException)
{
-- VCLXWindow::setProperty( PropertyName, Value );
-- }
-+ VCLXWindow::setProperty( PropertyName, Value );
-+}
+ VCLXWindow::setProperty( PropertyName, Value );
+ }
-Any SAL_CALL VCLXTabControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
+uno::Any SAL_CALL VCLXTabControl::getProperty( const ::rtl::OUString& PropertyName ) throw(uno::RuntimeException)
@@ -1957,16 +1866,16 @@
--- toolkit/source/awt/vclxwindow.cxx
+++ toolkit/source/awt/vclxwindow.cxx
@@ -1135,6 +1135,10 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException)
- aObj.Source = static_cast< ::cppu::OWeakObject* >( this );
+ aEvent.Source = mrAntiImpl;
- maEventListeners.disposeAndClear( aObj );
+ maEventListeners.disposeAndClear( aEvent );
+#if 0 // ENABLE_LAYOUT
+ /* FIXME: see layout::~ComboBox () */
+ if (!dynamic_cast<VCLXComboBox*> (this))
+#endif /* 0 ENABLE_LAYOUT */
- maFocusListeners.disposeAndClear( aObj );
- maWindowListeners.disposeAndClear( aObj );
- maKeyListeners.disposeAndClear( aObj );
+ maFocusListeners.disposeAndClear( aEvent );
+ maWindowListeners.disposeAndClear( aEvent );
+ maKeyListeners.disposeAndClear( aEvent );
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index ec4c268..72d470e 100644
--- toolkit/source/awt/vclxwindows.cxx
@@ -2031,9 +1940,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: bin.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -2227,9 +2136,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: bin.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -2353,9 +2262,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: box-base.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -2529,9 +2438,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: box-base.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -2625,9 +2534,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: box.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -2684,9 +2593,9 @@
-
-Box::ChildData*
-Box::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
-- {
+-{
- return new ChildData( xChild );
-- }
+-}
-
-Box::ChildProps*
-Box::createChildProps( Box_Base::ChildData *pData )
@@ -2916,9 +2825,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: box.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -3015,7 +2924,7 @@
-
-} // namespace layoutimpl
-
--#endif /*CORE_BOX_HXX*/
+-#endif /* CORE_BOX_HXX */
diff --git a/toolkit/source/layout/byteseq.cxx b/toolkit/source/layout/byteseq.cxx
deleted file mode 100644
index 7a61ad2..0000000
@@ -3031,7 +2940,7 @@
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: byteseq.cxx,v $
-- * $Revision: 1.3 $
+- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -3115,9 +3024,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: container.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -3288,9 +3197,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: container.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -9674,9 +9583,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: dialogbuttonhbox.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -9974,9 +9883,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: dialogbuttonhbox.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -10057,9 +9966,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: factory.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -10092,52 +10001,52 @@
-using namespace layoutimpl;
-
-void * SAL_CALL comp_Layout_component_getFactory( const char * pImplName, void * pServiceManager, void * /*registryKey*/ )
-- {
-- void * pRet = 0;
--
-- ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
-- uno::Reference< lang::XSingleServiceFactory > xFactory;
+-{
+- void * pRet = 0;
-
-- if ( pServiceManager && aImplName.equals( LayoutFactory::impl_staticGetImplementationName() ) )
-- xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ),
-- LayoutFactory::impl_staticGetImplementationName(),
-- LayoutFactory::impl_staticCreateSelfInstance,
-- LayoutFactory::impl_staticGetSupportedServiceNames() );
-- if ( xFactory.is() )
-- {
-- xFactory->acquire();
-- pRet = xFactory.get();
-- }
+- ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
+- uno::Reference< lang::XSingleServiceFactory > xFactory;
-
-- return pRet;
+- if ( pServiceManager && aImplName.equals( LayoutFactory::impl_staticGetImplementationName() ) )
+- xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ),
+- LayoutFactory::impl_staticGetImplementationName(),
+- LayoutFactory::impl_staticCreateSelfInstance,
+- LayoutFactory::impl_staticGetSupportedServiceNames() );
+- if ( xFactory.is() )
+- {
+- xFactory->acquire();
+- pRet = xFactory.get();
- }
-
+- return pRet;
+-}
+-
-sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, void * pRegistryKey )
+-{
+- if ( pRegistryKey )
- {
-- if ( pRegistryKey )
+- try
- {
-- try
-- {
-- uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-- uno::Reference< registry::XRegistryKey > xNewKey;
+- uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
+- uno::Reference< registry::XRegistryKey > xNewKey;
-
-- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-- LayoutFactory::impl_staticGetImplementationName() +
-- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
--
-- const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
-- for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
-- xNewKey->createKey( aServices.getConstArray()[i] );
+- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+- LayoutFactory::impl_staticGetImplementationName() +
+- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+-
+- const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
+- for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
+- xNewKey->createKey( aServices.getConstArray()[i] );
-
-- return sal_True;
-- }
-- catch (registry::InvalidRegistryException &)
+- return sal_True;
+- }
+- catch (registry::InvalidRegistryException &)
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
-- }
-- return sal_False;
- }
+- return sal_False;
+-}
-
-// Component registration
-::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
@@ -10179,7 +10088,7 @@
- for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
- if ( ServiceName.compareTo( aSeq[i] ) == 0 )
- return sal_True;
--
+-
- return sal_False;
-}
-
@@ -10217,9 +10126,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: factory.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -10301,9 +10210,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: flow.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -10514,9 +10423,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: flow.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -10619,9 +10528,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: helper.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -11198,9 +11107,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: helper.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -11359,9 +11268,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: import.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -11614,9 +11523,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: import.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -12119,9 +12028,9 @@
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
--# $RCSfile$
+-# $RCSfile: makefile.mk,v $
-#
--# $Revision$
+-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
@@ -12192,9 +12101,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: precompiled_xmlscript.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -12237,9 +12146,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: proplist.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -12701,9 +12610,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: proplist.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -12773,7 +12682,7 @@
index a50f42d..0000000
--- toolkit/source/layout/root.cxx
+++ /dev/null
-@@ -1,414 +0,0 @@
+@@ -1,415 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -12782,9 +12691,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: root.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -12823,6 +12732,7 @@
-#include "timer.hxx"
-#include "translate.hxx"
-
+-
-namespace layoutimpl
-{
-
@@ -12916,7 +12826,7 @@
- OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ),
- uno::UNO_QUERY );
- OSL_ASSERT( xParser.is() );
-- if (! xParser.is())
+- if (! xParser.is() )
- {
- throw uno::RuntimeException(
- OUString::createFromAscii( "cannot create sax-parser component" ),
@@ -13025,9 +12935,9 @@
- uno::Sequence< OUString > aNames( maItems.size() );
- sal_Int32 nPos = 0;
-
-- for ( ItemHash::const_iterator it = maItems.begin();
-- it != maItems.end(); it++ )
-- aNames[ nPos++ ] = it->first;
+- for ( ItemHash::const_iterator i = maItems.begin();
+- i != maItems.end(); i++ )
+- aNames[ nPos++ ] = i->first;
-
- return aNames;
-}
@@ -13121,9 +13031,9 @@
-uno::Reference< awt::XLayoutConstrains > LayoutRoot::getById( OUString id )
-{
- uno::Reference< awt::XLayoutConstrains > rRef = 0;
-- ItemHash::iterator it = maItems.find( id );
-- if ( it != maItems.end() )
-- rRef = it->second;
+- ItemHash::iterator i = maItems.find( id );
+- if ( i != maItems.end() )
+- rRef = i->second;
- return rRef;
-}
-#endif
@@ -13202,9 +13112,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: root.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -13368,9 +13278,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: table.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -13409,20 +13319,20 @@
-using namespace com::sun::star;
-
-Table::ChildProps::ChildProps( Table::ChildData *pData )
-- {
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
-- ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
+-{
+- addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
+- ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
- &( pData->mbExpand[ 0 ] ) );
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
-- ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
+- addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
+- ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
- &( pData->mbExpand[ 1 ] ) );
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
-- ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
+- addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
+- ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
- &( pData->mnColSpan ) );
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
-- ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
+- addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
+- ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
- &( pData->mnRowSpan ) );
-- }
+-}
-
-bool Table::ChildData::isVisible()
-{
@@ -13448,14 +13358,14 @@
- , mnRightCol( 0 )
- , mnTopRow( 0 )
- , mnBottomRow( 0 )
-- {
+-{
- mbExpand[ 0 ] = 0;
- mbExpand[ 1 ] = 1;
-}
-
-Table::ChildData*
-Table::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
-- {
+-{
- return new ChildData( xChild );
-}
-
@@ -13468,9 +13378,9 @@
-void SAL_CALL
-Table::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
- throw( uno::RuntimeException, awt::MaxChildrenException )
-- {
+-{
- if ( xChild.is() )
-- {
+- {
- Box_Base::addChild( xChild );
- // cause of flicker
- allocateChildAt( xChild, awt::Rectangle( 0,0,0,0 ) );
@@ -13501,7 +13411,7 @@
- col = 0;
- row++;
-
-- unsigned int i = col +( row*mnColsLen );
+- unsigned int i = col + ( row*mnColsLen );
- while ( aTable.size() > i && !aTable[ i ] )
- i++;
-
@@ -13602,14 +13512,14 @@
- mnColExpandables =( mnRowExpandables = 0 );
- maRequisition.Width =( maRequisition.Height = 0 );
- for ( std::vector<GroupData>::iterator it = maCols.begin();
-- it != maCols.end(); it++ )
+- it != maCols.end(); it++ )
- {
- maRequisition.Width += it->mnSize;
- if ( it->mbExpand )
- mnColExpandables++;
- }
- for ( std::vector<GroupData>::iterator it = maRows.begin();
-- it != maRows.end(); it++ )
+- it != maRows.end(); it++ )
- {
- maRequisition.Height += it->mnSize;
- if ( it->mbExpand )
@@ -13689,9 +13599,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: table.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -13803,9 +13713,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: timer.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -13898,12 +13808,12 @@
-
- // 1. remove duplications and children
- for ( ContainerList::iterator it = mxContainers.begin();
-- it != mxContainers.end(); it++ )
+- it != mxContainers.end(); it++ )
- eraseChildren( it, mxContainers );
-
- // 2. check damage extent
- for ( ContainerList::iterator it = mxContainers.begin();
-- it != mxContainers.end(); it++ )
+- it != mxContainers.end(); it++ )
- {
- uno::Reference< awt::XLayoutContainer > xContainer = *it;
- while ( xContainer->getParent().is() && isContainerDamaged( xContainer ) )
@@ -13923,7 +13833,7 @@
- }
-
- // 3. force re-calculations
-- for ( ContainerList::iterator it = mxContainers.begin();
+- for( ContainerList::iterator it = mxContainers.begin();
- it != mxContainers.end(); it++ )
- (*it)->allocateArea( (*it)->getAllocatedArea() );
- }
@@ -13961,9 +13871,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: timer.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -14020,9 +13930,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: translate.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -14160,9 +14070,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: translate.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -17737,9 +17647,9 @@
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
--# $RCSfile$
+-# $RCSfile: makefile.mk,v $
-#
--# $Revision$
+-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
@@ -17798,9 +17708,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: wbutton.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -17876,10 +17786,10 @@
- , public ::cppu::WeakImplHelper1< awt::XItemListener >
-{
- Link maClickHdl;
-- protected:
+-protected:
- // we add toggle hooks here to cut on code
- Link maToggleHdl;
-- public:
+-public:
- uno::Reference< awt::XButton > mxButton;
- ButtonImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : ControlImpl( pCtx, xPeer, pWindow )
@@ -18059,7 +17969,7 @@
- // set all others to false
- for ( std::list< RadioButtonImpl*>::iterator i = mpRadioGroup.begin();
- i != mpRadioGroup.end(); i++ )
-- {
+- {
- if ( *i != current )
- ( *i )->Check( false );
- }
@@ -18218,11 +18128,11 @@
- rtl::OUString mAdvancedLabel;
-
- Window* Remove( std::list< Window*> lst, Window* w )
--{
+- {
- for ( std::list< Window*>::iterator it = maAdvanced.begin();
- it != maAdvanced.end(); it++ )
- if ( *it == w )
-- {
+- {
- lst.erase( it );
- return *it;
- }
@@ -18251,8 +18161,8 @@
- // Button::GetStandardText( BUTTON_SIMPLE );
- , mSimpleLabel( rtl::OUString::createFromAscii( "Advanced..." ) )
- , mAdvancedLabel( rtl::OUString::createFromAscii( "Simple..." ) )
--{
--}
+- {
+- }
- void Click()
- {
- bAdvancedMode = !bAdvancedMode;
@@ -18286,7 +18196,7 @@
- }
-
- void simpleMode()
--{
+- {
- mxButton->setLabel( mSimpleLabel );
- for ( std::list< Window*>::iterator it = maAdvanced.begin();
- it != maAdvanced.end(); it++ )
@@ -18386,9 +18296,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: wcontainer.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -18482,7 +18392,7 @@
-{
- css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > children;
- children = mxContainer->getChildren();
-- for( int i = 0; i < children.getLength(); i++ )
+- for ( int i = 0; i < children.getLength(); i++ )
- mxContainer->removeChild( children[ i ] );
-}
-
@@ -18497,7 +18407,7 @@
- {
- uno::Sequence< uno::Reference < awt::XLayoutConstrains > > aChildren;
- aChildren = xCont->getChildren();
-- for( int i = 0; i < aChildren.getLength(); i++ )
+- for ( int i = 0; i < aChildren.getLength(); i++ )
- {
- uno::Reference < awt::XLayoutConstrains > xChild( aChildren[ i ] );
-
@@ -18664,9 +18574,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: wfield.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -18708,7 +18618,7 @@
- public ::cppu::WeakImplHelper1< awt::XTextListener >
-{
- Link maModifyHdl;
-- public:
+-public:
- uno::Reference< awt::XTextComponent > mxEdit;
- EditImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : ControlImpl( pCtx, xPeer, pWindow )
@@ -18786,7 +18696,7 @@
-// Window/Control/Edit/SpinField
-class SpinFieldImpl : public EditImpl
-{
-- public:
+-public:
- SpinFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : EditImpl( pCtx, xPeer, pWindow )
- {
@@ -18798,7 +18708,7 @@
-// Window/Control/Edit/SpinField/NumericField
-class NumericFieldImpl : public SpinFieldImpl
-{
-- public:
+-public:
- NumericFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : SpinFieldImpl( pCtx, xPeer, pWindow )
- {
@@ -18808,7 +18718,7 @@
-// Window/Control/Edit/SpinField/MetricField
-class MetricFieldImpl : public SpinFieldImpl
-{
-- public:
+-public:
- MetricFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : SpinFieldImpl( pCtx, xPeer, pWindow )
- {
@@ -18822,9 +18732,9 @@
-// FormatterBase
-class FormatterBaseImpl
-{
-- protected:
+-protected:
- PeerHandle mxPeer;
-- public:
+-public:
- explicit FormatterBaseImpl( const PeerHandle &xPeer )
- : mxPeer( xPeer )
- {
@@ -18833,7 +18743,7 @@
-
-class NumericFormatterImpl : public FormatterBaseImpl
-{
-- public:
+-public:
- uno::Reference< awt::XCurrencyField > mxField;
- explicit NumericFormatterImpl( const PeerHandle &xPeer )
- : FormatterBaseImpl( xPeer )
@@ -18862,7 +18772,7 @@
-
-class MetricFormatterImpl : public FormatterBaseImpl
-{
-- public:
+-public:
- uno::Reference< awt::XMetricField > mxField;
- explicit MetricFormatterImpl( const PeerHandle &xPeer )
- : FormatterBaseImpl( xPeer )
@@ -18962,7 +18872,7 @@
- uno::Reference< awt::XComboBox > mxComboBox;
- ComboBoxImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : EditImpl( pCtx, xPeer, pWindow ),
-- mxComboBox( xPeer, uno::UNO_QUERY )
+- mxComboBox( xPeer, uno::UNO_QUERY )
- {
- }
-
@@ -18983,7 +18893,7 @@
- {
- uno::Sequence< rtl::OUString> aItems( mxComboBox->getItems() );
- rtl::OUString rKey( rStr );
-- for( unsigned int i = 0; aItems.getLength(); i++ )
+- for ( unsigned int i = 0; aItems.getLength(); i++ )
- {
- if ( aItems[ i ] == rKey )
- return sal::static_int_cast< USHORT >( i );
@@ -19104,7 +19014,7 @@
- uno::Reference< awt::XListBox > mxListBox;
- ListBoxImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
- : ControlImpl( pCtx, xPeer, pWindow ),
-- mxListBox( xPeer, uno::UNO_QUERY )
+- mxListBox( xPeer, uno::UNO_QUERY )
- {
- SelectEntryPos( 0, true );
- }
@@ -19134,7 +19044,7 @@
- {
- uno::Sequence< rtl::OUString> aItems( mxListBox->getItems() );
- rtl::OUString rKey( rStr );
-- for( unsigned int i = 0; aItems.getLength(); i++ )
+- for ( unsigned int i = 0; aItems.getLength(); i++ )
- {
- if ( aItems[ i ] == rKey )
- return sal::static_int_cast< USHORT >( i );
@@ -19305,9 +19215,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: wrapper.cxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -19578,7 +19488,7 @@
-void Window::SetStyle( WinBits nStyle )
-{
- uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
-- for( int i = 0; i < toolkitVclPropsMapLen; i++ )
+- for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
- {
- if ( toolkitVclPropsMap[ i ].propName )
- {
@@ -19601,7 +19511,7 @@
-{
- uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
- WinBits ret = 0;
-- for( int i = 0; i < toolkitVclPropsMapLen; i++ )
+- for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
- {
- if ( toolkitVclPropsMap[ i ].propName )
- {
@@ -19644,7 +19554,7 @@
-{
-
- long nWinAttrbs = 0;
-- for( int i = 0; i < toolkitVclPropsMapLen; i++ )
+- for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
- if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
- nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
-
@@ -20074,9 +19984,9 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile$
+- * $RCSfile: wrapper.hxx,v $
- *
-- * $Revision$
+- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -20195,7 +20105,7 @@
- , other_par( new other_par##Impl( Window::GetPeer() ) ) \
- { \
- } \
-- t::t( Window *pParent, WinBits nBits) \
+- t::t( Window *pParent, WinBits nBits ) \
- : win_par( new t##Impl( pParent->getContext(), Window::CreatePeer( pParent, nBits, unoName ), this ) ) \
- , other_par( new other_par##Impl( Window::GetPeer() ) ) \
- { \
@@ -20603,30 +20513,6 @@
// store original properties
{
PropertyIterator it( this, WINDOW_PROPERTY );
-@@ -236,19 +223,19 @@ public:
- rtl::OUString name( prop.Name );
- rtl::OUString value( getProperty( name, WINDOW_PROPERTY ) );
- #if DEBUG_PRINT
--fprintf(stderr, "original property: %s = %s\n", OUSTRING_CSTR(name), OUSTRING_CSTR(value));
-+ fprintf(stderr, "original property: %s = %s\n", OUSTRING_CSTR(name), OUSTRING_CSTR(value));
- #endif
- std::pair< rtl::OUString, rtl::OUString > pair( name, value );
- maOriProps.push_back( pair );
- }
- }
--
-+
- }
--
-+
- ~Widget()
- {
- for ( std::vector< Widget *>::const_iterator it = maChildren.begin();
-- it != maChildren.end(); it++ )
-+ it != maChildren.end(); it++ )
- delete *it;
- if ( !mbForeign )
- {
@@ -394,18 +381,18 @@ fprintf(stderr, "original property: %s = %s\n", OUSTRING_CSTR(name), OUSTRING_CS
std::vector< Widget *> aChildChildren = pChild->maChildren;
@@ -20659,15 +20545,6 @@
if ( *it == pChild )
break;
return i;
-@@ -466,7 +453,7 @@ fprintf(stderr, "original property: %s = %s\n", OUSTRING_CSTR(name), OUSTRING_CS
- if ( it->first.equalsIgnoreAsciiCase( propName ) )
- return it->second;
- #if DEBUG_PRINT
--fprintf(stderr, "Serious error: property '%s' not found\n", OUSTRING_CSTR(propName));
-+ fprintf(stderr, "Serious error: property '%s' not found\n", OUSTRING_CSTR(propName));
- #endif
- return rtl::OUString();
- }
@@ -499,7 +486,7 @@ fprintf(stderr, "Serious error: property '%s' not found\n", OUSTRING_CSTR(propNa
case CONTAINER_PROPERTY:
if ( mpParent )
@@ -20677,15 +20554,6 @@
break;
case WINBITS_PROPERTY:
// TODO
-@@ -515,7 +502,7 @@ fprintf(stderr, "Serious error: property '%s' not found\n", OUSTRING_CSTR(propNa
- rtl::OUString newValue = getProperty( propName, rKind );
- bool isTouched = oriValue != newValue;
- #if DEBUG_PRINT
--fprintf(stderr, "is property '%s' touched? %s (%s vs %s)\n", OUSTRING_CSTR(propName), isTouched ? "yes" : "no", OUSTRING_CSTR(oriValue), OUSTRING_CSTR(newValue));
-+ fprintf(stderr, "is property '%s' touched? %s (%s vs %s)\n", OUSTRING_CSTR(propName), isTouched ? "yes" : "no", OUSTRING_CSTR(oriValue), OUSTRING_CSTR(newValue));
- #endif
- return isTouched;
- }
@@ -546,7 +533,7 @@ fprintf(stderr, "is property '%s' touched? %s (%s vs %s)\n", OUSTRING_CSTR(prop
int nPropIt;
@@ -20962,25 +20830,6 @@
{
mpFlag = 0;
mbBlockFlagCallback = false;
-@@ -786,15 +773,15 @@ class PropertiesList : public layout::Table
- checkProperty();
- }
-
--void checkProperty()
--{
-+ void checkProperty()
-+ {
- bool flag = mpWidget->isPropertyTouched( maPropName, maPropKind );
-
- if ( mpFlag && mpFlag->IsChecked() != (BOOL)flag )
- {
- CheckFlag( flag, true );
- }
--}
-+ }
-
- void CheckFlag( bool bValue, bool bBlockCallback )
- {
@@ -844,7 +831,7 @@ void checkProperty()
AnyEdit( Widget *pWidget, rtl::OUString aPropName,
@@ -21008,15 +20857,6 @@
{
load();
SetModifyHdl( LINK( this, AnyInteger, ApplyPropertyHdl ) );
-@@ -985,7 +972,7 @@ printf("Remove mpEdit and expand\n");
- virtual void store()
- {
- #if DEBUG_PRINT
--fprintf(stderr, "store number: %ld\n", rtl::OUString( GetText() ).toInt64());
-+ fprintf(stderr, "store number: %ld\n", rtl::OUString( GetText() ).toInt64());
- #endif
- save( uno::makeAny( rtl::OUString( GetText() ).toInt64() ) );
- }
@@ -995,7 +982,7 @@ fprintf(stderr, "store number: %ld\n", rtl::OUString( GetText() ).toInt64());
{
AnyFloat( Widget *pWidget, rtl::OUString aPropName,
@@ -21035,15 +20875,6 @@
{
// adding some whitespaces to make the hit area larger
// SetText( String::CreateFromAscii( "" ) );
-@@ -1029,7 +1016,7 @@ fprintf(stderr, "store number: %ld\n", rtl::OUString( GetText() ).toInt64());
- virtual void load()
- {
- #if DEBUG_PRINT
--fprintf(stderr, "loading boolean value\n");
-+ fprintf(stderr, "loading boolean value\n");
- #endif
- Check( getValue().toInt64() != 0 );
- setLabel();
@@ -1052,7 +1039,7 @@ fprintf(stderr, "loading boolean value\n");
{
AnyListBox( Widget *pWidget, rtl::OUString aPropName,
@@ -21232,45 +21063,6 @@
delete *it;
maPropertiesList.clear();
-@@ -1327,22 +1314,22 @@ IMPL_LINK( PropertiesList::PropertyEntry::AnyWidget, ApplyPropertyHdl, layout::W
- IMPL_LINK( PropertiesList::PropertyEntry::AnyWidget, FlagToggledHdl, layout::CheckBox *, pCheck )
- {
- #if DEBUG_PRINT
--fprintf(stderr, "Property flag pressed -- is: %d\n", pCheck->IsChecked());
-+ fprintf(stderr, "Property flag pressed -- is: %d\n", pCheck->IsChecked());
- #endif
- if ( !mbBlockFlagCallback )
- {
- bool checked = pCheck->IsChecked();
- if ( !checked ) // revert
--{
-+ {
- #if DEBUG_PRINT
--fprintf(stderr, "revert\n");
-+ fprintf(stderr, "revert\n");
- #endif
- load();
--}
-+ }
- else
- {
- #if DEBUG_PRINT
--fprintf(stderr, "user can't dirty the flag!\n");
-+ fprintf(stderr, "user can't dirty the flag!\n");
- #endif
- // User can't flag the property as dirty
- // Actually, we may want to allow the designer to force a property to be stored.
-@@ -1351,8 +1338,8 @@ fprintf(stderr, "user can't dirty the flag!\n");
- }
- }
- #if DEBUG_PRINT
--else
--fprintf(stderr, "Property flag pressed -- BLOCKED\n");
-+ else
-+ fprintf(stderr, "Property flag pressed -- BLOCKED\n");
- #endif
- return 0;
- }
@@ -1368,14 +1355,14 @@ IMPL_LINK( PropertiesList::PropertyEntry::AnyEdit, ExpandEditHdl, layout::PushBu
class SortListBox
{ // For a manual sort ListBox; asks for a ListBox and Up/Down/Remove
@@ -21303,25 +21095,6 @@
{
mpListBox->SetSelectHdl( LINK( this, SortListBox, ItemSelectedHdl ) );
-@@ -1447,12 +1434,12 @@ public:
- };
-
- SortListBox::~SortListBox()
-- {
-- delete mpListBox;
-- delete mpUpButton;
-- delete mpDownButton;
-- delete mpRemoveButton;
-- }
-+{
-+ delete mpListBox;
-+ delete mpUpButton;
-+ delete mpDownButton;
-+ delete mpRemoveButton;
-+}
-
- IMPL_LINK( SortListBox, UpPressedHdl, layout::Button *, pBtn )
- {
@@ -1506,10 +1493,10 @@ public:
Widget *mpRootWidget;
@@ -21337,45 +21110,6 @@
{
layout::PeerHandle handle = dialog->GetPeerHandle( "preview-box" );
uno::Reference< awt::XLayoutConstrains > xWidget( handle, uno::UNO_QUERY );
-@@ -1572,23 +1559,23 @@ public:
-
- // print in XML format...
-
--static rtl::OUString toXMLNaming (const rtl::OUString &string)
--{
-- rtl::OUStringBuffer buffer (string.getLength());
-- sal_Unicode *str = string.pData->buffer;
-- for (int i = 0; i < string.getLength(); i++) {
-- if ( str[i] >= 'A' && str[i] <= 'Z' )
-- {
-- if ( i > 0 )
-- buffer.append ((sal_Unicode) '-');
-- buffer.append ((sal_Unicode) (str[i] - 'A' + 'a'));
-+ static rtl::OUString toXMLNaming (const rtl::OUString &string)
-+ {
-+ rtl::OUStringBuffer buffer (string.getLength());
-+ sal_Unicode *str = string.pData->buffer;
-+ for (int i = 0; i < string.getLength(); i++) {
-+ if ( str[i] >= 'A' && str[i] <= 'Z' )
-+ {
-+ if ( i > 0 )
-+ buffer.append ((sal_Unicode) '-');
-+ buffer.append ((sal_Unicode) (str[i] - 'A' + 'a'));
-+ }
-+ else
-+ buffer.append ((sal_Unicode) str[i]);
- }
-- else
-- buffer.append ((sal_Unicode) str[i]);
-- }
-
-- return buffer.makeStringAndClear();
--}
-+ return buffer.makeStringAndClear();
-+ }
-
- void print()
- {
@@ -1607,7 +1594,7 @@ static rtl::OUString toXMLNaming (const rtl::OUString &string)
for ( int kind = 0; kind < 2; kind++ )
{
@@ -21416,32 +21150,6 @@
uno::Reference< lang::XMultiServiceFactory > xMSF );
virtual ~EditorImpl();
-@@ -1720,12 +1707,12 @@ EditorImpl::EditorImpl( layout::Dialog *dialog,
- uno::Reference< lang::XMultiServiceFactory > xFactory )
- : mxFactory( xFactory )
- , mxToplevel( dialog->GetPeerHandle( "dialog" ), uno::UNO_QUERY )
-- // FIXME: any of these should work
-- //dialog->getContext()->getRoot(), uno::UNO_QUERY )
-- // dialog->GetPeer(), uno::UNO_QUERY )
-+ // FIXME: any of these should work
-+ //dialog->getContext()->getRoot(), uno::UNO_QUERY )
-+ // dialog->GetPeer(), uno::UNO_QUERY )
- {
- #if DEBUG_PRINT
--fprintf (stderr, "EditorImpl()\n");
-+ fprintf (stderr, "EditorImpl()\n");
- #endif
- // framework
- mxToolkit = uno::Reference< awt::XToolkit >(
-@@ -1736,7 +1723,7 @@ fprintf (stderr, "EditorImpl()\n");
-
- // custom widgets
- #if DEBUG_PRINT
--fprintf (stderr, "custom widgets\n");
-+ fprintf (stderr, "custom widgets\n");
- #endif
- mpPropertiesList = new PropertiesList( dialog );
-
@@ -1744,7 +1731,7 @@ fprintf (stderr, "custom widgets\n");
mpLayoutTree->setListener( this );
@@ -21451,26 +21159,6 @@
// create buttons
layout::Container aWidgets( dialog, "create-widget" );
-@@ -1769,15 +1756,15 @@ fprintf (stderr, "custom widgets\n");
- }
-
- #ifdef FILEDLG
--fprintf(stderr,"creating file dialog\n");
-+ fprintf(stderr,"creating file dialog\n");
- pImportDialog = new FileDialog( NULL/*(layout::Window *) dialog*/, 0 );
--fprintf(stderr,"connecting it\n");
-+ fprintf(stderr,"connecting it\n");
- pImportDialog->SetFileSelectHdl( LINK( this, EditorImpl, ImportDialogHdl ) );
--fprintf(stderr,"done file dialog\n");
-+ fprintf(stderr,"done file dialog\n");
- #endif
-
- /* pImportButton = new layout::PushButton( dialog, "import-button" );
-- pImportButton->SetClickHdl( LINK( this, EditorImpl, ImportButtonHdl ) );*/
-+ pImportButton->SetClickHdl( LINK( this, EditorImpl, ImportButtonHdl ) );*/
- pExportButton = new layout::PushButton( dialog, "export-button" );
- pExportButton->SetClickHdl( LINK( this, EditorImpl, ExportButtonHdl ) );
- }
@@ -1787,7 +1774,7 @@ EditorImpl::~EditorImpl()
delete mpPropertiesList;
delete mpLayoutTree;
@@ -21480,54 +21168,6 @@
delete *i;
delete pImportButton;
delete pExportButton;
-@@ -1798,14 +1785,14 @@ EditorImpl::~EditorImpl()
-
- void EditorImpl::loadFile( const rtl::OUString &aTestFile )
- {
--fprintf( stderr, "TEST: layout instance\n" );
-+ fprintf( stderr, "TEST: layout instance\n" );
- uno::Reference< awt::XLayoutRoot > xRoot
- ( new EditorRoot( mxFactory, mpLayoutTree->mpRootWidget ) );
-
- /*
--mxMSF->createInstance
-- ( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
-- uno::UNO_QUERY );
-+ mxMSF->createInstance
-+ ( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
-+ uno::UNO_QUERY );
- */
- if ( !xRoot.is() )
- {
-@@ -1815,7 +1802,7 @@ mxMSF->createInstance
- }
-
- #if DEBUG_PRINT
--fprintf( stderr, "TEST: initing root\n" );
-+ fprintf( stderr, "TEST: initing root\n" );
- #endif
-
- uno::Reference< lang::XInitialization > xInit( xRoot, uno::UNO_QUERY );
-@@ -1827,16 +1814,16 @@ fprintf( stderr, "TEST: initing root\n" );
- }
-
- #if DEBUG_PRINT
--fprintf( stderr, "TEST: running parser\n" );
-+ fprintf( stderr, "TEST: running parser\n" );
- #endif
- uno::Sequence< uno::Any > aParams( 1 );
- aParams[0] <<= aTestFile;
- #if DEBUG_PRINT
--fprintf( stderr, "TEST: do it\n" );
-+ fprintf( stderr, "TEST: do it\n" );
- #endif
- xInit->initialize( aParams );
- #if DEBUG_PRINT
--fprintf( stderr, "TEST: file loaded\n" );
-+ fprintf( stderr, "TEST: file loaded\n" );
- #endif
-
- mpLayoutTree->rebuild();
@@ -1867,13 +1854,13 @@ void EditorImpl::widgetSelected( Widget *pWidget )
if ( !pWidget || pWidget->isContainer() )
{
@@ -21553,24 +21193,6 @@
{
if ( pBtn == *it )
break;
-@@ -1898,7 +1885,7 @@ IMPL_LINK( EditorImpl, ImportButtonHdl, layout::PushButton *, pBtn )
- {
- (void) pBtn;
- #if DEBUG_PRINT
--fprintf(stderr, "IMPORT!\n");
-+ fprintf(stderr, "IMPORT!\n");
- #endif
- #ifdef FILEDLG
- pImportDialog->Execute();
-@@ -1914,7 +1901,7 @@ IMPL_LINK( EditorImpl, ImportDialogHdl, FileDialog *, pDialog )
- //fprintf(stderr, "Executing import dialog!\n");
-
- #if DEBUG_PRINT
--fprintf(stderr, "got import file: %s\n",rtl::OUStringToOString( path, RTL_TEXTENCODING_ASCII_US ).getStr() );
-+ fprintf(stderr, "got import file: %s\n",rtl::OUStringToOString( path, RTL_TEXTENCODING_ASCII_US ).getStr() );
- #endif
-
- return 0;
diff --git a/toolkit/workben/layout/insert-sheet.xml b/toolkit/workben/layout/insert-sheet.xml
new file mode 100644
index 0000000..0ce5843
@@ -21691,7 +21313,7 @@
$(SHELL) ./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
+ cp -pv wordcount.xml ../$(PRJ)/sw/uiconfig/layout
- # FIXME: broken setup
+ # FIXME: broken setup
ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx
$(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
@@ -133,6 +138,17 @@ dist .PHONY :
@@ -22171,7 +21793,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: wordcountdialog.cxx,v $
-- * $Revision: 1.3 $
+- * $Revision: 1.4 $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
@@ -22223,7 +21845,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: zoom.cxx,v $
-- * $Revision: 1.3 $
+- * $Revision: 1.4 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
@@ -22270,7 +21892,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: zoom.hxx,v $
-- * $Revision: 1.3 $
+- * $Revision: 1.4 $
+ * $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
