basic/inc/basic/global.hxx | 3 - basic/source/basmgr/basmgr.cxx | 6 +- basic/source/classes/global.cxx | 36 ++++++++---- basic/source/comp/exprtree.cxx | 17 ----- basic/source/inc/expr.hxx | 1 comphelper/source/misc/string.cxx | 30 ---------- l10ntools/inc/l10ntools/directory.hxx | 6 -- l10ntools/source/directory.cxx | 20 ------ solenv/bin/install-gdb-printers | 2 solenv/gbuild/gbuild.mk | 8 ++ solenv/inc/unitools.mk | 8 ++ toolkit/source/helper/registerservices.cxx | 14 ---- tools/inc/tools/fsys.hxx | 1 tools/inc/tools/stream.hxx | 1 tools/inc/tools/string.hxx | 8 +- tools/source/fsys/dirent.cxx | 28 --------- tools/source/stream/stream.cxx | 8 -- tools/source/string/strimp.cxx | 26 -------- tools/source/string/strucvt.cxx | 25 -------- unusedcode.easy | 84 ++++++++++++++++++++++------- 20 files changed, 114 insertions(+), 218 deletions(-)
New commits: commit c3b59c3da7bf9e13a07620987aa85b633c7ec9c8 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Feb 13 10:45:59 2012 +0000 preserve timestamps for .py files .pyc and .pyo binary caches contain the timestamp of the .py file, so for fedora multilib if the .py files get different times on different arch then the .py[o|c] files end up being different for the same content diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 99686cf..df327a0 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -165,7 +165,7 @@ fi if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then mkdir -p "${DESTDIR}${pythondir}" || die "cannot create dir '${DESTDIR}${pythondir}'" - cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" + cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" fi make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 commit 3b4786b6b7eec79b29f604cffc1cd708244e90b3 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Feb 13 10:20:39 2012 +0000 callcatcher: regenerate list diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index fabb700..ef4ee5d 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -737,23 +737,6 @@ SbiExprNode* SbiExpression::VBA_And() return pNd; } -SbiExprNode* SbiExpression::VBA_Or() -{ - SbiExprNode* pNd = VBA_And(); - if( m_eMode != EXPRMODE_EMPTY_PAREN ) - { - for( ;; ) - { - SbiToken eTok = pParser->Peek(); - if( eTok != OR ) - break; - eTok = pParser->Next(); - pNd = new SbiExprNode( pParser, pNd, eTok, VBA_And() ); - } - } - 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 33ee938..eb03504 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -190,7 +190,6 @@ protected: SbiExprNode* Like(); SbiExprNode* VBA_Not(); SbiExprNode* VBA_And(); - SbiExprNode* VBA_Or(); SbiExprNode* Comp(); SbiExprNode* Boolean(); public: diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 13a1236..8514a83 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -511,16 +511,6 @@ namespace } } -bool isalnumAsciiString(const rtl::OString &rString) -{ - return tmpl_is_OPER_AsciiString<isalnumAscii>(rString); -} - -bool isalnumAsciiString(const rtl::OUString &rString) -{ - return tmpl_is_OPER_AsciiString<isalnumAscii>(rString); -} - bool isdigitAsciiString(const rtl::OString &rString) { return tmpl_is_OPER_AsciiString<isdigitAscii>(rString); @@ -531,26 +521,6 @@ bool isdigitAsciiString(const rtl::OUString &rString) return tmpl_is_OPER_AsciiString<isdigitAscii>(rString); } -bool islowerAsciiString(const rtl::OString &rString) -{ - return tmpl_is_OPER_AsciiString<islowerAscii>(rString); -} - -bool islowerAsciiString(const rtl::OUString &rString) -{ - return tmpl_is_OPER_AsciiString<islowerAscii>(rString); -} - -bool isupperAsciiString(const rtl::OString &rString) -{ - return tmpl_is_OPER_AsciiString<isupperAscii>(rString); -} - -bool isupperAsciiString(const rtl::OUString &rString) -{ - return tmpl_is_OPER_AsciiString<isupperAscii>(rString); -} - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx index ba2590f..d70e5fe 100644 --- a/l10ntools/inc/l10ntools/directory.hxx +++ b/l10ntools/inc/l10ntools/directory.hxx @@ -24,7 +24,6 @@ class Directory private: rtl::OUString sDirectoryName; rtl::OUString sFullName; - bool bSkipLinks; std::vector<Directory> aDirVec; std::vector<File> aFileVec; @@ -33,18 +32,15 @@ class Directory std::vector<Directory> getSubDirectories() { return aDirVec; } std::vector<File> getFiles() { return aFileVec; } - void readDirectory(); void readDirectory( const rtl::OUString& sFullpath ); void scanSubDir( int nLevels = 0 ); rtl::OUString getDirectoryName() { return sDirectoryName; } rtl::OUString getFullName() { return sFullName ; } - void setSkipLinks( bool is_skipped ); void dump(); - Directory(){}; + Directory(){} - Directory( const rtl::OUString sFullPath ); Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ; static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ; diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index 82984fa..c2c73ea 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -41,12 +41,7 @@ namespace transex { -Directory::Directory( const rtl::OUString sFullpath ) : bSkipLinks( false ) -{ - sFullName = sFullpath; -} - -Directory::Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) : bSkipLinks( false ) +Directory::Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) { sFullName = sFullPath; sDirectoryName = sEntry; @@ -88,16 +83,6 @@ void Directory::scanSubDir( int nLevels ) } } -void Directory::setSkipLinks( bool is_skipped ) -{ - bSkipLinks = is_skipped; -} - -void Directory::readDirectory() -{ - readDirectory( sFullName ); -} - #ifdef WNT void Directory::readDirectory ( const rtl::OUString& sFullpath ) @@ -247,9 +232,6 @@ void Directory::readDirectory( const rtl::OUString& sFullpath ) break; } case S_IFLNK: - { - if( bSkipLinks ) break; - } case S_IFDIR: { transex::Directory aDir( diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index 8757aca..3bb9ae6 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -67,20 +67,6 @@ namespace toolkit using namespace ::com::sun::star::registry; //......................................................................... - Reference< XRegistryKey > registerServices( const Reference< XRegistryKey >& _rxParentKey, - const sal_Char* _pAsciiImplName, const sal_Char* _pAsciiServiceName ) - { - ::rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "/stardiv.Toolkit." ) ); - sImplName += ::rtl::OUString::createFromAscii( _pAsciiImplName ); - sImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ); - - Reference< XRegistryKey > xNewKey = _rxParentKey->createKey( sImplName ); - xNewKey->createKey( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) ); - - return xNewKey; - } - - //......................................................................... void* tryCreateFactory( const sal_Char* _pRequiredImplName, const sal_Char* _pComponentImplName, const sal_Char* _pAsciiServiceName1, const sal_Char* _pAsciiServiceName2, ::cppu::ComponentInstantiation _pInstantiation, const Reference< XMultiServiceFactory >& _rxServiceFactory ) diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index b1fcc1e..6ad3de9 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -280,7 +280,6 @@ public: sal_uInt16 nMaxChars = STRING_MAXLEN ) const; DirEntry TempName( DirEntryKind = FSYS_KIND_NONE ) const; - static const DirEntry& SetTempNameBase( const String &rBaseName ); sal_Bool MakeShortName( const String& rLongName, DirEntryKind eCreateKind = FSYS_KIND_NONE, sal_Bool bUseTilde = sal_True, diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index e0a5509..c598efd 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -380,7 +380,6 @@ public: // next Tell() <= nSize sal_Bool SetStreamSize( sal_Size nSize ); - sal_Bool ReadLine( ByteString& rStr ); sal_Bool ReadLine( rtl::OString& rStr ); sal_Bool WriteLine( const rtl::OString& rStr ); diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 22aecff..b91170a 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -246,7 +246,6 @@ public: void SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr ); void SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr ); - xub_StrLen GetTokenCount( sal_Char cTok = ';' ) const; void SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr, xub_StrLen nIndex = 0 ); ByteString GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const; @@ -354,6 +353,9 @@ private: // Append(sal_Unicode) void operator +=(int); // not implemented; to detect misuses // of operator +=(sal_Unicode) + UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, + rtl_TextEncoding eTextEncoding, + sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); //not implemented, removed //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 ); @@ -370,9 +372,6 @@ public: UniString( const ByteString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); - UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); UniString( const sal_Char* pByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); @@ -508,7 +507,6 @@ public: void SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr ); void SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr ); - xub_StrLen GetTokenCount( sal_Unicode cTok = ';' ) const; void SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr, xub_StrLen nIndex = 0 ); UniString GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const; diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 38138f8..20251df 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1569,34 +1569,6 @@ String DirEntry::GetSearchDelimiter( FSysPathStyle eFormatter ) *************************************************************************/ namespace { struct TempNameBase_Impl : public rtl::Static< DirEntry, TempNameBase_Impl > {}; } -const DirEntry& DirEntry::SetTempNameBase( const String &rBase ) -{ - DirEntry aTempDir = DirEntry().TempName().GetPath(); - aTempDir += DirEntry( rBase ); -#ifdef UNX - rtl::OString aName(rtl::OUStringToOString(aTempDir.GetFull(), osl_getThreadTextEncoding())); - if ( access( aName.getStr(), W_OK | X_OK | R_OK ) ) - { - // Create the directory and only on success give all rights to - // everyone. Use mkdir instead of DirEntry::MakeDir because - // this returns sal_True even if directory already exists. - - if ( !mkdir( aName.getStr(), S_IRWXU | S_IRWXG | S_IRWXO ) ) - chmod( aName.getStr(), S_IRWXU | S_IRWXG | S_IRWXO ); - - // This will not create a directory but perhaps FileStat called - // there modifies the DirEntry - - aTempDir.MakeDir(); - } -#else - aTempDir.MakeDir(); -#endif - DirEntry &rEntry = TempNameBase_Impl::get(); - rEntry = aTempDir.TempName( FSYS_KIND_DIR ); - return rEntry; -} - DirEntry DirEntry::TempName( DirEntryKind eKind ) const { // ggf. Base-Temp-Dir verwenden (macht Remote keinen Sinn => vorher) diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index ee7803c..b1c939a 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -723,14 +723,6 @@ sal_Bool SvStream::ReadLine(rtl::OString& rStr) return bEnd; } -sal_Bool SvStream::ReadLine( ByteString& rStr ) -{ - rtl::OString aFoo; - sal_Bool ret = ReadLine(aFoo); - rStr = aFoo; - return ret; -} - sal_Bool SvStream::ReadUniStringLine( String& rStr ) { sal_Unicode buf[256+1]; diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 32913e0..97344b3 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -1135,32 +1135,6 @@ void STRING::SearchAndReplaceAll( const STRING& rStr, const STRING& rRepStr ) // ----------------------------------------------------------------------- -xub_StrLen STRING::GetTokenCount( STRCODE cTok ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - - // Leerer String: TokenCount per Definition 0 - if ( !mpData->mnLen ) - return 0; - - xub_StrLen nTokCount = 1; - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; - sal_Int32 nIndex = 0; - while ( nIndex < nLen ) - { - // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount - if ( *pStr == cTok ) - ++nTokCount; - ++pStr, - ++nIndex; - } - - return nTokCount; -} - -// ----------------------------------------------------------------------- - void STRING::SetToken( xub_StrLen nToken, STRCODE cTok, const STRING& rStr, xub_StrLen nIndex ) { diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index e16e60d..d047cb4 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -58,31 +58,6 @@ UniString::UniString( const ByteString& rByteStr, rtl_TextEncoding eTextEncoding // ----------------------------------------------------------------------- -UniString::UniString( const ByteString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, - rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) -{ - DBG_CTOR( UniString, DbgCheckUniString ); - DBG_CHKOBJ( &rByteStr, ByteString, DbgCheckByteString ); - - // Stringlaenge ermitteln - if ( nPos > rByteStr.mpData->mnLen ) - nLen = 0; - else - { - // Laenge korrigieren, wenn noetig - sal_Int32 nMaxLen = rByteStr.mpData->mnLen-nPos; - if ( nLen > nMaxLen ) - nLen = static_cast< xub_StrLen >(nMaxLen); - } - - mpData = NULL; - rtl_string2UString( (rtl_uString **)(&mpData), - rByteStr.mpData->maStr+nPos, nLen, - eTextEncoding, nCvtFlags ); -} - -// ----------------------------------------------------------------------- - UniString::UniString( const char* pByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) { diff --git a/unusedcode.easy b/unusedcode.easy index 6567bbc..61b121e 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,12 +1,16 @@ +ByteString::Append(char const*, unsigned short) ByteString::Append(char) ByteString::Assign(char const*, unsigned short) ByteString::Assign(char) ByteString::ByteString(char const*, unsigned short) ByteString::CompareTo(ByteString const&, unsigned short) const +ByteString::Equals(ByteString const&) const ByteString::Equals(ByteString const&, unsigned short, unsigned short) const ByteString::Equals(char const*, unsigned short, unsigned short) const ByteString::EqualsIgnoreCaseAscii(ByteString const&) const ByteString::GetToken(unsigned short, char, unsigned short&) const +ByteString::Insert(char const*, unsigned short) +ByteString::Insert(char, unsigned short) ByteString::Match(ByteString const&) const ByteString::SearchAndReplaceAll(ByteString const&, ByteString const&) ByteString::SearchAndReplaceAll(char const*, ByteString const&) @@ -20,9 +24,12 @@ CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) DffPropSet::SetPropertyValue(unsigned int, unsigned int) const Dialog::Dialog(Window*, ResId const&) +DirEntry::SetBase(String const&, char) EditView::GetSelectionMode() const EditView::SetCursor(Cursor const&) EditView::SetPointer(Pointer const&) +Export::GetNativeFile(rtl::OString const&) +Export::getCurrentDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&) FieldEntry::GetBookmarkType() FileControl::SetButtonText(String const&) FileStream::FileStream(rtl::OString const&, FileAccessMode) @@ -68,7 +75,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&) MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short) MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short) MSDffImportRecords::Remove(unsigned short, unsigned short) -MSFilterTracer::EndElement(rtl::OUString const&) 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() @@ -139,6 +145,7 @@ ScChangeActionContent::SetNewValue(rtl::OUString const&, ScDocument*) ScChartListener::ScChartListener(rtl::OUString const&, ScDocument*, ScRange const&) ScChartListener::SetName(rtl::OUString const&) ScCollection::Free(ScDataObject*) +ScCollection::FreeAll() ScCompressedArray<int, unsigned char>::GetEntryCount() const ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long) ScCompressedArray<int, unsigned short>::GetEntryCount() const @@ -183,6 +190,7 @@ ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(un ScRangeData::ScRangeData(unsigned short) ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const ScStringCell::ScStringCell() +ScTypedStrData::GetValue() const ScUserList::end() ScUserList::end() const ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&) @@ -271,7 +279,6 @@ SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::da SotFactory::TestInvariant() SotObject::RemoveOwnerLock() SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) -SourceTreeIterator::EndExecute() SpanStyleManager::get(WPXString const&) const SpinButton::SpinButton(Window*, ResId const&) SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) @@ -299,7 +306,6 @@ SvPersistStream::InsertObj(SvPersistBase*) SvPersistStream::RemoveObj(SvPersistBase*) SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) -SvStream::ReadLine(ByteString&) SvStringsISortDtor::Insert(String* const*, unsigned short) SvTabListBox::GetTabJustify(unsigned short) const SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) @@ -402,6 +408,7 @@ SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*) SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**) SvxPluginFileDlg::IsAvailable(unsigned short) SvxPopupWindowListBox::StartSelection() +SvxRectCtlAccessibleContext::CommitChange(com::sun::star::accessibility::AccessibleEventObject const&) SvxRelativeField::SvxRelativeField(Window*, long) SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*) SvxRubyChildWindow::GetChildWindowId() @@ -738,6 +745,7 @@ avmedia::priv::MediaWindowBaseImpl::setStopTime(double) basebmp::BitmapDevice::setDamageTracker(boost::shared_ptr<basebmp::IBitmapDeviceDamageTracker> const&) basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) basegfx::computeSetDifference(std::__debug::vector<basegfx::B2IBox, std::allocator<basegfx::B2IBox> >&, basegfx::B2IBox const&, basegfx::B2IBox const&) +basegfx::fround(basegfx::B2DRange const&) basegfx::tools::addPointsAtCuts(basegfx::B2DPolygon const&) basegfx::tools::addPointsAtCutsAndTouches(basegfx::B2DPolyPolygon const&, basegfx::B2DPolygon const&) basegfx::tools::applyLineDashing(basegfx::B3DPolyPolygon const&, std::__debug::vector<double, std::allocator<double> > const&, basegfx::B3DPolyPolygon*, basegfx::B3DPolyPolygon*, double) @@ -783,6 +791,28 @@ binfilter::B3dEntityBucketMemArr::Insert(binfilter::B3dEntityBucketMemArr const* 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 +binfilter::ByteString::CompareTo(binfilter::ByteString const&, unsigned short) const +binfilter::ByteString::CompareTo(char const*, unsigned short) const +binfilter::ByteString::Equals(binfilter::ByteString const&, unsigned short, unsigned short) const +binfilter::ByteString::Equals(char const*, unsigned short, unsigned short) const +binfilter::ByteString::EqualsIgnoreCaseAscii(binfilter::ByteString const&) const +binfilter::ByteString::EqualsIgnoreCaseAscii(char const*) const +binfilter::ByteString::GetToken(unsigned short, char, unsigned short&) const +binfilter::ByteString::Match(binfilter::ByteString const&) const +binfilter::ByteString::SearchAndReplace(binfilter::ByteString const&, binfilter::ByteString const&, unsigned short) +binfilter::ByteString::SearchAndReplace(char const*, binfilter::ByteString const&, unsigned short) +binfilter::ByteString::SearchAndReplaceAll(binfilter::ByteString const&, binfilter::ByteString const&) +binfilter::ByteString::SearchAndReplaceAll(char const*, binfilter::ByteString const&) +binfilter::ByteString::SearchAndReplaceAll(char, char) +binfilter::ByteString::SearchBackward(char, unsigned short) const +binfilter::ByteString::SetChar(unsigned short, char) +binfilter::ByteString::SetToken(unsigned short, char, binfilter::ByteString const&, unsigned short) +binfilter::ByteString::ToUpperAscii() binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, unsigned short, unsigned short) binfilter::CharPosArray::Replace(int const&, unsigned short) binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short) @@ -883,6 +913,18 @@ binfilter::SortedPositions::Remove(unsigned short, unsigned short) binfilter::SortedPositions_SAR::Replace(unsigned int const&, unsigned short) binfilter::SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short) binfilter::SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*) +binfilter::String::EqualsIgnoreCaseAscii(binfilter::String const&, unsigned short, unsigned short) const +binfilter::String::EqualsIgnoreCaseAscii(unsigned short const*) const +binfilter::String::GetQuotedToken(unsigned short, binfilter::String const&, unsigned short, unsigned short&) const +binfilter::String::GetQuotedTokenCount(binfilter::String const&, unsigned short) const +binfilter::String::ReplaceAscii(unsigned short, unsigned short, char const*, unsigned short) +binfilter::String::Reverse() +binfilter::String::Search(unsigned short const*, unsigned short) const +binfilter::String::SearchAndReplaceAll(binfilter::String const&, binfilter::String const&) +binfilter::String::SearchAndReplaceAllAscii(char const*, binfilter::String const&) +binfilter::String::SearchChar(unsigned short const*, unsigned short) const +binfilter::String::ToFloat() const +binfilter::String::intern() const binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short) binfilter::SvBools::Replace(unsigned char const&, unsigned short) binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short) @@ -907,28 +949,28 @@ binfilter::SvShorts::Replace(short const&, unsigned short) binfilter::SvShorts::Replace(short const*, unsigned short, unsigned short) binfilter::SvShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(short const&, void*), void*) binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvStringsISort::Insert(String* const&) -binfilter::SvStringsISort::Insert(String* const&, unsigned short&) -binfilter::SvStringsISort::Insert(String* const*, unsigned short) +binfilter::SvStringsISort::Insert(binfilter::String* const&) +binfilter::SvStringsISort::Insert(binfilter::String* const&, unsigned short&) +binfilter::SvStringsISort::Insert(binfilter::String* const*, unsigned short) binfilter::SvStringsISort::Insert(binfilter::SvStringsISort const*, unsigned short, unsigned short) -binfilter::SvStringsISort::Remove(String* const&, unsigned short) +binfilter::SvStringsISort::Remove(binfilter::String* const&, unsigned short) binfilter::SvStringsISort::Remove(unsigned short, unsigned short) binfilter::SvStringsISortDtor::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvStringsISortDtor::Insert(String* const&) -binfilter::SvStringsISortDtor::Insert(String* const&, unsigned short&) -binfilter::SvStringsISortDtor::Insert(String* const*, unsigned short) +binfilter::SvStringsISortDtor::Insert(binfilter::String* const&) +binfilter::SvStringsISortDtor::Insert(binfilter::String* const&, unsigned short&) +binfilter::SvStringsISortDtor::Insert(binfilter::String* const*, unsigned short) binfilter::SvStringsISortDtor::Insert(binfilter::SvStringsISortDtor const*, unsigned short, unsigned short) -binfilter::SvStringsISortDtor::Remove(String* const&, unsigned short) +binfilter::SvStringsISortDtor::Remove(binfilter::String* const&, unsigned short) binfilter::SvStringsISortDtor::Remove(unsigned short, unsigned short) binfilter::SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvStringsSort::Insert(String* const&, unsigned short&) -binfilter::SvStringsSort::Insert(String* const*, unsigned short) +binfilter::SvStringsSort::Insert(binfilter::String* const&, unsigned short&) +binfilter::SvStringsSort::Insert(binfilter::String* const*, unsigned short) binfilter::SvStringsSort::Insert(binfilter::SvStringsSort const*, unsigned short, unsigned short) -binfilter::SvStringsSort::Remove(String* const&, unsigned short) -binfilter::SvStringsSortDtor::Insert(String* const&, unsigned short&) -binfilter::SvStringsSortDtor::Insert(String* const*, unsigned short) +binfilter::SvStringsSort::Remove(binfilter::String* const&, unsigned short) +binfilter::SvStringsSortDtor::Insert(binfilter::String* const&, unsigned short&) +binfilter::SvStringsSortDtor::Insert(binfilter::String* const*, unsigned short) binfilter::SvStringsSortDtor::Insert(binfilter::SvStringsSortDtor const*, unsigned short, unsigned short) -binfilter::SvStringsSortDtor::Remove(String* const&, unsigned short) +binfilter::SvStringsSortDtor::Remove(binfilter::String* const&, unsigned short) binfilter::SvStringsSortDtor::Remove(unsigned short, unsigned short) binfilter::SvULongs::Remove(unsigned short, unsigned short) binfilter::SvULongs::Replace(unsigned long const&, unsigned short) @@ -1366,6 +1408,8 @@ oox::xls::Dxf::importProtection(oox::AttributeList const&) oox::xls::ExternalLinkBuffer::importExternalName(oox::xls::BiffInputStream&) oox::xls::FormulaParser::convertNumberToHyperlink(rtl::OUString const&, double) const oox::xls::FormulaParser::importOleTargetLink(oox::xls::BiffInputStream&, unsigned short const*) const +oox::xls::FormulaParserImpl::removeOperand(unsigned long, unsigned long) +oox::xls::FormulaProcessorBase::generateApiRangeString(com::sun::star::table::CellRangeAddress const&) const oox::xls::FunctionParamInfoIterator::getParamInfo() const oox::xls::FunctionProvider::getFuncInfoFromOdfFuncName(rtl::OUString const&) const oox::xls::ShapeAnchor::getToCell() const @@ -1377,6 +1421,7 @@ oox::xls::StylesBuffer::getDxf(int) const oox::xls::StylesBuffer::writeStyleXfToPropertyMap(oox::PropertyMap&, int) const oox::xls::UnitConverter::calcOoxErrorCode(unsigned char) const oox::xls::WorkbookHelper::getBiffFilter() const +oox::xls::WorkbookHelper::getCellFromDoc(com::sun::star::table::CellAddress const&) const oox::xls::WorkbookHelper::setTextEncoding(unsigned short) oox::xls::WorksheetHelper::getCellAddress(com::sun::star::uno::Reference<com::sun::star::table::XCell> const&) oox::xls::WorksheetHelper::getColumn(int) const @@ -1447,8 +1492,8 @@ 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::SvxTableController::DeleteTable() -sdr::table::SvxTableController::getSelectionCursor() +sdr::table::SdrTableObj::getColumnCount() const +sdr::table::SdrTableObj::getRowCount() const sfx2::TaskPaneWrapper::GetChildWindowId() slideshow::internal::DrawShapeSubsetting::reset(slideshow::internal::DocTreeNode const&, boost::shared_ptr<GDIMetaFile> const&) std::__cxx1998::map<rtl::OUString, OutputStorageWrapper_Impl*, OUStringLess, std::allocator<std::pair<rtl::OUString const, OutputStorageWrapper_Impl*> > >::~map() @@ -1481,7 +1526,6 @@ ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun: ucbhelper::SimpleCertificateValidationRequest::getResponse() const utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const -vcl::I18nHelper::GetDate(Date const&) const vcl::LazyDeletor<Menu>::is_less(Menu*, Menu*) vcl::PDFExtOutDevData::EndGroup() vcl::PDFExtOutDevData::GetFormsFormat() const commit 761f502083652f0e45de9c38f56cf4867a8197e9 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 11 21:25:24 2012 +0000 can use a reference for singleton diff --git a/basic/inc/basic/global.hxx b/basic/inc/basic/global.hxx index 75c5d62..fd79dc9 100644 --- a/basic/inc/basic/global.hxx +++ b/basic/inc/basic/global.hxx @@ -35,9 +35,8 @@ namespace utl { class SbGlobal { - static utl::TransliterationWrapper* pTransliteration; public: - static utl::TransliterationWrapper* GetTransliteration(); + static utl::TransliterationWrapper& GetTransliteration(); }; #endif diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 83000b8..2395296 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1737,11 +1737,11 @@ namespace String sModule = sMacro.GetToken( 0, '.', nLast ); sMacro.Erase( 0, nLast ); - utl::TransliterationWrapper* pTransliteration = SbGlobal::GetTransliteration(); + utl::TransliterationWrapper& rTransliteration = SbGlobal::GetTransliteration(); sal_uInt16 nLibCount = i_manager->GetLibCount(); for ( sal_uInt16 nLib = 0; nLib < nLibCount; ++nLib ) { - if ( pTransliteration->isEqual( i_manager->GetLibName( nLib ), sLibName ) ) + if ( rTransliteration.isEqual( i_manager->GetLibName( nLib ), sLibName ) ) { StarBASIC* pLib = i_manager->GetLib( nLib ); if( !pLib ) @@ -1756,7 +1756,7 @@ namespace for( sal_uInt16 nMod = 0; nMod < nModCount; ++nMod ) { SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod ); - if ( pMod && pTransliteration->isEqual( pMod->GetName(), sModule ) ) + if ( pMod && rTransliteration.isEqual( pMod->GetName(), sModule ) ) { SbMethod* pMethod = (SbMethod*)pMod->Find( sMacro, SbxCLASS_METHOD ); if( pMethod ) diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx index 023ed85..324a18a 100644 --- a/basic/source/classes/global.cxx +++ b/basic/source/classes/global.cxx @@ -27,24 +27,36 @@ */ #include "basic/global.hxx" -#include <unotools/transliterationwrapper.hxx> #include <comphelper/processfactory.hxx> #include <i18npool/lang.h> +#include <rtl/instance.hxx> +#include <unotools/transliterationwrapper.hxx> #include <vcl/svapp.hxx> -utl::TransliterationWrapper* SbGlobal::pTransliteration = NULL; - -utl::TransliterationWrapper* SbGlobal::GetTransliteration() +namespace { - if(!pTransliteration) + class lclTransliterationWrapper { - const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage(); - pTransliteration = new ::utl::TransliterationWrapper( - comphelper::getProcessServiceFactory(), - com::sun::star::i18n::TransliterationModules_IGNORE_CASE ); - pTransliteration->loadModuleIfNeeded( eOfficeLanguage ); - } - return pTransliteration; + private: + utl::TransliterationWrapper m_aTransliteration; + public: + lclTransliterationWrapper() + : m_aTransliteration( + comphelper::getProcessServiceFactory(), + com::sun::star::i18n::TransliterationModules_IGNORE_CASE ) + { + const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage(); + m_aTransliteration.loadModuleIfNeeded( eOfficeLanguage ); + } + utl::TransliterationWrapper& getTransliteration() { return m_aTransliteration; } + }; + + class theTransliterationWrapper : public rtl::Static<lclTransliterationWrapper, theTransliterationWrapper> {}; +} + +utl::TransliterationWrapper& SbGlobal::GetTransliteration() +{ + return theTransliterationWrapper::get().getTransliteration(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 56122bdf25c64ef8ebdab0c7d83eb8bd94e3aa41 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Feb 11 21:03:40 2012 +0000 tell tooling about xmllint diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 65d5a80..b544f74 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -313,6 +313,14 @@ gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) endif +ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) +gb_XMLLINTTARGET := +gb_XMLLINT := xsltproc +else +gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) +endif + ifeq ($(SYSTEM_PYTHON),YES) gb_PYTHONTARGET := gb_PYTHON := $(PYTHON) diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 0418fc1..4de797c 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -42,6 +42,14 @@ XSLTPROC=$(AUGMENT_LIBRARY_PATH) xsltproc .ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" .ENDIF +.IF "$(XMLLINT)"=="" +.IF "$(SYSTEM_LIBXML)"!="YES" +XMLLINT=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmllint +.ELSE # "$(SYSTEM_LIBXML)"!="YES" +XMLLINT=$(AUGMENT_LIBRARY_PATH) xmllint +.ENDIF # "$(SYSTEM_LIBXML)"!="YES" +.ENDIF + ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits