diff options
Diffstat (limited to 'framework/source/layoutmanager')
-rw-r--r-- | framework/source/layoutmanager/helpers.cxx | 2 | ||||
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 10 | ||||
-rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 92404ddcb818..a108baaa287f 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -310,7 +310,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp css::uno::Sequence< css::beans::PropertyValue > aArgs(1); aArgs[0].Name = aDockWinArgName; - aArgs[0].Value = css::uno::makeAny( bVisible ); + aArgs[0].Value <<= bVisible; css::uno::Reference< css::frame::XDispatchHelper > xDispatcher = css::frame::DispatchHelper::create( rxContext ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 425b57879739..1243f2d88205 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -655,12 +655,12 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI Sequence< PropertyValue > aWindowState( 8 ); aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED; - aWindowState[0].Value = makeAny( !rElementData.m_bFloating ); + aWindowState[0].Value <<= !rElementData.m_bFloating; aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE; - aWindowState[1].Value = makeAny( rElementData.m_bVisible ); + aWindowState[1].Value <<= rElementData.m_bVisible; aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA; - aWindowState[2].Value = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); + aWindowState[2].Value <<= static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ); aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS; aWindowState[3].Value <<= rElementData.m_aDockedData.m_aPos; @@ -671,9 +671,9 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE; aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize; aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME; - aWindowState[6].Value = makeAny( rElementData.m_aUIName ); + aWindowState[6].Value <<= rElementData.m_aUIName; aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED; - aWindowState[7].Value = makeAny( rElementData.m_aDockedData.m_bLocked ); + aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked; if ( xPersistentWindowState->hasByName( aName )) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 4f69df830dcb..98edc791193e 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1593,11 +1593,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen uno::Sequence< beans::PropertyValue > aWindowState( 9 ); aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED; - aWindowState[0].Value = ::uno::makeAny( !rElementData.m_bFloating ); + aWindowState[0].Value <<= !rElementData.m_bFloating; aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE; - aWindowState[1].Value = uno::makeAny( rElementData.m_bVisible ); + aWindowState[1].Value <<= rElementData.m_bVisible; aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA; - aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); + aWindowState[2].Value <<= static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ); awt::Point aPos = rElementData.m_aDockedData.m_aPos; aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS; @@ -1610,11 +1610,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE; aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize; aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME; - aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName ); + aWindowState[6].Value <<= rElementData.m_aUIName; aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED; - aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked ); + aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked; aWindowState[8].Name = WINDOWSTATE_PROPERTY_STYLE; - aWindowState[8].Value = uno::makeAny( static_cast<sal_uInt16>(rElementData.m_nStyle) ); + aWindowState[8].Value <<= static_cast<sal_uInt16>(rElementData.m_nStyle); OUString aName = rElementData.m_aName; if ( xPersistentWindowState->hasByName( aName )) |