diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-02-16 09:48:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-16 10:26:03 +0000 |
commit | 08c475bb24a34f3a6a3f08e8490b521e8dcc96be (patch) | |
tree | 45380d74b4b7f751d43041f28e9588f8ca7a1a89 | |
parent | fix up const malformed copy ctors and operator= (diff) | |
download | core-08c475bb24a34f3a6a3f08e8490b521e8dcc96be.tar.gz core-08c475bb24a34f3a6a3f08e8490b521e8dcc96be.zip |
callcatcher: update unused code list
-rw-r--r-- | basic/source/comp/exprtree.cxx | 17 | ||||
-rw-r--r-- | basic/source/inc/expr.hxx | 1 | ||||
-rw-r--r-- | connectivity/source/drivers/odbcbase/OConnection.cxx | 105 | ||||
-rw-r--r-- | connectivity/source/inc/odbc/OConnection.hxx | 1 | ||||
-rw-r--r-- | l10ntools/inc/export.hxx | 7 | ||||
-rw-r--r-- | l10ntools/source/export2.cxx | 108 | ||||
-rw-r--r-- | svl/inc/svl/style.hxx | 8 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 8 | ||||
-rw-r--r-- | svtools/inc/svtools/fmtfield.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/svmedit.hxx | 1 | ||||
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 14 | ||||
-rw-r--r-- | svtools/source/edit/svmedit.cxx | 6 | ||||
-rw-r--r-- | toolkit/inc/toolkit/controls/unocontrols.hxx | 1 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 36 | ||||
-rw-r--r-- | tools/inc/tools/multisel.hxx | 1 | ||||
-rw-r--r-- | tools/source/memtools/multisel.cxx | 17 | ||||
-rwxr-xr-x | unusedcode.easy | 32 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 6 |
19 files changed, 17 insertions, 355 deletions
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index ef4ee5d481bf..02db3928e1be 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -720,23 +720,6 @@ SbiExprNode* SbiExpression::VBA_Not() return pNd; } -SbiExprNode* SbiExpression::VBA_And() -{ - SbiExprNode* pNd = VBA_Not(); - if( m_eMode != EXPRMODE_EMPTY_PAREN ) - { - for( ;; ) - { - SbiToken eTok = pParser->Peek(); - if( eTok != AND ) - break; - eTok = pParser->Next(); - pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Not() ); - } - } - return pNd; -} - SbiExprNode* SbiExpression::Like() { SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp(); diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index eb0350480bdb..4830a9c7425b 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -189,7 +189,6 @@ protected: SbiExprNode* Cat(); SbiExprNode* Like(); SbiExprNode* VBA_Not(); - SbiExprNode* VBA_And(); SbiExprNode* Comp(); SbiExprNode* Boolean(); public: diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index 04df960eade3..323e9d2e44ee 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -495,111 +495,6 @@ Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) { } -//-------------------------------------------------------------------- -void OConnection::buildTypeInfo() throw( SQLException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - - Reference< XResultSet> xRs = getMetaData ()->getTypeInfo (); - if(xRs.is()) - { - Reference< XRow> xRow(xRs,UNO_QUERY); - // Information for a single SQL type - - ::connectivity::ORowSetValue aValue; - ::std::vector<sal_Int32> aTypes; - Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); - sal_Int32 nCount = xResultSetMetaData->getColumnCount(); - // Loop on the result set until we reach end of file - while (xRs->next ()) - { - OTypeInfo aInfo; - sal_Int32 nPos = 1; - if ( aTypes.empty() ) - { - if ( nCount < 1 ) - nCount = 18; - aTypes.reserve(nCount+1); - aTypes.push_back(-1); - for (sal_Int32 j = 1; j <= nCount ; ++j) - aTypes.push_back(xResultSetMetaData->getColumnType(j)); - } - - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aTypeName = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nType = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nPrecision = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLiteralPrefix = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLiteralSuffix = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aCreateParams = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCaseSensitive = (sal_Bool)aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nSearchType = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bUnsigned = (sal_Bool)aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCurrency = (sal_Bool)aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bAutoIncrement = (sal_Bool)aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLocalTypeName = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nMinimumScale = aValue; - ++nPos; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nMaximumScale = aValue; - if ( nCount >= 18 ) - { - nPos = 18; - aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nNumPrecRadix = aValue; - } - - // check if values are less than zero like it happens in a oracle jdbc driver - if( aInfo.nPrecision < 0) - aInfo.nPrecision = 0; - if( aInfo.nMinimumScale < 0) - aInfo.nMinimumScale = 0; - if( aInfo.nMaximumScale < 0) - aInfo.nMaximumScale = 0; - if( aInfo.nNumPrecRadix < 0) - aInfo.nNumPrecRadix = 10; - - // Now that we have the type info, save it - // in the Hashtable if we don't already have an - // entry for this SQL type. - - m_aTypeInfo.push_back(aInfo); - } - - // Close the result set/statement. - - Reference< XCloseable> xClose(xRs,UNO_QUERY); - if(xClose.is()) - xClose->close(); - } -} //------------------------------------------------------------------------------ void OConnection::disposing() { diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index c5dbe644705b..8bf121e2b20d 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -152,7 +152,6 @@ namespace connectivity // close and free the handle and set it to SQL_NULLHANDLE void freeStatementHandle(SQLHANDLE& _pHandle); - void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 2355f5b23e46..c669a3b57bbb 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -304,20 +304,13 @@ public: static void RemoveUTF8ByteOrderMarker( rtl::OString &rString ); static bool hasUTF8ByteOrderMarker( const rtl::OString &rString ); static rtl::OString QuoteHTML( rtl::OString const &rString ); - static bool CopyFile(const rtl::OString& rSource , const rtl::OString& rDest); static rtl::OString UnquoteHTML( rtl::OString const &rString ); - static const char* GetEnv( const char *pVar ); - static bool isSourceLanguage(const rtl::OString &rLanguage); static bool isAllowed(const rtl::OString &rLanguage); static void Languages( std::vector<rtl::OString>::const_iterator& begin , std::vector<rtl::OString>::const_iterator& end ); - static rtl::OString getRandomName(const rtl::OString& rPrefix, const rtl::OString & sPostfix); - static void getCurrentDir( std::string& dir ); - - static rtl::OString GetNativeFile( rtl::OString const & sSource ); static void DumpExportList(const rtl::OString& rListName, ExportList& aList); diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index bad5964b2f6e..1341c41691a1 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -205,49 +205,6 @@ bool Export::hasUTF8ByteOrderMarker( const rtl::OString &rString ) rString[1] == '\xBB' && rString[2] == '\xBF' ; } -bool Export::CopyFile(const rtl::OString& rSource, const rtl::OString& rDest) -{ - const int BUFFERSIZE = 8192; - char buf[ BUFFERSIZE ]; - - FILE* IN_FILE = fopen( rSource.getStr() , "r" ); - if( IN_FILE == NULL ) - { - std::cerr << "Export::CopyFile WARNING: Could not open " << rSource.getStr() << "\n"; - return false; - } - - FILE* OUT_FILE = fopen( rDest.getStr() , "w" ); - if( OUT_FILE == NULL ) - { - std::cerr << "Export::CopyFile WARNING: Could not open/create " << rDest.getStr() << " for writing\n"; - fclose( IN_FILE ); - return false; - } - - while( fgets( buf , BUFFERSIZE , IN_FILE ) != NULL ) - { - if( fputs( buf , OUT_FILE ) == EOF ) - { - std::cerr << "Export::CopyFile WARNING: Write problems " << rSource.getStr() << "\n"; - fclose( IN_FILE ); - fclose( OUT_FILE ); - return false; - } - } - if( ferror( IN_FILE ) ) - { - std::cerr << "Export::CopyFile WARNING: Read problems " << rDest.getStr() << "\n"; - fclose( IN_FILE ); - fclose( OUT_FILE ); - return false; - } - fclose ( IN_FILE ); - fclose ( OUT_FILE ); - - return true; -} - /*****************************************************************************/ rtl::OString Export::UnquoteHTML( rtl::OString const &rString ) /*****************************************************************************/ @@ -332,69 +289,4 @@ void Export::InitForcedLanguages( bool bMergeMode ){ while ( nIndex >= 0 ); } -/*****************************************************************************/ -rtl::OString Export::GetNativeFile( rtl::OString const & sSource ) -/*****************************************************************************/ -{ - //TODO: Drop this completely unless line end conversion *is* an issue - return sSource; -} - -const char* Export::GetEnv( const char *pVar ) -{ - char *pRet = getenv( pVar ); - if ( !pRet ) - pRet = 0; - return pRet; -} - -void Export::getCurrentDir( std::string& dir ) -{ - char buffer[64000]; - if( getcwd( buffer , sizeof( buffer ) ) == 0 ){ - std::cerr << "Error: getcwd failed!\n"; - exit( -1 ); - } - dir = std::string( buffer ); -} - - -// Stolen from sal/osl/unx/tempfile.c - -#define RAND_NAME_LENGTH 6 - -rtl::OString Export::getRandomName(const rtl::OString& rPrefix, const rtl::OString& rPostfix) -{ - static const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; - static const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1; - - rtl::OStringBuffer sRandStr(rPrefix); - - static sal_uInt64 value; - char buffer[RAND_NAME_LENGTH]; - - TimeValue tv; - sal_uInt64 v; - int i; - - osl_getSystemTime( &tv ); - oslProcessInfo proInfo; - proInfo.Size = sizeof(oslProcessInfo); - osl_getProcessInfo( 0 , osl_Process_IDENTIFIER , &proInfo ); - - value += ((sal_uInt64) ( tv.Nanosec / 1000 ) << 16) ^ ( tv.Nanosec / 1000 ) ^ proInfo.Ident; - - v = value; - - for (i = 0; i < RAND_NAME_LENGTH; ++i) - { - buffer[i] = LETTERS[v % COUNT_OF_LETTERS]; - v /= COUNT_OF_LETTERS; - } - - sRandStr.append(buffer , RAND_NAME_LENGTH); - sRandStr.append(rPostfix); - return sRandStr.makeStringAndClear(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 02e4a127ab34..5fe0d0b217b4 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -84,7 +84,9 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from: class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject { +private: friend class SfxStyleSheetBasePool; + SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool(); protected: SfxStyleSheetBasePool& rPool; // zugehoeriger Pool @@ -100,7 +102,11 @@ protected: sal_Bool bMySet; // sal_True: Set loeschen im dtor - SfxStyleSheetBase(); // do not use! + SfxStyleSheetBase() // do not use! + : comphelper::OWeakTypeObject() + , rPool( implGetStaticPool() ) + { + } SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); virtual ~SfxStyleSheetBase(); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index c3e11e16d3d8..2b3808013217 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -146,7 +146,7 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r ) pSet = NULL; } -static SfxStyleSheetBasePool& implGetStaticPool() +SfxStyleSheetBasePool& SfxStyleSheetBase::implGetStaticPool() { static SfxStyleSheetBasePool* pSheetPool = 0; static SfxItemPool* pBasePool = 0; @@ -159,12 +159,6 @@ static SfxStyleSheetBasePool& implGetStaticPool() return *pSheetPool; } -SfxStyleSheetBase::SfxStyleSheetBase() -: comphelper::OWeakTypeObject() -, rPool( implGetStaticPool() ) -{ -} - SfxStyleSheetBase::~SfxStyleSheetBase() { #ifdef DBG_UTIL diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx index a3e53c8ead79..fdbf2518b69b 100644 --- a/svtools/inc/svtools/fmtfield.hxx +++ b/svtools/inc/svtools/fmtfield.hxx @@ -200,7 +200,6 @@ public: public: virtual void SetText( const XubString& rStr ); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); - void SetValidateText(const XubString& rText, const String* pErrorText = NULL); // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx index 5ff8ab4de8a3..eb855dac731a 100644 --- a/svtools/inc/svtools/svmedit.hxx +++ b/svtools/inc/svtools/svmedit.hxx @@ -89,7 +89,6 @@ public: virtual sal_Bool IsReadOnly() const; void EnableFocusSelectionHide( sal_Bool bHide ); - sal_Bool IsFocusSelectionHideEnabled() const; virtual void SetMaxTextLen( xub_StrLen nMaxLen = 0 ); virtual xub_StrLen GetMaxTextLen() const; diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 821e9d86cdd3..3c8e3021fcea 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -398,20 +398,6 @@ FormattedField::~FormattedField() } //------------------------------------------------------------------------------ -void FormattedField::SetValidateText(const XubString& rText, const String* pErrorText) -{ - DBG_CHKTHIS(FormattedField, NULL); - - if (CheckText(rText)) - SetText(rText); - else - if (pErrorText) - ImplSetTextImpl(*pErrorText, NULL); - else - ImplSetValue(m_dDefaultValue, sal_True); -} - -//------------------------------------------------------------------------------ void FormattedField::SetText(const XubString& rStr) { DBG_CHKTHIS(FormattedField, NULL); diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 267a20337254..640f05a19d3e 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -1575,12 +1575,6 @@ void MultiLineEdit::EnableFocusSelectionHide( sal_Bool bHide ) pImpSvMEdit->GetTextWindow()->SetAutoFocusHide( bHide ); } -sal_Bool MultiLineEdit::IsFocusSelectionHideEnabled() const -{ - return pImpSvMEdit->GetTextWindow()->IsAutoFocusHide(); -} - - void MultiLineEdit::SetLeftMargin( sal_uInt16 n ) { if ( GetTextEngine() ) diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 2ed2cf724016..5f77c4a543f8 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -236,7 +236,6 @@ private: bool mbAdjustingGraphic; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ); protected: GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ) diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index fa765d351265..4dc6628539f8 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -581,42 +581,6 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } - uno::Reference< graphic::XGraphic > GraphicControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) - { - uno::Reference< graphic::XGraphic > xGraphic; - - if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) ) - { - // graphic manager uniqueid - rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); - // get the DefaultContext - mxGrfObj = graphic::GraphicObject::createWithId( maContext.getUNOContext(), sID ); - } - else // linked - mxGrfObj = NULL; // release the GraphicObject - - if ( _rURL.isEmpty() ) - return xGraphic; - - try - { - uno::Reference< graphic::XGraphicProvider > xProvider; - if ( maContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) ) - { - uno::Sequence< beans::PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); - aMediaProperties[0].Value <<= _rURL; - xGraphic = xProvider->queryGraphic( aMediaProperties ); - } - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - - return xGraphic; - } - void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx index 8410019cd9d8..4ff077f6350c 100644 --- a/tools/inc/tools/multisel.hxx +++ b/tools/inc/tools/multisel.hxx @@ -64,7 +64,6 @@ private: TOOLS_DLLPRIVATE size_t ImplFindSubSelection( long nIndex ) const; TOOLS_DLLPRIVATE sal_Bool ImplMergeSubSelections( size_t nPos1, size_t nPos2 ); TOOLS_DLLPRIVATE long ImplFwdUnselected(); - TOOLS_DLLPRIVATE long ImplBwdUnselected(); #endif public: diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index fd61bcbb227f..79f6662824f4 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -539,23 +539,6 @@ long MultiSelection::ImplFwdUnselected() // ----------------------------------------------------------------------- -long MultiSelection::ImplBwdUnselected() -{ - if ( !bCurValid ) - return SFX_ENDOFSELECTION; - - if ( aSels[ nCurSubSel ]->Max() < nCurIndex ) - return nCurIndex; - - nCurIndex = aSels[ nCurSubSel-- ]->Min() - 1; - if ( nCurIndex >= 0 ) - return nCurIndex; - else - return SFX_ENDOFSELECTION; -} - -// ----------------------------------------------------------------------- - long MultiSelection::FirstSelected( sal_Bool bInverse ) { bInverseCur = bInverse; diff --git a/unusedcode.easy b/unusedcode.easy index b65437f0f645..3dd0f66e70ad 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -5,8 +5,6 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) Dialog::Dialog(Window*, ResId const&) DirEntry::SetBase(String const&, char) -Export::GetNativeFile(rtl::OString const&) -Export::getCurrentDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&) FileStream::FileStream(rtl::OString const&, FileAccessMode) FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short) FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&) @@ -18,11 +16,8 @@ FmFormObj::getType() const FmPropBrwMgr::GetChildWindowId() FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool) FontStyleBox::FontStyleBox(Window*, long) -FormattedField::SetValidateText(String const&, String const*) FuncData::FuncData(rtl::OUString const&) GraphCtrl::GraphCtrl(Window*, long) -GtkSalFrame::popIgnoreDamage() -GtkSalFrame::pushIgnoreDamage() HTMLControls::Insert(HTMLControl const*&, unsigned short&) HTMLControls::Insert(HTMLControl const**, unsigned short) HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short) @@ -42,17 +37,15 @@ MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short) MSDffImportRecords::Remove(unsigned short, unsigned short) MSFilterTracer::SetProperty(rtl::OUString const&, com::sun::star::uno::Any const&) MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>) -MachineSettings::CopyData() MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>) Matrix3d::Inverse() const Matrix3d::Matrix3d() MenuBar::MenuBar(ResId const&) +MergeData::Dump() MultiLineEdit::GetHScrollBar() const MultiLineEdit::GetLeftMargin() const MultiLineEdit::GetTextLines() const -MultiLineEdit::IsFocusSelectionHideEnabled() const NfCurrencyEntry::NfCurrencyEntry() -NotificationSettings::CopyData() NumberFormatCodeWrapper::getDefault(short, short) const NumericBox::GetValue(unsigned short) const NumericBox::GetValuePos(long) const @@ -63,7 +56,6 @@ OLEObjCache::SetSize(unsigned long) ORegKey::acquireKey(void*) OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const -ParagraphObj::ParagraphObj(ParagraphObj&) ParagraphStyleManager::get(WPXString const&) const PluginConnector::getInstance(_NPP*) PluginConnector::getInstanceById(unsigned int) @@ -166,6 +158,7 @@ SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short) SectReprArr::Remove(SectRepr* const&, unsigned short) SectReprArr::Remove(unsigned short, unsigned short) SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) +SetOfByte::GetSetCount() const SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxApplication::Main() SfxBrushItemLink::Set(SfxBrushItemLink*) @@ -601,7 +594,7 @@ XWindowItem::XWindowItem(unsigned short, Window*) XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&) XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool) XclExpName::IsHidden() const -XclExpPivotCache::GetFieldAcc(String const&) +XclExpPivotCache::GetFieldAcc(rtl::OUString const&) XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&) XclRoot::GetDatabaseRanges() const XclRoot::GetPixelXFromHmm(int) const @@ -718,7 +711,6 @@ binfilter::B3dEntityBucketMemArr::Replace(char const*&, unsigned short) binfilter::B3dEntityBucketMemArr::Replace(char const**, unsigned short, unsigned short) binfilter::B3dEntityBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*) binfilter::ByteString::Append(char) -binfilter::ByteString::Assign(char const*, unsigned short) binfilter::ByteString::Assign(char) binfilter::ByteString::ByteString(char const*, unsigned short) binfilter::ByteString::CompareIgnoreCaseToAscii(char const*, unsigned short) const @@ -1148,10 +1140,6 @@ connectivity::mozab::OCatalog::getDot() connectivity::mozab::OPreparedStatement::checkParameterIndex(int) connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int) connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectivity::mozab::OConnection*) -connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes() -connectivity::odbc::OPreparedStatement::getDataBuf(int) -connectivity::odbc::OPreparedStatement::getParamLength(int) -connectivity::odbc::OPreparedStatement::getPrecision(int) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) connectivity::toString(com::sun::star::uno::Any const&) @@ -1237,6 +1225,7 @@ ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int) oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet() oox::AttributeList::getHyperHex(int, long) const oox::AttributeList::getUnsignedHex(int, unsigned int) const +oox::BinaryInputStream::readNulCharArray() oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&) oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const oox::ObjectContainer::getObject(rtl::OUString const&) const @@ -1258,6 +1247,7 @@ oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const oox::drawingml::TextListStyle::dump() const oox::drawingml::Theme::getEffectStyle(int) const oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&) +oox::drawingml::chart::ObjectTypeFormatter::convertAutomaticLine(oox::PropertySet&, int) oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&) oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&) @@ -1333,6 +1323,7 @@ oox::xls::WorksheetHelper::getRow(int) const oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const oox::xls::Xf::hasAnyUsedFlags() const +pdfi::createOdfEmitter(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&) psp::GetCommandLineTokenCount(rtl::OString const&) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) @@ -1379,17 +1370,6 @@ sdr::animation::Scheduler::Reset(unsigned int) sdr::contact::ViewContactOfPageObj::GetReferencedPage() const sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const -sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&) -sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short) -sdr::overlay::OverlayHatchRect::setSecondPosition(basegfx::B2DPoint const&) -sdr::overlay::OverlayLineStriped::setSecondPosition(basegfx::B2DPoint const&) -sdr::overlay::OverlayManagerBuffered::SetRefreshWithPreRendering(bool) -sdr::overlay::OverlayObjectList::remove(sdr::overlay::OverlayObject&) -sdr::overlay::OverlayPolyPolygonStriped::setPolyPolygon(basegfx::B2DPolyPolygon const&) -sdr::overlay::OverlayRollingRectangleStriped::setExtendedLines(bool) -sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool) -sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&) -sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&) sdr::table::Cell::GetStyleSheetPool() const sdr::table::SdrTableObj::getColumnCount() const sdr::table::SdrTableObj::getRowCount() const diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 1d84ca259ea2..ee436da271f2 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -325,10 +325,10 @@ public: int GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; } void updateScreenNumber(); +#if GTK_CHECK_VERSION(3,0,0) // only for gtk3 ... void pushIgnoreDamage(); void popIgnoreDamage(); -#if GTK_CHECK_VERSION(3,0,0) void renderArea( cairo_t *cr, cairo_rectangle_t *src ); #endif virtual ~GtkSalFrame(); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index e4856bde95c8..f889e619ba35 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -2994,19 +2994,17 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi return sal_True; } +#if GTK_CHECK_VERSION(3,0,0) void GtkSalFrame::pushIgnoreDamage() { -#if GTK_CHECK_VERSION(3,0,0) m_nDuringRender++; -#endif } void GtkSalFrame::popIgnoreDamage() { -#if GTK_CHECK_VERSION(3,0,0) m_nDuringRender--; -#endif } +#endif void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect) { |