canvas/source/cairo/cairo_textlayout.cxx | 4 ++- idl/source/objects/slot.cxx | 22 +++++++++---------- idl/source/prj/database.cxx | 6 ++--- rsc/inc/rscdef.hxx | 18 +++++++++------- rsc/inc/rsctools.hxx | 2 - rsc/source/parser/erscerr.cxx | 2 - rsc/source/parser/rscdb.cxx | 4 +-- rsc/source/prj/start.cxx | 12 +++++----- rsc/source/rsc/rsc.cxx | 22 +++++++++---------- rsc/source/tools/rscdef.cxx | 6 ++--- svx/inc/svx/svdetc.hxx | 1 svx/source/svdraw/svdetc.cxx | 6 ----- unotools/source/misc/componentresmodule.cxx | 9 +++----- unusedcode.easy | 20 ++++++----------- xmlhelp/source/cxxhelp/provider/databases.cxx | 29 -------------------------- xmlhelp/source/cxxhelp/provider/databases.hxx | 4 --- 16 files changed, 64 insertions(+), 103 deletions(-)
New commits: commit b6e200a2befb522b7e6032384a0aca307f01e579 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Dec 6 10:30:12 2011 +0000 fix annoying debugging-mode crash diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 11b8201..d1e1459 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -588,7 +588,9 @@ namespace cairocanvas nWidth, (int) rOutpos.X(), (int) rOutpos.Y(), - cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index, + cairo_glyphs.size() > 0 ? cairo_glyphs[0].index : -1, + cairo_glyphs.size() > 1 ? cairo_glyphs[1].index : -1, + cairo_glyphs.size() > 2 ? cairo_glyphs[2].index : -1, maLogicalAdvancements.getLength() ? "ADV " : "", rSysFontData.bAntialias ? "AA " : "", rSysFontData.bFakeBold ? "FB " : "", commit 7c89bc26ee2cba7d9afbb54cb01ed449acc0beae Author: Caolán McNamara <caol...@redhat.com> Date: Fri Dec 2 12:29:10 2011 +0000 update list diff --git a/unusedcode.easy b/unusedcode.easy index aa93d3d..d1afeb5 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,4 +1,3 @@ -(anonymous namespace)::UpdateInformationProvider::storeCommandInfo(int, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandProcessor> const&) (anonymous namespace)::getState(std::__debug::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&) AtomDocument::AtomDocument(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) commit 12ffc366c27c44941336398414251f9f9174212a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Dec 2 08:17:27 2011 +0000 callcatcher: update list diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 42c1c3d..b547289 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -132,7 +132,6 @@ public: sal_uInt16 GetObject(sal_uIntPtr nPos) const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); } sal_uIntPtr GetPos(sal_uInt16 nElem) const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); } sal_uIntPtr GetCount() const { return aArr.Count(); } - void Sort(); }; class ContainerSorter { diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 0e1d3e2..f832244 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -295,12 +295,6 @@ int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) co return n1<n2 ? -1 : n1>n2 ? 1 : 0; } -void UShortCont::Sort() -{ - ImpUShortContainerSorter aSorter(aArr); - aSorter.DoSort(); -} - //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrLinkList::Clear() diff --git a/unusedcode.easy b/unusedcode.easy index 5213980..aa93d3d 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -80,7 +80,6 @@ CurrencyBox::RemoveValue(long) CurrencyField::CurrencyField(Window*, ResId const&) CurrencyFormatter::SetCurrencySymbol(String const&) CustomToolBarImportHelper::showToolbar(rtl::OUString const&) -Date::IsValidDate() const DateBox::DateBox(Window*, ResId const&) DateBox::GetDate(unsigned short) const DateBox::GetDatePos(Date const&) const @@ -332,6 +331,11 @@ SbxDecimal::getUShort(unsigned short&) SbxDecimal::setShort(short) SbxDecimal::setString(rtl::OUString*) SbxDecimal::setUShort(unsigned short) +SbxItem::SetDocument(basctl::ScriptDocument const&) +SbxItem::SetLibName(rtl::OUString const&) +SbxItem::SetMethodName(rtl::OUString const&) +SbxItem::SetName(rtl::OUString const&) +SbxItem::SetType(BasicIDEType) SbxValue::PutDecimal(SbxDecimal*) ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&) ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short) @@ -1049,7 +1053,8 @@ ToolBox::GetToolbarLayoutMode() TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) UCBStorage::IsStorageFile(String const&) UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&) -UShortCont::Sort() +UnoApiTest::UnoApiTest() +UnoApiTest::createFileURL(rtl::OUString const&, rtl::OUString&) UnoComboBoxControl::getActionListeners() UnoComboBoxControl::getItemListeners() UnoControlBase::UnoControlBase() @@ -1808,7 +1813,6 @@ comphelper::getPathToUserRegistry() comphelper::string::isalnumAsciiString(rtl::OUString const&) comphelper::string::islowerAsciiString(rtl::OUString const&) comphelper::string::isupperAsciiString(rtl::OUString const&) -comphelper::string::searchAndReplaceAllAsciiWithAscii(rtl::OUString const&, char const*, char const*, int) connectivity::OKeyValue::OKeyValue() connectivity::ORowSetValue::setFromDouble(double const&, int) connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType, unsigned int) @@ -2025,7 +2029,6 @@ oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, un oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&) oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool) oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short) -oox::formulaimport::XmlStream::AttributeList::attribute(int, unsigned short) const oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const oox::formulaimport::XmlStream::skipElement(int) oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) @@ -2244,13 +2247,6 @@ sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short) sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short) sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short) sw::util::AuthorInfos::Remove(unsigned short, unsigned short) -test::OfficeConnection::OfficeConnection() -test::OfficeConnection::getComponentContext() const -test::OfficeConnection::isStillAlive() const -test::OfficeConnection::setUp() -test::OfficeConnection::tearDown() -test::OfficeConnection::~OfficeConnection() -test::getTestArgument(rtl::OUString const&, rtl::OUString*) toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*) ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequence<int> const&) ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, ucbhelper::Content&) commit 4c5fd05cd1017dea7b18b06784b1fb0f753b586a Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 1 23:38:57 2011 +0000 remove unused members, sablot went away a long time ago diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 63e0d8e..6287325 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -399,7 +399,7 @@ rtl::OUString Databases::getInstallPathAsURL() { osl::MutexGuard aGuard( m_aMutex ); - return m_aInstallDirectory; + return m_aInstallDirectory; } const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language ) @@ -1400,10 +1400,6 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir ) if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 ) m_aInstallDirectory += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )); - - m_aInstallDirectoryWithoutEncoding = rtl::Uri::decode( m_aInstallDirectory, - rtl_UriDecodeWithCharset, - RTL_TEXTENCODING_UTF8 ); } diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index dd95393..d9c333f 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -328,8 +328,6 @@ namespace chelp { com::sun::star::uno::Sequence< rtl::OUString > m_aImagesZipPaths; rtl::OString m_aImagesZipFileURL; sal_Int16 m_nSymbolsStyle; - rtl::OUString m_aInstallDirectoryWithoutEncoding; // a work around for a Sablot bug. - rtl::OUString m_aInstallDirectoryAsSystemPath; // Installation directory std::vector< rtl::OUString > m_avModules; commit c3b54e6dd46797e798b586e4ca007ac72bf6d01b Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 1 23:34:13 2011 +0000 callcatcher: remove some unused code diff --git a/unusedcode.easy b/unusedcode.easy index 874a1e8..5213980 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1771,7 +1771,6 @@ chart::EquidistantTickIter::getMaxIndex() const chart::EquidistantTickIter::gotoIndex(int) chart::UndoContext::UndoContext(com::sun::star::uno::Reference<com::sun::star::document::XUndoManager> const&, rtl::OUString const&) chart::UndoContext::~UndoContext() -chelp::Databases::getInstallPathAsSystemPath() cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&) cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&) codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&) diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 0aa4f5a..63e0d8e 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -395,28 +395,6 @@ void Databases::replaceName( rtl::OUString& oustring ) const } } - - - -rtl::OUString Databases::getInstallPathAsSystemPath() -{ - osl::MutexGuard aGuard( m_aMutex ); - - if( ! m_aInstallDirectoryAsSystemPath.getLength() ) - { -#ifdef DBG_UTIL - bool bla = - osl::FileBase::E_None == - osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath ); - OSL_ENSURE( bla,"HelpProvider, no installpath" ); -#else - osl::FileBase::getSystemPathFromFileURL( m_aInstallDirectory,m_aInstallDirectoryAsSystemPath ); -#endif - } - - return m_aInstallDirectoryAsSystemPath; -} - rtl::OUString Databases::getInstallPathAsURL() { osl::MutexGuard aGuard( m_aMutex ); @@ -424,7 +402,6 @@ rtl::OUString Databases::getInstallPathAsURL() return m_aInstallDirectory; } - const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language ) { if( m_avModules.empty() ) diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index eeb6d00..dd95393 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -197,8 +197,6 @@ namespace chelp { rtl::OString getImagesZipFileURL(); - rtl::OUString getInstallPathAsSystemPath(); - rtl::OUString getInstallPathAsURL(); const std::vector< rtl::OUString >& getModuleList( const rtl::OUString& Language ); commit cd676159ca49756549fa81b29caf77a805cb4a5e Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 1 23:31:52 2011 +0000 ByteString->rtl::OString[Buffer] diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 2434a10..36115d9 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -843,10 +843,10 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) } else { - ByteString aStr( "attribute " ); - aStr += pAttr->GetName(); - aStr += " is method or variable but not a slot"; - rBase.SetError( aStr, rInStm.GetToken() ); + rtl::OStringBuffer aStr( "attribute " ); + aStr.append(pAttr->GetName()); + aStr.append(" is method or variable but not a slot"); + rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); bOk = sal_False; } @@ -876,10 +876,10 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) } else { - ByteString aStr( "attribute " ); - aStr += pAttr2->GetName(); - aStr += " is method or variable but not a slot"; - rBase.SetError( aStr, rInStm.GetToken() ); + rtl::OStringBuffer aStr("attribute "); + aStr.append(pAttr2->GetName()); + aStr.append(" is method or variable but not a slot"); + rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); bOk = sal_False; } @@ -1084,9 +1084,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, static ByteString MakeSlotName( SvStringHashEntry * pEntry ) { - ByteString aName( "SFX_SLOT_" ); - aName += pEntry->GetName(); - return aName.ToUpperAscii(); + rtl::OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_")); + aName.append(pEntry->GetName()); + return aName.makeStringAndClear().toAsciiUpperCase(); }; void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName, diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 4ca16cb..e76434e 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -490,9 +490,9 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr } } - ByteString aStr( "Nicht gefunden : " ); - aStr += pTok->GetString(); - OSL_FAIL( aStr.GetBuffer() ); + rtl::OStringBuffer aStr("Nicht gefunden : "); + aStr.append(pTok->GetString()); + OSL_FAIL(aStr.getStr()); } } diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 4e2ff5b..e516b01 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -206,8 +206,8 @@ public: sal_Bool bLoaded; // Ist die Datei geladen sal_Bool bScanned; // Wurde Datei nach Inclide abgesucht sal_Bool bDirty; // Dirty-Flag - ByteString aFileName; // Name der Datei - ByteString aPathName; // Pfad und Name der Datei + rtl::OString aFileName; // Name der Datei + rtl::OString aPathName; // Pfad und Name der Datei RscDefineList aDefLst; // Liste der Defines RscDependList aDepLst; // List of Depend @@ -234,15 +234,19 @@ public: void Remove( RscDefine * pDef ); }; -class RscFileTab : public RscSubFileTab { +class RscFileTab : public RscSubFileTab +{ RscDefTree aDefTree; - sal_uLong Find( const ByteString & rName ); + sal_uLong Find(const rtl::OString& rName); public: RscFileTab(); ~RscFileTab(); RscDefine * FindDef( const char * ); - RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); } + RscDefine * FindDef(const rtl::OString& rStr) + { + return FindDef(rStr.getStr()); + } sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); sal_Bool TestDef( sal_uLong lFileKey, size_t lPos, @@ -257,8 +261,8 @@ public: // Alle Defines die in dieser Datei Definiert sind loeschen void DeleteFileContext( sal_uLong lKey ); - sal_uLong NewCodeFile( const rtl::OString& rName ); - sal_uLong NewIncFile( const ByteString & rName, const ByteString & rPath ); + sal_uLong NewCodeFile(const rtl::OString& rName); + sal_uLong NewIncFile(const rtl::OString& rName, const rtl::OString& rPath); RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); } }; diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index 5792c1d..7694af3 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -63,7 +63,7 @@ char* rsc_strdup( const char* ); /****************** C L A S S E S ****************************************/ -typedef ::std::vector< ByteString* > RscStrList; +typedef ::std::vector< rtl::OString* > RscStrList; /*********** R s c C h a r ***********************************************/ class RscChar diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 59f5a09..59f179f 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -403,7 +403,7 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, if( pFI && pTC ){ StdLstErr( ": \"" ); - StdLstErr( pTC->aFileTab.Get( pFI->GetFileIndex() )->aFileName.GetBuffer() ); + StdLstErr( pTC->aFileTab.Get( pFI->GetFileIndex() )->aFileName.getStr() ); StdLstErr( "\", line " ); sprintf( buf, "%u", (unsigned int)pFI->GetLineNo() ); StdLstErr( buf ); diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 7ac42d6..ea229cd 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -377,7 +377,7 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) { fprintf( fOutput, "#include " ); fprintf( fOutput, "\"%s\"\n", - pFName->aFileName.GetBuffer() ); + pFName->aFileName.getStr() ); } pFName = aFileTab.Next(); } @@ -400,7 +400,7 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) { fprintf( fOutput, "#include " ); fprintf( fOutput, "\"%s\"\n", - pFile->aFileName.GetBuffer() ); + pFile->aFileName.getStr() ); } } }; diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 3952622..aeddeb7 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -167,7 +167,7 @@ static sal_Bool CallRsc2( RscStrList * pInputList, RscPtrPtr * pCmdLine ) { int nRet; - ByteString* pString; + rtl::OString* pString; RscVerbosity eVerbosity = RscVerbosityNormal; RscPtrPtr aNewCmdL; @@ -205,7 +205,7 @@ static sal_Bool CallRsc2( RscStrList * pInputList, for ( size_t i = 0, n = pInputList->size(); i < n; ++i ) { pString = (*pInputList)[ i ]; - aNewCmdL.Append( rsc_strdup( pString->GetBuffer() ) ); + aNewCmdL.Append( rsc_strdup( pString->getStr() ) ); }; if ( eVerbosity >= RscVerbosityVerbose ) @@ -244,7 +244,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) char ** ppStr; RscPtrPtr aCmdLine; // Kommandozeile sal_uInt32 i; - ByteString* pString; + rtl::OString* pString; pStr = ::ResponseFile( &aCmdLine, argv, argc ); if( pStr ) @@ -287,7 +287,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) else { // Eingabedatei - aInputList.push_back( new ByteString( *ppStr ) ); + aInputList.push_back( new rtl::OString(*ppStr) ); } ppStr++; i++; @@ -321,7 +321,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) bError = sal_True; break; } - aTmpList.push_back( new ByteString( aTmpName ) ); + aTmpList.push_back( new rtl::OString(aTmpName) ); }; }; @@ -338,7 +338,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) }; for ( size_t k = 0, n = aTmpList.size(); k < n; ++k ) - unlink( aTmpList[ k ]->GetBuffer() ); + unlink( aTmpList[ k ]->getStr() ); return( bError ); } diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 628dc57..ee33b6c 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -177,7 +177,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) ; if( *pEqual ) { - const ByteString aSPath( pEqual + 1 ); + const rtl::OString aSPath( pEqual + 1 ); DirEntry aSDir( String( aSPath, RTL_TEXTENCODING_ASCII_US ) ); m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), @@ -221,10 +221,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) ) { // additional language specific include for system dependent files - const ByteString aSysSearchDir( (*ppStr)+5 ); + const rtl::OString aSysSearchDir( (*ppStr)+5 ); // ignore empty -lip= arguments that we get lots of these days - if (aSysSearchDir.Len()) + if (aSysSearchDir.getLength()) { DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) ); m_aOutputFiles.back().aSysSearchDirs.push_back( @@ -298,7 +298,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else { // Eingabedatei - aInputList.push_back( new ByteString( *ppStr ) ); + aInputList.push_back( new rtl::OString(*ppStr) ); } ppStr++; i++; @@ -483,7 +483,7 @@ ERRTYPE RscCompiler::Start() pFName = pTC->aFileTab.First(); while( pFName ) { - pTC->pEH->StdOut( pFName->aFileName.GetBuffer() ); + pTC->pEH->StdOut( pFName->aFileName.getStr() ); pTC->pEH->StdOut( " " ); pFName = pTC->aFileTab.Next(); }; @@ -621,12 +621,12 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) aError = ERR_ERROR; else if( !pFName->bScanned ) { - finput = fopen( pFName->aPathName.GetBuffer(), "r" ); + finput = fopen( pFName->aPathName.getStr(), "r" ); if( !finput ) { aError = ERR_OPENFILE; pTC->pEH->Error( aError, NULL, RscId(), - pFName->aPathName.GetBuffer() ); + pFName->aPathName.getStr() ); } else { @@ -704,7 +704,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, else { String aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US ); - DirEntry aTmpPath( aTmpName ), aSrsPath( String( pFName->aPathName.GetBuffer(), RTL_TEXTENCODING_ASCII_US ) ); + DirEntry aTmpPath( aTmpName ), aSrsPath(rtl::OStringToOUString(pFName->aPathName, RTL_TEXTENCODING_ASCII_US)); aTmpPath.ToAbs(); aSrsPath.ToAbs(); @@ -720,7 +720,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, if( !finput ) { - pTC->pEH->Error( ERR_OPENFILE, NULL, RscId(), pFName->aPathName.GetBuffer() ); + pTC->pEH->Error( ERR_OPENFILE, NULL, RscId(), pFName->aPathName.getStr() ); aError = ERR_OPENFILE; } else @@ -1238,7 +1238,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine( aLine ); } - aOStm.WriteLine( "FileList = {" ); + aOStm.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("FileList = {"))); for( sal_uInt32 i = 0; i < aEntryVector.size(); ++i ) { @@ -1253,7 +1253,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine(aEntryString.makeStringAndClear()); } - aOStm.WriteLine( "};" ); + aOStm.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("};"))); } else aOStm.WriteLine( aLine ); diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 93d9144..ce495e3 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -679,7 +679,7 @@ RscFileTab :: ~RscFileTab(){ |* RscFileTab::Find() |* *************************************************************************/ -sal_uLong RscFileTab :: Find( const ByteString & rName ) +sal_uLong RscFileTab :: Find( const rtl::OString& rName ) { RscFile * pFName; @@ -876,8 +876,8 @@ sal_uLong RscFileTab :: NewCodeFile( const rtl::OString& rName ) |* RscFileTab::NewIncFile() |* *************************************************************************/ -sal_uLong RscFileTab :: NewIncFile( const ByteString & rName, - const ByteString & rPath ) +sal_uLong RscFileTab :: NewIncFile(const rtl::OString& rName, + const rtl::OString& rPath) { sal_uLong lKey; RscFile * pFName; diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index 56522ea..1e2d607 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.cxx @@ -28,10 +28,9 @@ #include <unotools/componentresmodule.hxx> -/** === begin UNO includes === **/ -/** === end UNO includes === **/ #include <tools/resmgr.hxx> #include <osl/diagnose.h> +#include <rtl/strbuf.hxx> //........................................................................ namespace utl @@ -96,9 +95,9 @@ namespace utl m_pRessources = ResMgr::CreateResMgr( aMgrName.GetBuffer() ); OSL_ENSURE( m_pRessources, - ( ByteString( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) - += aMgrName - += ByteString( ")!" ) ).GetBuffer() ); + rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) + .append(aMgrName) + .append(")!").getStr() ); m_bInitialized = sal_True; }
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits