[Libreoffice-commits] .: toolkit/source vcl/source
toolkit/source/helper/unowrapper.cxx | 23 ++--
vcl/source/window/window.cxx | 66 +++
2 files changed, 50 insertions(+), 39 deletions(-)
New commits:
commit f902bcda6e769c59231e40a45430b83fc2006199
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 26 12:48:26 2012 +0100
Make ~Window more robust
...in cases where the Window(WindowType) ctor did not call
Window::ImplInit, so
many members are null; if then a derived class's ctor throws an exception,
~Window must be careful not to dereference those null members.
Change-Id: I12c4b1b5d7f3633387b85acf9da6d57c42e793b4
diff --git a/toolkit/source/helper/unowrapper.cxx
b/toolkit/source/helper/unowrapper.cxx
index 577e387..d138da4 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -268,19 +268,22 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
// ::com::sun::star::chaos::System-Windows suchen...
Window* pOverlap = pWindow-GetWindow( WINDOW_OVERLAP );
-pOverlap = pOverlap-GetWindow( WINDOW_FIRSTOVERLAP );
-while ( pOverlap )
+if ( pOverlap )
{
-Window* pNextOverlap = pOverlap-GetWindow( WINDOW_NEXT );
-Window* pClient = pOverlap-GetWindow( WINDOW_CLIENT );
-
-if ( pClient-GetWindowPeer() lcl_ImplIsParent( pWindow, pClient ) )
+pOverlap = pOverlap-GetWindow( WINDOW_FIRSTOVERLAP );
+while ( pOverlap )
{
-::com::sun::star::uno::Reference
::com::sun::star::lang::XComponent xComp( pClient-GetComponentInterface(
sal_False ), ::com::sun::star::uno::UNO_QUERY );
-xComp-dispose();
-}
+Window* pNextOverlap = pOverlap-GetWindow( WINDOW_NEXT );
+Window* pClient = pOverlap-GetWindow( WINDOW_CLIENT );
+
+if ( pClient-GetWindowPeer() lcl_ImplIsParent( pWindow,
pClient ) )
+{
+::com::sun::star::uno::Reference
::com::sun::star::lang::XComponent xComp( pClient-GetComponentInterface(
sal_False ), ::com::sun::star::uno::UNO_QUERY );
+xComp-dispose();
+}
-pOverlap = pNextOverlap;
+pOverlap = pNextOverlap;
+}
}
Window* pParent = pWindow-GetParent();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index db996f3..7e7538a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1105,11 +1105,11 @@ void Window::ImplRemoveWindow( sal_Bool
bRemoveFrameData )
{
if ( mpWindowImpl-mpPrev )
mpWindowImpl-mpPrev-mpWindowImpl-mpNext =
mpWindowImpl-mpNext;
-else
+else if ( mpWindowImpl-mpParent )
mpWindowImpl-mpParent-mpWindowImpl-mpFirstChild =
mpWindowImpl-mpNext;
if ( mpWindowImpl-mpNext )
mpWindowImpl-mpNext-mpWindowImpl-mpPrev =
mpWindowImpl-mpPrev;
-else
+else if ( mpWindowImpl-mpParent )
mpWindowImpl-mpParent-mpWindowImpl-mpLastChild =
mpWindowImpl-mpPrev;
}
@@ -4368,29 +4368,33 @@ Window::~Window()
{
rtl::OStringBuffer aErrorStr;
sal_BoolbError = sal_False;
-Window* pTempWin = mpWindowImpl-mpFrameData-mpFirstOverlap;
-while ( pTempWin )
+Window* pTempWin;
+if (mpWindowImpl-mpFrameData != 0)
{
-if ( ImplIsRealParentPath( pTempWin ) )
+pTempWin = mpWindowImpl-mpFrameData-mpFirstOverlap;
+while ( pTempWin )
{
-bError = sal_True;
-aErrorStr.append(lcl_createWindowInfo(*pTempWin));
+if ( ImplIsRealParentPath( pTempWin ) )
+{
+bError = sal_True;
+aErrorStr.append(lcl_createWindowInfo(*pTempWin));
+}
+pTempWin = pTempWin-mpWindowImpl-mpNextOverlap;
+}
+if ( bError )
+{
+rtl::OStringBuffer aTempStr;
+aTempStr.append(RTL_CONSTASCII_STRINGPARAM(Window ());
+aTempStr.append(rtl::OUStringToOString(GetText(),
+ RTL_TEXTENCODING_UTF8));
+aTempStr.append(RTL_CONSTASCII_STRINGPARAM(
+) with living SystemWindow(s) destroyed:
));
+aTempStr.append(aErrorStr.toString());
+OSL_FAIL(aTempStr.getStr());
+// abort in non-pro version, this must be fixed!
+GetpApp()-Abort(rtl::OStringToOUString(
+ aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8));
}
-pTempWin = pTempWin-mpWindowImpl-mpNextOverlap;
-}
-if ( bError )
-{
-rtl::OStringBuffer aTempStr;
-
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/dialogcontrol.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce1d0822d0a0fdb4ed3f2583cc1f63ef98381097
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 19 15:27:35 2012 +0100
warning C4100: unreferenced formal parameter
Change-Id: I49da06b94bdc91b1cdc4bb3d047804d353b0aba8
diff --git a/toolkit/source/controls/dialogcontrol.cxx
b/toolkit/source/controls/dialogcontrol.cxx
index 922ad41..1d711d3 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -643,7 +643,7 @@ void SAL_CALL UnoMultiPageControl::inserted(
SAL_UNUSED_PARAMETER ::sal_Int32 )
void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 )
throw (RuntimeException)
{
}
-void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32
ID,
+void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32,
SAL_UNUSED_PARAMETER const
Sequence NamedValue ) throw (RuntimeException)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/helper/accessibilityclient.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e87e2fd386a1848939aad755ed7dc2b3829a2008 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:23:59 2012 +0300 WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I700f66cbc3ddb01d723b9a50709b4b1d5ab66405 diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 4a1cb99..3119ba6 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -51,7 +51,9 @@ namespace toolkit #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibilityClients = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetStandardAccComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference IAccessibleFactorys_pFactory; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 57 -
toolkit/source/controls/grid/sortablegriddatamodel.hxx |4 +
2 files changed, 20 insertions(+), 41 deletions(-)
New commits:
commit 7bfbc9523fd2a6c907cb3ad0b3407ae60c66d358
Author: Frank Schoenheit [fs] frank.schoenh...@oracle.com
Date: Thu Mar 3 13:13:07 2011 +0100
gridfixes: #i117188# remove column sort when rows are inserted
Change-Id: I43b041583c20b47c0fd33a9b5deadffe6fd8f273
Reviewed-on: https://gerrit.libreoffice.org/532
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index fd476e3..ed83013 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -293,45 +293,15 @@ namespace toolkit
MethodGuard aGuard( *this, rBHelper );
DBG_CHECK_ME();
-// if the data is not sorted, broadcast the event unchanged
-if ( !impl_isSorted_nothrow() )
-{
-GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
-impl_broadcast( XGridDataListener::rowsInserted, aEvent, aGuard );
-return;
-}
-
-bool needReIndex = false;
-if ( i_event.FirstRow i_event.LastRow )
-{
-OSL_ENSURE( false, SortableGridDataModel::rowsInserted: invalid
event - invalid row indexes! );
-needReIndex = true;
-}
-else if ( size_t( i_event.FirstRow )
m_privateToPublicRowIndex.size() )
+if ( impl_isSorted_nothrow() )
{
-OSL_ENSURE( false, SortableGridDataModel::rowsInserted: invalid
event - too large row index! );
-needReIndex = true;
-}
-
-if ( needReIndex )
-{
-impl_rebuildIndexesAndNotify( aGuard );
-return;
+// no infrastructure is in place currently to sort the new row to
its proper location,
+// so we remove the sorting here.
+impl_removeColumnSort( aGuard );
+aGuard.reset();
}
-// we do not insert the new rows into the sort order - if somebody
adds rows while we're sorted, s/he has
-// to resort. Instead, we simply append the rows, no matter where they
were inserted in the delegator data
-// model.
-sal_Int32 const nPublicFirstRow = sal_Int32(
m_privateToPublicRowIndex.size() );
-sal_Int32 nPublicLastRow = nPublicFirstRow;
-for ( sal_Int32 newRow = i_event.FirstRow; newRow = i_event.LastRow;
++newRow, ++nPublicLastRow )
-{
-m_privateToPublicRowIndex.push_back( nPublicLastRow );
-m_publicToPrivateRowIndex.push_back( nPublicLastRow );
-}
-
-// broadcast the event
-GridDataEvent const aEvent( *this, -1, -1, nPublicFirstRow,
nPublicLastRow );
+GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
impl_broadcast( XGridDataListener::rowsInserted, aEvent, aGuard );
}
@@ -568,11 +538,8 @@ namespace toolkit
}
//--
-void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw
(RuntimeException)
+void SortableGridDataModel::impl_removeColumnSort( MethodGuard
i_instanceLock )
{
-MethodGuard aGuard( *this, rBHelper );
-DBG_CHECK_ME();
-
lcl_clear( m_publicToPrivateRowIndex );
lcl_clear( m_privateToPublicRowIndex );
@@ -582,11 +549,19 @@ namespace toolkit
impl_broadcast(
XGridDataListener::dataChanged,
GridDataEvent( *this, -1, -1, -1, -1 ),
-aGuard
+i_instanceLock
);
}
//--
+void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw
(RuntimeException)
+{
+MethodGuard aGuard( *this, rBHelper );
+DBG_CHECK_ME();
+impl_removeColumnSort( aGuard );
+}
+
+
//--
Pair ::sal_Int32, ::sal_Bool SAL_CALL
SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException)
{
MethodGuard aGuard( *this, rBHelper );
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx
b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
index 4222ed6..d5dd1e4 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
@@ -179,6 +179,10 @@ namespace toolkit
*/
voidimpl_rebuildIndexesAndNotify( MethodGuard i_instanceLock );
+/** removes the
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 28 -
toolkit/source/controls/grid/sortablegriddatamodel.hxx |6 +++
2 files changed, 25 insertions(+), 9 deletions(-)
New commits:
commit d4e79eb8f8f633ce59ee172bcae44e06fdb723bd
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Sep 3 14:46:42 2012 -0500
gridfixes: #i117625# recognize unsuccessful sorting attempts
and do not claim to be sorted afterwards
Change-Id: I3d71d45893563eac3b59e865aa1aa8d31e8154a8
Reviewed-on: https://gerrit.libreoffice.org/535
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index ed83013..4f4f601 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -330,14 +330,18 @@ namespace toolkit
lcl_clear( m_publicToPrivateRowIndex );
lcl_clear( m_privateToPublicRowIndex );
+// rebuild the index
+if ( !impl_reIndex_nothrow( m_currentSortColumn, m_sortAscending ) )
+{
+impl_removeColumnSort( i_instanceLock );
+return;
+}
+
// broadcast an artificial event, saying that all rows have been
removed
GridDataEvent const aRemovalEvent( *this, -1, -1, -1, -1 );
impl_broadcast( XGridDataListener::rowsRemoved, aRemovalEvent,
i_instanceLock );
i_instanceLock.reset();
-// rebuild the index
-impl_reIndex_nothrow( m_currentSortColumn, m_sortAscending );
-
// broadcast an artificial event, saying that n rows have been added
GridDataEvent const aAdditionEvent( *this, -1, -1, 0,
m_delegator-getRowCount() - 1 );
impl_broadcast( XGridDataListener::rowsInserted, aAdditionEvent,
i_instanceLock );
@@ -473,7 +477,7 @@ namespace toolkit
}
//--
-void SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const
i_columnIndex, sal_Bool const i_sortAscending )
+bool SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const
i_columnIndex, sal_Bool const i_sortAscending )
{
::sal_Int32 const rowCount( getRowCount() );
::std::vector ::sal_Int32 aPublicToPrivate( rowCount );
@@ -495,7 +499,7 @@ namespace toolkit
// get predicate object
::std::auto_ptr ::comphelper::IKeyPredicateLess const
pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
-ENSURE_OR_RETURN_VOID( pPredicate.get(),
SortableGridDataModel::impl_reIndex_nothrow: no sortable data found! );
+ENSURE_OR_RETURN_FALSE( pPredicate.get(),
SortableGridDataModel::impl_reIndex_nothrow: no sortable data found! );
// then sort
CellDataLessComparison const aComparator( aColumnData,
*pPredicate, i_sortAscending );
@@ -504,7 +508,7 @@ namespace toolkit
catch( const Exception )
{
DBG_UNHANDLED_EXCEPTION();
-return;
+return false;
}
// also build the private to public mapping
@@ -514,6 +518,8 @@ namespace toolkit
m_publicToPrivateRowIndex.swap( aPublicToPrivate );
m_privateToPublicRowIndex.swap( aPrivateToPublic );
+
+return true;
}
//--
@@ -525,7 +531,8 @@ namespace toolkit
if ( ( i_columnIndex 0 ) || ( i_columnIndex = getColumnCount() ) )
throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
-impl_reIndex_nothrow( i_columnIndex, i_sortAscending );
+if ( !impl_reIndex_nothrow( i_columnIndex, i_sortAscending ) )
+return;
m_currentSortColumn = i_columnIndex;
m_sortAscending = i_sortAscending;
@@ -538,14 +545,19 @@ namespace toolkit
}
//--
-void SortableGridDataModel::impl_removeColumnSort( MethodGuard
i_instanceLock )
+void SortableGridDataModel::impl_removeColumnSort_noBroadcast()
{
lcl_clear( m_publicToPrivateRowIndex );
lcl_clear( m_privateToPublicRowIndex );
m_currentSortColumn = -1;
m_sortAscending = sal_True;
+}
+
//--
+void SortableGridDataModel::impl_removeColumnSort( MethodGuard
i_instanceLock )
+{
+impl_removeColumnSort_noBroadcast();
impl_broadcast(
XGridDataListener::dataChanged,
GridDataEvent( *this, -1, -1, -1, -1 ),
diff --git
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/grid/defaultgriddatamodel.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5200140683c461e7439d8f2b5a625391350a2cef Author: Miklos Vajna vmik...@suse.cz Date: Fri Sep 14 09:31:34 2012 +0200 DefaultGridDataModel::getRowData: use o3tl::select1st Change-Id: I785588971d0f42596802276d3d0804387b98 diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index d268b62..7c05682 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -36,7 +36,7 @@ #include rtl/ref.hxx #include algorithm -#include functional +#include o3tl/compat_functional.hxx //.. namespace toolkit @@ -182,7 +182,7 @@ namespace toolkit Sequence Any resultData( m_nColumnCount ); RowData rRowData = impl_getRowDataAccess_throw( i_rowIndex, m_nColumnCount ); -::std::transform( rRowData.begin(), rRowData.end(), resultData.getArray(), ::std::select1st CellData () ); +::std::transform( rRowData.begin(), rRowData.end(), resultData.getArray(), ::o3tl::select1st CellData () ); return resultData; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/grid/sortablegriddatamodel.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f00bba4305cbe666593141a0be9295ef39c1f754 Author: Frank Schoenheit [fs] frank.schoenh...@oracle.com Date: Fri Mar 25 15:00:20 2011 +0100 gridfixes: GCC WaE Change-Id: Ie771f38a2a1d3d60dd6d84806d17839d93ec6cf3 Reviewed-on: https://gerrit.libreoffice.org/546 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index d64e68f..8e10e0b 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -615,7 +615,7 @@ namespace toolkit Reference XMutableGridDataModel const delegator( m_delegator ); aGuard.clear(); -delegator-insertRow( i_index, i_heading, i_data ); +delegator-insertRow( rowIndex, i_heading, i_data ); } //-- @@ -629,7 +629,7 @@ namespace toolkit Reference XMutableGridDataModel const delegator( m_delegator ); aGuard.clear(); -delegator-insertRows( i_index, i_headings, i_data ); +delegator-insertRows( rowIndex, i_headings, i_data ); } //-- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/tabpagecontainer.cxx | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 1e826e71e78f9f6609dc93e3f1d81eb4e418f4d6
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Sep 3 15:38:51 2012 -0500
gridfixes: #i117549# create/loadTabPage
use a GeometryControlModel only if the parent model is one, too
Change-Id: I8cf7bb8cf721b6f841ddfbb7e02475c6e2c6741a
Reviewed-on: https://gerrit.libreoffice.org/550
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/toolkit/source/controls/tabpagecontainer.cxx
b/toolkit/source/controls/tabpagecontainer.cxx
index 0175ecc..59a0335 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -107,15 +107,21 @@ Reference ::com::sun::star::beans::XPropertySetInfo
UnoControlTabPageContaine
namespace
{
Reference XTabPageModel lcl_createTabPageModel(
::comphelper::ComponentContext const i_context,
-Sequence Any const i_initArguments )
+Sequence Any const i_initArguments, Reference XPropertySet
const i_parentModel )
{
try
{
-Reference XTabPageModel const xTabPageModel(
-*( new OGeometryControlModel UnoControlTabPageModel (
i_context.getLegacyServiceFactory() ) ),
-UNO_QUERY_THROW
-);
+Reference XPropertySet const xParentDelegator( i_parentModel,
UNO_QUERY_THROW );
+Reference XPropertySetInfo const xPSI(
xParentDelegator-getPropertySetInfo() );
+bool const isGeometryControlModel = xPSI.is()
xPSI-hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
PositionX ) ) );
+Reference XInterface xInstance;
+if ( isGeometryControlModel )
+xInstance = *( new OGeometryControlModel
UnoControlTabPageModel ( i_context.getLegacyServiceFactory() ) );
+else
+xInstance = *( new UnoControlTabPageModel(
i_context.getLegacyServiceFactory() ) );
+
+Reference XTabPageModel const xTabPageModel( xInstance,
UNO_QUERY_THROW );
Reference XInitialization const xInit( xTabPageModel,
UNO_QUERY_THROW );
xInit-initialize( i_initArguments );
@@ -137,7 +143,7 @@ Reference XTabPageModel SAL_CALL
UnoControlTabPageContainerModel::createTabPa
{
Sequence Any aInitArgs(1);
aInitArgs[0] = i_tabPageID;
-return lcl_createTabPageModel( maContext, aInitArgs );
+return lcl_createTabPageModel( maContext, aInitArgs, this );
}
Reference XTabPageModel SAL_CALL
UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const
::rtl::OUString i_resourceURL ) throw (RuntimeException)
@@ -145,7 +151,7 @@ Reference XTabPageModel SAL_CALL
UnoControlTabPageContainerModel::loadTabPage
Sequence Any aInitArgs(2);
aInitArgs[0] = i_tabPageID;
aInitArgs[1] = i_resourceURL;
-return lcl_createTabPageModel( maContext, aInitArgs );
+return lcl_createTabPageModel( maContext, aInitArgs, this );
}
void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32
nIndex, const com::sun::star::uno::Any aElement) throw
(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException,
uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxcontainer.cxx |4 1 file changed, 4 insertions(+) New commits: commit a9b9ffacac74310c38f152cb9bcc56fe06b0e1d6 Author: Noel Power noel.po...@suse.com Date: Tue Sep 11 17:48:21 2012 +0100 blind fix for toolkit_unoapi Change-Id: I545b712c5fb72d8de415752b7fb4ec20ab3fcee0 diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index a15fef2..1afcfab 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -260,6 +260,10 @@ throw(::com::sun::star::uno::RuntimeException) OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() ); if ( !pDev ) pDev = pWindow-GetParent(); +// shouldn't happen but it appears pDev can be NULL +// #FIXME ( find out how/why ) +if ( !pDev ) +break; aSize = pDev-LogicToPixel( aSize, aMode ); switch ( nPropType ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxwindows.cxx |2 +-
toolkit/source/controls/unocontrols.cxx |2 +-
toolkit/source/helper/unowrapper.cxx|4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1e0a822fa14eb4f8d3da80cf76dd5a43df472649
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 10 23:47:53 2012 +0200
fdo#39468: Translate remaining German comments in toolkit/
This is a follow-up patch of be88027c327b5f09d134f235db100ec54afdc30d
translating the remaing comments that were missed there.
Change-Id: I7866060ef6eec5f92751671bd4fc4bee64db149b
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 586d3a6..88ae10a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -467,7 +467,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString
rCommand ) throw(::com
if ( pButton )
{
Size aMinSz = pButton-CalcMinimumSize();
-// Kein Text, also Image
+// no text, thus image
if ( !pButton-GetText().Len() )
{
if ( aSz.Width() aMinSz.Width() )
diff --git a/toolkit/source/controls/unocontrols.cxx
b/toolkit/source/controls/unocontrols.cxx
index 9d7c942..7fa0101 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -926,7 +926,7 @@ UnoImageControlControl::UnoImageControlControl( const
Reference XMultiServiceFa
:UnoImageControlControl_Base( i_factory )
,maActionListeners( *this )
{
-// Woher die Defaults nehmen?
+// TODO: Where should I look for defaults?
maComponentInfos.nWidth = 100;
maComponentInfos.nHeight = 100;
}
diff --git a/toolkit/source/helper/unowrapper.cxx
b/toolkit/source/helper/unowrapper.cxx
index 1712622..aab4433 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -258,8 +258,8 @@ sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window*
pPossibleChild )
void UnoWrapper::WindowDestroyed( Window* pWindow )
{
-// ggf. existieren noch von ::com::sun::star::loader::Java erzeugte
Children, die sonst erst
-// im Garbage-Collector zerstoert werden...
+// their still might be some children created with
::com::sun::star::loader::Java
+// that would otherwise not be destroyed until the garbage collector
cleans up
Window* pChild = pWindow-GetWindow( WINDOW_FIRSTCHILD );
while ( pChild )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxaccessiblecomponent.cxx |4 -
toolkit/source/awt/vclxprinter.cxx |4 -
toolkit/source/awt/vclxtoolkit.cxx |6 +-
toolkit/source/awt/vclxwindow1.cxx |4 -
toolkit/source/awt/vclxwindows.cxx | 16 ++---
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |6 +-
toolkit/source/controls/grid/gridcontrol.cxx|6 +-
toolkit/source/controls/roadmapcontrol.cxx | 10 +--
toolkit/source/controls/roadmapentry.cxx| 12 ++--
toolkit/source/controls/stdtabcontroller.cxx|2
toolkit/source/controls/tkscrollbar.cxx |2
toolkit/source/controls/tksimpleanimation.cxx |6 +-
toolkit/source/controls/tkspinbutton.cxx|6 +-
toolkit/source/controls/tkthrobber.cxx |6 +-
toolkit/source/controls/tree/treecontrol.cxx|2
toolkit/source/controls/unocontrol.cxx | 10 +--
toolkit/source/controls/unocontrols.cxx | 48
toolkit/source/helper/accessibilityclient.cxx |6 --
toolkit/source/helper/vclunohelper.cxx |2
19 files changed, 78 insertions(+), 80 deletions(-)
New commits:
commit 9485f3a6d68372db28481ee895a2b9983d1c3b59
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon May 28 15:43:18 2012 -0500
targeted string re-work
Change-Id: If929937d8b1243032983b8b379f067a47d2717a4
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index c0c5f96..794aa37 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -108,7 +108,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent,
AccessibleExtendedCom
::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw
(uno::RuntimeException)
{
-return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.toolkit.AccessibleWindow));
+return ::rtl::OUString(com.sun.star.comp.toolkit.AccessibleWindow);
}
sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString
rServiceName ) throw (uno::RuntimeException)
@@ -125,7 +125,7 @@ sal_Bool VCLXAccessibleComponent::supportsService( const
::rtl::OUString rServi
uno::Sequence ::rtl::OUString
VCLXAccessibleComponent::getSupportedServiceNames() throw
(uno::RuntimeException)
{
uno::Sequence ::rtl::OUString aNames(1);
-aNames[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.awt.AccessibleWindow));
+aNames[0] = ::rtl::OUString(com.sun.star.awt.AccessibleWindow);
return aNames;
}
diff --git a/toolkit/source/awt/vclxprinter.cxx
b/toolkit/source/awt/vclxprinter.cxx
index f76a381..c352d72 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -61,8 +61,8 @@
{
static ::com::sun::star::beans::Property aPropTable[] =
{
-::com::sun::star::beans::Property(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Orientation)),
PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
-::com::sun::star::beans::Property(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Horizontal)),
PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
+::com::sun::star::beans::Property(
::rtl::OUString(Orientation), PROPERTY_Orientation, ::getCppuType((const
sal_Int16*)0), 0 ),
+::com::sun::star::beans::Property(
::rtl::OUString(Horizontal), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
};
pProperties = aPropTable;
nElements = sizeof( aPropTable ) / sizeof(
::com::sun::star::beans::Property );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index f460c3e..93dbbee 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1105,7 +1105,7 @@ css::uno::Reference css::awt::XWindowPeer
VCLXToolkit::ImplCreateWindow(
thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib )
{
-::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM(
CreateWindow ) );
+::rtl::OUString aFunctionName( CreateWindow );
fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol(
hSvToolsLib, aFunctionName.pData );
}
}
@@ -1368,7 +1368,7 @@ css::uno::Reference css::awt::XWindowPeer
VCLXToolkit::ImplCreateWindow(
{
// remember clipboard here
mxClipboard = ::com::sun::star::uno::Reference
::com::sun::star::datatransfer::clipboard::XClipboard (
-xFactory-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.datatransfer.clipboard.SystemClipboard))
),
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/unocontrolmodel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d0644be54ddc581d98c2c4cab842b71756104c21 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 5 15:22:55 2012 + fix dbgutil build diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 53c5af0..ac7f3ed 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -703,7 +703,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference ::com::sun: ::rtl::OUString sTypeName( rType.getTypeName() ); sMessage += ::rtl::OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += '.\n(Currently handling property '; -::rtl::OUString sPropertyName( GetPropertyName( pProp-GetId() ) ); +::rtl::OUString sPropertyName( GetPropertyName( *it ) ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += '.); OSL_FAIL( sMessage.getStr() ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxprinter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 877663b9c262be9b5d8620f756a4cfdf97195279 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 19 11:39:15 2012 +0100 Explicit type in SvStream::operator call. diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 137c6f6..25a6efb 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -269,7 +269,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString rFormDescription ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; -aMem BINARYSETUPMARKER; +aMem sal_uInt32(BINARYSETUPMARKER); aMem GetPrinter()-GetJobSetup(); return ::com::sun::star::uno::Sequencesal_Int8( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/stdtabcontroller.cxx | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 09179e24c4e4eec135012a3cce5e1cffc42fae60
Author: julien2412 serval2...@yahoo.fr
Date: Mon Oct 24 14:46:13 2011 +0200
activation order crashes address database (fdo#41022)
diff --git a/toolkit/source/controls/stdtabcontroller.cxx
b/toolkit/source/controls/stdtabcontroller.cxx
index 3065515..082733f 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -262,6 +262,7 @@ void StdTabController::autoTabOrder( )
throw(RuntimeException)
sal_uInt32 nCtrls = aCompSeq.getLength();
Reference XWindow * pComponents = aCompSeq.getArray();
+// insert sort algorithm
ComponentEntryList aCtrls;
size_t n;
for ( n = 0; n nCtrls; n++ )
@@ -277,15 +278,9 @@ void StdTabController::autoTabOrder( )
throw(RuntimeException)
for ( nPos = 0; nPos aCtrls.size(); nPos++ )
{
ComponentEntry* pEntry = aCtrls[ nPos ];
-if ( pEntry-aPos.Y() = pE-aPos.Y() )
-{
-while ( pEntry ( pEntry-aPos.Y() == pE-aPos.Y() )
- ( pEntry-aPos.X() pE-aPos.X() ) )
-{
-pEntry = aCtrls[ ++nPos ];
-}
-break;
-}
+if ( ( pEntry-aPos.Y() pE-aPos.Y() ) ||
+ ( ( pEntry-aPos.Y() == pE-aPos.Y() ) ( pEntry-aPos.X()
pE-aPos.X() ) ) )
+break;
}
if ( nPos aCtrls.size() ) {
ComponentEntryList::iterator it = aCtrls.begin();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
