Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4129

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/4129/1

fdo#39468 Comment translation GER-ENG in sw/source/ui/uno

Cleanups and translations.

Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab
---
M sw/source/ui/uno/swdet2.cxx
M sw/source/ui/uno/unoatxt.cxx
M sw/source/ui/uno/unomailmerge.cxx
M sw/source/ui/uno/unomod.cxx
4 files changed, 11 insertions(+), 49 deletions(-)



diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index ebe5aeb..ecd96a3 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -43,8 +43,6 @@
     return SvtModuleOptions().IsWriter();
 }
 
-//-------------------------------------------------------------------------
-
 sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter )
 {
     sal_uLong nRet = ERRCODE_NONE;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index d495848..3a180d6 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -112,7 +112,7 @@
 
 sal_Bool SwXAutoTextContainer::hasElements(void) throw( uno::RuntimeException )
 {
-    //zumindest Standard sollte es immer geben!
+    // At least standard should always exists!
     return sal_True;
 }
 
@@ -142,15 +142,13 @@
 
     for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
-        // Die Namen werden ohne Pfad-Extension weitergegeben
+        // The names will be passed without a path extension.
         String sGroupName(pGlossaries->GetGroupName(i));
         pArr[i] = sGroupName.GetToken(0, GLOS_DELIM);
     }
     return aGroupNames;
 }
-/*-----------------------------------------------------------------------
-    findet Gruppennamen mit und ohne Pfadindex
-  -----------------------------------------------------------------------*/
+// Finds group names with or without path index.
 sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name)
     throw( uno::RuntimeException )
 {
@@ -199,7 +197,7 @@
 
     uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup, true );
     OSL_ENSURE( xGroup.is(), "SwXAutoTextContainer::insertNewByName: no UNO object created? How 
this?" );
-        // we just inserted the group into the glossaries, so why doesn't it exist?
+        // We just inserted the group into the glossaries, so why doesn't it exist?
 
     return xGroup;
 }
@@ -208,7 +206,7 @@
     throw( container::NoSuchElementException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
-    //zunaechst den Namen mit Pfad-Extension finden
+    // At first find the name with path extension
     String sGroupName = pGlossaries->GetCompleteGroupName( aGroupName );
     if(!sGroupName.Len())
         throw container::NoSuchElementException();
@@ -403,7 +401,7 @@
 
         SwDoc* pGDoc = pGlosGroup->GetDoc();
 
-        // Bis es eine Option dafuer gibt, base util::URL loeschen
+        // Until there is an option for that, delete base util::URL
         if(rCfg.IsSaveRelFile())
         {
             INetURLObject aTemp(pGlosGroup->GetFileName());
@@ -1126,8 +1124,5 @@
         delete pBlocks;
     }
 }
-
-
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 2f3e4ec..fecb485 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -70,7 +70,6 @@
 
 #include <unomid.h>
 
-
 #define SN_MAIL_MERGE               "com.sun.star.text.MailMerge"
 #define SN_DATA_ACCESS_DESCRIPTOR   "com.sun.star.sdb.DataAccessDescriptor"
 
@@ -82,19 +81,13 @@
 using namespace ::com::sun::star::text;
 using namespace SWUnoHelper;
 
-////////////////////////////////////////////////////////////
-
 typedef ::utl::SharedUNOComponent< XInterface > SharedComponent;
-
-////////////////////////////////////////////////////////////
 
 osl::Mutex &    GetMailMergeMutex()
 {
     static osl::Mutex   aMutex;
     return aMutex;
 }
-
-////////////////////////////////////////////////////////////
 
 enum CloseResult
 {
@@ -135,8 +128,6 @@
     }
     return eResult;
 }
-
-////////////////////////////////////////////////////////////
 
 static bool LoadFromURL_impl(
         Reference< frame::XModel > &rxModel,
@@ -192,7 +183,6 @@
     return bRes;
 }
 
-//==========================================================
 namespace
 {
     class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >
@@ -227,7 +217,6 @@
         DelayedFileDeletion& operator=( const DelayedFileDeletion& );       // never implemented
     };
 
-    //------------------------------------------------------
     DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const String& 
_rTemporaryFile )
         :
         m_xDocument( _rxModel, UNO_QUERY )
