[Libreoffice-commits] core.git: vcl/source

[Jan Holesovsky]

 vcl/source/window/builder.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21acf9d636574249f3c4748831e659c0b12a8a4a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Jun 16 21:37:46 2013 +0200

    Reduce scope.
    
    Change-Id: I1cabfd0aad8aa00a50d5f854aca96fa27b635273

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 542c4c5..8806c4c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1286,7 +1286,6 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
         if (pToolBox)
         {
             OUString aCommand(OStringToOUString(extractActionName(rMap), RTL_TEXTENCODING_UTF8));
-            OUString aTooltip(OStringToOUString(extractTooltipText(rMap), RTL_TEXTENCODING_UTF8));
 
             ToolBoxItemBits nBits = 0;
             if (name == "GtkMenuToolButton")
@@ -1296,6 +1295,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
             {
                 pToolBox->InsertItem(aCommand, m_xFrame, nBits, extractSizeRequest(rMap));
 
+                OUString aTooltip(OStringToOUString(extractTooltipText(rMap), RTL_TEXTENCODING_UTF8));
                 if (!aTooltip.isEmpty())
                     pToolBox->SetQuickHelpText(pToolBox->GetItemId(aCommand), aTooltip);
             }