CWS-TOOLING: integrate CWS notes7

2008-12-29 19:45:08 +0100 mod  r265824 : CWS-TOOLING: rebase CWS notes7 to trunk@265758 (milestone: DEV300:m38)
2008-12-16 14:54:42 +0100 mod  r265544 : #i97239#
2008-12-16 14:53:18 +0100 mod  r265543 : #i97239#
2008-12-16 13:36:43 +0100 mod  r265537 : 96602
2008-12-13 13:02:54 +0100 mba  r265452 : warning fixed
2008-12-13 08:20:21 +0100 mod  r265448 : search inside notes
2008-12-13 00:11:47 +0100 mod  r265447 : search inside notes
2008-12-13 00:11:09 +0100 mod  r265446 : search inside notes
2008-12-13 00:10:52 +0100 mod  r265445 : search inside notes
2008-12-12 19:39:14 +0100 mod  r265439 : search inside notes
2008-12-12 19:02:44 +0100 mod  r265438 : search inside notes
2008-12-12 16:42:07 +0100 mba  r265431 : #i80135#: search in notes
2008-12-12 16:11:54 +0100 mba  r265429 : #i80135#: search in notes
2008-12-12 16:11:02 +0100 mba  r265428 : #i80135#: search in notes
2008-12-11 20:24:20 +0100 pb  r265358 : fix: #i80135# fixes for aNotesBtn
2008-12-11 20:23:19 +0100 pb  r265357 : fix: #i80135# fixes for aNotesBtn
2008-12-11 07:42:17 +0100 pb  r265241 : fix: #i80135# CB_NOTES added
2008-12-11 07:40:36 +0100 pb  r265240 : fix: #i80135# CB_NOTES added
2008-12-11 07:32:03 +0100 pb  r265239 : fix: #i80135# CheckBox aNotesBtn added
2008-12-11 07:24:45 +0100 pb  r265238 : fix: #i80135# CheckBox aNotesBtn added
2008-12-10 15:41:31 +0100 mod  r265198 : crash using replies
2008-12-10 15:21:23 +0100 mod  r265195 : crash using replies
2008-12-10 13:45:14 +0100 mba  r265181 : warning fixed
2008-12-10 13:26:45 +0100 mba  r265178 : warning fixed
2008-12-10 11:48:23 +0100 mba  r265162 : fixed compilation error on Linux
2008-12-03 18:39:07 +0100 mod  r264806 : we don't get the Ctrl-Alt-N on mac inside a note, let's do the whole reply thing using the shell, cleaner anyway
2008-12-03 17:13:59 +0100 mod  r264802 : search dialog can be started and closed when focus is inside a note
2008-12-03 00:07:08 +0100 mod  r264733 : search inside notes
2008-12-02 18:06:08 +0100 mod  r264729 : WaE
2008-12-02 15:01:26 +0100 mod  r264703 : WaE
2008-12-02 00:20:14 +0100 mod  r264644 : WaE
2008-12-01 10:06:14 +0100 mod  r264587 : WaE
2008-12-01 01:28:34 +0100 mod  r264585 : WaE
2008-11-30 22:51:19 +0100 mod  r264584 : search inside notes
2008-11-30 17:03:04 +0100 mod  r264583 : search inside notes
2008-11-28 16:30:05 +0100 mod  r264560 : #i96602#
2008-11-28 16:14:50 +0100 mod  r264559 : test
2008-11-28 16:11:37 +0100 mod  r264558 : test
2008-11-17 17:46:10 +0100 mod  r263735 : WaE
2008-11-17 17:45:56 +0100 mod  r263734 : WaE
2008-11-17 17:37:35 +0100 mod  r263733 : revert manual fix for icu
2008-11-17 15:03:55 +0100 mod  r263726 : manual fix for icu
2008-11-17 11:17:49 +0100 mod  r263707 : manual fix for icu
2008-11-14 15:51:19 +0100 mod  r263679 : fix
2008-11-14 14:48:02 +0100 mod  r263676 : some more cleanup, redline comments not in the margin for 3.1
2008-11-14 08:37:07 +0100 mod  r263664 : end of line missing
2008-11-13 18:36:53 +0100 mod  r263660 : WaE
2008-11-13 18:20:04 +0100 mod  r263659 : #i94374#
2008-11-13 15:51:28 +0100 mod  r263648 : CWS-TOOLING: rebase CWS notes7 to trunk@263288 (milestone: DEV300:m35)
2008-11-13 08:33:19 +0100 mod  r263622 : typos
2008-11-02 23:18:19 +0100 mod  r263278 : changes notes, replies
2008-11-01 11:48:35 +0100 mod  r262873 : replies, comments
2008-11-01 11:44:57 +0100 mod  r262872 : notes search button
2008-10-10 14:34:34 +0200 mod  r262150 : migration from cvs to svn
2008-10-10 14:33:39 +0200 mod  r262149 : migration from cvs to svn

