summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs8
-rw-r--r--sfx2/inc/sfx2/srchitem.hxx6
-rw-r--r--sfx2/source/control/srchitem.cxx6
-rw-r--r--svx/inc/srchdlg.hxx1
-rw-r--r--svx/source/dialog/srchdlg.cxx118
-rw-r--r--svx/source/dialog/srchdlg.hrc2
-rw-r--r--svx/source/dialog/srchdlg.src27
-rw-r--r--svx/source/editeng/edtspell.cxx2
8 files changed, 137 insertions, 33 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b2e77536e685..9df8fa4945bd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5868,6 +5868,14 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
<desc>Specifies the label of the second component-based search command.</desc>
</info>
</prop>
+ <prop oor:name="IsNotes" oor:type="xs:boolean">
+ <!-- UIHints: Edit Search/Replace -->
+ <info>
+ <author>mod</author>
+ <desc>Specifies if search includes notes(SwPostItFields)</desc>
+ </info>
+ <value>false</value>
+ </prop>
<group oor:name="Japanese">
<info>
<author>OS</author>
diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx
index 60ff8295c1f7..3547fc14515c 100644
--- a/sfx2/inc/sfx2/srchitem.hxx
+++ b/sfx2/inc/sfx2/srchitem.hxx
@@ -86,6 +86,9 @@ class SFX2_DLLPUBLIC SvxSearchItem :
sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise
sal_Bool bAllTables; // in alle Tabellen suchen
+ // Writer-spezifisch
+ sal_Bool bNotes;
+
sal_Bool bBackward; // Suche Rueckwaerts
sal_Bool bPattern; // Suche nach Vorlagen
sal_Bool bContent; // Suche im Inhalt
@@ -153,6 +156,9 @@ public:
sal_uInt16 GetCellType() const { return nCellType; }
void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
+ sal_Bool GetNotes() const { return bNotes; }
+ void SetNotes(sal_Bool bNew) { bNotes = bNew; }
+
sal_uInt16 GetAppFlag() const { return nAppFlag; }
void SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; }
diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx
index b2be721559f6..3d499e5e263f 100644
--- a/sfx2/source/control/srchitem.cxx
+++ b/sfx2/source/control/srchitem.cxx
@@ -140,6 +140,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
nAppFlag ( SVX_SEARCHAPP_WRITER ),
bRowDirection ( sal_True ),
bAllTables ( sal_False ),
+ bNotes ( sal_False),
bBackward ( sal_False ),
bPattern ( sal_False ),
bContent ( sal_False ),
@@ -151,6 +152,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
bBackward = aOpt.IsBackwards();
bAsianOptions = aOpt.IsUseAsianOptions();
+ bNotes = aOpt.IsNotes();
if (aOpt.IsUseRegularExpression())
aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
@@ -215,6 +217,7 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
nAppFlag ( rItem.nAppFlag ),
bRowDirection ( rItem.bRowDirection ),
bAllTables ( rItem.bAllTables ),
+ bNotes ( rItem.bNotes),
bBackward ( rItem.bBackward ),
bPattern ( rItem.bPattern ),
bContent ( rItem.bContent ),
@@ -266,7 +269,8 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
( nCellType == rSItem.nCellType ) &&
( nAppFlag == rSItem.nAppFlag ) &&
( bAsianOptions == rSItem.bAsianOptions ) &&
- ( aSearchOpt == rSItem.aSearchOpt );
+ ( aSearchOpt == rSItem.aSearchOpt ) &&
+ ( bNotes == rSItem.bNotes );
}
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index c1806166f978..b5b1c306757f 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -206,6 +206,7 @@ private:
CheckBox aSimilarityBox;
PushButton aSimilarityBtn;
CheckBox aLayoutBtn;
+ CheckBox aNotesBtn;
CheckBox aJapMatchFullHalfWidthCB;
CheckBox aJapOptionsCB;
PushButton aJapOptionsBtn;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 2b5ce5bbf9d9..3cec321e9aa4 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -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_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 ) ), \
@@ -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,6 +775,8 @@ 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(
::comphelper::getProcessServiceFactory()->createInstance(
@@ -781,6 +788,8 @@ 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& )
{
@@ -792,9 +801,19 @@ void SvxSearchDialog::CalculateDelta_Impl()
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 ) );
@@ -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 8a45b15adfaa..a903caa86801 100644
--- a/svx/source/dialog/srchdlg.hrc
+++ b/svx/source/dialog/srchdlg.hrc
@@ -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 408daa130bb9..2c69a25b92d8 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -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 a6fea0ef1beb..808d75615255 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();
generated by cgit (git 2.34.1) at 2025-05-02 03:23:26 +0000