summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/toolkit/controls/unocontrol.hxx2
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx2
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrol.cxx9
-rw-r--r--toolkit/source/controls/unocontrolbase.cxx10
5 files changed, 11 insertions, 14 deletions
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index ba9519e5a940..fd5fa0a0f618 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -116,7 +116,7 @@ protected:
virtual void updateFromModel();
void peerCreated();
bool ImplCheckLocalize( OUString& _rPossiblyLocalizable );
- css::uno::Reference< css::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer );
+ css::uno::Reference< css::awt::XWindowPeer > ImplGetCompatiblePeer();
virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal );
virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc );
virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents );
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index cb0fa9f6d9f9..be6c1f92acc6 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1427,7 +1427,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
}
else
{
- Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true );
+ Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer();
Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM;
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index e7ae8201869a..9713c16306de 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -1133,7 +1133,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
}
else
{
- Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true );
+ Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer();
Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 856ea4cd2005..84d2fcf3d328 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -156,16 +156,13 @@ OUString UnoControl::GetComponentServiceName()
return OUString();
}
-Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( bool bAcceptExistingPeer )
+Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer()
{
DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" );
mbCreatingCompatiblePeer = true;
- Reference< XWindowPeer > xCompatiblePeer;
-
- if ( bAcceptExistingPeer )
- xCompatiblePeer = getPeer();
+ Reference< XWindowPeer > xCompatiblePeer = getPeer();
if ( !xCompatiblePeer.is() )
{
@@ -1005,7 +1002,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::e
{
::osl::MutexGuard aGuard( GetMutex() );
- xDrawPeer = ImplGetCompatiblePeer( true );
+ xDrawPeer = ImplGetCompatiblePeer();
bDisposeDrawPeer = xDrawPeer.is() && ( xDrawPeer != getPeer() );
xDrawPeerView.set( xDrawPeer, UNO_QUERY );
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index 3ded2fcead43..81732d148cdc 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -174,7 +174,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
css::awt::Size UnoControlBase::Impl_getMinimumSize()
{
css::awt::Size aSz;
- css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
+ css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@@ -191,7 +191,7 @@ css::awt::Size UnoControlBase::Impl_getMinimumSize()
css::awt::Size UnoControlBase::Impl_getPreferredSize()
{
css::awt::Size aSz;
- css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
+ css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@@ -208,7 +208,7 @@ css::awt::Size UnoControlBase::Impl_getPreferredSize()
css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNewSize )
{
css::awt::Size aSz;
- css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
+ css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@@ -225,7 +225,7 @@ css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNew
css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
{
css::awt::Size aSz;
- css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
+ css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@@ -241,7 +241,7 @@ css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 n
void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
{
- css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
+ css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
generated by cgit (git 2.34.1) at 2025-01-28 18:02:37 +0000