4 files changed, 127 insertions, 42 deletions

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 73ea46fe50..11eeb12a6b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -96,10 +96,11 @@ using namespace comphelper;
 #define MODIFY_SIMILARITY	0x00000100
 #define MODIFY_FORMULAS		0x00000200
 #define MODIFY_VALUES		0x00000400
-#define MODIFY_NOTES		0x00000800
+#define MODIFY_CALC_NOTES   0x00000800
 #define MODIFY_ROWS			0x00001000
 #define MODIFY_COLUMNS		0x00002000
-#define MODIFY_ALLTABLES	0x00004000
+#define MODIFY_ALLTABLES    0x00004000
+#define MODIFY_NOTES        0x00008000
 
 SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
 
@@ -349,6 +350,7 @@ void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
     aSimilarityBox  ( this, SVX_RES( CB_SIMILARITY) ),                        \
     aSimilarityBtn  ( this, SVX_RES( PB_SIMILARITY) ),                        \
     aLayoutBtn      ( this, SVX_RES( CB_LAYOUTS ) ),                          \
+    aNotesBtn       ( this, SVX_RES( CB_NOTES ) ),                            \
     aJapMatchFullHalfWidthCB( this, SVX_RES( CB_JAP_MATCH_FULL_HALF_WIDTH ) ),\
     aJapOptionsCB   ( this, SVX_RES( CB_JAP_SOUNDS_LIKE ) ),                  \
     aJapOptionsBtn  ( this, SVX_RES( PB_JAP_OPTIONS ) ),                      \
@@ -557,7 +559,7 @@ void SvxSearchDialog::Construct_Impl()
             }
         }
         catch(uno::Exception&){}
-        
+
         if(aSearchComponent1PB.GetText().Len() && bSearchComponent1 )
         {
             aSearchComponentFL.Show();
@@ -573,8 +575,8 @@ void SvxSearchDialog::Construct_Impl()
             aSearchComponent2PB.Show();
         }
         if( aSearchComponentFL.IsVisible() && aSearchComponent1PB.IsVisible() )