@@ -254,7 +243,6 @@
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
     IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -296,7 +284,6 @@
         return 0L;
     }
 
-    //--------------------------------------------------------------------
     void DelayedFileDeletion::implTakeOwnership( )
     {
         // revoke ourself as listener
@@ -315,7 +302,6 @@
         m_aDeleteTimer.Start( );
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership 
) throw (util::CloseVetoException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -327,7 +313,6 @@
         throw util::CloseVetoException( );
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject&  ) throw 
(RuntimeException)
     {
         OSL_FAIL("DelayedFileDeletion::notifyClosing: how this?" );
@@ -336,7 +321,6 @@
         // Or, we ourself close the document, then we should not be a listener anymore
     }
 
-    //------------------------------------------------------
     void SAL_CALL DelayedFileDeletion::disposing( const EventObject&  ) throw (RuntimeException)
     {
         OSL_FAIL("DelayedFileDeletion::disposing: how this?" );
@@ -345,13 +329,10 @@
         // Or, we ourself close the document, then we should not be a listener anymore
     }
 
-    //------------------------------------------------------
     DelayedFileDeletion::~DelayedFileDeletion( )
     {
     }
 }
-
-////////////////////////////////////////////////////////////
 
 static bool DeleteTmpFile_Impl(
         Reference< frame::XModel > &rxModel,
@@ -389,8 +370,6 @@
     return bRes;
 }
 
-////////////////////////////////////////////////////////////
-
 SwXMailMerge::SwXMailMerge() :
     aEvtListeners   ( GetMailMergeMutex() ),
     aMergeListeners ( GetMailMergeMutex() ),
@@ -408,7 +387,7 @@
     xDocSh->DoInitNew( 0 );
     SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
     SwView *pView = (SwView*) pFrame->GetViewShell();
-    pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird.
+    pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called.
 
     xModel = pDocShell->GetModel();
 
@@ -444,11 +423,10 @@
 {
     SolarMutexGuard aGuard;
 
-    //
     // get property values to be used
     // (use values from the service as default and override them with
     // the values that are provided as arguments)
-    //
+
     uno::Sequence< uno::Any >           aCurSelection   = aSelection;
     uno::Reference< sdbc::XResultSet >  xCurResultSet   = xResultSet;
     uno::Reference< sdbc::XConnection > xCurConnection  = xConnection;
@@ -464,9 +442,9 @@
     sal_Bool   bCurEscapeProcessing     = bEscapeProcessing;
     sal_Bool   bCurSinglePrintJobs      = bSinglePrintJobs;
     sal_Bool   bCurFileNameFromColumn   = bFileNameFromColumn;
-    //
+
     SfxObjectShellRef xCurDocSh = xDocSh;   // the document
-    //
+
     const beans::NamedValue *pArguments = rArguments.getConstArray();
     sal_Int32 nArgs = rArguments.getLength();
     for (sal_Int32 i = 0;  i < nArgs;  ++i)
@@ -615,7 +593,7 @@
     // while still in Update of Sfx.
     // (GetSelection in Update is not allowed)
     if (!aCurDocumentURL.isEmpty())
-        pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird.
+        pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called.
 
     SharedComponent aRowSetDisposeHelper;
     if (!xCurResultSet.is())
@@ -771,7 +749,6 @@
                 throw RuntimeException( OUString( "Failed to connect to mail server." ), 
static_cast < cppu::OWeakObject * > ( this ) );
         }
     }
-
 
     // save document with temporary filename
     const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
@@ -1195,8 +1172,6 @@
     SolarMutexGuard aGuard;
     return SwXMailMerge_getSupportedServiceNames();
 }
-
-////////////////////////////////////////////////////////////
 
 uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames()
     throw()
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 54423f6..bb1115b 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -189,9 +189,6 @@
     return new ChainablePropertySetInfo ( aPrintSettingsMap_Impl );
 }
 
-/******************************************************************
- * SwXModule
- ******************************************************************/
 Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
     const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
 {
@@ -268,9 +265,6 @@
     return SwXModule_getSupportedServiceNames();
 }
 
-/******************************************************************
- * SwXPrintSettings
- ******************************************************************/
 SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
 : ChainableHelperNoState ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
 , meType(eType)

-- 
To view, visit https://gerrit.libreoffice.org/4129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.