.gitignore | 4 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 6 connectivity/source/drivers/evoab2/NDebug.cxx | 2 connectivity/source/drivers/evoab2/NDebug.hxx | 2 connectivity/source/drivers/evoab2/NStatement.cxx | 8 - idl/inc/bastype.hxx | 1 sc/source/core/inc/core_pch.hxx | 1 sc/source/filter/inc/filt_pch.hxx | 1 sc/source/ui/inc/ui_pch.hxx | 1 sfx2/inc/pch/precompiled_sfx2.hxx | 1 sfx2/inc/sfx2/shell.hxx | 1 sfx2/source/appl/appserv.cxx | 3 sfx2/source/appl/sfxpicklist.cxx | 6 sfx2/source/dialog/filedlghelper.cxx | 14 - sfx2/source/dialog/taskpane.cxx | 10 - sfx2/source/doc/docfac.cxx | 4 sfx2/source/doc/objuno.cxx | 14 - sfx2/source/view/viewfac.cxx | 2 sfx2/source/view/viewfrm.cxx | 10 - sfx2/source/view/viewsh.cxx | 4 starmath/source/math_pch.cxx | 1 sw/source/core/crsr/bookmrk.cxx | 50 ++++-- sw/source/filter/ww8/docxattributeoutput.cxx | 2 sw/source/filter/ww8/docxexport.cxx | 18 +- sw/source/ui/vba/vbacolumn.cxx | 2 sw/source/ui/vba/vbarow.cxx | 4 tools/Package_inc.mk | 1 tools/inc/tools/unqid.hxx | 110 --------------- tools/source/memtools/unqidx.cxx | 95 ------------ unusedcode.easy | 18 ++ vcl/inc/svdata.hxx | 1 vcl/inc/vcl/svapp.hxx | 3 vcl/source/app/svapp.cxx | 11 - vcl/source/app/svmain.cxx | 6 34 files changed, 105 insertions(+), 312 deletions(-)
New commits: commit 72c439a7bd01f7e0571df81f584d71d3a8f48b18 Author: Caolán McNamara <[email protected]> Date: Wed Nov 16 13:23:36 2011 +0000 update unused list diff --git a/unusedcode.easy b/unusedcode.easy index 08b9060..c148242 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -336,6 +336,8 @@ SbiImage::Load(SvStream&) SbiIoSystem::NextChannel() SbiRuntime::GetParams() SbiSymPool::Clear() +SbxDecimal::SbxDecimal() +SbxDecimal::getByte(unsigned char&) SbxDecimal::getChar(unsigned short&) SbxDecimal::getInt(int&) SbxDecimal::getLong(int&) @@ -347,6 +349,7 @@ SbxDecimal::getUShort(unsigned short&) SbxDecimal::setShort(short) SbxDecimal::setString(rtl::OUString*) SbxDecimal::setUShort(unsigned short) +SbxValue::PutDecimal(SbxDecimal*) ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&) ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short) ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short) @@ -391,7 +394,6 @@ ScDdeLink::ResetValue() ScDocRowHeightUpdater::TabRanges::TabRanges() ScDocument::ValidNewTabName(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) const ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) -ScFiltersTest::testPassword() ScFormulaCell::IsRangeNameInUse(unsigned short) const ScFormulaCell::ScFormulaCell() ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short) @@ -407,6 +409,7 @@ ScJobSetup::ScJobSetup(SfxPrinter*) ScLeftFooterEditPage::GetRanges() ScLeftHeaderEditPage::GetRanges() ScMatrix::CalcOffset(unsigned long, unsigned long) const +ScModule::Find1RefWindow(Window*) ScMultiTextWnd::GetLineCount() ScMyCellInfo::ScMyCellInfo() ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&) @@ -1485,6 +1488,9 @@ binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, binfilter::CharPosArray::Replace(int const&, unsigned short) binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short) binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) +binfilter::Container::GetCurObject() const +binfilter::Container::Insert(void*) +binfilter::Container::Remove() binfilter::Dictionary::~Dictionary() binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short) binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short) @@ -1752,6 +1758,9 @@ binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const*&, unsigned short&) binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const**, unsigned short) binfilter::SwpHtStart::Insert(binfilter::SwpHtStart const*, unsigned short, unsigned short) binfilter::SwpHtStart::Remove(binfilter::SwTxtAttr const*&, unsigned short) +binfilter::UniqueIndex::Get(unsigned long) const +binfilter::UniqueIndex::Insert(unsigned long, void*) +binfilter::UniqueIndex::Seek(void*) binfilter::WritingDirectionInfos::Insert(binfilter::WritingDirectionInfos const*, unsigned short, unsigned short, unsigned short) binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const&, unsigned short) binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const*, unsigned short, unsigned short) @@ -1994,6 +2003,13 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne jfw_plugin::VendorBase::createInstance() jfw_plugin::VendorBase::getJavaExePaths(int*) jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&) +layout::MessageBox::MessageBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*) +layout::MessageBox::MessageBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*) +layout::MessageBox::MessageBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*) +layout::MessageBox::MessageBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*) +layout::TabControl::GetTabControl() const +layout::WindowImpl::setProperty(char const*, com::sun::star::uno::Any) +layout::getToolkit() libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >) libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&) libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat) commit 3ca643271efb0caf2d02d9cb5e8f24f11be615d6 Author: Caolán McNamara <[email protected]> Date: Wed Nov 16 13:10:05 2011 +0000 log errors by default in debug mode diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 3b06a0c..bd4eeaf 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -42,12 +42,6 @@ #include <string.h> #include "EApi.h" -#if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) -#else /* OSL_DEBUG_LEVEL */ -# define OUtoCStr( x ) ("dummy") -#endif /* OSL_DEBUG_LEVEL */ - using namespace connectivity::evoab; using namespace connectivity; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx index 7636020..9e76620 100644 --- a/connectivity/source/drivers/evoab2/NDebug.cxx +++ b/connectivity/source/drivers/evoab2/NDebug.cxx @@ -30,7 +30,7 @@ #include "precompiled_connectivity.hxx" #include "NDebug.hxx" #include <osl/diagnose.h> -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 void evo_traceStringMessage( const sal_Char *pFormat, const ::rtl::OUString& rString ) { diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx index e522c78..95ba056 100644 --- a/connectivity/source/drivers/evoab2/NDebug.hxx +++ b/connectivity/source/drivers/evoab2/NDebug.hxx @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 void evo_traceStringMessage( const sal_Char* pFormat, const ::rtl::OUString& rString ); # define EVO_TRACE_STRING( pFormat, rString ) evo_traceStringMessage( pFormat, rString ) #else diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 25a9666..496a6f1 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -502,7 +502,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer const OSQLParseNode* pOrderByClause = m_aSQLIterator.getOrderTree(); if ( pOrderByClause ) { - #if OSL_DEBUG_LEVEL > 0 + #if OSL_DEBUG_LEVEL > 1 ::rtl::OUString sTreeDebug; pOrderByClause->showParseTree( sTreeDebug ); EVO_TRACE_STRING( "found order-by tree:\n%s", sTreeDebug ); @@ -513,7 +513,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer const OSQLParseNode* pWhereClause = m_aSQLIterator.getWhereTree(); if ( pWhereClause && SQL_ISRULE( pWhereClause, where_clause ) ) { - #if OSL_DEBUG_LEVEL > 0 + #if OSL_DEBUG_LEVEL > 1 ::rtl::OUString sTreeDebug; pWhereClause->showParseTree( sTreeDebug ); EVO_TRACE_STRING( "found where tree:\n%s", sTreeDebug ); @@ -591,7 +591,7 @@ QueryData OCommonStatement::impl_getEBookQuery_throw( const ::rtl::OUString& _rS QueryData aData; parseSql( _rSql, aData ); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 char *pSexpr = aData.getQuery() ? e_book_query_to_string( aData.getQuery() ) : g_strdup( "<map failed>" ); g_message( "Parsed SQL to sexpr '%s'\n", pSexpr ); g_free( pSexpr ); @@ -626,7 +626,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const ::rtl:: { EVO_TRACE_STRING( "OCommonStatement::impl_executeQuery_throw(%s)\n", _rSql ); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 g_message( "Parse SQL '%s'\n", OUStringToOString(_rSql, RTL_TEXTENCODING_UTF8).getStr() ); #endif commit 02d946fae53ea6373d17e2e4a9d858d36a8c1cfd Author: Caolán McNamara <[email protected]> Date: Tue Nov 15 23:25:31 2011 +0000 gitignore debugging droppings diff --git a/.gitignore b/.gitignore index 3fc92e4..a7f5466 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,7 @@ test/user-template/user/psprint/pspfontcache # Everyone loves patching *.orig *.rej + +# Somepeople love debugging +gdbtrace.log +valgrind.log commit f24268cae353f00c0fc0c8e5fc51fbb43913f9ed Author: Caolán McNamara <[email protected]> Date: Tue Nov 15 23:22:52 2011 +0000 we can drop unqid.hxx entirely post move to binfilter diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index 4ccb729..22f034c 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/t $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx deleted file mode 100644 index 1ae6fa4..0000000 --- a/tools/inc/tools/unqid.hxx +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _UNQID_HXX -#define _UNQID_HXX - -#include "tools/toolsdllapi.h" -#include <tools/unqidx.hxx> - -// --------------- -// - ImpUniqueId - -// --------------- - -struct ImpUniqueId -{ - sal_uIntPtr nId; - sal_uInt16 nRefCount; - void Release() - { - nRefCount--; - if( 0 == nRefCount ) - delete this; - } -}; - -// ------------ -// - UniqueId - -// ------------ - -class UniqueIdContainer; -class UniqueItemId -{ - friend class UniqueIdContainer; - ImpUniqueId* pId; - - UniqueItemId( ImpUniqueId * pIdP ) - { pId = pIdP; pId->nRefCount++; } -public: - UniqueItemId() { pId = NULL; } - UniqueItemId( const UniqueItemId & rId ) - { pId = rId.pId; if( pId ) pId->nRefCount++; } - ~UniqueItemId() - { if( pId ) pId->Release(); } - UniqueItemId& operator = ( const UniqueItemId & rId ) - { - if( rId.pId ) rId.pId->nRefCount++; - if( pId ) pId->Release(); - pId = rId.pId; - return *this; - } - sal_uIntPtr GetId() const { return pId ? pId->nId : 0; } -}; - -// --------------------- -// - UniqueIdContainer - -// --------------------- - -class TOOLS_DLLPUBLIC UniqueIdContainer : private UniqueIndex -{ - sal_uInt16 nCollectCount; - -public: // Irgend etwas mit protected falsch - void Clear( sal_Bool bAll ); - -public: - UniqueIdContainer( sal_uIntPtr _nStartIndex, - sal_uIntPtr _nInitSize = 16, - sal_uIntPtr _nReSize = 16 ) - : UniqueIndex( _nStartIndex, _nInitSize, _nReSize ) - , nCollectCount( 0 ) - {} - UniqueIdContainer( const UniqueIdContainer& ); - - ~UniqueIdContainer() - { Clear( sal_True ); } - UniqueIdContainer& operator = ( const UniqueIdContainer & ); - - sal_Bool IsIndexValid( sal_uIntPtr nIndex ) const - { return UniqueIndex::IsIndexValid( nIndex ); } - - UniqueItemId CreateId(); -}; - -#endif // _UNQID_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx index a60777d..e85c87b 100644 --- a/tools/source/memtools/unqidx.cxx +++ b/tools/source/memtools/unqidx.cxx @@ -30,7 +30,6 @@ #include "precompiled_tools.hxx" #include <impcont.hxx> #include <tools/unqidx.hxx> -#include <tools/unqid.hxx> /************************************************************************* |* @@ -351,99 +350,5 @@ sal_Bool UniqueIndex::operator ==( const UniqueIndex& rIdx ) const else return sal_False; } -/************************************************************************* -|* -|* UniqueIdContainer::UniqueIdContainer () -|* -*************************************************************************/ - -UniqueIdContainer::UniqueIdContainer( const UniqueIdContainer& rObj ) - : UniqueIndex( rObj ) - , nCollectCount( rObj.nCollectCount ) -{ - sal_uIntPtr nCur = GetCurIndex(); - - ImpUniqueId * pEle = (ImpUniqueId *)First(); - while( pEle ) - { - pEle->nRefCount++; - pEle = (ImpUniqueId *)Next(); - } - Seek( nCur ); -} - -/************************************************************************* -|* -|* UniqueIdContainer::operator = () -|* -*************************************************************************/ - -UniqueIdContainer& UniqueIdContainer::operator = ( const UniqueIdContainer & rObj ) -{ - UniqueIndex::operator = ( rObj ); - nCollectCount = rObj.nCollectCount; - - sal_uIntPtr nCur = GetCurIndex(); - - ImpUniqueId * pEle = (ImpUniqueId *)First(); - while( pEle ) - { - pEle->nRefCount++; - pEle = (ImpUniqueId *)Next(); - } - Seek( nCur ); - return *this; -} - -/************************************************************************* -|* -|* UniqueIdContainer::Clear() -|* -*************************************************************************/ - -void UniqueIdContainer::Clear( sal_Bool bAll ) -{ - sal_uInt16 nFree = bAll ? 0xFFFF : 1; - - ImpUniqueId* pId = (ImpUniqueId*)Last(); - sal_Bool bLast = sal_True; - while ( pId ) - { - if ( pId->nRefCount <= nFree ) - { - ((ImpUniqueId *)Remove( pId->nId ))->Release(); - if( bLast ) - pId = (ImpUniqueId *)Last(); - else - pId = (ImpUniqueId *)Prev(); - } - else - { - pId = (ImpUniqueId *)Prev(); - bLast = sal_False; - } - } -} - -/************************************************************************* -|* -|* UniqueIdContainer::CreateId() -|* -*************************************************************************/ - -UniqueItemId UniqueIdContainer::CreateId() -{ - if( nCollectCount > 50 ) - { // aufraeumen - Clear( sal_False ); - nCollectCount = 0; - } - nCollectCount++; - - ImpUniqueId * pId = new ImpUniqueId; - pId->nRefCount = 1; - pId->nId = Insert( pId ); - return UniqueItemId( pId ); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit abf7cdac13c66778ea7deac7251e5b2a6d385a72 Author: Caolán McNamara <[email protected]> Date: Tue Nov 15 22:37:13 2011 +0000 UniqueIdContainer is only needed by binfilter diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index a951149..3d20e62 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -33,7 +33,6 @@ #include <tools/globname.hxx> #include <tools/gen.hxx> #include <tools/stream.hxx> -#include <tools/unqid.hxx> #include <tools/string.hxx> class SvStringHashEntry; diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx index ee2a378..52867e4 100644 --- a/sc/source/core/inc/core_pch.hxx +++ b/sc/source/core/inc/core_pch.hxx @@ -99,7 +99,6 @@ #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <rechead.hxx> -#include <tools/unqid.hxx> #include <vcl/apptypes.hxx> #include <vcl/vclenum.hxx> #include <globstr.hrc> diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index db56e09..805cad1 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -151,7 +151,6 @@ #include <namebuff.hxx> #include <tools/shl.hxx> #include <editeng/fhgtitem.hxx> -#include <tools/unqid.hxx> #include <com/sun/star/uno/Sequence.h> #include <uno/sequence2.h> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 9c0a7c5..66622ee 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -103,7 +103,6 @@ #include <sfx2/shell.hxx> #include <vcl/window.hxx> #include <vcl/group.hxx> -#include <tools/unqid.hxx> #include <tools/table.hxx> #include <svl/itemset.hxx> #include <vcl/dialog.hxx> diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index e80c080..a4817ab 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -610,7 +610,6 @@ #include "tools/string.hxx" #include "tools/table.hxx" #include "tools/tenccvt.hxx" -#include "tools/unqid.hxx" #include "tools/urlobj.hxx" #include "tools/wldcrd.hxx" #include "tools/zcodec.hxx" diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 1b933a9..e757cbd 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -36,7 +36,6 @@ #include <tools/rtti.hxx> #include <svl/brdcst.hxx> -#include <tools/unqid.hxx> #include <tools/string.hxx> #include <sfx2/sfxuno.hxx> diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index 3128680..0c3e560 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -128,7 +128,6 @@ #include <basic/sbxcore.hxx> #include <basic/sbxprop.hxx> #include <basic/sbxmeth.hxx> -#include <tools/unqid.hxx> #include <svl/poolitem.hxx> #include <svtools/args.hxx> #include <smmod.hxx> diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index a527615..6cb4890 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -150,7 +150,6 @@ struct ImplSVAppData String* mpFontPath; // Additional Fontpath Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) - UniqueIdContainer* mpUniqueIdCont; // Fuer Eindeutige Id's ImplIdleMgr* mpIdleMgr; // Idle-Manager ImplWheelWindow* mpWheelWindow; // WheelWindow ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 07782df..0350ee5 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -33,7 +33,6 @@ #include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/link.hxx> -#include <tools/unqid.hxx> #include <vcl/sv.h> #include <vcl/dllapi.h> #include <vcl/apptypes.hxx> @@ -311,8 +310,6 @@ public: static void SetDialogScaleX( short nScale ); - static UniqueItemId CreateUniqueId(); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > GetDisplayConnection(); // The global service manager has to be created before! diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e23192c..3765821 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1569,17 +1569,6 @@ sal_uInt16 Application::GetSystemWindowMode() // ----------------------------------------------------------------------- -UniqueItemId Application::CreateUniqueId() -{ - ImplSVData* pSVData = ImplGetSVData(); - - if ( !pSVData->maAppData.mpUniqueIdCont ) - pSVData->maAppData.mpUniqueIdCont = new UniqueIdContainer( UNIQUEID_SV_BEGIN ); - return pSVData->maAppData.mpUniqueIdCont->CreateId(); -} - -// ----------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit() { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT; diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index e1f9052..df43cd2 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -36,7 +36,6 @@ #include "tools/tools.h" #include "tools/debug.hxx" -#include "tools/unqid.hxx" #include "tools/resmgr.hxx" #include "comphelper/processfactory.hxx" @@ -513,11 +512,6 @@ void DeInitVCL() delete pSVData->maAppData.mpAccelMgr; pSVData->maAppData.mpAccelMgr = NULL; } - if ( pSVData->maAppData.mpUniqueIdCont ) - { - delete pSVData->maAppData.mpUniqueIdCont; - pSVData->maAppData.mpUniqueIdCont = NULL; - } if ( pSVData->maAppData.mpAppFileName ) { delete pSVData->maAppData.mpAppFileName; commit 25b119a02143e2e5b321ef16272c276d17414bad Author: Caolán McNamara <[email protected]> Date: Tue Nov 15 21:04:21 2011 +0000 add RTL_CONSTASCII_STRINGPARAM to appendAscii on string literals diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 733fb91..af114b6 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -138,10 +138,12 @@ namespace sw { namespace mark rtl::OUString MarkBase::ToString( ) const { rtl::OUStringBuffer buf; - buf.appendAscii( "Mark: ( Name, [ Node1, Index1 ] ): ( " ); - buf.append( m_aName ).appendAscii( ", [ " ); - buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " ); - buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) ).appendAscii( " ] )" ); + buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("Mark: ( Name, [ Node1, Index1 ] ): ( ")); + buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [ ")); + buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] )") ); return buf.makeStringAndClear( ); } @@ -160,7 +162,7 @@ namespace sw { namespace mark sal_Int32 nRandom; ::rtl::OUStringBuffer sUniquePostfixBuffer; rtl_random_getBytes(aPool, &nRandom, sizeof(nRandom)); - sUniquePostfix = ::rtl::OUStringBuffer(13).appendAscii("_").append(static_cast<sal_Int32>(abs(nRandom))).makeStringAndClear(); + sUniquePostfix = ::rtl::OUStringBuffer(13).append('_').append(static_cast<sal_Int32>(abs(nRandom))).makeStringAndClear(); nCount = 0; } // putting the counter in front of the random parts will speed up string comparisons @@ -291,13 +293,18 @@ namespace sw { namespace mark rtl::OUString Fieldmark::ToString( ) const { rtl::OUStringBuffer buf; - buf.appendAscii( "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( " ); - buf.append( m_aName ).appendAscii( ", " ); - buf.append( m_aFieldname ).appendAscii( ", [ " ); - buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " ); - buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ], [" ); - buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " ); - buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ] ) " ); + buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( + "Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( ")); + buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( m_aFieldname ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [ ")); + buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ], [")); + buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] ) ")); return buf.makeStringAndClear( ); } @@ -357,13 +364,18 @@ namespace sw { namespace mark rtl::OUString CheckboxFieldmark::toString( ) const { rtl::OUStringBuffer buf; - buf.appendAscii( "CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( " ); - buf.append( m_aName ).appendAscii( ", " ); - buf.append( GetFieldname() ).appendAscii( ", [ " ); - buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " ); - buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ], [" ); - buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ).appendAscii( ", " ); - buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ).appendAscii( " ] ) " ); + buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( + "CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( ")); + buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( GetFieldname() ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [ ")); + buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ], [")); + buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(" ] ) ")); return buf.makeStringAndClear( ); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0181c61..36e2860 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2879,7 +2879,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel, if ( *pIt < sal_Unicode( WW8ListManager::nMaxLevel ) ) { aBuffer.append( pPrev, pIt - pPrev ); - aBuffer.appendAscii( "%" ); + aBuffer.append( '%' ); aBuffer.append( OUString::valueOf( sal_Int32( *pIt ) + 1 ) ); pPrev = pIt + 1; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 90cf555..98049c6 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -307,9 +307,9 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/) rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) { rtl::OUString aFileName = rtl::OUStringBuffer() - .appendAscii("charts/chart") + .appendAscii(RTL_CONSTASCII_STRINGPARAM("charts/chart")) .append(nCount) - .appendAscii( ".xml" ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) .makeStringAndClear(); OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), @@ -317,9 +317,9 @@ rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, s aFileName ); aFileName = rtl::OUStringBuffer() - .appendAscii("word/charts/chart") + .appendAscii(RTL_CONSTASCII_STRINGPARAM("word/charts/chart")) .append(nCount) - .appendAscii( ".xml" ) + .appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) .makeStringAndClear(); ::sax_fastparser::FSHelperPtr pChartFS = @@ -577,26 +577,28 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* ::sax_fastparser::FSHelperPtr pFS; if ( bHeader ) { - OUString aName( OUStringBuffer().appendAscii( "header" ).append( ++m_nHeaders ).appendAscii( ".xml" ).makeStringAndClear() ); + OUString aName( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("header")) + .append( ++m_nHeaders ).appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) + .makeStringAndClear() ); aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"; ), aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("word/")).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) ); pFS->startElementNS( XML_w, XML_hdr, MainXmlNamespaces( pFS )); } else { - OUString aName( OUStringBuffer().appendAscii( "footer" ).append( ++m_nFooters ).appendAscii( ".xml" ).makeStringAndClear() ); + OUString aName( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("footer")).append( ++m_nFooters ).appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")).makeStringAndClear() ); aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"; ), aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("word/")).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) ); pFS->startElementNS( XML_w, XML_ftr, MainXmlNamespaces( pFS )); diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index 86b2f27..0e1718c 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -133,7 +133,7 @@ void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, c aRangeName.append(sStartCol).append(sal_Int32( 1 ) ); rtl::OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn ); sal_Int32 nRowCount = xTextTable->getRows()->getCount(); - aRangeName.appendAscii(":").append( sEndCol ).append( sal_Int32( nRowCount ) ); + aRangeName.append(':').append( sEndCol ).append( sal_Int32( nRowCount ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); rtl::OUString sSelRange = aRangeName.makeStringAndClear(); diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 7199b99..2ec5d4f 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -91,13 +91,13 @@ SwVbaRow::Select( ) throw ( uno::RuntimeException ) void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException ) { rtl::OUStringBuffer aRangeName; - aRangeName.appendAscii("A").append(sal_Int32( nStartRow + 1 ) ); + aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) ); SwVbaTableHelper aTableHelper( xTextTable ); sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow ); // FIXME: the column count > 26 //sal_Char cCol = 'A' + nColCount - 1; rtl::OUString sCol = aTableHelper.getColumnStr( nColCount - 1); - aRangeName.appendAscii(":").append( sCol ).append( sal_Int32( nEndRow + 1 ) ); + aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); rtl::OUString sSelRange = aRangeName.makeStringAndClear(); commit e1aff9edc8ffa4a9fbced86247abd2d2313578ed Author: Caolán McNamara <[email protected]> Date: Tue Nov 15 20:56:37 2011 +0000 add RTL_CONSTASCII_STRINGPARAM to appendAscii on string literals diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d0b0ba7..2d7baf7 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -950,8 +950,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if ( xSystemShell.is() && sTemplRepoURL.getLength() > 0 ) { ::rtl::OUStringBuffer aURLBuf( sTemplRepoURL ); - aURLBuf.appendAscii( "?" ); - aURLBuf.appendAscii( "lang=" ); + aURLBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM("?lang=")); // read locale from configuration ::rtl::OUString sLocale = getConfigurationStringValue( diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index d80a80c..0c8f499 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -94,10 +94,10 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons aPickEntry.append(::rtl::OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); } else if ( nNo == 9 ) - aPickEntry.appendAscii("1~0"); + aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0")); else aPickEntry.append(::rtl::OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); - aPickEntry.appendAscii(": "); + aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": ")); INetURLObject aURL( aURLString ); rtl::OUString aTipHelpText; @@ -123,7 +123,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons if ( aPickEntry.getLength() > 50 ) { aPickEntry.setLength( 47 ); - aPickEntry.appendAscii("..."); + aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("...")); } } else diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 56b0868..e298de1 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1741,13 +1741,13 @@ void FileDialogHelper_Impl::addFilters( sal_Int64 nFlags, // create the list of filters ::rtl::OUStringBuffer sQuery(256); - sQuery.appendAscii("getSortedFilterList()"); - sQuery.appendAscii(":module=" ); - sQuery.append (rFactory ); // use long name here ! - sQuery.appendAscii(":iflags=" ); - sQuery.append (::rtl::OUString::valueOf((sal_Int32)m_nMustFlags)); - sQuery.appendAscii(":eflags=" ); - sQuery.append (::rtl::OUString::valueOf((sal_Int32)m_nDontFlags)); + sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM("getSortedFilterList()")); + sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module=")); + sQuery.append(rFactory); // use long name here ! + sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags=")); + sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nMustFlags)); + sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags=")); + sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nDontFlags)); uno::Reference< XEnumeration > xResult; try diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 3204dc6..1babbf9 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -115,13 +115,13 @@ namespace sfx2 const ::rtl::OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", ::rtl::OUString() ) ); - aPathComposer.appendAscii( "org.openoffice.Office.UI." ); + aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM( + "org.openoffice.Office.UI.")); aPathComposer.append( sWindowStateRef ); - aPathComposer.appendAscii( "/UIElements/States" ); + aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("/UIElements/States")); if ( i_rResourceURL.getLength() ) { - aPathComposer.appendAscii( "/" ); - aPathComposer.append( i_rResourceURL ); + aPathComposer.append('/').append( i_rResourceURL ); } } catch( const Exception& ) @@ -181,7 +181,7 @@ namespace sfx2 if ( sImageURL.compareToAscii( pCommandImagePrefix, nCommandImagePrefixLen ) == 0 ) { ::rtl::OUStringBuffer aCommandName; - aCommandName.appendAscii( ".uno:" ); + aCommandName.appendAscii(RTL_CONSTASCII_STRINGPARAM(".uno:")); aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() ); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 76f166a..a2c2a4f 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -390,8 +390,8 @@ const SvGlobalName& SfxObjectFactory::GetClassId() const String SfxObjectFactory::GetFactoryURL() const { ::rtl::OUStringBuffer aURLComposer; - aURLComposer.appendAscii( "private:factory/" ); - aURLComposer.appendAscii( GetShortName() ); + aURLComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); + aURLComposer.appendAscii(GetShortName()); return aURLComposer.makeStringAndClear(); } diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index cd14844..b3d2263 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -673,11 +673,11 @@ void SAL_CALL SfxDocumentInfoObject::addProperty(const ::rtl::OUString& if ( bFixProp ) { ::rtl::OUStringBuffer sMsg(256); - sMsg.appendAscii("The property \"" ); - sMsg.append (sName ); - sMsg.appendAscii("\" " ); + sMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM("The property \"")); + sMsg.append(sName); + sMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM("\" ")); if ( bFixProp ) - sMsg.appendAscii(" already exists as a fix property. Please have a look into the IDL documentation of the DocumentInfo service."); + sMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(" already exists as a fix property. Please have a look into the IDL documentation of the DocumentInfo service.")); throw ::com::sun::star::beans::PropertyExistException( sMsg.makeStringAndClear(), @@ -699,9 +699,9 @@ void SAL_CALL SfxDocumentInfoObject::removeProperty(const ::rtl::OUString& sName if ( bFixProp ) { ::rtl::OUStringBuffer sMsg(256); - sMsg.appendAscii("The property \"" ); - sMsg.append (sName ); - sMsg.appendAscii("\" cant be removed. Its a fix property of the DocumentInfo service."); + sMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM("The property \"")); + sMsg.append(sName); + sMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM("\" cant be removed. Its a fix property of the DocumentInfo service.")); throw ::com::sun::star::beans::NotRemoveableException( sMsg.makeStringAndClear(), diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 1514c57..08e7a38 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -47,7 +47,7 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell String SfxViewFactory::GetLegacyViewName() const { ::rtl::OUStringBuffer aViewName; - aViewName.appendAscii( "view" ); + aViewName.appendAscii(RTL_CONSTASCII_STRINGPARAM("view")); aViewName.append( sal_Int32( GetOrdinal() ) ); return aViewName.makeStringAndClear(); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index aef93fc..004ace4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2787,11 +2787,11 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) } // append new method - sRoutine.appendAscii("\nsub " ); - sRoutine.append (sMacroName ); - sRoutine.appendAscii("\n" ); - sRoutine.append (sMacro ); - sRoutine.appendAscii("\nend sub\n"); + sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\nsub ")); + sRoutine.append(sMacroName); + sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n")); + sRoutine.append(sMacro); + sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\nend sub\n")); // create the modul inside the library and insert the macro routine aTemp <<= sRoutine.makeStringAndClear(); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 6db3399..6d04e4c 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -873,9 +873,9 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) aBuffer.append( RetrieveLabelFromCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintDefault" )), xFrame )); - aBuffer.appendAscii( " (" ); + aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); aBuffer.append( aPrinterName ); - aBuffer.appendAscii( ")" ); + aBuffer.append(')'); rSet.Put( SfxStringItem( SID_PRINTDOCDIRECT, aBuffer.makeStringAndClear() ) ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
