diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index afebf2e6b62d..4a2211d749dd 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1834,6 +1834,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) aSearchBtn.Enable( !bNoSearch ); aSearchText.Enable( !bNoSearch ); aSearchLB.Enable( !bNoSearch ); + aNotesBtn.Enable(); if ( ( SEARCH_OPTIONS_WHOLE_WORDS & nOptions ) != 0 ) aWordBtn.Enable(); @@ -1843,7 +1844,6 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) aBackwardsBtn.Enable(); else aBackwardsBtn.Disable(); - aNotesBtn.Enable(); if ( ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0 ) aRegExpBtn.Enable(); else diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 282cbde3e53a..6581488c6bce 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2991,8 +2991,6 @@ sal_Bool DbFilterField::commitControl() } else { - // display the error and return sal_False - OUString aTitle( SVX_RESSTR(RID_STR_SYNTAXERROR) ); SQLException aError; aError.Message = aErrorMsg; diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index e9b0a282838d..44bb0ca60237 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -859,8 +859,8 @@ namespace svxform // test for 5) // if ( bDropTargetIsComponent && (pDropTargetParent != pCurrentParent) ) - if ( bDropTargetIsComponent ) // TODO : die obige Zeile wieder rein, dann muss aber ExecuteDrop das Vertauschen auch beherrschen - return DND_ACTION_NONE; + if ( bDropTargetIsComponent ) // TODO : die obige Zeile wieder rein, dann muss aber ExecuteDrop das Vertauschen auch beherrschen + return DND_ACTION_NONE; // test for 3) if ( IsFormEntry(pCurrent) ) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 271e196e250d..53975595b624 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -193,7 +193,7 @@ const String SgaObject::GetTitle() const String aPrivateInd ( aReturnValue.GetToken( 0, ':' ) ); String aResourceName( aReturnValue.GetToken( 1, ':' ) ); sal_Int32 nResId ( aReturnValue.GetToken( 2, ':' ).ToInt32() ); - if ( aReturnValue.GetToken( 0, ':' ).EqualsAscii( "private" ) && + if ( aPrivateInd.EqualsAscii( "private" ) && aResourceName.Len() && ( nResId > 0 ) && ( nResId < 0x10000 ) ) { rtl::OString aMgrName(rtl::OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); |