Skip to content

C
core
Kaydet (Commit) e2281331 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky
Dosyalara gözat
Seçenekler

Fix mismerge 

Change-Id: I48971707410c05e0af1ffa80ed50e5f43615795b
üst e6ff4775
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sfx2/source/toolbox/tbxitem.cxx
Dosyayı görüntüle @ e2281331
...@@ -1142,7 +1142,7 @@ VclPtr<SfxPopupWindow> SfxRecentFilesToolBoxControl::CreatePopupWindow() ...@@ -1142,7 +1142,7 @@ VclPtr<SfxPopupWindow> SfxRecentFilesToolBoxControl::CreatePopupWindow()
sal_uInt16 nItemId = GetId(); sal_uInt16 nItemId = GetId();
::Rectangle aRect( rBox.GetItemRect( nItemId ) ); ::Rectangle aRect( rBox.GetItemRect( nItemId ) );
Sequence< Any > aArgs( 2 ); Sequence< Any > aArgs( 3 );
PropertyValue aPropValue; PropertyValue aPropValue;
aPropValue.Name = "CommandURL"; aPropValue.Name = "CommandURL";
...@@ -1195,7 +1195,7 @@ VclPtr<SfxPopupWindow> SfxSaveAsToolBoxControl::CreatePopupWindow() ...@@ -1195,7 +1195,7 @@ VclPtr<SfxPopupWindow> SfxSaveAsToolBoxControl::CreatePopupWindow()
sal_uInt16 nItemId = GetId(); sal_uInt16 nItemId = GetId();
::Rectangle aRect( rBox.GetItemRect( nItemId ) ); ::Rectangle aRect( rBox.GetItemRect( nItemId ) );
Sequence< Any > aArgs( 3 ); Sequence< Any > aArgs( 2 );
PropertyValue aPropValue; PropertyValue aPropValue;
aPropValue.Name = "CommandURL"; aPropValue.Name = "CommandURL";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment