diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-25 22:11:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:34 +0100 |
| commit | a1748501d81425d26d09509eec2fd141f2f28f05 (patch) | |
| tree | ef1f7e42eb8d8afd660741229d6d628c7127667a /framework | |
| parent | Better approach for solving fdo#52204 (diff) | |
| download | core-a1748501d81425d26d09509eec2fd141f2f28f05.tar.gz core-a1748501d81425d26d09509eec2fd141f2f28f05.zip | |
Kill SfxAppToolBoxControl_Impl
(cherry picked from commit 273121f8d7e277e35c8e5a8aad46ef0c103ebc03)
Conflicts:
sfx2/inc/sfx2/mnuitem.hxx
sfx2/inc/sfx2/tbxctrl.hxx
sfx2/source/appl/appreg.cxx
sfx2/source/menu/mnuitem.cxx
sfx2/source/toolbox/tbxitem.cxx
Change-Id: I6d0750d89ad009f82c5552d971537b78e45426f2
Silence warning C4706
(cherry picked from commit 0b373b3e4c45d09c40a8949e9366adb9b991de4b)
Change-Id: Id497469eba8288565145c47c84b7938a1316c21a
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index d9189a353b47..0340c03c07fd 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -312,7 +312,7 @@ static sal_Bool Impl_ExistURLInMenu( { sal_Bool bValidFallback( sal_False ); sal_uInt16 nCount( 0 ); - if ( rPopupMenu.is() && ( nCount = rPopupMenu->getItemCount() ) && sURL.getLength() ) + if ( rPopupMenu.is() && ( nCount = rPopupMenu->getItemCount() ) != 0 && sURL.getLength() ) { for ( sal_uInt16 n = 0; n < nCount; ++n ) { |