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

Jan Kantert jan-lo at kantert.net
Thu Jun 12 06:14:07 PDT 2014


 sw/source/uibase/dochdl/swdtflvr.cxx |    2 +-
 sw/source/uibase/inc/uitool.hxx      |    2 +-
 sw/source/uibase/uiview/view.cxx     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3c19e4a3b29b044ed01c9d4b64cd0def883f83d1
Author: Jan Kantert <jan-lo at kantert.net>
Date:   Thu Jun 12 10:13:22 2014 +0200

    translate comments in uibase
    
    Change-Id: I1a187426ae41b9398c062f3c4998363b073e80f1
    Reviewed-on: https://gerrit.libreoffice.org/9744
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 1ada150..2b7124f 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -416,7 +416,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor )
         // the fallback and just try to get a graphic
         const bool bPending(pWrtShell->BasicActionPend());
 
-        // SEL_GRF kommt vom ContentType der editsh
+        // SEL_GRF is from ContentType of editsh
         if(bPending || ((nsSelectionType::SEL_GRF | nsSelectionType::SEL_DRW_FORM) & nSelectionType))
         {
             pClpGraphic = new Graphic;
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 3680cb0..1bfc6c8 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -88,7 +88,7 @@ void        SetDfltMetric(FieldUnit eMetric, bool bWeb);
 SW_DLLPUBLIC bool HasCharUnit( bool bWeb );
 void SetApplyCharUnit(bool bApplyChar, bool bWeb);
 
-// ListBox mit allen Zeichenvorlagen fuellen - ausser Standard!
+// fill ListBox with all char style templates, except the standard ones
 SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false);
 
 //inserts a string sorted into a ListBox,
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 7ab26cf..37060cc 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1033,9 +1033,9 @@ SwView::~SwView()
     m_pPostItMgr = 0;
 
     m_bInDtor = true;
-    m_pEditWin->Hide(); // damit kein Paint Aerger machen kann!
-    // An der SwDocShell den Pointer auf die View ruecksetzen
+    m_pEditWin->Hide(); // prevent problems with painting
 
+    // Set pointer in SwDocShell to the view again
     SwDocShell* pDocSh = GetDocShell();
     if( pDocSh && pDocSh->GetView() == this )
         pDocSh->SetView( 0 );


More information about the Libreoffice-commits mailing list