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

Matthias Freund matti_lx at yahoo.de
Sun Jun 2 09:41:11 PDT 2013


 sw/source/ui/uno/swdet2.cxx       |    2 --
 sw/source/ui/uno/unoatxt.cxx      |   17 ++++++-----------
 sw/source/ui/uno/unomailmerge.cxx |   35 +++++------------------------------
 sw/source/ui/uno/unomod.cxx       |    6 ------
 4 files changed, 11 insertions(+), 49 deletions(-)

New commits:
commit deebdee7e15a58fdbf1de835e1d8ca253f307baa
Author: Matthias Freund <matti_lx at yahoo.de>
Date:   Sun Jun 2 00:09:56 2013 +0200

    fdo#39468 Comment translation GER-ENG in sw/source/ui/uno
    
    Cleanups and translations.
    
    Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab
    Reviewed-on: https://gerrit.libreoffice.org/4129
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

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 @@ bool IsDocShellRegistered()
     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 @@ uno::Type SwXAutoTextContainer::getElementType(void) throw( uno::RuntimeExceptio
 
 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 @@ uno::Sequence< OUString > SwXAutoTextContainer::getElementNames(void) throw( uno
 
     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 >  SwXAutoTextContainer::insertNewByName(
 
     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 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
     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 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
 
         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());
@@ -1127,7 +1125,4 @@ void SwAutoTextEventDescriptor::getByName(
     }
 }
 
-
-
-
 /* 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,20 +81,14 @@ using namespace ::com::sun::star::beans;
 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
 {
     eSuccess,       // successfully closed
@@ -136,8 +129,6 @@ static CloseResult CloseModelAndDocSh(
     return eResult;
 }
 
-////////////////////////////////////////////////////////////
-
 static bool LoadFromURL_impl(
         Reference< frame::XModel > &rxModel,
         SfxObjectShellRef &rxDocSh,
@@ -192,7 +183,6 @@ static bool LoadFromURL_impl(
     return bRes;
 }
 
-//==========================================================
 namespace
 {
     class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >
@@ -227,7 +217,6 @@ namespace
         DelayedFileDeletion& operator=( const DelayedFileDeletion& );       // never implemented
     };
 
-    //------------------------------------------------------
     DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const String& _rTemporaryFile )
         :
         m_xDocument( _rxModel, UNO_QUERY )
@@ -254,7 +243,6 @@ namespace
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
     IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -296,7 +284,6 @@ namespace
         return 0L;
     }
 
-    //--------------------------------------------------------------------
     void DelayedFileDeletion::implTakeOwnership( )
     {
         // revoke ourself as listener
@@ -315,7 +302,6 @@ namespace
         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 @@ namespace
         throw util::CloseVetoException( );
     }
 
-    //--------------------------------------------------------------------
     void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject&  ) throw (RuntimeException)
     {
         OSL_FAIL("DelayedFileDeletion::notifyClosing: how this?" );
@@ -336,7 +321,6 @@ namespace
         // 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,14 +329,11 @@ namespace
         // Or, we ourself close the document, then we should not be a listener anymore
     }
 
-    //------------------------------------------------------
     DelayedFileDeletion::~DelayedFileDeletion( )
     {
     }
 }
 
-////////////////////////////////////////////////////////////
-
 static bool DeleteTmpFile_Impl(
         Reference< frame::XModel > &rxModel,
         SfxObjectShellRef &rxDocSh,
@@ -389,8 +370,6 @@ static bool DeleteTmpFile_Impl(
     return bRes;
 }
 
-////////////////////////////////////////////////////////////
-
 SwXMailMerge::SwXMailMerge() :
     aEvtListeners   ( GetMailMergeMutex() ),
     aMergeListeners ( GetMailMergeMutex() ),
@@ -408,7 +387,7 @@ SwXMailMerge::SwXMailMerge() :
     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 @@ uno::Any SAL_CALL SwXMailMerge::execute(
 {
     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 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     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 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     // 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())
@@ -772,7 +750,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         }
     }
 
-
     // save document with temporary filename
     const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
             OUString( FILTER_XML ),
@@ -1196,8 +1173,6 @@ uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames()
     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 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
     return new ChainablePropertySetInfo ( aPrintSettingsMap_Impl );
 }
 
-/******************************************************************
- * SwXModule
- ******************************************************************/
 Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
     const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
 {
@@ -268,9 +265,6 @@ Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeExc
     return SwXModule_getSupportedServiceNames();
 }
 
-/******************************************************************
- * SwXPrintSettings
- ******************************************************************/
 SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
 : ChainableHelperNoState ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
 , meType(eType)


More information about the Libreoffice-commits mailing list