[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source scripting/source svx/source

[Caolán McNamara]

 editeng/inc/editeng/outliner.hxx     |    1 -
 editeng/source/outliner/outlvw.cxx   |    6 ------
 scripting/source/pyprov/mailmerge.py |    6 +++---
 svx/source/form/formcontrolling.cxx  |   15 ---------------
 svx/source/inc/formcontrolling.hxx   |    6 ------
 5 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit 2829346208ebf2c6e0337e1b4d95d13716410823
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 26 12:24:49 2011 +0100

    coerce port to int

diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 4654ad3..04af53a 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -73,7 +73,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 		server = xConnectionContext.getValueByName("ServerName")
 		if dbg:
 			print >> sys.stderr, server
-		port = xConnectionContext.getValueByName("Port")
+		port = int(xConnectionContext.getValueByName("Port"))
 		if dbg:
 			print >> sys.stderr, port
 		self.server = smtplib.SMTP(server, port)
@@ -254,7 +254,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
 		server = xConnectionContext.getValueByName("ServerName")
 		if dbg:
 			print >> sys.stderr, server
-		port = xConnectionContext.getValueByName("Port")
+		port = int(xConnectionContext.getValueByName("Port"))
 		if dbg:
 			print >> sys.stderr, port
 		connectiontype = xConnectionContext.getValueByName("ConnectionType")
@@ -323,7 +323,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
 		server = xConnectionContext.getValueByName("ServerName")
 		if dbg:
 			print >> sys.stderr, server
-		port = xConnectionContext.getValueByName("Port")
+		port = int(xConnectionContext.getValueByName("Port"))
 		if dbg:
 			print >> sys.stderr, port
 		connectiontype = xConnectionContext.getValueByName("ConnectionType")
commit 3f5a3bcb1c0889cab436a70214eae6ec967cb8d4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 25 23:46:08 2011 +0100

    callcatcher: remove unused Write methods

diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index e42ae93..7661ff0 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -306,7 +306,6 @@ public:
                     sal_Bool bWithChilds=sal_False );
 
     sal_uLong       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    sal_uLong		Write( SvStream& rOutput, EETextFormat eFormat );
 
     void        InsertText( const String& rNew, sal_Bool bSelect = sal_False );
     void        InsertText( const OutlinerParaObject& rParaObj );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 98de3f7..f71864a 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1622,12 +1622,6 @@ sal_uLong OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextF
     return nRet;
 }
 
-sal_uLong OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
-{
-    DBG_CHKTHIS(OutlinerView,0);
-    return pEditView->Write( rOutput, eFormat );
-}
-
 void OutlinerView::SetBackgroundColor( const Color& rColor )
 {
     DBG_CHKTHIS(OutlinerView,0);
commit 3c3cf5d8c5b5c35096351a56c66bd77ccb188ef5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 25 22:46:32 2011 +0100

    callcatcher: ditch unused methods

diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 3cb853b..82accf2 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -188,21 +188,6 @@ namespace svx
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString  FeatureSlotTranslation::getControllerFeatureURLForSlotId( sal_Int32 _nSlotId )
-    {
-        const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
-        FeatureDescriptions::const_iterator pos = ::std::find_if( rDescriptions.begin(), rDescriptions.end(), MatchFeatureDescriptionBySlotId( _nSlotId ) );
-        OSL_ENSURE( pos != rDescriptions.end(), "FeatureSlotTranslation::getControllerFeatureURLForSlotId: not found!" );
-        return ( pos != rDescriptions.end() ) ? pos->sURL : ::rtl::OUString();
-    }
-
-    //--------------------------------------------------------------------
-    sal_Bool FeatureSlotTranslation::isFeatureURL( const ::rtl::OUString& _rMainURL )
-    {
-        return ( _rMainURL.indexOf( FMURL_FORMSLOTS_PREFIX ) == 0 );
-    }
-
-    //--------------------------------------------------------------------
     sal_Int16 FeatureSlotTranslation::getFormFeatureForSlotId( sal_Int32 _nSlotId )
     {
         const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f334e30..6efe629 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -55,12 +55,6 @@ namespace svx
         /// retrieves the feature id for a given feature URL
         static  sal_Int32       getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL );
 
-        /// retrieves the feature URL for a given feature id
-        static ::rtl::OUString  getControllerFeatureURLForSlotId( sal_Int32 _nSlotId );
-
-        /// determines whether the given URL is a controller feature URL
-        static sal_Bool         isFeatureURL( const ::rtl::OUString& _rMainURL );
-
         /// retrieves the css.form.runtime.FormFeature ID for a given slot ID
         static  sal_Int16       getFormFeatureForSlotId( sal_Int32 _nSlotId );