summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-09-09 14:31:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-09-09 14:34:17 +0100
commita96941702a1454afa8ff8f340277cbccb4787a7c (patch)
tree458d94403b5a50ca1458bdd3e448ab7edddbf026 /sw/source
parent351b631dd510f30cb84a4273554569022bab2e41 (diff)
convert info not found to .ui
Change-Id: I553e6f696ad10e847d845c263fbfbab5d2279345
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/uiview/srcview.cxx3
-rw-r--r--sw/source/ui/uiview/view.hrc1
-rw-r--r--sw/source/ui/uiview/view.src4
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx11
4 files changed, 6 insertions, 13 deletions
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index c3ceef353d87..02762d5d98f2 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -631,7 +631,8 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
{
if(bNotFoundMessage)
{
- InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute();
+ MessageDialog(0, "InfoNotFoundDialog",
+ "modules/swriter/ui/infonotfounddialog.ui").Execute();
}
else if(!bRecursive)
{
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index 439f77d50811..692c45fadc4f 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -35,7 +35,6 @@
#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
-#define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16)
#define MSG_SEARCH_START (RC_VIEW_BEGIN + 17)
#define MSG_SEARCH_END (RC_VIEW_BEGIN + 18)
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 1a08b818314b..23f2f1314527 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -71,10 +71,6 @@ String STR_TEXTOPTIONS
{
Text [ en-US ] = "Text document";
};
-InfoBox MSG_NOT_FOUND
-{
- Message [ en-US ] = "Search key not found." ;
-};
InfoBox MSG_SCAN_NOSOURCE
{
Message [ en-US ] = "Source not specified." ;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 2df0a383be7d..69230859b121 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -76,7 +76,7 @@ struct SwSearchOptions
SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward );
};
-inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
+static Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
{
Window* pWin;
if( m_pSrchDlg && m_pSrchDlg->IsVisible() )
@@ -86,18 +86,15 @@ inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
return pWin;
}
-inline void ShowNotFoundInfoBox( SvxSearchDialog* m_pSrchDlg )
+static void ShowNotFoundInfoBox( SvxSearchDialog* m_pSrchDlg )
{
Window* pParentWindow = GetParentWindow( m_pSrchDlg );
- InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND));
+ MessageDialog aBox(pParentWindow, "InfoNotFoundDialog",
+ "modules/swriter/ui/infonotfounddialog.ui");
if (pParentWindow)
{
aBox.SetText(pParentWindow->GetText());
}
- else
- {
- aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
- }
aBox.Execute();
}