[Libreoffice-commits] .: 3 commits - sw/AllLangResTarget_sw.mk sw/source vcl/inc vcl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jan 28 01:39:51 PST 2013


 sw/AllLangResTarget_sw.mk        |    1 -
 sw/source/ui/misc/autocorr.src   |   18 ------------------
 sw/source/ui/uiview/viewsrch.cxx |   29 +++++++++++++++++++++--------
 vcl/inc/svids.hrc                |   21 +++++++++++----------
 vcl/source/src/btntext.src       |    5 +++++
 vcl/source/window/builder.cxx    |    2 ++
 6 files changed, 39 insertions(+), 37 deletions(-)

New commits:
commit 0c5225b871b6b1a1121c3f803d946392a4676e97
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 28 09:28:44 2013 +0000

    add SV_BUTTONTEXT_SAVE and map to gtk-save
    
    Change-Id: Ib51e7c95a807c988da87068d8d2e49773a41282e

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 064cd53..32d24e4 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -156,18 +156,19 @@
 #define SV_BUTTONTEXT_NEW                   10115
 #define SV_BUTTONTEXT_EDIT                  10116
 #define SV_BUTTONTEXT_APPLY                 10117
-#define SV_BUTTONTEXT_OK_NOMNEMONIC         10118
-#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC     10119
+#define SV_BUTTONTEXT_SAVE                  10118
+#define SV_BUTTONTEXT_OK_NOMNEMONIC         10119
+#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC     10120
 
 #define SV_STDTEXT_FIRST                    SV_STDTEXT_SERVICENOTAVAILABLE
-#define SV_STDTEXT_SERVICENOTAVAILABLE      10200
-
-#define SV_STDTEXT_DONTASKAGAIN             10202
-#define SV_STDTEXT_DONTWARNAGAIN            10203
-#define SV_STDTEXT_ABOUT                    10204
-#define SV_STDTEXT_PREFERENCES              10205
-#define SV_MAC_SCREENNNAME                  10206
-#define SV_STDTEXT_ALLFILETYPES             10207
+#define SV_STDTEXT_SERVICENOTAVAILABLE      10210
+
+#define SV_STDTEXT_DONTASKAGAIN             10212
+#define SV_STDTEXT_DONTWARNAGAIN            10213
+#define SV_STDTEXT_ABOUT                    10214
+#define SV_STDTEXT_PREFERENCES              10215
+#define SV_MAC_SCREENNNAME                  10216
+#define SV_STDTEXT_ALLFILETYPES             10217
 
 #define STR_FPICKER_AUTO_EXTENSION                10300
 #define STR_FPICKER_PASSWORD                      10301
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index a16fc70..75379f7 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -119,3 +119,8 @@ String SV_BUTTONTEXT_APPLY
 {
     Text [ en-US ] = "~Apply";
 };
+
+String SV_BUTTONTEXT_SAVE
+{
+    Text [ en-US ] = "~Save";
+};
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e62e4dc..510a4ce 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -556,6 +556,8 @@ namespace
             return (VclResId(SV_BUTTONTEXT_EDIT).toString());
         else if (rType == "gtk-apply")
             return (VclResId(SV_BUTTONTEXT_APPLY).toString());
+        else if (rType == "gtk-save")
+            return (VclResId(SV_BUTTONTEXT_SAVE).toString());
         SAL_WARN("vcl.layout", "unknown stock type: " << rType.getStr());
         return OUString();
     }
commit a29032c951c53ac889de2a7644ae4ac9beef28dc
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Mon Jan 28 03:53:55 2013 +0200

    Show meaningful title for search key not found infobox, fdo#59865
    
    Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef

diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 9cad97b..8e1f9c3 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -37,6 +37,8 @@
 #include <sal/macros.h>
 #include <sfx2/request.hxx>
 #include <svx/srchdlg.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
 #include "editeng/unolingu.hxx"
@@ -87,6 +89,21 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
     return pWin;
 }
 
+inline void ShowNotFoundInfoBox( SvxSearchDialog* pSrchDlg )
+{
+    Window* pParentWindow = GetParentWindow( pSrchDlg );
+    InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND));
+    if (pParentWindow)
+    {
+        aBox.SetText(pParentWindow->GetText());
+    }
+    else
+    {
+        aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
+    }
+    aBox.Execute();
+}
+
 void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
 {
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -211,8 +228,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
                 {
                     if( !bApi )
                     {
-                        Window* pParentWindow = GetParentWindow( pSrchDlg );
-                        InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+                        ShowNotFoundInfoBox( pSrchDlg );
                     }
                     bFound = sal_False;
                 }
@@ -311,8 +327,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
                     {
                         if( !bApi )
                         {
-                            Window* pParentWindow = GetParentWindow( pSrchDlg );
-                            InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+                            ShowNotFoundInfoBox( pSrchDlg );
                         }
                         bFound = sal_False;
                         return;
@@ -483,8 +498,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
         pWrtShell->EndAllAction();
         if( !bApi )
         {
-            Window* pParentWindow = GetParentWindow( pSrchDlg );
-            InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+            ShowNotFoundInfoBox( pSrchDlg );
         }
         bFound = sal_False;
         pWrtShell->Pop();
@@ -528,8 +542,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
         return bFound;
     if(!bApi)
     {
-        Window* pParentWindow = GetParentWindow( pSrchDlg );
-        InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+        ShowNotFoundInfoBox( pSrchDlg );
     }
     return bFound = sal_False;
 }
commit 6d0f143554692eedbf2409ef2c12ee7c0e9defb8
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Sun Jan 27 22:41:56 2013 +0200

    Removed empty autocorr.src file
    
    Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 9fbfa31..a388fc1 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -136,7 +136,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/index/idxmrk.src \
     sw/source/ui/index/multmrk.src \
     sw/source/ui/lingu/olmenu.src \
-    sw/source/ui/misc/autocorr.src \
     sw/source/ui/misc/docfnote.src \
     sw/source/ui/misc/glossary.src \
     sw/source/ui/misc/numberingtypelistbox.src \
diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src
deleted file mode 100644
index 14bebe3..0000000
--- a/sw/source/ui/misc/autocorr.src
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-/* StarView resource file */


More information about the Libreoffice-commits mailing list