[Libreoffice-commits] core.git: sfx2/source

[Maxim Monastirsky]

 sfx2/source/toolbox/tbxitem.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2281331b1ab40288494ab3659d9c66e13d3e905
Author: Maxim Monastirsky <momonas...@gmail.com>
Date:   Mon Jul 27 20:11:17 2015 +0300

    Fix mismerge
    
    Change-Id: I48971707410c05e0af1ffa80ed50e5f43615795b

diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2906100..8119b26 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1142,7 +1142,7 @@ VclPtr<SfxPopupWindow> 
SfxRecentFilesToolBoxControl::CreatePopupWindow()
     sal_uInt16 nItemId = GetId();
     ::Rectangle aRect( rBox.GetItemRect( nItemId ) );
 
-    Sequence< Any > aArgs( 2 );
+    Sequence< Any > aArgs( 3 );
     PropertyValue aPropValue;
 
     aPropValue.Name = "CommandURL";
@@ -1195,7 +1195,7 @@ VclPtr<SfxPopupWindow> 
SfxSaveAsToolBoxControl::CreatePopupWindow()
     sal_uInt16 nItemId = GetId();
     ::Rectangle aRect( rBox.GetItemRect( nItemId ) );
 
-    Sequence< Any > aArgs( 3 );
+    Sequence< Any > aArgs( 2 );
     PropertyValue aPropValue;
 
     aPropValue.Name = "CommandURL";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits