summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-02-20 13:59:08 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-02-22 10:07:32 +0100
commitfc956febae30ed0604477c49a78247bc81cde66e (patch)
tree0c619fe02b618665f0a10400a505979911100df6 /svx/source
parentd1a4f50d686054b757320c0ef3f3dc4c724c685c (diff)
Resolves: rhbz#1546997 'search not found' at 0,0 when window too narrow
if the statusbar hadn't got space for the initial label, then it doesn't get set a position, so when later forced visible it draws at 0,0 call Resize on the toolbox to get it to relayout, and while we're at it set the required size of the label so we might have space for it if that text is shorter than the original len allocation Change-Id: I37d20125d8195b2c75e83e9673c82c2011ceda8e Reviewed-on: https://gerrit.libreoffice.org/50042 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/srchdlg.cxx42
1 files changed, 17 insertions, 25 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 504c52f2de4e..2ee79ba6b44d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2363,11 +2363,11 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
}
-static vcl::Window* lcl_GetSearchLabelWindow()
+static void lcl_SetSearchLabelWindow(const OUString& rStr)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if (!pViewFrame)
- return nullptr;
+ return;
css::uno::Reference< css::beans::XPropertySet > xPropSet(
pViewFrame->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
@@ -2376,7 +2376,7 @@ static vcl::Window* lcl_GetSearchLabelWindow()
css::uno::Reference< css::ui::XUIElement > xUIElement =
xLayoutManager->getElement("private:resource/toolbar/findbar");
if (!xUIElement.is())
- return nullptr;
+ return;
css::uno::Reference< css::awt::XWindow > xWindow(
xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW);
VclPtr< ToolBox > pToolBox = static_cast<ToolBox*>( VCLUnoHelper::GetWindow(xWindow).get() );
@@ -2384,9 +2384,19 @@ static vcl::Window* lcl_GetSearchLabelWindow()
{
sal_uInt16 id = pToolBox->GetItemId(i);
if (pToolBox->GetItemCommand(id) == ".uno:SearchLabel")
- return pToolBox->GetItemWindow(id);
+ {
+ vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
+ assert(pSearchLabel);
+ pSearchLabel->Hide();
+ pSearchLabel->SetText(rStr);
+ if (!rStr.isEmpty())
+ {
+ pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
+ pSearchLabel->Show();
+ }
+ }
}
- return nullptr;
+ pToolBox->Resize();
}
void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
@@ -2401,16 +2411,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
else if (rSL == SearchLabel::NotFound)
sStr = SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
- if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
- {
- if (sStr.isEmpty())
- pSearchLabel->Hide();
- else
- {
- pSearchLabel->SetText(sStr);
- pSearchLabel->Show();
- }
- }
+ lcl_SetSearchLabelWindow(sStr);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->
GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
pWrp->getDialog()->SetSearchLabel(sStr);
@@ -2419,16 +2420,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
void SvxSearchDialogWrapper::SetSearchLabel(const OUString& sStr)
{
- if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
- {
- if (sStr.isEmpty())
- pSearchLabel->Hide();
- else
- {
- pSearchLabel->SetText(sStr);
- pSearchLabel->Show();
- }
- }
+ lcl_SetSearchLabelWindow(sStr);
if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->
GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
pWrp->getDialog()->SetSearchLabel(sStr);