-        {        
-        
+        {
+
             //dialog must be resized
             Size aDlgSize(GetSizePixel());
             sal_Int32 nOffset = aSearchCmdLine.GetPosPixel().Y() - aSearchAllBtn.GetPosPixel().Y()
@@ -590,6 +592,7 @@ void SvxSearchDialog::Construct_Impl()
                 &aSimilarityBox,
                 &aSimilarityBtn,
                 &aLayoutBtn,
+                &aNotesBtn,
                 &aJapMatchFullHalfWidthCB,
                 &aJapOptionsCB,
                 &aJapOptionsBtn,
@@ -642,6 +645,7 @@ BOOL SvxSearchDialog::Close()
     aOpt.SetSimilaritySearch		( aSimilarityBox		  .IsChecked() );
     //aOpt.SetMatchFullHalfWidthForms   ( !aJapMatchFullHalfWidthCB.IsChecked() );
     aOpt.SetUseAsianOptions			( aJapOptionsCB		  	  .IsChecked() );
+        aOpt.SetNotes                   ( aNotesBtn               .IsChecked() );
 
     const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
     rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs );
@@ -735,6 +739,7 @@ void SvxSearchDialog::InitControls_Impl()
     aMatchCaseCB.SetClickHdl( aLink );
     aRegExpBtn.SetClickHdl( aLink );
     aBackwardsBtn.SetClickHdl( aLink );
+    aNotesBtn.SetClickHdl( aLink );
     aSimilarityBox.SetClickHdl( aLink );
     aJapOptionsCB.SetClickHdl( aLink );
     aJapMatchFullHalfWidthCB.SetClickHdl( aLink );
@@ -770,8 +775,10 @@ void SvxSearchDialog::CalculateDelta_Impl()
 
     bool bDrawApp = false;
     bool bCalcApp = false;
+    bool bWriterApp = false;
+    bool bImpressApp = false;
     const uno::Reference< frame::XFrame > xFrame = rBindings.GetActiveFrame();
-    uno::Reference< frame::XModuleManager > xModuleManager( 
+    uno::Reference< frame::XModuleManager > xModuleManager(
         ::comphelper::getProcessServiceFactory()->createInstance(
             DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), uno::UNO_QUERY );
     if ( xModuleManager.is() )
@@ -781,20 +788,32 @@ void SvxSearchDialog::CalculateDelta_Impl()
             ::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame );
             bCalcApp = aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" );
             bDrawApp = aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" );
+            bImpressApp = aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" );
+            bWriterApp = aModuleIdentifier.equalsAscii( "com.sun.star.text.TextDocument" );
         }
         catch ( uno::Exception& )
         {
         }
     }
-    
+
     if ( pImpl->bDeltaCalculated )
         return;
     else
         pImpl->bDeltaCalculated = TRUE;
 
+    ULONG nDelta = 187, nOffset = 0;
+    SvtCJKOptions aCJKOptions;
+
     pMoreBtn->AddWindow( &aOptionsFL );
     if ( !bDrawApp )
         pMoreBtn->AddWindow( &aLayoutBtn );
+    if ( bWriterApp )
+        pMoreBtn->AddWindow( &aNotesBtn );
+    else
+    {
+        aNotesBtn.Hide();
+        nOffset = !bDrawApp ? 13 : 0;
+    }
     pMoreBtn->AddWindow( &aBackwardsBtn );
     if ( !bDrawApp )
         pMoreBtn->AddWindow( &aRegExpBtn );
@@ -802,8 +821,6 @@ void SvxSearchDialog::CalculateDelta_Impl()
     pMoreBtn->AddWindow( &aSimilarityBtn );
     pMoreBtn->AddWindow( &aSelectionBtn );
 
-    ULONG nDelta = 174, nOffset = 0;
-    SvtCJKOptions aCJKOptions;
     if ( aCJKOptions.IsCJKFontEnabled() )
         pMoreBtn->AddWindow( &aJapMatchFullHalfWidthCB );
     else
@@ -836,8 +853,8 @@ void SvxSearchDialog::CalculateDelta_Impl()
         aNewPos = aSimilarityBtn.GetPosPixel();
         aNewPos.Y() -= nH;
         aSimilarityBtn.SetPosPixel( aNewPos );
-        nH *= 2;
-        nOffset += ( 2 * nAppFontHeight );
+        nH *= 3;
+        nOffset += ( 3 * nAppFontHeight );
         if ( aCJKOptions.IsCJKFontEnabled() )
         {
             aNewPos = aJapMatchFullHalfWidthCB.GetPosPixel();
@@ -855,28 +872,41 @@ void SvxSearchDialog::CalculateDelta_Impl()
         }
     }
 
-    if ( bCalcApp )
+    if ( bCalcApp || bImpressApp )
     {
         Window* pWins[] =
         {
             &aCalcFL, &aCalcSearchInFT, &aCalcSearchInLB, &aCalcSearchDirFT,
-            &aRowsBtn, &aColumnsBtn, &aAllSheetsCB
+            &aRowsBtn, &aColumnsBtn, &aAllSheetsCB, &aJapMatchFullHalfWidthCB,
+            &aJapOptionsCB, &aJapOptionsBtn
         };
         Window** pCurrent = pWins;
-        sal_uInt32 i;
+        sal_uInt32 i = 0;
+        const sal_uInt32 nCalcCtrlCount = 7;
         if ( nOffset > 0 )
         {
             long nH = LogicToPixel( Size( 0, nOffset ), MAP_APPFONT ).Height();
             for ( i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent )
             {
-                Point aNewPos = (*pCurrent)->GetPosPixel();
-                aNewPos.Y() -= nH;
-                (*pCurrent)->SetPosPixel( aNewPos );
+                if ( ( bCalcApp && i < nCalcCtrlCount )
+                    || ( i == nCalcCtrlCount && aCJKOptions.IsCJKFontEnabled() )
+                    || ( i > nCalcCtrlCount && aCJKOptions.IsJapaneseFindEnabled() ) )
+                {
+                    Point aNewPos = (*pCurrent)->GetPosPixel();
+                    aNewPos.Y() -= nH;
+                    (*pCurrent)->SetPosPixel( aNewPos );
+                }
             }
         }
-        pCurrent = pWins;
-        for ( i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent )
-            pMoreBtn->AddWindow( *pCurrent );
+
+        if ( bCalcApp)
+        {
+            pCurrent = pWins;
+            for ( i = 0; i < nCalcCtrlCount; ++i, ++pCurrent )
+                pMoreBtn->AddWindow( *pCurrent );
+        }
+        else
+            nOffset += 64;
     }
     else
         nOffset += 64;
@@ -924,12 +954,16 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
         aMatchCaseCB.Check( pSearchItem->GetExact() );
     if ( ( nModifyFlag & MODIFY_BACKWARDS ) == 0 )
         aBackwardsBtn.Check( pSearchItem->GetBackward() );
+    if ( ( nModifyFlag & MODIFY_NOTES ) == 0 )
+        aNotesBtn.Check( pSearchItem->GetNotes() );
     if ( ( nModifyFlag & MODIFY_SELECTION ) == 0 )
         aSelectionBtn.Check( pSearchItem->GetSelection() );
     if ( ( nModifyFlag & MODIFY_REGEXP ) == 0 )
         aRegExpBtn.Check( pSearchItem->GetRegExp() );
     if ( ( nModifyFlag & MODIFY_LAYOUT ) == 0 )
         aLayoutBtn.Check( pSearchItem->GetPattern() );
+    if (aNotesBtn.IsChecked())
+        aLayoutBtn.Disable();
     aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
     if( aJapOptionsCB.IsVisible() )
         aJapOptionsCB.Check( pSearchItem->IsUseAsianOptions() );
@@ -959,7 +993,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
                 break;
 
             case SVX_SEARCHIN_NOTE:
-                if ( ( nModifyFlag & MODIFY_NOTES ) == 0 )
+                if ( ( nModifyFlag & MODIFY_CALC_NOTES ) == 0 )
                     aCalcSearchInLB.SelectEntryPos( SVX_SEARCHIN_NOTE );
                 break;
         }
@@ -1161,9 +1195,17 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
     else
     {
         EnableControl_Impl( &aSearchBtn );
-        EnableControl_Impl( &aSearchAllBtn );
         EnableControl_Impl( &aReplaceBtn );
-        EnableControl_Impl( &aReplaceAllBtn );
+        if (!bWriter || (bWriter && !aNotesBtn.IsChecked()))
+        {
+            EnableControl_Impl( &aSearchAllBtn );
+            EnableControl_Impl( &aReplaceAllBtn );
+        }
+        if (bWriter && pSearchItem->GetNotes())
+        {
+            aSearchAllBtn.Disable();
+            aReplaceAllBtn.Disable();
+        }
     }
 
     if ( ( !pImpl->bMultiLineEdit && aSearchAttrText.GetText().Len() ) ||
@@ -1286,7 +1328,8 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
         else
         {
             EnableControl_Impl( &aRegExpBtn );
-            EnableControl_Impl( &aLayoutBtn );
+            if (!aNotesBtn.IsChecked())
+                EnableControl_Impl( &aLayoutBtn );
             EnableControl_Impl( &aFormatBtn );
             EnableControl_Impl( &aAttributeBtn );
             aSimilarityBtn.Disable();
@@ -1294,6 +1337,21 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
         pSearchItem->SetLevenshtein( bIsChecked );
     }
     else
+    if ( pCtrl == &aNotesBtn)
+    {
+        if (aNotesBtn.IsChecked())
+        {
+            aLayoutBtn.Disable();
+            aSearchAllBtn.Disable();
+            aReplaceAllBtn.Disable();
+        }
+        else
+        {
+            EnableControl_Impl( &aLayoutBtn );
+            ModifyHdl_Impl( &aSearchLB );
+        }
+    }
+    else
     {
         if ( aLayoutBtn.IsChecked() && !bFormat )
         {
@@ -1303,6 +1361,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
             aRegExpBtn.Disable();
             aMatchCaseCB.Check( FALSE );
             aMatchCaseCB.Disable();
+            aNotesBtn.Disable();
 
             if ( aSearchTmplLB.GetEntryCount() )
             {
@@ -1316,6 +1375,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
         {
             EnableControl_Impl( &aRegExpBtn );
             EnableControl_Impl( &aMatchCaseCB );
+            EnableControl_Impl( &aNotesBtn );
 
             if ( aRegExpBtn.IsChecked() )
             {
@@ -1401,6 +1461,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
 
         pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
         pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
+        pSearchItem->SetNotes( GetCheckBoxValue( aNotesBtn ) );
         pSearchItem->SetPattern( GetCheckBoxValue( aLayoutBtn ) );
         pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
@@ -1525,7 +1586,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             if ( pImpl->xCommand2Dispatch.is() )
                 pImpl->xCommand2Dispatch->dispatch(pImpl->aCommand2URL, aArgs);
         }
-    }            
+    }
 
     return 0;
 }
@@ -1551,9 +1612,12 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
         if ( nLBTxtLen || nTxtLen )
         {
             EnableControl_Impl( &aSearchBtn );
-            EnableControl_Impl( &aSearchAllBtn );
             EnableControl_Impl( &aReplaceBtn );
-            EnableControl_Impl( &aReplaceAllBtn );
+            if (!bWriter || (bWriter && !aNotesBtn.IsChecked()))
+            {
+                EnableControl_Impl( &aSearchAllBtn );
+                EnableControl_Impl( &aReplaceAllBtn );
+            }
         }
         else
         {
@@ -1822,6 +1886,10 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
         aBackwardsBtn.Enable();
     else
         aBackwardsBtn.Disable();
+    //!if ( ( SEARCH_OPTIONS_NOTES & nOptions ) != 0 )
+        aNotesBtn.Enable();
+    //!else
+    //!    aNotesBtn.Disable();
     if ( ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0 )
         aRegExpBtn.Enable();
     else
@@ -1915,6 +1983,11 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl )
         aBackwardsBtn.Enable();
         return;
     }
+    if ( &aNotesBtn == pCtrl /*! && ( SEARCH_OPTIONS_NOTES & nOptions ) != 0 */ )
+    {
+        aNotesBtn.Enable();
+        return;
+    }
     if ( &aRegExpBtn == pCtrl && ( SEARCH_OPTIONS_REG_EXP & nOptions ) != 0
         && !aSimilarityBox.IsChecked())
     {
@@ -2337,6 +2410,8 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
         nModifyFlag |= MODIFY_EXACT;
     else if ( &aBackwardsBtn == (CheckBox*)pCtrl )
         nModifyFlag |= MODIFY_BACKWARDS;
+    else if ( &aNotesBtn == (CheckBox*)pCtrl )
+        nModifyFlag |= MODIFY_NOTES;
     else if ( &aSelectionBtn == (CheckBox*)pCtrl )
         nModifyFlag |= MODIFY_SELECTION;
     else if ( &aRegExpBtn == (CheckBox*)pCtrl )
@@ -2349,7 +2424,7 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
     {
         nModifyFlag |= MODIFY_FORMULAS;
         nModifyFlag |= MODIFY_VALUES;
-        nModifyFlag |= MODIFY_NOTES;
+        nModifyFlag |= MODIFY_CALC_NOTES;
     }
     else if ( &aRowsBtn == (RadioButton*)pCtrl )
         nModifyFlag |= MODIFY_ROWS;
@@ -2387,6 +2462,7 @@ void SvxSearchDialog::SaveToModule_Impl()
 
     pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
     pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
+    pSearchItem->SetNotes( GetCheckBoxValue( aNotesBtn ) );
     pSearchItem->SetPattern( GetCheckBoxValue( aLayoutBtn ) );
     pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc
index 6ceee7bc5c..a903caa868 100644
--- a/svx/source/dialog/srchdlg.hrc
+++ b/svx/source/dialog/srchdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,6 +83,8 @@
 #define RB_CALC_COLUMNS                 58
 #define CB_ALL_SHEETS                   59
 
+#define CB_NOTES                        60
+
 #define IMG_MOREBTN_DOWN                100
 #define IMG_MOREBTN_UP                  101
 
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index deeaa8f78e..2c69a25b92 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -284,17 +284,24 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Hide = TRUE ;
     };
-    CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
+    CheckBox CB_NOTES
     {
         Pos = MAP_APPFONT ( 12 , 232 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         TabStop = TRUE ;
+        Text [ en-US ] = "Notes";
+    };
+    CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
+    {
+        Pos = MAP_APPFONT ( 12 , 247 ) ;
+        Size = MAP_APPFONT ( 126 , 10 ) ;
+        TabStop = TRUE ;
         Text [ en-US ] = "Match character width";
         Hide = TRUE ;
     };
     CheckBox CB_JAP_SOUNDS_LIKE
     {
-        Pos = MAP_APPFONT ( 12 , 247 ) ;
+        Pos = MAP_APPFONT ( 12 , 260 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Sounds like (Japanese)";
@@ -302,7 +309,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton PB_JAP_OPTIONS
     {
-        Pos = MAP_APPFONT ( 124 , 245 ) ;
+        Pos = MAP_APPFONT ( 124 , 258 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "..." ;
         TabStop = TRUE ;
@@ -334,13 +341,13 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     FixedLine FL_CALC
     {
-        Pos = MAP_APPFONT ( 6 , 259 ) ;
+        Pos = MAP_APPFONT ( 6 , 272 ) ;
         Size = MAP_APPFONT ( 191 , 8 ) ;
         Hide = TRUE ;
     };
     FixedText FT_CALC_SEARCHIN
     {
-        Pos = MAP_APPFONT ( 12 , 272 ) ;
+        Pos = MAP_APPFONT ( 12 , 285 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text [ en-US ] = "~Search in" ;
         Hide = TRUE ;
@@ -348,7 +355,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     ListBox LB_CALC_SEARCHIN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 270 ) ;
+        Pos = MAP_APPFONT ( 75 , 283 ) ;
         Size = MAP_APPFONT ( 63 , 48 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -362,28 +369,28 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     FixedText FT_CALC_SEARCHDIR
     {
-        Pos = MAP_APPFONT ( 12 , 287 ) ;
+        Pos = MAP_APPFONT ( 12 , 300 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text [ en-US ] = "~Search direction" ;
         Hide = TRUE ;
     };
     RadioButton RB_CALC_ROWS
     {
-        Pos = MAP_APPFONT ( 75 , 287 ) ;
+        Pos = MAP_APPFONT ( 75 , 300 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "Ro~ws" ;
         Hide = TRUE ;
     };
     RadioButton RB_CALC_COLUMNS
     {
-        Pos = MAP_APPFONT ( 75 , 300 ) ;
+        Pos = MAP_APPFONT ( 75 , 313 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "Col~umns" ;
         Hide = TRUE ;
     };
     CheckBox CB_ALL_SHEETS
     {
-        Pos = MAP_APPFONT ( 12 , 313 ) ;
+        Pos = MAP_APPFONT ( 12 , 326 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Search in all sheets" ;
         Hide = TRUE ;
diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx
index a2d8a68cea..25ba541ce6 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/svx/source/editeng/edtspell.cxx
@@ -570,7 +570,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
 {
     SfxItemPool* pPool = &pImpEE->GetEditDoc().GetItemPool();
     while ( pPool->GetSecondaryPool() &&
-            pPool->GetName().EqualsAscii( "EditEngineItemPool" ) )
+            !pPool->GetName().EqualsAscii( "EditEngineItemPool" ) )
     {
         pPool = pPool->GetSecondaryPool();