ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

refactor out some com::sun::star typedefs

Browse Source 
which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8
This commit is contained in:
Noel Grandin
2015-10-21 14:17:56 +02:00
parent 54409159b8
commit 2f3ea8dfbc
44 changed files with 314 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+4 -7
View File
@@ -35,9 +35,6 @@
namespace accessibility
{
typedef ::com::sun::star::awt::Rectangle UnoRectangle;
typedef ::com::sun::star::awt::Point UnoPoint;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::UNO_QUERY;
@@ -318,7 +315,7 @@ namespace accessibility
return pStateSet;
}
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException, std::exception)
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const css::awt::Point& i_rLocation ) throw (RuntimeException, std::exception)
{
ItemMethodGuard aGuard( *m_xImpl );
// we do not have children ...
@@ -368,15 +365,15 @@ namespace accessibility
return m_xImpl->getPanelDisplayName();
}
UnoRectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
css::awt::Rectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
{
ItemMethodGuard aGuard( *m_xImpl );
const ::Rectangle aItemScreenRect( m_xImpl->getTabBar()->GetItemScreenRect( m_xImpl->getItemPos() ) );
Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
const UnoPoint aParentLocation( xParentComponent->getLocationOnScreen() );
return UnoRectangle(
const css::awt::Point aParentLocation( xParentComponent->getLocationOnScreen() );
return css::awt::Rectangle(
aItemScreenRect.Left() - aParentLocation.X,
aItemScreenRect.Top() - aParentLocation.Y,
aItemScreenRect.GetWidth(),
chart2/source/controller/inc/AccessibleBase.hxx
+2 -4
View File
@@ -313,15 +313,13 @@ private:
sal_Int32 getColor( eColorType eColType );
private:
typedef ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > tAccessible;
/** type of the vector containing the accessible children
*/
typedef ::std::vector< tAccessible > ChildListVectorType;
typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > ChildListVectorType;
/** type of the hash containing a vector index for every AccessibleUniqueId
of the object in the child list
*/
typedef ::std::map< ObjectIdentifier, tAccessible > ChildOIDMap;
typedef ::std::map< ObjectIdentifier, css::uno::Reference< css::accessibility::XAccessible > > ChildOIDMap;
bool m_bIsDisposed;
const bool m_bMayHaveChildren;
chart2/source/view/inc/PropertyMapper.hxx
+3 -12
View File
@@ -28,20 +28,11 @@
namespace chart
{
/**
*/
typedef ::std::map< OUString, OUString > tPropertyNameMap;
typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap;
typedef ::std::map< OUString, OUString > tPropertyNameMap;
typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap;
typedef ::std::map< OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap;
typedef ::comphelper::MakeMap< OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap;
typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence;
typedef ::comphelper::MakeSequence< OUString > tMakeNameSequence;
typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence;
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence;
typedef ::comphelper::MakeSequence< ::com::sun::star::uno::Any > tMakeAnySequence;
/**
* PropertyMapper provides easy mapping of the property names of various
connectivity/source/drivers/file/fanalyzer.cxx
+1 -1
View File
@@ -197,7 +197,7 @@ void OSQLAnalyzer::dispose()
}
}
void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
void OSQLAnalyzer::setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols)
{
m_aCompiler->setOrigColumns(rCols);
for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
connectivity/source/inc/TConnection.hxx
-2
View File
@@ -39,8 +39,6 @@ namespace connectivity
::com::sun::star::lang::XUnoTunnel
> OMetaConnection_BASE;
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions;
class OOO_DLLPUBLIC_DBTOOLS OMetaConnection : public OMetaConnection_BASE
{
protected:
connectivity/source/inc/TDatabaseMetaDataBase.hxx
-1
View File
@@ -30,7 +30,6 @@
namespace connectivity
{
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
public comphelper::OBaseMutex,
public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData2,
connectivity/source/inc/file/fanalyzer.hxx
+1 -1
View File
@@ -75,7 +75,7 @@ namespace connectivity
bool hasFunctions() const;
inline bool evaluateRestriction() { return m_aInterpreter->start(); }
void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const OFileColumns& rCols);
void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols);
static OOperandAttr* createOperandAttr(sal_Int32 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL);
connectivity/source/inc/file/fcode.hxx
-3
View File
@@ -42,9 +42,6 @@ namespace connectivity
class OBoolOperator;
typedef ::std::map<sal_Int32,sal_Int32> OEvaluateSet;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> OFileColumns;
class OOO_DLLPUBLIC_FILE OCode
{
public:
connectivity/source/inc/file/fcomp.hxx
+3 -3
View File
@@ -39,7 +39,7 @@ namespace connectivity
friend class OSQLAnalyzer;
OCodeList m_aCodeList;
OFileColumns m_orgColumns; // in filecurs this are the filecolumns
css::uno::Reference< css::container::XNameAccess> m_orgColumns; // in filecurs this are the filecolumns
OSQLAnalyzer* m_pAnalyzer;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xIndexes;
sal_Int32 m_nParamCounter;
@@ -65,8 +65,8 @@ namespace connectivity
void Clean();
bool isClean() const {return m_aCodeList.empty();}
bool hasCode() const {return !isClean();}
void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; }
const OFileColumns getOrigColumns() const { return m_orgColumns; }
void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols) { m_orgColumns = rCols; }
const css::uno::Reference< css::container::XNameAccess> getOrigColumns() const { return m_orgColumns; }
protected:
OOperand* execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
OOperand* execute_LIKE(connectivity::OSQLParseNode* pPredicateNode) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
connectivity/source/inc/odbc/OResultSet.hxx
-1
View File
@@ -66,7 +66,6 @@ namespace connectivity
typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr;
typedef ::std::allocator< TVoidPtr > TVoidAlloc;
typedef ::std::vector<TVoidPtr> TVoidVector;
// typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector;
/// unary_function Functor object for class ZZ returntype is void
struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool >
{
forms/source/component/FormattedField.cxx
+12 -19
View File
@@ -71,13 +71,6 @@ using namespace css::lang;
using namespace css::util;
using namespace css::form::binding;
namespace
{
typedef css::util::Date UNODate;
typedef css::util::Time UNOTime;
typedef css::util::DateTime UNODateTime;
}
namespace frm
{
class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public ::utl::ITerminationListener
@@ -899,21 +892,21 @@ Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternal
break;
default:
{
if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNODate >::get() ) )
if ( _rExternalValue.getValueType().equals( cppu::UnoType< css::util::Date >::get() ) )
{
UNODate aDate;
css::util::Date aDate;
_rExternalValue >>= aDate;
aControlValue <<= DBTypeConversion::toDouble( aDate, m_aNullDate );
}
else if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNOTime >::get() ) )
else if ( _rExternalValue.getValueType().equals( cppu::UnoType< css::util::Time >::get() ) )
{
UNOTime aTime;
css::util::Time aTime;
_rExternalValue >>= aTime;
aControlValue <<= DBTypeConversion::toDouble( aTime );
}
else if ( _rExternalValue.getValueType().equals( cppu::UnoType< UNODateTime >::get() ) )
else if ( _rExternalValue.getValueType().equals( cppu::UnoType< css::util::DateTime >::get() ) )
{
UNODateTime aDateTime;
css::util::DateTime aDateTime;
_rExternalValue >>= aDateTime;
aControlValue <<= DBTypeConversion::toDouble( aDateTime, m_aNullDate );
}
@@ -969,15 +962,15 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
// if this asserts ... well, the somebody set the TreatAsNumeric property to false,
// and the control value is a string. This implies some weird misconfiguration
// of the FormattedModel, so we won't care for it for the moment.
if ( aExternalValueType.equals( cppu::UnoType< UNODate >::get() ) )
if ( aExternalValueType.equals( cppu::UnoType< css::util::Date >::get() ) )
{
aExternalValue <<= DBTypeConversion::toDate( fValue, m_aNullDate );
}
else if ( aExternalValueType.equals( cppu::UnoType< UNOTime >::get() ) )
else if ( aExternalValueType.equals( cppu::UnoType< css::util::Time >::get() ) )
{
aExternalValue <<= DBTypeConversion::toTime( fValue );
}
else if ( aExternalValueType.equals( cppu::UnoType< UNODateTime >::get() ) )
else if ( aExternalValueType.equals( cppu::UnoType< css::util::DateTime >::get() ) )
{
aExternalValue <<= DBTypeConversion::toDateTime( fValue, m_aNullDate );
}
@@ -1011,13 +1004,13 @@ Sequence< Type > OFormattedModel::getSupportedBindingTypes()
switch ( m_nKeyType & ~NumberFormat::DEFINED )
{
case NumberFormat::DATE:
aTypes.push_front(cppu::UnoType< UNODate >::get() );
aTypes.push_front(cppu::UnoType< css::util::Date >::get() );
break;
case NumberFormat::TIME:
aTypes.push_front(cppu::UnoType< UNOTime >::get() );
aTypes.push_front(cppu::UnoType< css::util::Time >::get() );
break;
case NumberFormat::DATETIME:
aTypes.push_front(cppu::UnoType< UNODateTime >::get() );
aTypes.push_front(cppu::UnoType< css::util::DateTime >::get() );
break;
case NumberFormat::TEXT:
aTypes.push_front(cppu::UnoType< OUString >::get() );
forms/source/xforms/convert.cxx
+19 -23
View File
@@ -42,10 +42,6 @@ using namespace std;
using namespace o3tl;
using namespace utl;
typedef com::sun::star::util::Date UNODate;
typedef com::sun::star::util::Time UNOTime;
typedef com::sun::star::util::DateTime UNODateTime;
Convert::Convert()
: maMap()
{
@@ -110,7 +106,7 @@ namespace
}
OUString lcl_toXSD_UNODate_typed( const UNODate& rDate )
OUString lcl_toXSD_UNODate_typed( const css::util::Date& rDate )
{
OUStringBuffer sInfo;
@@ -126,15 +122,15 @@ namespace
OUString lcl_toXSD_UNODate( const Any& rAny )
{
UNODate aDate;
css::util::Date aDate;
OSL_VERIFY( rAny >>= aDate );
return lcl_toXSD_UNODate_typed( aDate );
}
UNODate lcl_toUNODate( const OUString& rString )
css::util::Date lcl_toUNODate( const OUString& rString )
{
UNODate aDate( 1, 1, 1900 );
css::util::Date aDate( 1, 1, 1900 );
bool bWellformed = ISO8601parseDate(rString, aDate);
@@ -150,7 +146,7 @@ namespace
// all okay?
if ( !bWellformed )
return UNODate( 1, 1, 1900 );
return css::util::Date( 1, 1, 1900 );
return aDate;
}
@@ -162,7 +158,7 @@ namespace
}
OUString lcl_toXSD_UNOTime_typed( const UNOTime& rTime )
OUString lcl_toXSD_UNOTime_typed( const css::util::Time& rTime )
{
OUStringBuffer sInfo;
@@ -188,15 +184,15 @@ namespace
OUString lcl_toXSD_UNOTime( const Any& rAny )
{
UNOTime aTime;
css::util::Time aTime;
OSL_VERIFY( rAny >>= aTime );
return lcl_toXSD_UNOTime_typed( aTime );
}
UNOTime lcl_toUNOTime( const OUString& rString )
css::util::Time lcl_toUNOTime( const OUString& rString )
{
UNOTime aTime;
css::util::Time aTime;
bool bWellformed = ISO8601parseTime(rString, aTime);
@@ -220,7 +216,7 @@ namespace
// all okay?
if ( !bWellformed )
return UNOTime();
return css::util::Time();
return aTime;
}
@@ -234,13 +230,13 @@ namespace
OUString lcl_toXSD_UNODateTime( const Any& rAny )
{
UNODateTime aDateTime;
css::util::DateTime aDateTime;
OSL_VERIFY( rAny >>= aDateTime );
UNODate aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
css::util::Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
OUString sDate = lcl_toXSD_UNODate_typed( aDate );
UNOTime const aTime( aDateTime.NanoSeconds, aDateTime.Seconds,
css::util::Time const aTime( aDateTime.NanoSeconds, aDateTime.Seconds,
aDateTime.Minutes, aDateTime.Hours, aDateTime.IsUTC);
OUString sTime = lcl_toXSD_UNOTime_typed( aTime );
@@ -256,8 +252,8 @@ namespace
if ( nDateTimeSep == -1 )
nDateTimeSep = rString.indexOf( 't' );
UNODate aDate;
UNOTime aTime;
css::util::Date aDate;
css::util::Time aTime;
if ( nDateTimeSep == -1 )
{ // no time part
aDate = lcl_toUNODate( rString );
@@ -267,7 +263,7 @@ namespace
aDate = lcl_toUNODate( rString.copy( 0, nDateTimeSep ) );
aTime = lcl_toUNOTime( rString.copy( nDateTimeSep + 1 ) );
}
UNODateTime aDateTime(
css::util::DateTime aDateTime(
aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours,
aDate.Day, aDate.Month, aDate.Year, aTime.IsUTC
);
@@ -281,9 +277,9 @@ void Convert::init()
ADD_ENTRY( this, OUString );
ADD_ENTRY( this, bool );
ADD_ENTRY( this, double );
ADD_ENTRY( this, UNODate );
ADD_ENTRY( this, UNOTime );
ADD_ENTRY( this, UNODateTime );
maMap[ cppu::UnoType<css::util::Date>::get() ] = Convert_t( &lcl_toXSD_UNODate, &lcl_toAny_UNODate );
maMap[ cppu::UnoType<css::util::Time>::get() ] = Convert_t( &lcl_toXSD_UNOTime, &lcl_toAny_UNOTime );
maMap[ cppu::UnoType<css::util::DateTime>::get() ] = Convert_t( &lcl_toXSD_UNODateTime, &lcl_toAny_UNODateTime );
}
include/sfx2/sfxmodelfactory.hxx
+2 -2
View File
@@ -41,8 +41,8 @@ namespace o3tl
namespace sfx2
{
typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ( SAL_CALL * SfxModelFactoryFunc ) (
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
typedef css::uno::Reference< css::uno::XInterface > ( SAL_CALL * SfxModelFactoryFunc ) (
const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory,
SfxModelFlags _nCreationFlags
);
mysqlc/source/mysqlc_connection.hxx
+4 -7
View File
@@ -59,10 +59,7 @@ namespace connectivity
using ::com::sun::star::sdbc::SQLWarning;
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > my_XStatementRef;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > my_XPreparedStatementRef;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
@@ -152,13 +149,13 @@ namespace connectivity
SAL_OVERRIDE;
// XConnection
my_XStatementRef SAL_CALL createStatement()
css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XPreparedStatementRef SAL_CALL prepareStatement(const rtl::OUString& sql)
css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XPreparedStatementRef SAL_CALL prepareCall(const rtl::OUString& sql)
css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql)
@@ -179,7 +176,7 @@ namespace connectivity
sal_Bool SAL_CALL isClosed()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XDatabaseMetaDataRef SAL_CALL getMetaData()
css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setReadOnly(sal_Bool readOnly)
mysqlc/source/mysqlc_databasemetadata.hxx
+152 -155
View File
@@ -31,9 +31,6 @@ namespace connectivity
{
namespace mysqlc
{
typedef ::com::sun::star::sdbc::SQLException my_SQLException;
typedef ::com::sun::star::uno::RuntimeException my_RuntimeException;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > my_XResultSetRef;
using ::com::sun::star::uno::Any;
@@ -45,11 +42,11 @@ namespace connectivity
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
OConnection& m_rConnection;
bool m_bUseCatalog;
bool m_bUseCatalog;
protected:
sql::DatabaseMetaData * meta;
rtl::OUString identifier_quote_string;
bool identifier_quote_string_set;
rtl::OUString identifier_quote_string;
bool identifier_quote_string_set;
private:
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
@@ -69,158 +66,158 @@ namespace connectivity
// as I mentioned before this interface is really BIG
// XDatabaseMetaData
sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL usesLocalFilePerTable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesUpperCaseIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesLowerCaseIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullPlusNonNullIsNull() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTypeConversion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL allProceduresAreCallable() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL allTablesAreSelectable() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getURL() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getUserName() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedHigh() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedLow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtStart() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDatabaseProductName() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDatabaseProductVersion() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDriverName() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getDriverVersion() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMajorVersion() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMinorVersion() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL usesLocalFiles() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL usesLocalFilePerTable() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMixedCaseIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesUpperCaseIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesLowerCaseIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesMixedCaseIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getIdentifierQuoteString() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSQLKeywords() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getNumericFunctions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getStringFunctions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSystemFunctions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getTimeDateFunctions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSearchStringEscape() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getExtraNameCharacters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsColumnAliasing() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullPlusNonNullIsNull() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTypeConversion() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType)
throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTableCorrelationNames() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsExpressionsInOrderBy() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOrderByUnrelated() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupBy() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupByUnrelated() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupByBeyondSelect() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsLikeEscapeClause() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMultipleResultSets() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMultipleTransactions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsNonNullableColumns() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMinimumSQLGrammar() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCoreSQLGrammar() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsExtendedSQLGrammar() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92IntermediateSQL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92FullSQL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInDataManipulation() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsPositionedDelete() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsPositionedUpdate() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSelectForUpdate() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsStoredProcedures() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInComparisons() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInExists() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInIns() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCorrelatedSubqueries() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsUnion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsUnionAll() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxBinaryLiteralLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCharLiteralLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInGroupBy() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInIndex() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInOrderBy() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInSelect() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInTable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxConnections() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCursorNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxIndexLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxSchemaNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxProcedureNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCatalogNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxRowSize() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxStatementLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxStatements() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxTableNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxTablesInSelect() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxUserNameLength() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDefaultTransactionIsolation() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTransactions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTableCorrelationNames() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsExpressionsInOrderBy() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOrderByUnrelated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupBy() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupByUnrelated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsGroupByBeyondSelect() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsLikeEscapeClause() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMultipleResultSets() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMultipleTransactions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsNonNullableColumns() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsMinimumSQLGrammar() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCoreSQLGrammar() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsExtendedSQLGrammar() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92IntermediateSQL() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsANSI92FullSQL() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOuterJoins() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsFullOuterJoins() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSchemaTerm() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getProcedureTerm() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogTerm() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isCatalogAtStart() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogSeparator() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInDataManipulation() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsPositionedDelete() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsPositionedUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSelectForUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsStoredProcedures() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInComparisons() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInExists() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInIns() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsCorrelatedSubqueries() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsUnion() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsUnionAll() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxBinaryLiteralLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCharLiteralLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInGroupBy() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInIndex() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInOrderBy() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInSelect() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxColumnsInTable() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxConnections() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCursorNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxIndexLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxSchemaNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxProcedureNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxCatalogNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxRowSize() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxStatementLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxStatements() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxTableNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxTablesInSelect() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMaxUserNameLength() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDefaultTransactionIsolation() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTransactions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level)
throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions()
throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getSchemas() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getCatalogs() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTableTypes() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTypeInfo() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsBatchUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
}
}
mysqlc/source/mysqlc_resultset.hxx
+4 -6
View File
@@ -46,8 +46,6 @@ namespace connectivity
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > my_XInputStreamRef;
typedef my_XNameAccessRef my_XNameAccessRef;
/*
** OResultSet
@@ -179,9 +177,9 @@ namespace connectivity
::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XInputStreamRef SAL_CALL getBinaryStream(sal_Int32 column)
css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XInputStreamRef SAL_CALL getCharacterStream(sal_Int32 column)
css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap)
@@ -238,9 +236,9 @@ namespace connectivity
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateBinaryStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateCharacterStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateObject(sal_Int32 column, const Any& x)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sc/inc/cellsuno.hxx
+1 -3
View File
@@ -116,9 +116,7 @@ public:
virtual void Notify( const SfxHint& rHint ) override;
};
typedef ::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener > XModifyListenerRef;
typedef std::vector<XModifyListenerRef> XModifyListenerArr_Impl;
typedef std::vector< css::uno::Reference< css::util::XModifyListener > > XModifyListenerArr_Impl;
// ScCellRangesBase - base class for ScCellRangesObj (with access by index)
// and ScCellRangeObj (without access by index)
sc/inc/datauno.hxx
+1 -3
View File
@@ -57,9 +57,7 @@ class ScDataPilotDescriptorBase;
struct ScSortParam;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener > XDBRefreshListenerRef;
typedef std::vector<XDBRefreshListenerRef> XDBRefreshListenerArr_Impl;
typedef std::vector< css::uno::Reference< css::util::XRefreshListener > > XDBRefreshListenerArr_Impl;
class ScDataUnoConversion
{
sc/inc/dispuno.hxx
+1 -3
View File
@@ -32,9 +32,7 @@ namespace com { namespace sun { namespace star { namespace frame {
class ScTabViewShell;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::frame::XStatusListener > XStatusListenerRef;
typedef std::vector<XStatusListenerRef> XStatusListenerArr_Impl;
typedef std::vector< css::uno::Reference< css::frame::XStatusListener > > XStatusListenerArr_Impl;
class ScDispatchProviderInterceptor : public cppu::WeakImplHelper<
com::sun::star::frame::XDispatchProviderInterceptor,
sc/source/filter/inc/formulabase.hxx
+3 -3
View File
@@ -255,12 +255,12 @@ struct BinComplexRef2d
// Token vector, token sequence ===============================================
typedef ::com::sun::star::sheet::FormulaToken ApiToken;
typedef ::com::sun::star::uno::Sequence< ApiToken > ApiTokenSequence;
typedef css::sheet::FormulaToken ApiToken;
typedef css::uno::Sequence< ApiToken > ApiTokenSequence;
/** Contains the base address and type of a special token representing an array
formula or a shared formula (sal_False), or a table operation (sal_True). */
typedef ::com::sun::star::beans::Pair< ::com::sun::star::table::CellAddress, sal_Bool > ApiSpecialTokenInfo;
typedef css::beans::Pair< css::table::CellAddress, sal_Bool > ApiSpecialTokenInfo;
/** A vector of formula tokens with additional convenience functions. */
class ApiTokenVector
sc/source/filter/inc/stylesbuffer.hxx
+19 -24
View File
@@ -201,17 +201,15 @@ struct ApiScriptFontName
/** Contains all API font attributes. */
struct ApiFontData
{
typedef ::com::sun::star::awt::FontDescriptor ApiFontDescriptor;
ApiScriptFontName maLatinFont; /// Font name for latin scripts.
ApiScriptFontName maAsianFont; /// Font name for east-asian scripts.
ApiScriptFontName maCmplxFont; /// Font name for complex scripts.
ApiFontDescriptor maDesc; /// Font descriptor (height in twips, weight in %).
sal_Int32 mnColor; /// Font color.
sal_Int16 mnEscapement; /// Escapement style.
sal_Int8 mnEscapeHeight; /// Escapement font height.
bool mbOutline; /// True = outlined characters.
bool mbShadow; /// True = shadowed chgaracters.
ApiScriptFontName maLatinFont; /// Font name for latin scripts.
ApiScriptFontName maAsianFont; /// Font name for east-asian scripts.
ApiScriptFontName maCmplxFont; /// Font name for complex scripts.
css::awt::FontDescriptor maDesc; /// Font descriptor (height in twips, weight in %).
sal_Int32 mnColor; /// Font color.
sal_Int16 mnEscapement; /// Escapement style.
sal_Int8 mnEscapeHeight; /// Escapement font height.
bool mbOutline; /// True = outlined characters.
bool mbShadow; /// True = shadowed chgaracters.
explicit ApiFontData();
};
@@ -300,19 +298,16 @@ struct AlignmentModel
/** Contains all API cell alignment attributes. */
struct ApiAlignmentData
{
typedef ::com::sun::star::table::CellHoriJustify ApiCellHoriJustify;
typedef ::com::sun::star::table::CellOrientation ApiCellOrientation;
ApiCellHoriJustify meHorJustify; /// Horizontal alignment.
sal_Int32 mnHorJustifyMethod;
sal_Int32 mnVerJustify; /// Vertical alignment.
sal_Int32 mnVerJustifyMethod;
ApiCellOrientation meOrientation; /// Normal or stacked text.
sal_Int32 mnRotation; /// Text rotation angle.
sal_Int16 mnWritingMode; /// CTL text direction.
sal_Int16 mnIndent; /// Indentation.
bool mbWrapText; /// True = multi-line text.
bool mbShrink; /// True = shrink to fit cell size.
css::table::CellHoriJustify meHorJustify; /// Horizontal alignment.
sal_Int32 mnHorJustifyMethod;
sal_Int32 mnVerJustify; /// Vertical alignment.
sal_Int32 mnVerJustifyMethod;
css::table::CellOrientation meOrientation; /// Normal or stacked text.
sal_Int32 mnRotation; /// Text rotation angle.
sal_Int16 mnWritingMode; /// CTL text direction.
sal_Int16 mnIndent; /// Indentation.
bool mbWrapText; /// True = multi-line text.
bool mbShrink; /// True = shrink to fit cell size.
explicit ApiAlignmentData();
};
sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+5 -5
View File
@@ -103,7 +103,7 @@ void SAL_CALL ScAccessibleCsvControl::disposing()
// XAccessibleComponent -------------------------------------------------------
Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const AwtPoint& /* rPoint */ )
Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const css::awt::Point& /* rPoint */ )
throw( RuntimeException, std::exception )
{
ensureAlive();
@@ -445,7 +445,7 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes(
return aSeq;
}
ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
throw( IndexOutOfBoundsException, RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -453,7 +453,7 @@ ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBo
ensureValidIndexWithEnd( nIndex );
ScCsvRuler& rRuler = implGetRuler();
Point aPos( rRuler.GetX( lcl_GetRulerPos( nIndex ) ) - rRuler.GetCharWidth() / 2, 0 );
AwtRectangle aRect( aPos.X(), aPos.Y(), rRuler.GetCharWidth(), rRuler.GetSizePixel().Height() );
css::awt::Rectangle aRect( aPos.X(), aPos.Y(), rRuler.GetCharWidth(), rRuler.GetSizePixel().Height() );
// do not return rectangle out of window
sal_Int32 nWidth = rRuler.GetOutputSizePixel().Width();
if( aRect.X >= nWidth )
@@ -470,7 +470,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep
return implGetTextLength();
}
sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint )
sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point& rPoint )
throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -867,7 +867,7 @@ ScAccessibleCsvGrid::~ScAccessibleCsvGrid()
// XAccessibleComponent -------------------------------------------------------
Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const AwtPoint& rPoint )
Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const css::awt::Point& rPoint )
throw( RuntimeException, std::exception )
{
Reference< XAccessible > xRet;
sc/source/ui/dbgui/csvcontrol.cxx
+2 -2
View File
@@ -298,10 +298,10 @@ ScMoveMode ScCsvControl::GetVertDirection( sal_uInt16 nCode, bool bHomeEnd )
// accessibility --------------------------------------------------------------
ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible()
css::uno::Reference< css::accessibility::XAccessible > ScCsvControl::CreateAccessible()
{
mxAccessible = ImplCreateAccessible().get();
return XAccessibleRef(mxAccessible.get());
return css::uno::Reference< css::accessibility::XAccessible >(mxAccessible.get());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/csvtablebox.cxx
+1 -1
View File
@@ -413,7 +413,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void )
// accessibility --------------------------------------------------------------
ScCsvTableBox::XAccessibleRef ScCsvTableBox::CreateAccessible()
css::uno::Reference< css::accessibility::XAccessible > ScCsvTableBox::CreateAccessible()
{
// do not use the ScCsvControl mechanism, return default accessible object
return Control::CreateAccessible();
sc/source/ui/inc/AccessibleCsvControl.hxx
+20 -38
View File
@@ -38,24 +38,12 @@ namespace utl { class AccessibleStateSetHelper; }
/** Accessible base class used for CSV controls. */
class ScAccessibleCsvControl : public ScAccessibleContextBase
{
protected:
typedef ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > XAccessibleRef;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet > XAccessibleRelationSetRef;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet > XAccessibleStateSetRef;
typedef ::com::sun::star::awt::Point AwtPoint;
typedef ::com::sun::star::awt::Size AwtSize;
typedef ::com::sun::star::awt::Rectangle AwtRectangle;
private:
VclPtr<ScCsvControl> mpControl; /// Pointer to the VCL control.
public:
explicit ScAccessibleCsvControl(
const XAccessibleRef& rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
ScCsvControl& rControl,
sal_uInt16 nRole );
virtual ~ScAccessibleCsvControl();
@@ -69,7 +57,7 @@ public:
// XAccessibleComponent ---------------------------------------------------
/** Returns the child at the specified point (cell returns NULL). */
virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Sets the focus to this control. */
@@ -109,7 +97,7 @@ protected:
ScCsvControl& implGetControl() const;
/** Returns the first child of rxParentObj, which has the role nRole. */
static XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole )
static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole )
throw( ::com::sun::star::uno::RuntimeException );
/** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */
::utl::AccessibleStateSetHelper* implCreateStateSet();
@@ -130,10 +118,6 @@ typedef ::cppu::ImplHelper1<
/** Accessible class representing the CSV ruler control. */
class ScAccessibleCsvRuler : public ScAccessibleCsvControl, public ScAccessibleCsvRulerImpl
{
protected:
typedef ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > PropertyValueSeq;
private:
OUStringBuffer maBuffer; /// Contains the text representation of the ruler.
@@ -156,15 +140,15 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Throws an exception (the ruler does not have children). */
virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the relation to the grid control. */
virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the current set of states. */
virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XAccessibleText --------------------------------------------------------
@@ -181,18 +165,18 @@ public:
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the attributes of the specified character. */
virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the screen coordinates of the specified character. */
virtual AwtRectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex )
virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the count of characters. */
virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the character index at the specified coordinate (object's coordinate system). */
virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint )
virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the selected text (ruler returns empty string). */
@@ -312,7 +296,7 @@ public:
// XAccessibleComponent ---------------------------------------------------
/** Returns the cell at the specified point. */
virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getForeground( )
@@ -328,15 +312,15 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the specified child cell. */
virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the relation to the ruler control. */
virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the current set of states. */
virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XAccessibleTable -------------------------------------------------------
@@ -392,15 +376,15 @@ public:
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the accessible cell object at the specified position. */
virtual XAccessibleRef SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the caption object of the table. */
virtual XAccessibleRef SAL_CALL getAccessibleCaption()
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the summary description object of the table. */
virtual XAccessibleRef SAL_CALL getAccessibleSummary()
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns true, if the cell at a specified position is selected. */
@@ -442,7 +426,7 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the child with the specified index in all selected children. */
virtual XAccessibleRef SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Deselects the child with the specified index in all selected children. */
@@ -537,8 +521,6 @@ private:
class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase
{
protected:
typedef ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > PropertyValueSeq;
typedef ::std::unique_ptr< SvxEditSource > SvxEditSourcePtr;
private:
@@ -575,7 +557,7 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the specified child. */
virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the index of this cell in the table. */
@@ -583,11 +565,11 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the relation to the ruler control. */
virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
/** Returns the current set of states. */
virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XInterface -------------------------------------------------------------
sc/source/ui/inc/csvcontrol.hxx
+2 -4
View File
@@ -225,9 +225,6 @@ protected:
typedef ::std::vector< OUString > StringVec;
typedef ::std::vector< StringVec > StringVecVec;
typedef ::css::uno::Reference<
::css::accessibility::XAccessible > XAccessibleRef;
private:
Link<ScCsvControl&,void> maCmdHdl; /// External command handler.
ScCsvCmd maCmd; /// Data of last command.
@@ -379,7 +376,8 @@ public:
public:
/** Creates and returns the accessible object of this control. Do not overwrite in
derived classes, use ImplCreateAccessible() instead. */
virtual XAccessibleRef CreateAccessible() override;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible() override;
protected:
/** Derived classes create a new accessible object here. */
sc/source/ui/inc/csvtablebox.hxx
+2 -1
View File
@@ -130,7 +130,8 @@ private:
// accessibility ----------------------------------------------------------
public:
/** Creates and returns the accessible object of this control. */
virtual XAccessibleRef CreateAccessible() override;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible() override;
protected:
/** Creates a new accessible object. */
sc/workben/result.cxx
+1 -1
View File
@@ -23,7 +23,7 @@
using namespace com::sun::star;
SV_IMPL_PTRARR( XResultListenerArr_Impl, XResultListenerPtr );
SV_IMPL_PTRARR( XResultListenerArr_Impl, css::uno::Reference< css::sheet::XResultListener >* );
ScAddInResult::ScAddInResult(const String& rStr) :
aArg( rStr ),
sc/workben/result.hxx
+1 -2
View File
@@ -28,8 +28,7 @@
#include <cppuhelper/implbase.hxx>
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr;
typedef boost::ptr_vector<XResultListenerPtr> XResultListenerArr_Impl;
typedef boost::ptr_vector<css::uno::Reference< css::sheet::XResultListener >*> XResultListenerArr_Impl;
class ScAddInResult : public cppu::WeakImplHelper<
com::sun::star::sheet::XVolatileResult>
sfx2/source/dialog/filedlghelper.cxx
+3 -3
View File
@@ -2166,14 +2166,14 @@ bool FileDialogHelper_Impl::isShowFilterExtensionEnabled() const
void FileDialogHelper_Impl::addFilterPair( const OUString& rFilter,
const OUString& rFilterWithExtension )
{
maFilters.push_back( FilterPair( rFilter, rFilterWithExtension ) );
maFilters.push_back( css::beans::StringPair( rFilter, rFilterWithExtension ) );
}
OUString FileDialogHelper_Impl::getFilterName( const OUString& rFilterWithExtension ) const
{
OUString sRet;
for( ::std::vector< FilterPair >::const_iterator pIter = maFilters.begin(); pIter != maFilters.end(); ++pIter )
for( ::std::vector< css::beans::StringPair >::const_iterator pIter = maFilters.begin(); pIter != maFilters.end(); ++pIter )
{
if ( (*pIter).Second == rFilterWithExtension )
{
@@ -2187,7 +2187,7 @@ OUString FileDialogHelper_Impl::getFilterName( const OUString& rFilterWithExtens
OUString FileDialogHelper_Impl::getFilterWithExtension( const OUString& rFilter ) const
{
OUString sRet;
for( ::std::vector< FilterPair >::const_iterator pIter = maFilters.begin(); pIter != maFilters.end(); ++pIter )
for( ::std::vector< css::beans::StringPair >::const_iterator pIter = maFilters.begin(); pIter != maFilters.end(); ++pIter )
{
if ( (*pIter).First == rFilter )
{
sfx2/source/dialog/filedlgimpl.hxx
+1 -3
View File
@@ -37,8 +37,6 @@ class FileDialogHelper;
namespace sfx2
{
typedef ::com::sun::star::beans::StringPair FilterPair;
class FileDialogHelper_Impl :
public ::cppu::WeakImplHelper<
::com::sun::star::ui::dialogs::XFilePickerListener,
@@ -49,7 +47,7 @@ namespace sfx2
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker2 > mxFileDlg;
::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > mxFilterCFG;
std::vector< FilterPair > maFilters;
std::vector< css::beans::StringPair > maFilters;
SfxFilterMatcher* mpMatcher;
GraphicFilter* mpGraphicFilter;
svl/source/filepicker/pickerhistory.cxx
+3 -4
View File
@@ -27,8 +27,7 @@ namespace svt
namespace
{
typedef ::com::sun::star::uno::WeakReference< XInterface > InterfaceAdapter;
typedef ::std::vector< InterfaceAdapter > InterfaceArray;
typedef ::std::vector< css::uno::WeakReference< XInterface > > InterfaceArray;
InterfaceArray& getFolderPickerHistory()
@@ -64,14 +63,14 @@ namespace svt
if ( aCleanedHistory.empty() )
// make some room, assume that all interfaces (from here on) are valid
aCleanedHistory.reserve( _rHistory.size() - ( aLoop - _rHistory.begin() ) );
aCleanedHistory.push_back( InterfaceAdapter( xCurrent ) );
aCleanedHistory.push_back( css::uno::WeakReference< XInterface >( xCurrent ) );
}
}
_rHistory.swap( aCleanedHistory );
}
// then push_back the picker
_rHistory.push_back( InterfaceAdapter( _rxPicker ) );
_rHistory.push_back( css::uno::WeakReference< XInterface >( _rxPicker ) );
}
}
svtools/source/table/cellvalueconversion.cxx
+5 -8
View File
@@ -55,9 +55,6 @@ namespace svt
namespace NumberFormat = ::com::sun::star::util::NumberFormat;
typedef ::com::sun::star::util::Time UnoTime;
typedef ::com::sun::star::util::Date UnoDate;
//= helper
@@ -255,7 +252,7 @@ namespace svt
::rtl::math::setNan( &returnValue );
// extract
UnoDate aDateValue;
css::util::Date aDateValue;
ENSURE_OR_RETURN( i_value >>= aDateValue, "allowed for Date values only", returnValue );
// convert
@@ -285,7 +282,7 @@ namespace svt
::rtl::math::setNan( &returnValue );
// extract
UnoTime aTimeValue;
css::util::Time aTimeValue;
ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for tools::Time values only", returnValue );
// convert
@@ -322,7 +319,7 @@ namespace svt
NumberFormatsSupplier::createWithLocale( xContext, aLocale );
// ensure a NullDate we will assume later on
UnoDate const aNullDate( 1, 1, 1900 );
css::util::Date const aNullDate( 1, 1, 1900 );
Reference< XPropertySet > const xFormatSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
xFormatSettings->setPropertyValue( "NullDate", makeAny( aNullDate ) );
@@ -357,11 +354,11 @@ namespace svt
{
o_formatter.reset( new DateTimeNormalization( io_data.xNumberFormatter ) );
}
else if ( sTypeName.equals( ::cppu::UnoType< UnoDate >::get().getTypeName() ) )
else if ( sTypeName.equals( ::cppu::UnoType< css::util::Date >::get().getTypeName() ) )
{
o_formatter.reset( new DateNormalization( io_data.xNumberFormatter ) );
}
else if ( sTypeName.equals( ::cppu::UnoType< UnoTime >::get().getTypeName() ) )
else if ( sTypeName.equals( ::cppu::UnoType< css::util::Time >::get().getTypeName() ) )
{
o_formatter.reset( new TimeNormalization( io_data.xNumberFormatter ) );
}
svtools/source/uno/svtxgridcontrol.cxx
+1 -3
View File
@@ -73,8 +73,6 @@ namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleState
using namespace ::svt::table;
typedef ::com::sun::star::util::Color UnoColor;
SVTXGridControl::SVTXGridControl()
:m_xTableModel( new UnoControlTableModel() )
@@ -547,7 +545,7 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx
aPropertyValue.clear();
else
{
Sequence< UnoColor > aAPIColors( aColors->size() );
Sequence< css::util::Color > aAPIColors( aColors->size() );
for ( size_t i=0; i<aColors->size(); ++i )
{
aAPIColors[i] = aColors->at(i).GetColor();
svx/source/form/fmvwimp.cxx
+2 -4
View File
@@ -1447,8 +1447,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
if(OUString(_rDesc.szServiceName) == FM_COMPONENT_COMMANDBUTTON)
nOBJID = OBJ_FM_BUTTON;
typedef ::com::sun::star::form::submission::XSubmission XSubmission_t;
Reference< XSubmission_t > xSubmission(_rDesc.xPropSet, UNO_QUERY);
Reference< css::form::submission::XSubmission > xSubmission(_rDesc.xPropSet, UNO_QUERY);
// xform control or submission button?
if ( !xSubmission.is() )
@@ -1506,8 +1505,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
// connect the submission with the submission supplier (aka the button)
xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE,
makeAny( FormButtonType_SUBMIT ) );
typedef ::com::sun::star::form::submission::XSubmissionSupplier XSubmissionSupplier_t;
Reference< XSubmissionSupplier_t > xSubmissionSupplier(pControl->GetUnoControlModel(), UNO_QUERY);
Reference< css::form::submission::XSubmissionSupplier > xSubmissionSupplier(pControl->GetUnoControlModel(), UNO_QUERY);
xSubmissionSupplier->setSubmission(xSubmission);
return pControl;
svx/source/inc/datanavi.hxx
+13 -26
View File
@@ -86,32 +86,19 @@ namespace svxform
class DataNavigatorWindow;
class AddInstanceDialog;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::xforms::XFormsUIHelper1 > XFormsUIHelper1_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::XNode > XNode_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > XPropertySet_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::xforms::XModel > XModel_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::container::XContainer > XContainer_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > XNameContainer_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > XFrame_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > XFrameModel_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::xml::dom::events::XEventTarget > XEventTarget_ref;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::xforms::XSubmission > XSubmission_ref;
typedef ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > PropertyValue_seq;
typedef std::vector< XContainer_ref > ContainerList;
typedef std::vector< XEventTarget_ref > EventTargetList;
typedef css::uno::Reference< css::xforms::XFormsUIHelper1 > XFormsUIHelper1_ref;
typedef css::uno::Reference< css::xml::dom::XNode > XNode_ref;
typedef css::uno::Reference< css::beans::XPropertySet > XPropertySet_ref;
typedef css::uno::Reference< css::xforms::XModel > XModel_ref;
typedef css::uno::Reference< css::container::XContainer > XContainer_ref;
typedef css::uno::Reference< css::container::XNameContainer > XNameContainer_ref;
typedef css::uno::Reference< css::frame::XFrame > XFrame_ref;
typedef css::uno::Reference< css::frame::XModel > XFrameModel_ref;
typedef css::uno::Reference< css::xml::dom::events::XEventTarget > XEventTarget_ref;
typedef css::uno::Reference< css::xforms::XSubmission > XSubmission_ref;
typedef css::uno::Sequence< css::beans::PropertyValue > PropertyValue_seq;
typedef std::vector< XContainer_ref > ContainerList;
typedef std::vector< XEventTarget_ref > EventTargetList;
class DataTreeListBox : public SvTreeListBox
svx/source/inc/fmexch.hxx
+2 -4
View File
@@ -124,15 +124,13 @@ namespace svxform
class OControlTransferData
{
private:
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_uInt32 > > ControlPaths;
private:
DataFlavorExVector m_aCurrentFormats;
protected:
ListBoxEntrySet m_aSelectedEntries;
ControlPaths m_aControlPaths;
css::uno::Sequence< css::uno::Sequence< sal_uInt32 > >
m_aControlPaths;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
m_aHiddenControlModels;
sw/source/core/access/acchypertextdata.hxx
+1 -2
View File
@@ -32,8 +32,7 @@ class SwAccessibleHyperTextData
{
public:
typedef const SwTextAttr * key_type;
typedef ::com::sun::star::uno::WeakReference<
com::sun::star::accessibility::XAccessibleHyperlink > mapped_type;
typedef css::uno::WeakReference< css::accessibility::XAccessibleHyperlink > mapped_type;
typedef std::pair<const key_type,mapped_type> value_type;
typedef ::std::less< const SwTextAttr * > key_compare;
typedef std::map<key_type,mapped_type,key_compare>::iterator iterator;
sw/source/uibase/inc/glosdoc.hxx
+2 -5
View File
@@ -35,11 +35,8 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef;
#include <vector>
#include "swdllapi.h"
typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XAutoTextGroup > AutoTextGroupRef;
typedef ::std::vector< AutoTextGroupRef > UnoAutoTextGroups;
typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XAutoTextEntry > AutoTextEntryRef;
typedef ::std::vector< AutoTextEntryRef > UnoAutoTextEntries;
typedef ::std::vector< css::uno::WeakReference< css::text::XAutoTextGroup > > UnoAutoTextGroups;
typedef ::std::vector< css::uno::WeakReference< css::text::XAutoTextEntry > > UnoAutoTextEntries;
#define GLOS_DELIM (sal_Unicode)'*'
sw/source/uibase/misc/glosdoc.cxx
+2 -2
View File
@@ -596,7 +596,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString
{
xGroup = new SwXAutoTextGroup( sCompleteGroupName, this );
// cache it
m_aGlossaryGroups.push_back( AutoTextGroupRef( xGroup ) );
m_aGlossaryGroups.push_back( css::uno::WeakReference< css::text::XAutoTextGroup >( xGroup ) );
}
return xGroup;
@@ -654,7 +654,7 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry(
{
xReturn = new SwXAutoTextEntry( this, rGroupName, rEntryName );
// cache it
m_aGlossaryEntries.push_back( AutoTextEntryRef( xReturn ) );
m_aGlossaryEntries.push_back( css::uno::WeakReference< css::text::XAutoTextEntry >( xReturn ) );
}
return xReturn;
vcl/osx/OSXTransferable.hxx
-2
View File
@@ -39,8 +39,6 @@ class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransf
private ::boost::noncopyable
{
public:
typedef com::sun::star::uno::Sequence< sal_Int8 > ByteSequence_t;
explicit OSXTransferable(com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
DataFlavorMapperPtr_t pDataFlavorMapper,
NSPasteboard* pasteboard);
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+11 -11
View File
@@ -327,7 +327,7 @@ protected:
OUString m_sTitle;
OUString m_sFilter;
UnoFilterList m_aSubFilters;
css::uno::Sequence< css::beans::StringPair > m_aSubFilters;
public:
FilterEntry( const OUString& _rTitle, const OUString& _rFilter )
@@ -346,11 +346,11 @@ public:
@return
the number of sub filters
*/
sal_Int32 getSubFilters( UnoFilterList& _rSubFilterList );
sal_Int32 getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList );
// helpers for iterating the sub filters
const UnoFilterEntry* beginSubFilters() const { return m_aSubFilters.getConstArray(); }
const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); }
const css::beans::StringPair* beginSubFilters() const { return m_aSubFilters.getConstArray(); }
const css::beans::StringPair* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); }
};
bool FilterEntry::hasSubFilters() const
@@ -358,7 +358,7 @@ bool FilterEntry::hasSubFilters() const
return( 0 < m_aSubFilters.getLength() );
}
sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
sal_Int32 FilterEntry::getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList )
{
_rSubFilterList = m_aSubFilters;
return m_aSubFilters.getLength();
@@ -477,7 +477,7 @@ namespace {
return bMatch;
}
bool operator () ( const UnoFilterEntry& _rEntry )
bool operator () ( const css::beans::StringPair& _rEntry )
{
OUString aShrunkName = shrinkFilterName( _rEntry.First );
return aShrunkName == rTitle;
@@ -500,14 +500,14 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle )
return bRet;
}
bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
bool SalGtkFilePicker::FilterNameExists( const css::uno::Sequence< css::beans::StringPair >& _rGroupedFilters )
{
bool bRet = false;
if( m_pFilterList )
{
const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
const css::beans::StringPair* pStart = _rGroupedFilters.getConstArray();
const css::beans::StringPair* pEnd = pStart + _rGroupedFilters.getLength();
for( ; pStart != pEnd; ++pStart )
if( ::std::any_of(
m_pFilterList->begin(),
@@ -1897,7 +1897,7 @@ void SalGtkFilePicker::SetFilters()
{
if( aListIter->hasSubFilters() )
{ // it's a filter group
UnoFilterList aSubFilters;
css::uno::Sequence< css::beans::StringPair > aSubFilters;
aListIter->getSubFilters( aSubFilters );
const StringPair* pSubFilters = aSubFilters.getConstArray();
const StringPair* pSubFiltersEnd = pSubFilters + aSubFilters.getLength();
@@ -1933,7 +1933,7 @@ void SalGtkFilePicker::SetFilters()
if( aListIter->hasSubFilters() )
{ // it's a filter group
UnoFilterList aSubFilters;
css::uno::Sequence< css::beans::StringPair > aSubFilters;
aListIter->getSubFilters( aSubFilters );
implAddFilterGroup( aListIter->getTitle(), aSubFilters );
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+1 -3
View File
@@ -40,8 +40,6 @@ struct ElementEntry_Impl;
typedef ::std::list < FilterEntry > FilterList;
typedef ::std::list < ElementEntry_Impl > ElementList;
typedef ::com::sun::star::beans::StringPair UnoFilterEntry;
typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively
// class declaration
@@ -170,7 +168,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
SalGtkFilePicker& operator=( const SalGtkFilePicker& ) = delete;
bool FilterNameExists( const OUString& rTitle );
bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
bool FilterNameExists( const css::uno::Sequence< css::beans::StringPair >& _rGroupedFilters );
void ensureFilterList( const OUString& _rInitialCurrentFilter );
xmloff/source/forms/layerexport.cxx
+1 -3
View File
@@ -67,8 +67,6 @@ namespace xmloff
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::text;
typedef ::com::sun::star::xforms::XFormsSupplier XXFormsSupplier;
//= OFormLayerXMLExport_Impl
const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix()
{
@@ -298,7 +296,7 @@ namespace xmloff
bool OFormLayerXMLExport_Impl::documentContainsXForms() const
{
Reference< XXFormsSupplier > xXFormSupp( m_rContext.GetModel(), UNO_QUERY );
Reference< css::xforms::XFormsSupplier > xXFormSupp( m_rContext.GetModel(), UNO_QUERY );
Reference< XNameContainer > xForms;
if ( xXFormSupp.is() )
xForms = xXFormSupp->getXForms();