Kaydet (Commit) 0b7aef11 authored tarafından Vishv Brahmbhatt's avatar Vishv Brahmbhatt Kaydeden (comit) Caolán McNamara

fdo#59397 Use more precise wording at 'Find & Replace - More Options - Styles'

Change-Id: I5013e8b2ce99478f2445756e181f009b93d4e746
Reviewed-on: https://gerrit.libreoffice.org/1905Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5f356bd9
...@@ -265,8 +265,8 @@ ...@@ -265,8 +265,8 @@
#define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) #define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80)
#define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_SEARCH (RID_SVX_START + 81)
#define RID_SVXSTR_REPLACE (RID_SVX_START + 82) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82)
#define RID_SVXSTR_WRITER_STYLES (RID_SVX_START + 83)
#define RID_SVXSTR_CALC_STYLES (RID_SVX_START + 85)
// ResIds for the PageDialog // ResIds for the PageDialog
// Strings of the ToolBox-Controls from tbcontrl.cxx // Strings of the ToolBox-Controls from tbcontrl.cxx
......
...@@ -203,6 +203,8 @@ private: ...@@ -203,6 +203,8 @@ private:
sal_uIntPtr nModifyFlag; sal_uIntPtr nModifyFlag;
String aStylesStr; String aStylesStr;
String aLayoutStr; String aLayoutStr;
String aLayoutWriterStr;
String aLayoutCalcStr;
String aCalcStr; String aCalcStr;
std::vector<rtl::OUString> aSearchStrings; std::vector<rtl::OUString> aSearchStrings;
......
...@@ -371,6 +371,8 @@ void SvxSearchDialog::Construct_Impl() ...@@ -371,6 +371,8 @@ void SvxSearchDialog::Construct_Impl()
aCalcStr += aWordBtn.GetText(); aCalcStr += aWordBtn.GetText();
aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES ); aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES );
aLayoutWriterStr = SVX_RESSTR( RID_SVXSTR_WRITER_STYLES );
aLayoutCalcStr = SVX_RESSTR( RID_SVXSTR_CALC_STYLES );
aStylesStr = aLayoutBtn.GetText(); aStylesStr = aLayoutBtn.GetText();
// Get stored search-strings from the application // Get stored search-strings from the application
...@@ -1985,6 +1987,23 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) ...@@ -1985,6 +1987,23 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem )
IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
{ {
sal_Int32 nTxtLen; sal_Int32 nTxtLen;
bool bDrawApp = false;
bool bCalcApp = false;
bool bWriterApp = false;
bool bImpressApp = false;
const uno::Reference< frame::XFrame > xFrame = rBindings.GetActiveFrame();
uno::Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(::comphelper::getProcessComponentContext()) );
try
{
::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame );
bCalcApp = aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument";
bDrawApp = aModuleIdentifier == "com.sun.star.drawing.DrawingDocument";
bImpressApp = aModuleIdentifier == "com.sun.star.presentation.PresentationDocument";
bWriterApp = aModuleIdentifier == "com.sun.star.text.TextDocument";
}
catch ( uno::Exception& )
{
}
if ( !pImpl->bMultiLineEdit ) if ( !pImpl->bMultiLineEdit )
nTxtLen = aSearchAttrText.GetText().getLength(); nTxtLen = aSearchAttrText.GetText().getLength();
...@@ -2022,8 +2041,16 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) ...@@ -2022,8 +2041,16 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
ModifyHdl_Impl( (ComboBox*)pCtrl ); ModifyHdl_Impl( (ComboBox*)pCtrl );
aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aStylesStr ); if(bWriterApp)
aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aLayoutWriterStr );
else
{
if(bCalcApp)
aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aLayoutCalcStr );
else
aLayoutBtn.SetText( bFormat && nTxtLen ? aLayoutStr : aStylesStr );
}
return 0; return 0;
} }
...@@ -2134,8 +2161,36 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) ...@@ -2134,8 +2161,36 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
{ {
aLayoutBtn.SetText( aStylesStr ); bool bDrawApp = false;
bool bCalcApp = false;
bool bWriterApp = false;
bool bImpressApp = false;
const uno::Reference< frame::XFrame > xFrame = rBindings.GetActiveFrame();
uno::Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(::comphelper::getProcessComponentContext()) );
try
{
::rtl::OUString aModuleIdentifier = xModuleManager->identify( xFrame );
bCalcApp = aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument";
bDrawApp = aModuleIdentifier == "com.sun.star.drawing.DrawingDocument";
bImpressApp = aModuleIdentifier == "com.sun.star.presentation.PresentationDocument";
bWriterApp = aModuleIdentifier == "com.sun.star.text.TextDocument";
}
catch ( uno::Exception& )
{
}
if(bCalcApp)
aLayoutBtn.SetText( aLayoutCalcStr );
else
{
if(bWriterApp)
aLayoutBtn.SetText( aLayoutWriterStr);
else
aLayoutBtn.SetText( aStylesStr );
}
bFormat = sal_False; bFormat = sal_False;
aLayoutBtn.Check( sal_False ); aLayoutBtn.Check( sal_False );
......
...@@ -28,6 +28,14 @@ String RID_SVXSTR_SEARCH_STYLES ...@@ -28,6 +28,14 @@ String RID_SVXSTR_SEARCH_STYLES
{ {
Text [ en-US ] = "Including Styles" ; Text [ en-US ] = "Including Styles" ;
}; };
String RID_SVXSTR_WRITER_STYLES
{
Text [ en-US ] = "Search for Paragraph St~yles" ;
};
String RID_SVXSTR_CALC_STYLES
{
Text [ en-US ] = "Search for Cell St~yles" ;
};
String RID_SVXSTR_SEARCH String RID_SVXSTR_SEARCH
{ {
Text [ en-US ] = "(Search)" ; Text [ en-US ] = "(Search)" ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment