ooo-build r15028 - in trunk: . patches/dev300
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15028 - in trunk: . patches/dev300
- Date: Thu, 8 Jan 2009 14:40:08 +0000 (UTC)
Author: jannieuw
Date: Thu Jan 8 14:40:08 2009
New Revision: 15028
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15028&view=rev
Log:
2009-01-08 Jan Nieuwenhuizen <janneke gnu org>
* patches/dev300/layout-tab-toolkit.diff: Remove whitespace
fixes / adapt for whitespace fixes now also in upstream.
* patches/dev300/layout-tab-sfx2.diff: Remove compile warning fix
now also in upstream.
* patches/dev300/apply (LayoutDialogs): Re-enable layout-tab-*
patches.
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/layout-tab-sfx2.diff
trunk/patches/dev300/layout-tab-toolkit.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Jan 8 14:40:08 2009
@@ -2315,12 +2315,11 @@
layout-plugin-toolkit.diff
# use one or more layout tabpages in old .src tabbed dialog
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#layout-tab-toolkit.diff
-#layout-tab-sfx2.diff
-#layout-tab-sc.diff
-#layout-tab-scp2.diff
-#layout-tab-svx.diff
+layout-tab-toolkit.diff
+layout-tab-sfx2.diff
+layout-tab-sc.diff
+layout-tab-scp2.diff
+layout-tab-svx.diff
# convert some simple dialogs to layout engine
#layout-simple-dialogs-offapi.diff
Modified: trunk/patches/dev300/layout-tab-sfx2.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-sfx2.diff (original)
+++ trunk/patches/dev300/layout-tab-sfx2.diff Thu Jan 8 14:40:08 2009
@@ -49,15 +49,6 @@
void RemoveTabPage( USHORT nId );
void SetCurPageId( USHORT nId ) { nAppPageId = nId; }
-@@ -181,7 +193,7 @@ public:
- const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
- const SfxItemSet* GetOutputItemSet( USHORT nId ) const;
- int FillOutputItemSet();
-- const BOOL IsFormat() const { return bFmt; }
-+ BOOL IsFormat() const { return bFmt; }
-
- const OKButton& GetOKButton() const { return aOKBtn; }
- OKButton& GetOKButton() { return aOKBtn; }
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 084ec17..d3254ed 100644
--- sfx2/source/dialog/tabdlg.cxx
Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff (original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff Thu Jan 8 14:40:08 2009
@@ -335,19 +335,6 @@
#include <com/sun/star/awt/ImagePosition.hpp>
#include <vcl/button.hxx>
-diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
-index 84d7e3b..7f45718 100644
---- toolkit/source/awt/vclxdialog.hxx
-+++ toolkit/source/awt/vclxdialog.hxx
-@@ -61,7 +61,7 @@ protected:
- Window* GetWindowImpl();
- TopWindowListenerMultiplexer& GetTopWindowListenersImpl();
-
-- ~VCLXDialog( );
-+ ~VCLXDialog();
-
- // XInterface
- DECLARE_XINTERFACE()
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index 4c3091a..f17552a 100644
--- toolkit/source/awt/vclxplugin.cxx
@@ -380,56 +367,17 @@
index 66662f6..f2efbb3 100644
--- toolkit/source/awt/vclxsplitter.cxx
+++ toolkit/source/awt/vclxsplitter.cxx
-@@ -50,9 +50,9 @@ using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star;
-
- VCLXSplitter::ChildProps::ChildProps( VCLXSplitter::ChildData *pData )
-- {
-- addProp( RTL_CONSTASCII_USTRINGPARAM( "Shrink" ),
-- ::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
-+{
-+ addProp( RTL_CONSTASCII_USTRINGPARAM( "Shrink" ),
-+ ::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
- &(pData->mbShrink) );
- }
-
-@@ -66,7 +66,7 @@ VCLXSplitter::ChildData*
- VCLXSplitter::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
- {
- return new ChildData( xChild );
-- }
-+}
-
- VCLXSplitter::ChildProps*
- VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
@@ -78,8 +78,8 @@ VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
DBG_NAME( VCLXSplitter );
VCLXSplitter::VCLXSplitter( bool bHorizontal )
--: VCLXWindow()
-- , Box_Base()
+- : VCLXWindow()
+- , Box_Base()
+ : VCLXWindow()
+ , Box_Base()
{
DBG_CTOR( VCLXSplitter, NULL );
mnHandleRatio = 0.5;
-@@ -226,13 +226,13 @@ void SAL_CALL VCLXSplitter::allocateArea(
-
- void VCLXSplitter::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
- {
-- VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
-+ VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
- }
-
- void SAL_CALL VCLXSplitter::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
- {
-- VCLXWindow::setProperty( PropertyName, Value );
-- }
-+ VCLXWindow::setProperty( PropertyName, Value );
-+}
-
- Any SAL_CALL VCLXSplitter::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
- {
diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
new file mode 100644
index 0000000..4a1c127
@@ -672,72 +620,6 @@
-#endif /* CORE_BOX__BASE HXX */
+#endif /* CORE_BOX_BASE HXX */
-diff --git a/toolkit/source/layout/container.cxx b/toolkit/source/layout/container.cxx
-index 3af0f4c..c9b4513 100644
---- toolkit/source/layout/container.cxx
-+++ toolkit/source/layout/container.cxx
-@@ -136,7 +136,7 @@ Container::getLabel() // debug label
-
- uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
- aChildren = xParent->getChildren();
-- for( node = 0; node < aChildren.getLength(); node++ )
-+ for ( node = 0; node < aChildren.getLength(); node++ )
- if ( aChildren[ node ] == xContainer )
- break;
- }
-diff --git a/toolkit/source/layout/factory.cxx b/toolkit/source/layout/factory.cxx
-index f4f3606..e687ca8 100644
---- toolkit/source/layout/factory.cxx
-+++ toolkit/source/layout/factory.cxx
-@@ -75,7 +75,7 @@ sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, vo
- ::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++ )
-+ for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
- xNewKey->createKey( aServices.getConstArray()[i] );
-
- return sal_True;
-@@ -125,10 +125,10 @@ sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& Service
- throw ( uno::RuntimeException )
- {
- uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
-- for( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
-+ for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
- if ( ServiceName.compareTo( aSeq[i] ) == 0 )
- return sal_True;
--
-+
- return sal_False;
- }
-
-diff --git a/toolkit/source/layout/flow.cxx b/toolkit/source/layout/flow.cxx
-index 002ba53..4bfd1b9 100644
---- toolkit/source/layout/flow.cxx
-+++ toolkit/source/layout/flow.cxx
-@@ -75,8 +75,8 @@ void SAL_CALL
- Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild )
- throw (css::uno::RuntimeException)
- {
-- for( std::list< ChildData * >::iterator it = maChildren.begin();
-- it != maChildren.end(); it++ )
-+ for ( std::list< ChildData * >::iterator it = maChildren.begin();
-+ it != maChildren.end(); it++ )
- {
- if ( (*it)->xChild == xChild )
- {
-@@ -96,8 +96,8 @@ Flow::getChildren()
- {
- uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
- unsigned int i = 0;
-- for( std::list< ChildData * >::iterator it = maChildren.begin();
-- it != maChildren.end(); it++, i++ )
-+ for ( std::list< ChildData * >::iterator it = maChildren.begin();
-+ it != maChildren.end(); it++, i++ )
- children[i] = (*it)->xChild;
-
- return children;
-diff --git a/toolkit/source/layout/helper.cxx b/toolkit/source/layout/helper.cxx
index 413c2c3..1e96643 100644
--- toolkit/source/layout/helper.cxx
+++ toolkit/source/layout/helper.cxx
@@ -807,15 +689,6 @@
return xPeer;
}
-@@ -250,7 +270,7 @@ PropHelper::getInfoHelper()
- if ( ! pHelper )
- {
- uno::Sequence< beans::Property > aProps( maDetails.size() );
-- for( unsigned int i = 0; i < maDetails.size(); i++)
-+ for ( unsigned int i = 0; i < maDetails.size(); i++)
- {
- aProps[i].Name = maDetails[i].aName;
- aProps[i].Type = maDetails[i].aType;
@@ -345,10 +365,11 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
#include <awt/vclxbutton.hxx>
#include <awt/vclxdialog.hxx>
@@ -1080,23 +953,12 @@
index 6dba3b4..c16d979 100644
--- toolkit/source/layout/proplist.cxx
+++ toolkit/source/layout/proplist.cxx
-@@ -196,8 +196,8 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
-
- uno::Sequence< OUString > seq( values.size() );
- i = 0;
-- for( std::list< OUString >::const_iterator it = values.begin();
-- it != values.end(); it++, i++ )
-+ for ( std::list< OUString >::const_iterator it = values.begin();
-+ it != values.end(); it++, i++ )
- seq[ i ] = *it;
-
- return uno::makeAny( seq );
@@ -251,17 +251,17 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
if ( !prophlp::canHandleProps( xPeer ) )
{
DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" );
- PropList::const_iterator cur;
-- for( cur = rProps.begin(); cur != rProps.end(); cur++ )
+- for ( cur = rProps.begin(); cur != rProps.end(); cur++ )
+ for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
+ it++ )
{
@@ -1107,7 +969,7 @@
}
- PropList::const_iterator cur;
-- for( cur = rProps.begin(); cur != rProps.end(); cur++ )
+- for ( cur = rProps.begin(); cur != rProps.end(); cur++ )
- setProperty( xPeer, cur->first, cur->second );
+ for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
+ it++ )
@@ -1131,8 +993,7 @@
-
-
sal_Int32 nAttrs = xAttributes->getLength();
-- for( sal_Int32 i = 0; i < nAttrs; i++ )
-+ for ( sal_Int32 i = 0; i < nAttrs; i++ )
+ for ( sal_Int32 i = 0; i < nAttrs; i++ )
{
if ( nNamespace != xAttributes->getUidByIndex( i ) )
continue;
@@ -1144,7 +1005,7 @@
+ PropList::iterator it;
OUString aName = OUString::createFromAscii( pAttr );
-- for( cur = rProps.begin(); cur != rProps.end(); cur++ )
+- for ( cur = rProps.begin(); cur != rProps.end(); cur++ )
+ for ( it = rProps.begin(); it != rProps.end(); it++ )
{
- if ( cur->first.equalsIgnoreAsciiCase( aName ) )
@@ -1157,15 +1018,6 @@
return true;
}
}
-@@ -432,7 +430,7 @@ getAttributeProps( PropList &rProps )
- else
- nAttrs |= awt::WindowAttribute::SHOW;
-
-- for( int i = 0; i < attribsMapLen; i++ )
-+ for ( int i = 0; i < attribsMapLen; i++ )
- {
- if ( findAndRemove( attribsMap[i].name, rProps, aValue ) )
- {
diff --git a/toolkit/source/layout/proplist.hxx b/toolkit/source/layout/proplist.hxx
index 64923b0..123de61 100644
--- toolkit/source/layout/proplist.hxx
@@ -1208,166 +1060,6 @@
ShowMessageBox( mxFactory, mxToolkit,
OUString::createFromAscii( "Fatal error" ),
message );
-@@ -248,9 +249,9 @@ uno::Sequence< OUString > SAL_CALL LayoutRoot::getElementNames()
- uno::Sequence< OUString > aNames( maItems.size() );
- sal_Int32 nPos = 0;
-
-- for( ItemHash::const_iterator i = maItems.begin();
-- i != maItems.end(); i++ )
-- aNames[ nPos++ ] = i->first;
-+ for ( ItemHash::const_iterator it = maItems.begin();
-+ it != maItems.end(); it++ )
-+ aNames[ nPos++ ] = it->first;
-
- return aNames;
- }
-@@ -334,21 +335,21 @@ LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attr
- }
-
- #if 0
-- uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
-- {
-- if ( mpToplevel )
-- return mpToplevel->getPeer();
-- return uno::Reference< awt::XLayoutConstrains > ();
-- }
--
-- uno::Reference< awt::XLayoutConstrains > LayoutRoot::getById( OUString id )
-- {
-- uno::Reference< awt::XLayoutConstrains > rRef = 0;
-- ItemHash::iterator i = maItems.find( id );
-- if ( i != maItems.end() )
-- rRef = i->second;
-- return rRef;
-- }
-+uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
-+{
-+ if ( mpToplevel )
-+ return mpToplevel->getPeer();
-+ return uno::Reference< awt::XLayoutConstrains > ();
-+}
-+
-+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;
-+ return rRef;
-+}
- #endif
-
- LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
-diff --git a/toolkit/source/layout/table.cxx b/toolkit/source/layout/table.cxx
-index 1c4d8ed..87c15e2 100644
---- toolkit/source/layout/table.cxx
-+++ toolkit/source/layout/table.cxx
-@@ -158,7 +158,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
- unsigned int end =( child->mnRightCol-1 ) +( ( child->mnBottomRow-1 )*mnColsLen );
- if ( aTable.size() < end+1 )
- aTable.resize( end+1, NULL );
-- for( unsigned int i = start; i < end; i++ )
-+ for ( unsigned int i = start; i < end; i++ )
- aTable[ i ] = child;
-
- nRowsLen = SAL_MAX( nRowsLen, child->mnBottomRow );
-@@ -166,7 +166,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
- }
-
- // 2. calculate columns/rows sizes
-- for( int g = 0; g < 2; g++ )
-+ for ( int g = 0; g < 2; g++ )
- {
- std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
-
-@@ -211,7 +211,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
- child->maRequisition = child->mxChild->getMinimumSize();
- int size = 0;
- int expandables = 0;
-- for( int i = nFirstAttach; i < nLastAttach; i++ )
-+ for ( int i = nFirstAttach; i < nLastAttach; i++ )
- {
- size += aGroup[ i ].mnSize;
- if ( aGroup[ i ].mbExpand )
-@@ -228,7 +228,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
- else
- extra /= nLastAttach - nFirstAttach;
-
-- for( int i = nFirstAttach; i < nLastAttach; i++ )
-+ for ( int i = nFirstAttach; i < nLastAttach; i++ )
- if ( expandables == 0 || aGroup[ i ].mbExpand )
- aGroup[ i ].mnSize += extra;
- }
-@@ -239,14 +239,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
- // 3. Sum everything up
- mnColExpandables =( mnRowExpandables = 0 );
- maRequisition.Width =( maRequisition.Height = 0 );
-- for( std::vector<GroupData>::iterator it = maCols.begin();
-+ for ( std::vector<GroupData>::iterator it = maCols.begin();
- it != maCols.end(); it++ )
- {
- maRequisition.Width += it->mnSize;
- if ( it->mbExpand )
- mnColExpandables++;
- }
-- for( std::vector<GroupData>::iterator it = maRows.begin();
-+ for ( std::vector<GroupData>::iterator it = maRows.begin();
- it != maRows.end(); it++ )
- {
- maRequisition.Height += it->mnSize;
-@@ -280,13 +280,13 @@ Table::allocateArea( const awt::Rectangle &rArea )
-
- awt::Rectangle rChildArea( rArea.X, rArea.Y, 0, 0 );
-
-- for( int g = 0; g < 2; g++ )
-+ for ( int g = 0; g < 2; g++ )
- {
- std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
- const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
- const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
-
-- for( int i = 0; i < nFirstAttach; i++ )
-+ for ( int i = 0; i < nFirstAttach; i++ )
- {
- int gSize = aGroup[ i ].mnSize;
- if ( aGroup[ i ].mbExpand )
-@@ -296,7 +296,7 @@ Table::allocateArea( const awt::Rectangle &rArea )
- else
- rChildArea.Y += gSize;
- }
-- for( int i = nFirstAttach; i < nLastAttach; i++ )
-+ for ( int i = nFirstAttach; i < nLastAttach; i++ )
- {
- int gSize = aGroup[ i ].mnSize;
- if ( aGroup[ i ].mbExpand )
-diff --git a/toolkit/source/layout/timer.cxx b/toolkit/source/layout/timer.cxx
-index af3e009..26874a0 100644
---- toolkit/source/layout/timer.cxx
-+++ toolkit/source/layout/timer.cxx
-@@ -100,12 +100,12 @@ public:
- mxLastAdded = uno::Reference< awt::XLayoutContainer >();
-
- // 1. remove duplications and children
-- for( ContainerList::iterator it = mxContainers.begin();
-+ for ( ContainerList::iterator it = mxContainers.begin();
- it != mxContainers.end(); it++ )
- eraseChildren( it, mxContainers );
-
- // 2. check damage extent
-- for( ContainerList::iterator it = mxContainers.begin();
-+ for ( ContainerList::iterator it = mxContainers.begin();
- it != mxContainers.end(); it++ )
- {
- uno::Reference< awt::XLayoutContainer > xContainer = *it;
-@@ -126,7 +126,7 @@ public:
- }
-
- // 3. force re-calculations
-- for( ContainerList::iterator it = mxContainers.begin();
-+ for ( ContainerList::iterator it = mxContainers.begin();
- it != mxContainers.end(); it++ )
- (*it)->allocateArea( (*it)->getAllocatedArea() );
- }
diff --git a/toolkit/source/vclcompat/wbutton.cxx b/toolkit/source/vclcompat/wbutton.cxx
index 9f348fb..5617f4f 100644
--- toolkit/source/vclcompat/wbutton.cxx
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
