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

[Matthias Freund]

 sw/source/ui/ribbar/workctrl.cxx |   18 ++++++------------
 sw/source/ui/ribbar/workctrl.hrc |    4 ++--
 sw/source/ui/ribbar/workctrl.src |    6 +++---
 3 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 89001143ea5aeecf8af1b62748431dc785369f44
Author: Matthias Freund <matti_lx at yahoo.de>
Date:   Thu May 16 22:52:17 2013 +0200

    fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/ (Part2)
    
    cleanups, translations and correction :-)
    
    Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788
    Reviewed-on: https://gerrit.libreoffice.org/3924
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 11a6fe8..b7d959c 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -45,10 +45,10 @@
 
 #include <vcl/svapp.hxx>
 
-// Size Abpruefung
+// Size check
 #define NAVI_ENTRIES 20
 #if NAVI_ENTRIES != NID_COUNT
-#error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ??
+#error SwScrollNaviPopup-CTOR static array wrong size. Are new IDs added?
 #endif
 
 using namespace ::com::sun::star;
@@ -205,13 +205,13 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
                 sal_uInt16 nGroupCount = pGlossaryList->GetGroupCount();
                 for(sal_uInt16 i = 1; i <= nGroupCount; i++)
                 {
-                    // Gruppenname mit Pfad-Extension besorgen
+                    // Acquire group name with path extension
                     String sTitle;
                     sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i -1);
                     if(nBlockCount)
                     {
                         sal_uInt16 nIndex = 100 * (i);
-                        // aber ohne extension einfuegen
+                        // but insert without extension
                         pPopup->InsertItem( i, sTitle);
                         PopupMenu* pSub = new PopupMenu;
                         pSub->SetSelectHdl(aLnk);
@@ -244,7 +244,6 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 
 }
 
-
 SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUT;
@@ -334,7 +333,7 @@ void SwTbxAutoTextCtrl::DelPopup()
     }
 }
 
-/* Navigations-Popup */
+// Navigation-Popup
 // determine the order of the toolbox items
 static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
 {
@@ -487,7 +486,7 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
         aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
         aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + NID_COUNT]);
         aInfoField.SetText(aToolBox.GetItemText(nSet));
-        //check the current button only
+        // check the current button only
         for(sal_uInt16 i = 0; i < NID_COUNT; i++)
         {
             sal_uInt16 nItemId = aToolBox.GetItemId( i );
@@ -544,8 +543,6 @@ void SwNaviImageButton::Click()
     pPopup->StartPopupMode(aRect, FLOATWIN_POPUPMODE_LEFT|FLOATWIN_POPUPMODE_ALLOWTEAROFF);
 }
 
-//--------------------------------------------------------------------
-
 void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* pWindow )
 {
     pPopupWindow = pWindow;
@@ -553,8 +550,6 @@ void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* pWindow )
     pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNaviImageButton, ClosePopupWindow ));
 }
 
-//--------------------------------------------------------------------
-
 IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl)
 {
     if ( pPopupWindow->IsVisible() )
@@ -575,7 +570,6 @@ IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl)
     return 1;
 }
 
-//--------------------------------------------------------------------
 IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
 {
     if ( pWindow == pFloatingWindow )
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc
index 471b1ee..cee389b 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/ui/ribbar/workctrl.hrc
@@ -45,8 +45,8 @@
 #define ST_TABLE_FORMULA  28
 #define ST_TABLE_FORMULA_ERROR  29
 
-// doppelter Eintrag! hrc und hxx
-// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
+// duplicate entry! hrc and hxx
+// these Ids specifiy the action of the buttons below the scroll bar
 #define NID_START   20000
 #define NID_NEXT    20000
 #define NID_PREV    20001
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 2522a5e..23e60ad 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -205,9 +205,9 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
     };
     Text [ en-US ] = "Navigation" ;
 };
-/***************************************************************
-    Strings fuer die Quickhelp der View-PgUp/Down-Buttons
-***************************************************************/
+
+// Strings for the quickhelp of the View-PgUp/Down-Buttons
+
 String STR_IMGBTN_NEXT_DOWN
 {
     Text = "" ;