[Libreoffice-commits] .: 3 commits - automation/source crashrep/source cui/source extensions/source

[Thomas Arnhold]

 automation/source/communi/communi.cxx     |   10 ----------
 crashrep/source/unx/main.cxx              |    4 ++--
 cui/source/dialogs/SpellDialog.cxx        |    2 --
 extensions/source/bibliography/datman.cxx |   12 ------------
 4 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 6ed68a9d0336e6c798b863f009db33d85a351c5d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Mar 14 21:30:13 2011 +0100

    Remove empty comment fields

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9b3d6df..cd1cd86 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -900,9 +900,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
     sTitle.SearchAndReplaceAscii( "$LANGUAGE ($LOCATION)", SvtLanguageTable::GetLanguageString(nLang) );
     SetText( sTitle );
 }
-/*-------------------------------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SpellDialog::InitUserDicts()
 {
     sal_uInt16 nLang = aLanguageLB.GetSelectLanguage();
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 29ee460..0787125 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -748,9 +748,7 @@ BibDataManager::BibDataManager()
 {
 }
 
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 BibDataManager::~BibDataManager()
 {
     Reference< XLoadable >		xLoad( m_xForm, UNO_QUERY );
@@ -864,16 +862,12 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
         OSL_FAIL("Exception in BibDataManager::InsertFields");
     }
 }
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 Reference< awt::XControlModel >	BibDataManager::updateGridModel()
 {
     return updateGridModel( m_xForm );
 }
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 Reference< awt::XControlModel >	BibDataManager::updateGridModel(const Reference< XForm > & xDbForm)
 {
     try
@@ -903,9 +897,7 @@ Reference< awt::XControlModel >	BibDataManager::updateGridModel(const Reference<
 
     return m_xGridModel;
 }
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 Reference< XForm >	BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
 {
     Reference< XForm >	xResult;
@@ -1185,9 +1177,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
     }
 }
 
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
 {
     ResetIdentifierMapping();
@@ -1649,9 +1639,7 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
     }
     delete pDlg;
 }
-/* --------------------------------------------------
 
- --------------------------------------------------*/
 ::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
 {
     ::rtl::OUString uRet;
commit 1fcc737eee5f02fa69d3d7b97e42ed11419fd9c0
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Mar 13 17:52:20 2011 +0100

    Remove unused macro GETSET

diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index a7f551d..2a7ff09 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -567,16 +567,6 @@ IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYAR
     return 1;
 }
 
-
-#define GETSET(aVar, KeyName, Dafault)                 \
-    aVar = aConf.ReadKey(KeyName,"No Entry");          \
-    if ( aVar == "No Entry" )                          \
-    {                                                  \
-        aVar = Dafault;                                \
-        aConf.WriteKey(KeyName, aVar);                 \
-    }
-
-
 CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel )
 : CommunicationManagerClient( bUseMultiChannel )
 , aHostToTalk( aHost )
commit 9d7057f82fdc7f236906b82338fdd845840a96cf
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Mar 13 17:35:42 2011 +0100

    Use format string on printf()

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 876a4c2..3606d34 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -368,7 +368,7 @@ bool SendHTTPRequest(
                 if ( g_bDebugMode )
                 {
                     printf( "*** Sending HTTP request ***\n\n" );
-                    printf( buffer );
+                    printf( "%s", buffer );
                 }
 
                 if ( SOCKET_ERROR != send( s, buffer, strlen(buffer), 0 ) )
@@ -405,7 +405,7 @@ bool SendHTTPRequest(
                         if ( g_bDebugMode )
                             do
                             {
-                                printf( buffer );
+                                printf( "%s", buffer );
                                 memset( buffer, 0, sizeof(buffer) );
                             } while ( 0 < recv( s, buffer, sizeof(buffer), 0 ) );
                     }