[Libreoffice-commits] .: 3 commits - comphelper/source desktop/source editeng/inc editeng/source filter/source framework/source oox/inc oox/source sc/source svtools/source svx/source unusedcode.easy vbahelper/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Mar 29 04:48:49 PDT 2012
comphelper/source/misc/numberedcollection.cxx | 6
desktop/source/app/appfirststart.cxx | 4
desktop/source/app/check_ext_deps.cxx | 10
editeng/inc/editeng/unotext.hxx | 5
editeng/source/uno/unotext.cxx | 9
editeng/source/uno/unotext2.cxx | 18 -
filter/source/config/cache/filtercache.cxx | 17 -
framework/source/services/modulemanager.cxx | 10
oox/inc/oox/core/filterbase.hxx | 3
oox/inc/oox/dump/dumperbase.hxx | 1
oox/source/core/filterbase.cxx | 8
oox/source/dump/dumperbase.cxx | 14
sc/source/filter/ftools/fapihelper.cxx | 6
sc/source/filter/inc/biffdetector.hxx | 4
sc/source/filter/inc/fapihelper.hxx | 5
sc/source/filter/inc/stylesbuffer.hxx | 2
sc/source/filter/inc/workbookfragment.hxx | 23 -
sc/source/filter/oox/biffdetector.cxx | 48 --
sc/source/filter/oox/stylesbuffer.cxx | 12
sc/source/filter/oox/workbookfragment.cxx | 403 ------------------------
svtools/source/misc/transfer.cxx | 8
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 60 +--
unusedcode.easy | 3
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 8
24 files changed, 67 insertions(+), 620 deletions(-)
New commits:
commit 21ca0847952be3eabc7c11200a2b70e0801a8fc6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 29 12:29:44 2012 +0100
callcatcher: update list
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 127771b..ace08dd 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -485,7 +485,9 @@ public:
virtual ~SvxUnoText() throw();
// Internal
- UNO3_GETIMPLEMENTATION_DECL( SvxUnoText )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw(::com::sun::star::uno::RuntimeException);
};
// ====================================================================
@@ -536,7 +538,6 @@ protected:
using SvxUnoTextRangeBase::getPropertyValue;
public:
- SvxUnoTextContent() throw();
SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw();
SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw();
virtual ~SvxUnoTextContent() throw();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 469e2d7..ab24176 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2162,15 +2162,6 @@ SvxUnoText::~SvxUnoText() throw()
{
}
-SvxUnoText* SvxUnoText::getImplementation( const uno::Reference< uno::XInterface >& xInt )
-{
- uno::Reference< lang::XUnoTunnel > xUT( xInt, uno::UNO_QUERY );
- if( xUT.is() )
- return reinterpret_cast<SvxUnoText*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxUnoText::getUnoTunnelId())));
- else
- return NULL;
-}
-
namespace
{
class theSvxUnoTextUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextUnoTunnelId > {};
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 095763f..e3fb8c9 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -102,24 +102,6 @@ uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuc
// ====================================================================
// class SvxUnoTextContent
// ====================================================================
-uno::Reference< text::XText > xDummyText;
-
-static SvxUnoText* getDummyText() throw()
-{
- if(!xDummyText.is())
- xDummyText = new SvxUnoText();
-
- return SvxUnoText::getImplementation( xDummyText );
-}
-
-SvxUnoTextContent::SvxUnoTextContent() throw()
-: SvxUnoTextContent_Base(*getDummyText())
-, mnParagraph(0)
-, mrParentText(*getDummyText())
-, maDisposeListeners(maDisposeContainerMutex)
-, mbDisposing( false )
-{
-}
SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
: SvxUnoTextContent_Base(rText)
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 7c09707..41f49f7 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -121,9 +121,6 @@ public:
// ------------------------------------------------------------------------
- /** Returns the specified argument passed through the XInitialization interface. */
- ::com::sun::star::uno::Any getArgument( const ::rtl::OUString& rArgName ) const;
-
/** Returns the component context passed in the filter constructor (always existing). */
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
getComponentContext() const;
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 77d2710..a8b16b0 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -875,7 +875,6 @@ public:
void eraseNameList( const ::rtl::OUString& rListName );
NameListRef getNameList( const ::rtl::OUString& rListName ) const;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier );
inline bool isPasswordCancelled() const { return mbPwCancelled; }
protected:
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 40288ef..2620272 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -246,14 +246,6 @@ OoxmlVersion FilterBase::getVersion() const
return mxImpl->meVersion;
}
-// ----------------------------------------------------------------------------
-
-Any FilterBase::getArgument( const OUString& rArgName ) const
-{
- SequenceAsHashMap::const_iterator aIt = mxImpl->maArguments.find( rArgName );
- return (aIt == mxImpl->maArguments.end()) ? Any() : aIt->second;
-}
-
const Reference< XComponentContext >& FilterBase::getComponentContext() const
{
return mxImpl->mxComponentContext;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index b2078ed..0a10907 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1469,20 +1469,6 @@ NameListRef SharedConfigData::getNameList( const OUString& rListName ) const
return xList;
}
-Sequence< NamedValue > SharedConfigData::requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier )
-{
- Sequence< NamedValue > aEncryptionData;
- if( !mbPwCancelled )
- {
- ::std::vector< OUString > aDefaultPasswords;
- aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) );
- aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
- rVerifier, mrMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords );
- mbPwCancelled = !aEncryptionData.hasElements();
- }
- return aEncryptionData;
-}
-
bool SharedConfigData::implIsValid() const
{
return mbLoaded && mxContext.is() && mxRootStrg.get() && !maSysFileName.isEmpty();
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 70bca8e..328fb1b 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -129,12 +129,6 @@ Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs(
return xInt;
}
-Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs(
- const OUString& rServiceName, const Sequence< Any >& rArgs )
-{
- return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs );
-}
-
uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( SfxMedium& rMedium,
::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords )
{
diff --git a/sc/source/filter/inc/biffdetector.hxx b/sc/source/filter/inc/biffdetector.hxx
index b75c912..10c026b 100644
--- a/sc/source/filter/inc/biffdetector.hxx
+++ b/sc/source/filter/inc/biffdetector.hxx
@@ -52,10 +52,6 @@ namespace BiffDetector
{
/** Detects the BIFF version of the passed stream. */
BiffType detectStreamBiffVersion( BinaryInputStream& rInStream );
-
- /** Detects the BIFF version and workbook stream name of the passed storage. */
- BiffType detectStorageBiffVersion( ::rtl::OUString& orWorkbookStreamName,
- const StorageRef& rxStorage );
};
// ============================================================================
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index f8a338f..7a5f4dc 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -97,11 +97,6 @@ public:
const ::rtl::OUString& rServiceName,
const UnoAnySequence& rArgs );
- /** Creates an instance from the passed service name, using the process service factory. */
- static XInterfaceRef CreateInstanceWithArgs(
- const ::rtl::OUString& rServiceName,
- const UnoAnySequence& rArgs );
-
/** Opens a password dialog and returns the encryption data.
@return The encryption data or an empty sequence on 'Cancel' or any error. */
static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium,
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 9906c61..76f90f7 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -150,8 +150,6 @@ public:
void importPaletteColor( SequenceInputStream& rStrm );
/** Imports the PALETTE record from the passed stream. */
void importPalette( BiffInputStream& rStrm );
- /** Imports a color palette from a UNO sequence in the passed any. */
- void importPalette( const ::com::sun::star::uno::Any& rPalette );
/** Rturns the RGB value of the color with the passed index. */
sal_Int32 getColor( sal_Int32 nPaletteIdx ) const;
diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx
index ab1aab6..223a859 100644
--- a/sc/source/filter/inc/workbookfragment.hxx
+++ b/sc/source/filter/inc/workbookfragment.hxx
@@ -70,29 +70,6 @@ private:
DefinedNameRef mxCurrName;
};
-// ============================================================================
-
-class BiffWorkbookFragment : public BiffWorkbookFragmentBase
-{
-public:
- explicit BiffWorkbookFragment( const WorkbookHelper& rHelper, const ::rtl::OUString& rStrmName );
-
- /** Imports the entire workbook stream, including all contained worksheets. */
- virtual bool importFragment();
-
-private:
- /** Imports a complete BIFF4 workspace fragment (with embedded sheets). */
- bool importWorkspaceFragment();
- /** Imports the workbook globals fragment from current stream position. */
- bool importGlobalsFragment( ISegmentProgressBar& rProgressBar );
- /** Imports a sheet fragment with passed type from current stream position. */
- bool importSheetFragment(
- ISegmentProgressBar& rProgressBar,
- BiffFragmentType eFragment, sal_Int16 nCalcSheet );
-};
-
-// ============================================================================
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/biffdetector.cxx b/sc/source/filter/oox/biffdetector.cxx
index cf29f62..14ebbcf 100644
--- a/sc/source/filter/oox/biffdetector.cxx
+++ b/sc/source/filter/oox/biffdetector.cxx
@@ -103,54 +103,6 @@ BiffType detectStreamBiffVersion( BinaryInputStream& rInStream )
return eBiff;
}
-BiffType detectStorageBiffVersion( OUString& orWorkbookStreamName, const StorageRef& rxStorage )
-{
-
- BiffType eBiff = BIFF_UNKNOWN;
- if( rxStorage.get() )
- {
- if( rxStorage->isStorage() )
- {
- // try to open the "Book" stream
- const OUString saBookName = CREATE_OUSTRING( "Book" );
- BinaryXInputStream aBookStrm5( rxStorage->openInputStream( saBookName ), true );
- BiffType eBookStrm5Biff = detectStreamBiffVersion( aBookStrm5 );
-
- // try to open the "Workbook" stream
- const OUString saWorkbookName = CREATE_OUSTRING( "Workbook" );
- BinaryXInputStream aBookStrm8( rxStorage->openInputStream( saWorkbookName ), true );
- BiffType eBookStrm8Biff = detectStreamBiffVersion( aBookStrm8 );
-
- // decide which stream to use
- if( (eBookStrm8Biff != BIFF_UNKNOWN) && ((eBookStrm5Biff == BIFF_UNKNOWN) || (eBookStrm8Biff > eBookStrm5Biff)) )
- {
- /* Only "Workbook" stream exists; or both streams exist, and
- "Workbook" has higher BIFF version than "Book" stream. */
- eBiff = eBookStrm8Biff;
- orWorkbookStreamName = saWorkbookName;
- }
- else if( eBookStrm5Biff != BIFF_UNKNOWN )
- {
- /* Only "Book" stream exists; or both streams exist, and
- "Book" has higher BIFF version than "Workbook" stream. */
- eBiff = eBookStrm5Biff;
- orWorkbookStreamName = saBookName;
- }
- }
- else
- {
- // no storage, try plain input stream from medium (even for BIFF5+)
- BinaryXInputStream aStrm( rxStorage->openInputStream( OUString() ), false );
- eBiff = detectStreamBiffVersion( aStrm );
- orWorkbookStreamName = OUString();
- }
- }
-
- return eBiff;
-}
-
-// ============================================================================
-
} // BiffDetector
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index b9bcdd8..4f2935b 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -565,18 +565,6 @@ void ColorPalette::importPalette( BiffInputStream& rStrm )
}
}
-void ColorPalette::importPalette( const Any& rPalette )
-{
- Sequence< sal_Int32 > rColorSeq;
- if( (rPalette >>= rColorSeq) && rColorSeq.hasElements() )
- {
- const sal_Int32* pnColor = rColorSeq.getConstArray();
- const sal_Int32* pnColorEnd = pnColor + rColorSeq.getLength();
- for( ; pnColor < pnColorEnd; ++pnColor )
- appendColor( *pnColor & 0xFFFFFF );
- }
-}
-
sal_Int32 ColorPalette::getColor( sal_Int32 nPaletteIdx ) const
{
sal_Int32 nColor = API_RGB_TRANSPARENT;
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 4d079e0..2ef185d 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -368,409 +368,6 @@ void WorkbookFragment::importPivotCacheDefFragment( const OUString& rRelId, sal_
getPivotCaches().registerPivotCacheFragment( nCacheId, getFragmentPathFromRelId( rRelId ) );
}
-// ============================================================================
-
-BiffWorkbookFragment::BiffWorkbookFragment( const WorkbookHelper& rHelper, const OUString& rStrmName ) :
- BiffWorkbookFragmentBase( rHelper, rStrmName )
-{
-}
-
-bool BiffWorkbookFragment::importFragment()
-{
- bool bRet = false;
-
- BiffFragmentType eFragment = startFragment( getBiff() );
- switch( eFragment )
- {
- case BIFF_FRAGMENT_GLOBALS:
- {
- BiffInputStream& rStrm = getInputStream();
- // import workbook globals fragment and create sheets in document
- ISegmentProgressBarRef xGlobalsProgress = getProgressBar().createSegment( PROGRESS_LENGTH_GLOBALS );
- bRet = importGlobalsFragment( *xGlobalsProgress );
- // load sheet fragments (do not return false in bRet on missing/broken sheets)
- WorksheetBuffer& rWorksheets = getWorksheets();
- bool bNextSheet = bRet;
- for( sal_Int32 nWorksheet = 0, nWorksheetCount = rWorksheets.getWorksheetCount(); bNextSheet && (nWorksheet < nWorksheetCount); ++nWorksheet )
- {
- // calculate progress size for the sheet
- double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
- ISegmentProgressBarRef xSheetProgress = getProgressBar().createSegment( fSegmentLength );
- /* Try to start a new sheet fragment. The SHEET records point to the
- first record of the sheet fragment which is usually a BOF record. */
- BiffFragmentType eSheetFragment = BIFF_FRAGMENT_UNKNOWN;
- sal_Int64 nRecHandle = rWorksheets.getBiffRecordHandle( nWorksheet );
- if( rStrm.startRecordByHandle( nRecHandle ) )
- {
- /* #i109800# Stream may point to any record of the sheet fragment.
- Check the record identifier before calling startFragment(). */
- bool bIsBofRec = BiffHelper::isBofRecord( rStrm );
- /* Rewind the record. If it is the BOF record, it will be read in
- startFragment(). In every case, stream will point before the
- first available non-BOF record. */
- rStrm.rewindRecord();
- // if the BOF record is missing, a regular worksheet will be assumed
- eSheetFragment = bIsBofRec ? startFragment( getBiff() ) : BIFF_FRAGMENT_WORKSHEET;
- }
- sal_Int16 nCalcSheet = rWorksheets.getCalcSheetIndex( nWorksheet );
- bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nCalcSheet );
- }
- }
- break;
-
- case BIFF_FRAGMENT_WORKSPACE:
- {
- bRet = importWorkspaceFragment();
- // sheets are embedded in workspace fragment, nothing to do here
- }
- break;
-
- case BIFF_FRAGMENT_WORKSHEET:
- case BIFF_FRAGMENT_CHARTSHEET:
- case BIFF_FRAGMENT_MACROSHEET:
- {
- /* Single sheet without globals
- - #i62752# possible in all BIFF versions
- - do not return false in bRet on missing/broken sheets. */
- getWorksheets().initializeSingleSheet();
- importSheetFragment( getProgressBar(), eFragment, 0 );
- // success, even if stream is broken
- bRet = true;
- }
- break;
-
- default:;
- }
-
- // final conversions, e.g. calculation settings and view settings
- if( bRet )
- finalizeWorkbookImport();
-
- return bRet;
-}
-
-bool BiffWorkbookFragment::importWorkspaceFragment()
-{
- // enable workbook mode, has not been set yet in BIFF4 workspace files
- setIsWorkbookFile();
-
- WorksheetBuffer& rWorksheets = getWorksheets();
- bool bRet = true;
-
- // import the workspace globals
- ISegmentProgressBarRef xGlobalsProgress = getProgressBar().createSegment( PROGRESS_LENGTH_GLOBALS );
- bool bLoop = true;
- BiffInputStream& rStrm = getInputStream();
- while( bRet && bLoop && rStrm.startNextRecord() && (rStrm.getRecId() != BIFF_ID_EOF) )
- {
- switch( rStrm.getRecId() )
- {
- case BIFF_ID_SHEET: rWorksheets.importSheet( rStrm ); break;
- case BIFF_ID_CODEPAGE: setCodePage( rStrm.readuInt16() ); break;
- case BIFF_ID_FILEPASS: bRet = getCodecHelper().importFilePass( rStrm ); break;
- case BIFF_ID_SHEETHEADER: rStrm.rewindRecord(); bLoop = false; break;
- }
- }
- xGlobalsProgress->setPosition( 1.0 );
-
- // load sheet fragments (do not return false in bRet on missing/broken sheets)
- bool bNextSheet = bRet;
- for( sal_Int32 nWorksheet = 0, nWorksheetCount = rWorksheets.getWorksheetCount(); bNextSheet && (nWorksheet < nWorksheetCount); ++nWorksheet )
- {
- // try to start a new sheet fragment (with leading SHEETHEADER record)
- bNextSheet = rStrm.startNextRecord() && (rStrm.getRecId() == BIFF_ID_SHEETHEADER);
- if( bNextSheet )
- {
- double fSegmentLength = getProgressBar().getFreeLength() / (nWorksheetCount - nWorksheet);
- ISegmentProgressBarRef xSheetProgress = getProgressBar().createSegment( fSegmentLength );
- /* Read current sheet name (sheet substreams may not be in the
- same order as SHEET records are). */
- rStrm.skip( 4 );
- OUString aSheetName = rStrm.readByteStringUC( false, getTextEncoding() );
- sal_Int16 nCurrSheet = rWorksheets.getCalcSheetIndex( aSheetName );
- // load the sheet fragment records
- BiffFragmentType eSheetFragment = startFragment( getBiff() );
- bNextSheet = importSheetFragment( *xSheetProgress, eSheetFragment, nCurrSheet );
- // do not return false in bRet on missing/broken sheets
- }
- }
-
- return bRet;
-}
-
-bool BiffWorkbookFragment::importGlobalsFragment( ISegmentProgressBar& rProgressBar )
-{
- WorkbookSettings& rWorkbookSett = getWorkbookSettings();
- ViewSettings& rViewSett = getViewSettings();
- SharedStringsBuffer& rSharedStrings = getSharedStrings();
- StylesBuffer& rStyles = getStyles();
- WorksheetBuffer& rWorksheets = getWorksheets();
- PivotCacheBuffer& rPivotCaches = getPivotCaches();
- bool bHasVbaProject = false;
- bool bEmptyVbaProject = false;
-
- // collect records that need to be loaded in a second pass
- typedef ::std::vector< sal_Int64 > RecordHandleVec;
- RecordHandleVec aExtLinkRecs;
-
- bool bRet = true;
- bool bLoop = true;
- BiffInputStream& rStrm = getInputStream();
- while( bRet && bLoop && rStrm.startNextRecord() )
- {
- sal_uInt16 nRecId = rStrm.getRecId();
- bool bExtLinkRec = false;
-
- /* #i56376# BIFF5-BIFF8: If an EOF record for globals is missing,
- simulate it. The issue is about a document where the sheet fragment
- starts directly after the EXTSST record, without terminating the
- globals fragment with an EOF record. */
- if( BiffHelper::isBofRecord( rStrm ) || (nRecId == BIFF_ID_EOF) )
- {
- bLoop = false;
- }
- else switch( nRecId )
- {
- // records in all BIFF versions
- case BIFF_ID_CODEPAGE: setCodePage( rStrm.readuInt16() ); break;
- case BIFF_ID_DATEMODE: rWorkbookSett.importDateMode( rStrm ); break;
- case BIFF_ID_FILEPASS: bRet = getCodecHelper().importFilePass( rStrm ); break;
- case BIFF_ID_PRECISION: rWorkbookSett.importPrecision( rStrm ); break;
- case BIFF_ID_WINDOW1: rViewSett.importWindow1( rStrm ); break;
-
- // BIFF specific records
- default: switch( getBiff() )
- {
- case BIFF2: switch( nRecId )
- {
- case BIFF2_ID_DEFINEDNAME: bExtLinkRec = true; break;
- case BIFF2_ID_EXTERNALNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNSHEET: bExtLinkRec = true; break;
- case BIFF2_ID_FONT: rStyles.importFont( rStrm ); break;
- case BIFF_ID_FONTCOLOR: rStyles.importFontColor( rStrm ); break;
- case BIFF2_ID_FORMAT: rStyles.importFormat( rStrm ); break;
- case BIFF2_ID_XF: rStyles.importXf( rStrm ); break;
- }
- break;
-
- case BIFF3: switch( nRecId )
- {
- case BIFF_ID_CRN: bExtLinkRec = true; break;
- case BIFF3_ID_DEFINEDNAME: bExtLinkRec = true; break;
- case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNSHEET: bExtLinkRec = true; break;
- case BIFF_ID_FILESHARING: rWorkbookSett.importFileSharing( rStrm ); break;
- case BIFF3_ID_FONT: rStyles.importFont( rStrm ); break;
- case BIFF2_ID_FORMAT: rStyles.importFormat( rStrm ); break;
- case BIFF_ID_HIDEOBJ: rWorkbookSett.importHideObj( rStrm ); break;
- case BIFF_ID_PALETTE: rStyles.importPalette( rStrm ); break;
- case BIFF_ID_STYLE: rStyles.importStyle( rStrm ); break;
- case BIFF_ID_XCT: bExtLinkRec = true; break;
- case BIFF3_ID_XF: rStyles.importXf( rStrm ); break;
- }
- break;
-
- case BIFF4: switch( nRecId )
- {
- case BIFF_ID_CRN: bExtLinkRec = true; break;
- case BIFF3_ID_DEFINEDNAME: bExtLinkRec = true; break;
- case BIFF3_ID_EXTERNALNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNSHEET: bExtLinkRec = true; break;
- case BIFF_ID_FILESHARING: rWorkbookSett.importFileSharing( rStrm ); break;
- case BIFF3_ID_FONT: rStyles.importFont( rStrm ); break;
- case BIFF4_ID_FORMAT: rStyles.importFormat( rStrm ); break;
- case BIFF_ID_HIDEOBJ: rWorkbookSett.importHideObj( rStrm ); break;
- case BIFF_ID_PALETTE: rStyles.importPalette( rStrm ); break;
- case BIFF_ID_STYLE: rStyles.importStyle( rStrm ); break;
- case BIFF_ID_XCT: bExtLinkRec = true; break;
- case BIFF4_ID_XF: rStyles.importXf( rStrm ); break;
- }
- break;
-
- case BIFF5: switch( nRecId )
- {
- case BIFF_ID_BOOKBOOL: rWorkbookSett.importBookBool( rStrm ); break;
- case BIFF_ID_CRN: bExtLinkRec = true; break;
- case BIFF5_ID_DEFINEDNAME: bExtLinkRec = true; break;
- case BIFF5_ID_EXTERNALNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNSHEET: bExtLinkRec = true; break;
- case BIFF_ID_FILESHARING: rWorkbookSett.importFileSharing( rStrm ); break;
- case BIFF5_ID_FONT: rStyles.importFont( rStrm ); break;
- case BIFF4_ID_FORMAT: rStyles.importFormat( rStrm ); break;
- case BIFF_ID_HIDEOBJ: rWorkbookSett.importHideObj( rStrm ); break;
- case BIFF_ID_OLESIZE: rViewSett.importOleSize( rStrm ); break;
- case BIFF_ID_PALETTE: rStyles.importPalette( rStrm ); break;
- case BIFF_ID_PIVOTCACHE: rPivotCaches.importPivotCacheRef( rStrm ); break;
- case BIFF_ID_SHEET: rWorksheets.importSheet( rStrm ); break;
- case BIFF_ID_STYLE: rStyles.importStyle( rStrm ); break;
- case BIFF_ID_XCT: bExtLinkRec = true; break;
- case BIFF5_ID_XF: rStyles.importXf( rStrm ); break;
- }
- break;
-
- case BIFF8: switch( nRecId )
- {
- case BIFF_ID_BOOKBOOL: rWorkbookSett.importBookBool( rStrm ); break;
- case BIFF_ID_CODENAME: rWorkbookSett.importCodeName( rStrm ); break;
- case BIFF_ID_CRN: bExtLinkRec = true; break;
- case BIFF5_ID_DEFINEDNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNALBOOK: bExtLinkRec = true; break;
- case BIFF5_ID_EXTERNALNAME: bExtLinkRec = true; break;
- case BIFF_ID_EXTERNSHEET: bExtLinkRec = true; break;
- case BIFF_ID_FILESHARING: rWorkbookSett.importFileSharing( rStrm ); break;
- case BIFF5_ID_FONT: rStyles.importFont( rStrm ); break;
- case BIFF4_ID_FORMAT: rStyles.importFormat( rStrm ); break;
- case BIFF_ID_HIDEOBJ: rWorkbookSett.importHideObj( rStrm ); break;
- case BIFF_ID_OLESIZE: rViewSett.importOleSize( rStrm ); break;
- case BIFF_ID_PALETTE: rStyles.importPalette( rStrm ); break;
- case BIFF_ID_PIVOTCACHE: rPivotCaches.importPivotCacheRef( rStrm ); break;
- case BIFF_ID_SHEET: rWorksheets.importSheet( rStrm ); break;
- case BIFF_ID_SST: rSharedStrings.importSst( rStrm ); break;
- case BIFF_ID_STYLE: rStyles.importStyle( rStrm ); break;
- case BIFF_ID_USESELFS: rWorkbookSett.importUsesElfs( rStrm ); break;
- case BIFF_ID_VBAPROJECT: bHasVbaProject = true; break;
- case BIFF_ID_VBAPROJECTEMPTY: bEmptyVbaProject = true; break;
- case BIFF_ID_XCT: bExtLinkRec = true; break;
- case BIFF5_ID_XF: rStyles.importXf( rStrm ); break;
- }
- break;
-
- case BIFF_UNKNOWN: break;
- }
- }
-
- if( bExtLinkRec )
- aExtLinkRecs.push_back( rStrm.getRecHandle() );
- }
-
- // finalize global buffers
- rProgressBar.setPosition( 0.5 );
- if( bRet )
- {
- rSharedStrings.finalizeImport();
- rStyles.finalizeImport();
- }
-
- /* Import external link data (EXTERNSHEET, EXTERNALNAME, DEFINEDNAME)
- which need existing internal sheets (SHEET records). The SHEET records
- may follow the external links records in some BIFF versions. */
- if( bRet && !aExtLinkRecs.empty() )
- {
- // remember current stream position (the EOF record)
- sal_Int64 nEofHandle = rStrm.getRecHandle();
- // context handler implementing import of external link records
- BiffExternalSheetDataContext aSheetContext( *this, true );
- // import all records by using their cached record handle
- for( RecordHandleVec::const_iterator aIt = aExtLinkRecs.begin(), aEnd = aExtLinkRecs.end(); (aIt != aEnd) && rStrm.startRecordByHandle( *aIt ); ++aIt )
- aSheetContext.importRecord( rStrm );
- // finalize global buffers
- getDefinedNames().finalizeImport();
- // seek back to the EOF record of the workbook globals fragment
- bRet = rStrm.startRecordByHandle( nEofHandle );
- }
-
- // open the VBA project storage
- if( bHasVbaProject && !bEmptyVbaProject )
- setVbaProjectStorage( getBaseFilter().openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ) );
-
- // #i56376# missing EOF - rewind before worksheet BOF record (see above)
- if( bRet && BiffHelper::isBofRecord( rStrm ) )
- rStrm.rewindRecord();
-
- rProgressBar.setPosition( 1.0 );
- return bRet;
-}
-
-bool BiffWorkbookFragment::importSheetFragment( ISegmentProgressBar& rProgressBar, BiffFragmentType eFragment, sal_Int16 nCalcSheet )
-{
- // no Calc sheet - skip the fragment
- if( nCalcSheet < 0 )
- return skipFragment();
-
- // find the sheet type for this fragment
- WorksheetType eSheetType = SHEETTYPE_EMPTYSHEET;
- switch( eFragment )
- {
- case BIFF_FRAGMENT_WORKSHEET: eSheetType = SHEETTYPE_WORKSHEET; break;
- case BIFF_FRAGMENT_CHARTSHEET: eSheetType = SHEETTYPE_CHARTSHEET; break;
- case BIFF_FRAGMENT_MACROSHEET: eSheetType = SHEETTYPE_MACROSHEET; break;
- case BIFF_FRAGMENT_MODULESHEET: eSheetType = SHEETTYPE_MODULESHEET; break;
- case BIFF_FRAGMENT_EMPTYSHEET: eSheetType = SHEETTYPE_EMPTYSHEET; break;
- default: return false;
- }
-
- /* #i11183# Clear buffers that are used per-sheet, e.g. external links in
- BIFF4W and BIFF5 files, or defined names in BIFF4W files. */
- createBuffersPerSheet( nCalcSheet );
-
- // preprocess some records
- BiffInputStream& rStrm = getInputStream();
- switch( getBiff() )
- {
- // load the workbook globals fragment records in BIFF2-BIFF4
- case BIFF2:
- case BIFF3:
- case BIFF4:
- {
- // remember current record to seek back below
- sal_Int64 nRecHandle = rStrm.getRecHandle();
- // import the global records
- ISegmentProgressBarRef xGlobalsProgress = rProgressBar.createSegment( PROGRESS_LENGTH_GLOBALS );
- importGlobalsFragment( *xGlobalsProgress );
- // rewind stream to fragment BOF record
- rStrm.startRecordByHandle( nRecHandle );
- }
- break;
-
- // load the external link records for this sheet in BIFF5
- case BIFF5:
- {
- // remember current record to seek back below
- sal_Int64 nRecHandle = rStrm.getRecHandle();
- // fragment implementing import of external link records
- BiffExternalLinkFragment( *this ).importFragment();
- // rewind stream to fragment BOF record
- rStrm.startRecordByHandle( nRecHandle );
- }
- break;
-
- case BIFF8:
- break;
-
- case BIFF_UNKNOWN:
- break;
- }
-
- // create the WorksheetGlobals object
- ISegmentProgressBarRef xSheetProgress = rProgressBar.createSegment( rProgressBar.getFreeLength() );
- WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, xSheetProgress, eSheetType, nCalcSheet );
- OSL_ENSURE( xSheetGlob.get(), "BiffWorkbookFragment::importSheetFragment - missing sheet in document" );
- if( !xSheetGlob.get() )
- return false;
-
- // create the worksheet fragment
- ::boost::shared_ptr< BiffWorksheetFragmentBase > xFragment;
- switch( eSheetType )
- {
- case SHEETTYPE_WORKSHEET:
- case SHEETTYPE_MACROSHEET:
- case SHEETTYPE_DIALOGSHEET:
- xFragment.reset( new BiffWorksheetFragment( *xSheetGlob, *this ) );
- break;
- case SHEETTYPE_CHARTSHEET:
- xFragment.reset( new BiffChartsheetFragment( *xSheetGlob, *this ) );
- break;
- case SHEETTYPE_MODULESHEET:
- case SHEETTYPE_EMPTYSHEET:
- xFragment.reset( new BiffSkipWorksheetFragment( *xSheetGlob, *this ) );
- break;
- }
- // load the sheet fragment records
- return xFragment.get() && xFragment->importFragment();
-}
-
-// ============================================================================
-
} // namespace xls
} // namespace oox
diff --git a/unusedcode.easy b/unusedcode.easy
index 61a0856..ecbba19 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,5 @@
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
+CharAttribList::Clear()
CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
@@ -186,7 +187,6 @@ SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
-SvxUnoTextContent::SvxUnoTextContent()
SwAttrIter::Dump(SvStream&) const
SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
@@ -825,6 +825,7 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
+oox::PropertySet::dump()
oox::dump::DffStreamObject::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
oox::dump::InputObjectBase::dumpColorABGR(oox::dump::String const&)
oox::dump::InputObjectBase::dumpRk(oox::dump::String const&)
commit 9ce98add53128716524ec06dd1f90548326adce0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 28 22:19:30 2012 +0100
remove static OUStrings from static_initialization_and_destruction chain
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index b1560dc..5abc559 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -44,7 +44,7 @@ namespace css = ::com::sun::star;
//_______________________________________________
// definitions
-static const ::rtl::OUString ERRMSG_INVALID_COMPONENT_PARAM(RTL_CONSTASCII_USTRINGPARAM("NULL as component reference not allowed."));
+static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed.";
//-----------------------------------------------
NumberedCollection::NumberedCollection()
@@ -91,7 +91,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix)
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( ! xComponent.is ())
- throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
+ throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
long pComponent = (long) xComponent.get ();
TNumberedItemHash::const_iterator pIt = m_lComponents.find (pComponent);
@@ -167,7 +167,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( ! xComponent.is ())
- throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1);
+ throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
long pComponent = (long) xComponent.get ();
TNumberedItemHash::iterator pIt = m_lComponents.find (pComponent);
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index bf42f75..a284143 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -44,7 +44,7 @@ using namespace ::desktop;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
+static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
/* Local function - get access to the configuration */
static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath )
@@ -56,7 +56,7 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP
NamedValue aValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), makeAny( rPath ) );
aArgs[0] <<= aValue;
return Reference< XPropertySet >(
- xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), UNO_QUERY_THROW );
+ xConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW );
}
void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 7b3578a..9a48732 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -218,9 +218,9 @@ void SilentCommandEnv::pop() throw (uno::RuntimeException)
} // end namespace
-//-----------------------------------------------------------------------------
-static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
-//------------------------------------------------------------------------------
+
+static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
+
static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext )
{
rtl::OUString sServiceName = UNISTRING("com.sun.star.deployment.ui.UpdateRequiredDialog");
@@ -333,7 +333,7 @@ static void impl_setNeedsCompatCheck()
makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
theArgs[0] <<= v;
Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
- theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+ theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW );
Any value = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("never")) );
@@ -385,7 +385,7 @@ static bool impl_needsCompatCheck()
makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
theArgs[0] <<= v;
Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
- theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+ theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW );
Any result = pset->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")) );
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ca1af31..716655e 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -77,9 +77,8 @@ namespace css = ::com::sun::star;
// Error message in case filter config seems to be corrupted.
// Note: Dont tell user something about "setup -repair"!
// Its no longer supported by using native installers ...
-static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." ));
-
-
+const char MESSAGE_CORRUPTED_FILTERCONFIG[] =
+ "The filter configuration appears to be defective. Please install the office suite again.";
FilterCache::FilterCache()
: BaseLock ( )
@@ -998,7 +997,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
catch(const css::uno::Exception& ex)
{
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
ex.Message);
}
@@ -1043,7 +1042,7 @@ void FilterCache::impl_validateAndOptimize()
)
{
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
}
@@ -1307,7 +1306,7 @@ void FilterCache::impl_validateAndOptimize()
OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
if (nErrors>0)
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
sLogOut);
OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
@@ -1558,7 +1557,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex)
{
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
ex.Message);
}
@@ -1587,7 +1586,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex)
{
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
ex.Message);
}
@@ -1616,7 +1615,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex)
{
throw css::document::CorruptedFilterConfigurationException(
- MESSAGE_CORRUPTED_FILTERCONFIG,
+ rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG),
css::uno::Reference< css::uno::XInterface >(),
ex.Message);
}
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 665d3dc..fd358bf 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -54,8 +54,8 @@
namespace framework
{
-static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
-static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
+static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories";
+static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier";
/*-----------------------------------------------
04.12.2003 09:32
@@ -212,7 +212,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
// we can close it without a flush ... and our read data wont be affected .-)
css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig(
xSMGR,
- CFGPATH_FACTORIES,
+ rtl::OUString(CFGPATH_FACTORIES),
::comphelper::ConfigurationHelper::E_STANDARD);
css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameReplace > xModule ;
@@ -266,7 +266,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
sal_Int32 c = lPropNames.getLength();
sal_Int32 i = 0;
- lProps[MODULEPROP_IDENTIFIER] <<= sName;
+ lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName;
for (i=0; i<c; ++i)
{
const ::rtl::OUString& sPropName = lPropNames[i];
@@ -375,7 +375,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
{
xCfg = ::comphelper::ConfigurationHelper::openConfig(
xSMGR,
- CFGPATH_FACTORIES,
+ rtl::OUString(CFGPATH_FACTORIES),
::comphelper::ConfigurationHelper::E_READONLY);
}
catch(const css::uno::RuntimeException&)
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index f26ce03..d96fa49 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -45,26 +45,26 @@
namespace svx
{
-static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchString" ) );
-static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.Backward" ) );
-static const ::rtl::OUString SEARCHITEM_SEARCHFLAGS( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchFlags" ) );
+static const char SEARCHITEM_SEARCHSTRING[] = "SearchItem.SearchString";
+static const char SEARCHITEM_SEARCHBACKWARD[] = "SearchItem.Backward";
+static const char SEARCHITEM_SEARCHFLAGS[] = "SearchItem.SearchFlags";
-static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExecuteSearch" ) );
-static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) );
-static const ::rtl::OUString COMMAND_DOWNSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:DownSearch") );
-static const ::rtl::OUString COMMAND_UPSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:UpSearch") );
-static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY( RTL_CONSTASCII_USTRINGPARAM( "AppendSearchHistory") );
+static const char COMMAND_EXECUTESEARCH[] = ".uno:ExecuteSearch";
+static const char COMMAND_FINDTEXT[] = ".uno:FindText";
+static const char COMMAND_DOWNSEARCH[] = ".uno:DownSearch";
+static const char COMMAND_UPSEARCH[] = ".uno:UpSearch";
+static const char COMMAND_APPENDSEARCHHISTORY[] = "AppendSearchHistory";
-static const ::rtl::OUString SERVICENAME_URLTRANSFORMER( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer") );
+static const char SERVICENAME_URLTRANSFORMER[] = "com.sun.star.util.URLTransformer";
static const sal_Int32 REMEMBER_SIZE = 10;
void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
{
- css::uno::Reference< css::util::XURLTransformer > xURLTransformer( rSMgr->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY );
+ css::uno::Reference< css::util::XURLTransformer > xURLTransformer( rSMgr->createInstance(rtl::OUString(SERVICENAME_URLTRANSFORMER)), css::uno::UNO_QUERY );
if ( xURLTransformer.is() )
{
css::util::URL aURL;
- aURL.Complete = COMMAND_EXECUTESEARCH;
+ aURL.Complete = rtl::OUString(COMMAND_EXECUTESEARCH);
xURLTransformer->parseStrict(aURL);
css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY);
@@ -164,16 +164,16 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
::rtl::OUString sFindText = GetText();
css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
- lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+ lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
lArgs[0].Value <<= sFindText;
- lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+ lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
if (bShift)
lArgs[1].Value <<= sal_True;
else
lArgs[1].Value <<= sal_False;
- lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
lArgs[2].Value <<= (sal_Int32)0;
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
@@ -300,7 +300,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag
FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
:svt::ToolboxController( rServiceManager,
css::uno::Reference< css::frame::XFrame >(),
- COMMAND_FINDTEXT )
+ rtl::OUString(COMMAND_FINDTEXT) )
{
}
@@ -383,9 +383,9 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
- if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
+ if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_DOWNSEARCH)))
m_nDownSearchId = i;
- else if (sItemCommand.equals( COMMAND_UPSEARCH ))
+ else if (sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_UPSEARCH)))
m_nUpSearchId = i;
}
}
@@ -464,7 +464,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
DownSearchToolboxController::DownSearchToolboxController(const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
: svt::ToolboxController( rServiceManager,
css::uno::Reference< css::frame::XFrame >(),
- COMMAND_DOWNSEARCH )
+ rtl::OUString(COMMAND_DOWNSEARCH) )
{
}
@@ -518,7 +518,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL DownSearchToolboxController::getS
css::uno::Sequence< ::rtl::OUString > DownSearchToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+ aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController");
return aSNS;
}
@@ -554,7 +554,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
- if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
+ if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_FINDTEXT)) )
{
Window* pItemWin = pToolBox->GetItemWindow(i);
if (pItemWin)
@@ -565,17 +565,17 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
}
css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
- lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+ lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
lArgs[0].Value <<= sFindText;
- lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+ lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
lArgs[1].Value <<= sal_False;
- lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
lArgs[2].Value <<= (sal_Int32)0;
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
css::frame::FeatureStateEvent aEvent;
- aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+ aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY);
css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
if (xStatusListener.is())
xStatusListener->statusChanged( aEvent );
@@ -595,7 +595,7 @@ void SAL_CALL DownSearchToolboxController::statusChanged( const css::frame::Feat
UpSearchToolboxController::UpSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager )
:svt::ToolboxController( rServiceManager,
css::uno::Reference< css::frame::XFrame >(),
- COMMAND_UPSEARCH )
+ rtl::OUString(COMMAND_UPSEARCH) )
{
}
@@ -649,7 +649,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL UpSearchToolboxController::getSup
css::uno::Sequence< ::rtl::OUString > UpSearchToolboxController::getSupportedServiceNames_Static() throw()
{
css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) );
+ aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController");
return aSNS;
}
@@ -696,17 +696,17 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
}
css::uno::Sequence< css::beans::PropertyValue > lArgs(3);
- lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+ lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING);
lArgs[0].Value <<= sFindText;
- lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+ lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD);
lArgs[1].Value <<= sal_True;
- lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+ lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS);
lArgs[2].Value <<= (sal_Int32)0;
impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
css::frame::FeatureStateEvent aEvent;
- aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+ aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY);
css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
if (xStatusListener.is())
xStatusListener->statusChanged( aEvent );
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 261599d..f10c682 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -63,8 +63,8 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-static const rtl::OUString sSpreadsheetDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") );
-static const rtl::OUString sTextDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") );
+static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocument";
+static const char aTextDocument[] = "com.sun.star.text.TextDocument";
typedef boost::unordered_map< rtl::OUString,
sal_Int32, ::rtl::OUStringHash,
@@ -146,8 +146,8 @@ public:
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY );
if ( xServiceInfo.is()
- && ( ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
- || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
+ && ( ( xServiceInfo->supportsService( rtl::OUString(aSpreadsheetDocument) ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT )
+ || ( xServiceInfo->supportsService( rtl::OUString(aTextDocument) ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) )
{
uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given
m_documents.push_back( xModel );
commit 37d6ff0691f7be9fa4d742779fa59883de3586d9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 28 17:01:05 2012 +0100
no need for a global rtl::OUString here
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index c441839..373df6d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -151,7 +151,6 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD
// the reading of the parameter is done using the special service ::com::sun::star::datatransfer::MimeContentType,
// a similar approach should be implemented for creation of the mimetype string;
// for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype
-const ::rtl::OUString aQuotedParamChars = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "()<>@,;:\\\"/[]?=!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~. " ) );
static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
{
@@ -181,9 +180,12 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto
for ( sal_Int32 nBInd = 0; nBInd < 128; nBInd++ )
pToAccept[nBInd] = sal_False;
- for ( sal_Int32 nInd = 0; nInd < aQuotedParamChars.getLength(); nInd++ )
+ const char aQuotedParamChars[] =
+ "()<>@,;:\\\"/[]?=!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~. ";
+
+ for ( sal_Int32 nInd = 0; nInd < RTL_CONSTASCII_LENGTH(aQuotedParamChars); ++nInd )
{
- sal_Unicode nChar = aQuotedParamChars.getStr()[nInd];
+ sal_Unicode nChar = aQuotedParamChars[nInd];
if ( nChar < 128 )
pToAccept[nChar] = sal_True;
}
More information about the Libreoffice-commits
mailing list