summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-23 16:52:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-23 20:47:56 +0000
commit1dbdcee43f64e2fd00d7dbeaca862bafbbbd6332 (patch)
tree1ce8b9b28c127a4948814b9126535a19d95ed939 /connectivity
parent91f20d6449f0fca905082a2004af9dfa4f683239 (diff)
cut mozab down to size somewhat
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx36
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx5
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx38
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx2
4 files changed, 0 insertions, 81 deletions
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 81b087cbfde5..9433e26517c8 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -146,15 +146,6 @@ void MQuery::setAddressbook(::rtl::OUString &ab)
OSL_TRACE("\tOUT MQuery::setAddressbook()");
}
// -------------------------------------------------------------------------
-::rtl::OUString MQuery::getAddressbook() const
-{
- OSL_TRACE("IN MQuery::getAddressbook()");
-
- OSL_TRACE("\tOUT MQuery::getAddressbook()");
-
- return(m_aAddressbook);
-}
-// -------------------------------------------------------------------------
void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
{
OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" );
@@ -164,33 +155,6 @@ void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" );
}
// -------------------------------------------------------------------------
-sal_Int32 MQuery::getMaxNrOfReturns() const
-{
- OSL_TRACE("IN MQuery::getMaxNrOfReturns()");
-
- OSL_TRACE("\tOUT MQuery::getMaxNrOfReturns()");
-
- return(m_nMaxNrOfReturns);
-}
-// -------------------------------------------------------------------------
-void MQuery::setQuerySubDirs(sal_Bool &qsd)
-{
- OSL_TRACE("IN MQuery::setQuerySubDirs()");
- ::osl::MutexGuard aGuard(m_aMutex);
-
- m_bQuerySubDirs = qsd;
- OSL_TRACE("\tOUT MQuery::setQuerySubDirs()");
-}
-// -------------------------------------------------------------------------
-sal_Bool MQuery::getQuerySubDirs() const
-{
- OSL_TRACE("IN MQuery::getQuerySubDirs()");
-
- OSL_TRACE("\tOUT MQuery::getQuerySubDirs()");
-
- return(m_bQuerySubDirs);
-}
-// -------------------------------------------------------------------------
void MQuery::setExpression( MQueryExpression &_expr )
{
OSL_TRACE("IN MQuery::setExpression()");
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 2c17529ed48d..77235092ad19 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -236,17 +236,12 @@ namespace connectivity
sal_uInt32 InsertLoginInfo(OConnection* _pCon);
void setAddressbook( ::rtl::OUString&);
- ::rtl::OUString getAddressbook(void) const;
const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; }
void setExpression( MQueryExpression &_expr );
void setMaxNrOfReturns( const sal_Int32);
- sal_Int32 getMaxNrOfReturns(void) const;
-
- void setQuerySubDirs( sal_Bool&);
- sal_Bool getQuerySubDirs(void) const;
sal_Int32 getRowCount( void );
sal_uInt32 getRealRowCount( void );
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 92fba3495b88..bc2cd6928fc3 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -47,13 +47,6 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
nss = mozString; // temp.
}
// -------------------------------------------------------------------------
-::rtl::OUString MTypeConverter::nsACStringToOUString( const nsACString& _source )
-{
- const char* buffer = _source.BeginReading();
- const char* bufferEnd = _source.EndReading();
- return ::rtl::OUString( buffer, static_cast<sal_Int32>(bufferEnd - buffer), RTL_TEXTENCODING_ASCII_US );
-}
-// -------------------------------------------------------------------------
::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source )
{
const char* buffer = _source.BeginReading();
@@ -61,12 +54,6 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
}
// -------------------------------------------------------------------------
-void MTypeConverter::asciiOUStringToNsACString( const ::rtl::OUString& _asciiString, nsACString& _dest )
-{
- ::rtl::OString sAsciiVersion( _asciiString.getStr(), _asciiString.getLength(), RTL_TEXTENCODING_ASCII_US );
- asciiToNsACString( sAsciiVersion.getStr(), _dest );
-}
-// -------------------------------------------------------------------------
void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
{
_dest.Truncate();
@@ -95,16 +82,6 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &
ous = _ous;
}
// -------------------------------------------------------------------------
-char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous)
-{
- // Convert to ::rtl::OString,
- ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
-
- const char *cs = os.getStr();
-
- return(strdup(cs));
-}
-// -------------------------------------------------------------------------
char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
{
// Convert ::rtl::OUString to ::rtl::OString,
@@ -113,20 +90,5 @@ char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
return(strdup(os.getStr()));
}
// -------------------------------------------------------------------------
-char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss)
-{
- char cs[1024];
- nss.ToCString(cs, 1024);
-
- return(strdup(cs));
-}
-// -------------------------------------------------------------------------
-::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous)
-{
- // Convert ::rtl::OUString to ::rtl::OString.
- ::rtl::OString os(rtl::OUStringToOString(ous,RTL_TEXTENCODING_ASCII_US));
- return( ::std::string(os.getStr()));
-}
-// -------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index df903eaa003f..66b4720d7b8a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -52,9 +52,7 @@ namespace connectivity
static ::std::string ouStringToStlString(const ::rtl::OUString&);
static ::std::string nsStringToStlString(const nsString&);
- static ::rtl::OUString nsACStringToOUString( const nsACString& _source );
static ::rtl::OString nsACStringToOString( const nsACString& _source );
- static void asciiOUStringToNsACString( const ::rtl::OUString& _asciiString, nsACString& _dest );
static void asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest );
private: