[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sfx2
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Jan 8 12:20:00 PST 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 46 ++-
binfilter/bf_basic/source/classes/sbintern.cxx | 3
binfilter/bf_basic/source/classes/sbunoobj.cxx | 35 +-
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 10
binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx | 24 -
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 61 ++---
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 267 ++++++++++------------
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 73 ++----
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 60 ++--
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 92 +++----
binfilter/bf_sfx2/source/inc/objshimp.hxx | 2
11 files changed, 337 insertions(+), 336 deletions(-)
New commits:
commit b129959fedb7ba5f7fd52f8b534fb6119d8f06cc
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jan 8 12:19:46 2011 -0800
Remove DECLARE_LIST( BasErrorLst, BasicError* )
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 8b5aa3a..e746261 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -61,6 +61,7 @@
#include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
#include <cppuhelper/implbase1.hxx>
+#include <vector>
namespace binfilter {
@@ -70,6 +71,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::script;
using namespace cppu;
using namespace rtl;
+using ::std::vector;
typedef WeakImplHelper1< XNameContainer > NameContainerHelper;
typedef WeakImplHelper1< XStarBasicModuleInfo > ModuleInfoHelper;
@@ -111,7 +113,7 @@ DBG_NAME( BasicManager );
StreamMode eStreamReadMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL;
StreamMode eStorageReadMode = STREAM_READ | STREAM_SHARE_DENYWRITE;
-DECLARE_LIST( BasErrorLst, BasicError* )
+typedef vector< BasicError* > BasErrorLst;
//----------------------------------------------------------------------------
@@ -200,7 +202,7 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const Reference< XLibraryCo
{
BasicManager* pBasMgr = static_cast< BasicManager* >( pMgr );
#ifdef DBG_UTIL
- StarBASIC* pLib =
+ StarBASIC* pLib =
#endif
pBasMgr->CreateLibForLibContainer( aLibName, xScriptCont );
DBG_ASSERT( pLib, "XML Import: Basic library could not be created");
@@ -366,16 +368,18 @@ class BasicErrorManager
{
private:
BasErrorLst aErrorList;
+ size_t CurrentError;
public:
+ BasicErrorManager() { CurrentError = 0; }
~BasicErrorManager();
void Reset();
void InsertError( const BasicError& rError );
- BOOL HasErrors() { return (BOOL)aErrorList.Count(); }
- BasicError* GetFirstError() { return aErrorList.First(); }
- BasicError* GetNextError() { return aErrorList.Next(); }
+ BOOL HasErrors() { return !aErrorList.empty(); }
+ BasicError* GetFirstError();
+ BasicError* GetNextError();
};
@@ -384,20 +388,34 @@ BasicErrorManager::~BasicErrorManager()
Reset();
}
+BasicError* BasicErrorManager::GetFirstError()
+{
+ CurrentError = 0;
+ if ( aErrorList.empty() )
+ return NULL;
+ return aErrorList[ 0 ];
+}
+
+BasicError* BasicErrorManager::GetNextError()
+{
+ if ( aErrorList.empty()
+ || CurrentError + 1 >= aErrorList.size()
+ )
+ return NULL;
+ CurrentError++;
+ return aErrorList[ CurrentError ];
+}
+
void BasicErrorManager::Reset()
{
- BasicError* pError = (BasicError*)aErrorList.First();
- while ( pError )
- {
- delete pError;
- pError = (BasicError*)aErrorList.Next();
- }
- aErrorList.Clear();
+ for ( size_t i = 0, n = aErrorList.size(); i < n; ++i )
+ delete aErrorList[ i ];
+ aErrorList.clear();
}
void BasicErrorManager::InsertError( const BasicError& rError )
{
- aErrorList.Insert( new BasicError( rError ), LIST_APPEND );
+ aErrorList.push_back( new BasicError( rError ) );
}
BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) :
diff --git a/binfilter/bf_basic/source/classes/sbintern.cxx b/binfilter/bf_basic/source/classes/sbintern.cxx
index 1fdb6f5..9ad2336 100644
--- a/binfilter/bf_basic/source/classes/sbintern.cxx
+++ b/binfilter/bf_basic/source/classes/sbintern.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -30,7 +30,6 @@
#include "sbunoobj.hxx"
#include "token.hxx" // Tokenizer
#include "codegen.hxx" // Code-Generator
-#include "basmgr.hxx"
namespace binfilter {
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index a7ea3cd..c31f836 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -83,7 +83,6 @@ using namespace rtl;
#include "sberrors.hxx"
#include "sbunoobj.hxx"
#include "sbjsmod.hxx"
-#include "basmgr.hxx"
#include "sbintern.hxx"
#include<math.h>
@@ -162,7 +161,7 @@ Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Im
Reference< XIdlReflection > xCoreReflection = getCoreReflection_Impl();
if( xCoreReflection.is() )
{
- xCoreReflection_HierarchicalNameAccess =
+ xCoreReflection_HierarchicalNameAccess =
Reference< XHierarchicalNameAccess >( xCoreReflection, UNO_QUERY );
}
}
@@ -377,7 +376,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
Type aType = aValue.getValueType();
TypeClass eTypeClass = aType.getTypeClass();
- sal_Int32 indicesIndex = indices.getLength() -1;
+ sal_Int32 indicesIndex = indices.getLength() -1;
sal_Int32 dimCopy = dimension;
if ( eTypeClass == TypeClass_SEQUENCE )
@@ -394,7 +393,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
++dimCopy;
if ( sizes.getLength() < dimCopy )
{
- sizes.realloc( sizes.getLength() + 1 );
+ sizes.realloc( sizes.getLength() + 1 );
sizes[ sizes.getLength() - 1 ] = nLen;
indices.realloc( indices.getLength() + 1 );
indicesIndex = indices.getLength() - 1;
@@ -403,19 +402,19 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
if ( bIsZeroIndex )
indices[ dimCopy - 1 ] = index;
- else
+ else
indices[ dimCopy - 1] = index + 1;
implSequenceToMultiDimArray( pArray, indices, sizes, aElementAny, dimCopy, bIsZeroIndex );
}
-
+
}
else
{
- if ( indices.getLength() < 1 )
+ if ( indices.getLength() < 1 )
{
// Should never ever get here ( indices.getLength()
- // should equal number of dimensions in the array )
+ // should equal number of dimensions in the array )
// And that should at least be 1 !
// #QUESTION is there a better error?
StarBASIC::Error( SbERR_INVALID_OBJECT );
@@ -427,7 +426,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() );
pArray = new SbxDimArray( eSbxElementType );
sal_Int32 nIndexLen = indices.getLength();
-
+
// Dimension the array
for ( sal_Int32 index = 0; index < nIndexLen; ++index )
{
@@ -691,7 +690,7 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
{
if( aType.getTypeClass() == TypeClass_VOID )
{
- // #88522
+ // #88522
// if only first element is void: different types -> []any
// if all elements are void: []void is not allowed -> []any
aElementType = getCppuType( (Any*)0 );
@@ -854,8 +853,8 @@ Any sbxToUnoValueImpl( SbxVariable* pVar, bool bBlockConversionToSmallestType =
// Helper function for StepREDIMP
-static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
- const Type& aElemType, short nMaxDimIndex, short nActualDim,
+static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
+ const Type& aElemType, short nMaxDimIndex, short nActualDim,
sal_Int32* pActualIndices, sal_Int32* pLowerBounds, sal_Int32* pUpperBounds )
{
sal_Int32 nSeqLevel = nMaxDimIndex - nActualDim + 1;
@@ -880,7 +879,7 @@ static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
xArray->realloc( aRetVal, nSeqSize );
sal_Int32& ri = pActualIndices[nActualDim];
-
+
for( ri = nLower,i = 0 ; ri <= nUpper ; ri++,i++ )
{
Any aElementVal;
@@ -903,7 +902,7 @@ static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
}
catch( IllegalArgumentException& e1 )
{
- StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
+ StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
implGetExceptionMsg( e1, aIllegalArgumentExceptionName ) );
}
catch (IndexOutOfBoundsException&)
@@ -1068,7 +1067,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
pUpperBounds[j] = uBound;
}
- aRetVal = implRekMultiDimArrayToSequence( pArray, aElemType,
+ aRetVal = implRekMultiDimArrayToSequence( pArray, aElemType,
nDims - 1, 0, pActualIndices, pLowerBounds, pUpperBounds );
delete[] pUpperBounds;
@@ -2167,7 +2166,7 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t )
getMethod( aUName, MethodConcept::ALL - MethodConcept::DANGEROUS );
// SbUnoMethode anlegen und reinbraten
- SbxVariableRef xMethRef = new SbUnoMethod( rxMethod->getName(),
+ SbxVariableRef xMethRef = new SbUnoMethod( rxMethod->getName(),
unoToSbxType( rxMethod->getReturnType() ), rxMethod, false );
QuickInsert( (SbxVariable*)xMethRef );
pRes = xMethRef;
@@ -2444,7 +2443,7 @@ SbxVariable* findUnoClass( const String& rName )
SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
{
(void)t;
-
+
SbxVariable* pRes = SbxObject::Find( rName, SbxCLASS_VARIABLE );
// Wenn nichts gefunden wird, ist das Sub-Modul noch nicht bekannt
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 7be16a3..2d1701d 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -51,14 +51,12 @@
#include "appimp.hxx"
#include "dlgcont.hxx"
-#include "bf_basic/basmgr.hxx"
-
#include "scriptcont.hxx"
#define ITEMID_SEARCH SID_SEARCH_ITEM
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
@@ -170,10 +168,10 @@ BasicManager* SfxApplication::GetBasicManager()
/*N*/ if ( 1 == ++pAppData_Impl->nBasicCallLevel )
/*N*/ {
/*N*/ DBG_TRACE( "SfxShellObject: BASIC-on-demand" );
-/*N*/
+/*N*/
/*N*/ // das kann l"anger dauern, da Progress nicht geht, wenigstens Sanduhr
/*N*/ //(mba)/task SfxWaitCursor aWait;
-/*N*/
+/*N*/
/*N*/ // zuerst das BASIC laden
/*N*/ GetBasic();
/*
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
index edb8304..0a1c792 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -25,8 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "bf_basic/basmgr.hxx"
-
#ifdef WIN
#define _TL_LANG_SPECIAL
#endif
@@ -67,20 +65,20 @@ SV_DECL_PTRARR(SfxInitLinkList, Link*, 2, 2)//STRIP008 ;
/*?*/ {
/*?*/ if ( bDowning )
/*?*/ return;
-/*?*/
+/*?*/
/*?*/ StarBASIC::Stop();
-/*?*/
+/*?*/
/*?*/ bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit
-/*?*/
+/*?*/
/*?*/ bDowning = FALSE;
/*?*/ DBG_ASSERT( !SfxObjectShell::GetFirst(),
/*?*/ "existing SfxObjectShell after Execute" );
/*?*/ bDowning = TRUE;
-/*?*/
+/*?*/
/*?*/ // call derived application-exit
/*?*/ bInExit = TRUE;
/*?*/ Exit();
-/*?*/
+/*?*/
/*?*/ // Controller u."a. freigeben
/*?*/ // dabei sollten auch restliche Komponenten ( Beamer! ) verschwinden
/*?*/ SfxObjectFactory::ClearAll_Impl();
@@ -89,21 +87,21 @@ SV_DECL_PTRARR(SfxInitLinkList, Link*, 2, 2)//STRIP008 ;
/*?*/ pImp->pBasicLibContainer->release();
/*?*/ if( pImp->pDialogLibContainer )
/*?*/ pImp->pDialogLibContainer->release();
-/*?*/
+/*?*/
/*?*/ bInExit = FALSE;
-/*?*/
+/*?*/
/*?*/ // ab hier d"urfen keine SvObjects mehr existieren
/*?*/ DELETEX(pAppData_Impl->pMatcher);
/*?*/ DELETEX(pAppData_Impl->pSfxFrameObjectFactoryPtr);
-/*?*/
+/*?*/
/*?*/ DELETEX(pAppData_Impl->pEventConfig);
/*?*/ DELETEX(pAppData_Impl->pMiscConfig);
/*?*/ SfxMacroConfig::Release_Impl();
/*?*/ DELETEX(pAppData_Impl->pInitLinkList);
-/*?*/
+/*?*/
/*?*/ DELETEX(pImp->pEventHdl);
/*?*/ DELETEX(pImp->pObjShells);
-/*?*/
+/*?*/
/*?*/ NoChaos::ReleaseItemPool();
/*?*/ pAppData_Impl->pPool = NULL;
/*?*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index 3814ff3..fc34120 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -35,7 +35,6 @@
#include <bf_svtools/rectitem.hxx>
#include <tools/urlobj.hxx>
#include <bf_basic/sbmeth.hxx>
-#include <bf_basic/basmgr.hxx>
#include <bf_basic/sbxcore.hxx>
#include <bf_basic/sbx.hxx>
#include <bf_svtools/stritem.hxx>
@@ -523,7 +522,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
/*N*/ if (bOK)
/*N*/ rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ }
/*N*/ }
/*N*/ }
@@ -534,7 +533,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
/*N*/ {
/*N*/ // find number of properties to avoid permanent reallocations in the sequence
/*N*/ sal_Int32 nProps=0;
-/*N*/
+/*N*/
/*N*/ // special treatment for slots that are *not* meant to be recorded as slots (except SaveAs/To)
/*N*/ if ( nSlotId == SID_OPENDOC || nSlotId == SID_SAVEASDOC )
/*N*/ {
@@ -631,19 +630,19 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
/*N*/ nAdditional++;
/*N*/ if ( rSet.GetItemState( SID_DOCINFO_TITLE ) == SFX_ITEM_SET )
/*N*/ nAdditional++;
-/*N*/
+/*N*/
/*N*/ // consider additional arguments
/*N*/ nProps += nAdditional;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( !nProps )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ // convert every item into a property
/*N*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> aSequ( nProps );
/*N*/ ::com::sun::star::beans::PropertyValue *pValue = aSequ.getArray();
/*N*/ nProps = 0;
-/*N*/
+/*N*/
/*N*/ if ( nSlotId == SID_OPENDOC || nSlotId == SID_SAVEASDOC )
/*N*/ {
/*N*/ const SfxPoolItem *pItem=0;
@@ -853,7 +852,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
/*N*/ pValue[nProps].Name = sJumpMark;
/*N*/ pValue[nProps++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( rSet.GetItemState( SID_CHARSET, sal_False, &pItem ) == SFX_ITEM_SET )
/*N*/ {
/*N*/ pValue[nProps].Name = sCharacterSet;
@@ -880,7 +879,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
/*N*/ pValue[nProps++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rArgs = aSequ;
/*N*/ }
@@ -888,65 +887,65 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
extern "C" {
-/*N*/
+/*N*/
/*N*/ sal_Bool SAL_CALL sfx2_component_writeInfo( void* /*pServiceManager*/ ,
/*N*/ void* pRegistryKey )
/*N*/ {
/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ;
-/*N*/
+/*N*/
/*N*/ // Eigentliche Implementierung und ihre Services registrieren
/*N*/ ::rtl::OUString aImpl;
/*N*/ ::rtl::OUString aTempStr;
/*N*/ ::rtl::OUString aKeyStr;
/*N*/ Reference< XRegistryKey > xNewKey;
/*N*/ Reference< XRegistryKey > xLoaderKey;
-/*N*/
+/*N*/
/*N*/ // global app event broadcaster
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
/*N*/ aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName();
-/*N*/
+/*N*/
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" )) );
-/*N*/
+/*N*/
/*N*/ // standalone document info
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
/*N*/ aImpl += SfxStandaloneDocumentInfoObject::impl_getStaticImplementationName();
-/*N*/
+/*N*/
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.StandaloneDocumentInfo" )) );
-/*N*/
+/*N*/
/*N*/ // script library container service
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
/*N*/ aImpl += SfxScriptLibraryContainer::impl_getStaticImplementationName();
-/*N*/
+/*N*/
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" )) );
-/*N*/
+/*N*/
/*N*/ // dialog library container service
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
/*N*/ aImpl += SfxDialogLibraryContainer::impl_getStaticImplementationName();
-/*N*/
+/*N*/
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DialogLibraryContainer" )) );
-/*N*/
+/*N*/
/*N*/ return sal_True;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
/*N*/ void* pServiceManager ,
/*N*/ void* /*pRegistryKey*/ )
/*N*/ {
/*N*/ // Set default return value for this operation - if it failed.
/*N*/ void* pReturn = NULL ;
-/*N*/
+/*N*/
/*N*/ if (
/*N*/ ( pImplementationName != NULL ) &&
/*N*/ ( pServiceManager != NULL )
@@ -986,16 +985,16 @@ extern "C" {
/*N*/ {
/*N*/ rProperties = rProps;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
/*N*/ FilterOptionsContinuation::getFilterOptions()
/*N*/ throw (::com::sun::star::uno::RuntimeException)
/*N*/ {
/*N*/ return rProperties;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ //=========================================================================
-/*N*/
+/*N*/
/*N*/ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel,
/*N*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties )
/*N*/ {
@@ -1005,23 +1004,23 @@ extern "C" {
/*N*/ temp2,
/*N*/ rModel,
/*N*/ rProperties );
-/*N*/
+/*N*/
/*N*/ m_aRequest <<= aOptionsRequest;
-/*N*/
+/*N*/
/*N*/ m_pAbort = new ContinuationAbort;
/*N*/ m_pOptions = new FilterOptionsContinuation;
-/*N*/
+/*N*/
/*N*/ m_lContinuations.realloc( 2 );
/*N*/ m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort );
/*N*/ m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ ::com::sun::star::uno::Any SAL_CALL RequestFilterOptions::getRequest()
/*N*/ throw( ::com::sun::star::uno::RuntimeException )
/*N*/ {
/*N*/ return m_aRequest;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
/*N*/ SAL_CALL RequestFilterOptions::getContinuations()
/*N*/ throw( ::com::sun::star::uno::RuntimeException )
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 0ad8605..f77a1d7 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-
#include <rtl/uri.hxx>
@@ -38,14 +36,13 @@
#include <bf_svtools/pathoptions.hxx>
#include <bf_svtools/sfxecode.hxx>
#include <bf_svtools/ehdl.hxx>
-#include "bf_basic/basmgr.hxx"
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/DeploymentException.hpp>
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
namespace binfilter {
using namespace ::com::sun::star::container;
@@ -72,7 +69,7 @@ namespace SfxContainer_Impl
// Methods XElementAccess
/*?*/ Type NameContainer_Impl::getElementType()
/*?*/ throw(RuntimeException)
-/*?*/ {
+/*?*/ {
return mType;
/*?*/ }
@@ -119,7 +116,7 @@ namespace SfxContainer_Impl
/*N*/ Type aAnyType = aElement.getValueType();
/*N*/ if( mType != aAnyType )
/*?*/ throw IllegalArgumentException();
-/*N*/
+/*N*/
/*N*/ NameContainerNameMap::iterator aIt = mHashMap.find( aName );
/*N*/ if( aIt == mHashMap.end() )
/*N*/ {
@@ -128,15 +125,15 @@ namespace SfxContainer_Impl
/*N*/ sal_Int32 iHashResult = (*aIt).second;
/*N*/ Any aOldElement = mValues.getConstArray()[ iHashResult ];
/*N*/ mValues.getArray()[ iHashResult ] = aElement;
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ // Fire event
/*N*/ ContainerEvent aEvent;
/*N*/ aEvent.Source = mpxEventSource;
/*N*/ aEvent.Accessor <<= aName;
/*N*/ aEvent.Element = aElement;
/*N*/ aEvent.ReplacedElement = aOldElement;
-/*N*/
+/*N*/
/*N*/ OInterfaceIteratorHelper aIterator( maListenerContainer );
/*N*/ while( aIterator.hasMoreElements() )
/*N*/ {
@@ -161,29 +158,29 @@ namespace SfxContainer_Impl
/*N*/ Type aAnyType = aElement.getValueType();
/*N*/ if( mType != aAnyType )
/*?*/ throw IllegalArgumentException();
-/*N*/
+/*N*/
/*N*/ NameContainerNameMap::iterator aIt = mHashMap.find( aName );
/*N*/ if( aIt != mHashMap.end() )
/*N*/ {
/*?*/ throw ElementExistException();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ sal_Int32 nCount = mNames.getLength();
/*N*/ mNames.realloc( nCount + 1 );
/*N*/ mValues.realloc( nCount + 1 );
/*N*/ mNames.getArray()[ nCount ] = aName;
/*N*/ mValues.getArray()[ nCount ] = aElement;
-/*N*/
+/*N*/
/*N*/ mHashMap[ aName ] = nCount;
/*N*/ mnElementCount++;
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ // Fire event
/*N*/ ContainerEvent aEvent;
/*N*/ aEvent.Source = mpxEventSource;
/*N*/ aEvent.Accessor <<= aName;
/*N*/ aEvent.Element = aElement;
-/*N*/
+/*N*/
/*N*/ OInterfaceIteratorHelper aIterator( maListenerContainer );
/*N*/ while( aIterator.hasMoreElements() )
/*N*/ {
@@ -202,7 +199,7 @@ namespace SfxContainer_Impl
/*?*/ void NameContainer_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
@@ -245,7 +242,7 @@ namespace SfxContainer_Impl
/*N*/ {
/*N*/ OSL_ENSURE( 0, "### couln't get ProcessServiceFactory\n" );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ mxSFI = Reference< XSimpleFileAccess >( mxMSF->createInstance
/*N*/ ( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
/*N*/ if( !mxSFI.is() )
@@ -259,8 +256,6 @@ namespace SfxContainer_Impl
/*N*/ SfxLibraryContainer_Impl::~SfxLibraryContainer_Impl()
/*N*/ {
-/*N*/ if( mbOwnBasMgr )
-/*?*/ BasicManager::LegacyDeleteBasicManager( mpBasMgr );
/*N*/ }
@@ -294,26 +289,21 @@ namespace SfxContainer_Impl
/*N*/ const OUString& aLibrariesDir,
/*N*/ SotStorageRef xStorage )
/*N*/ {
-/*N*/ maInitialisationParam = aInitialisationParam;
+/*N*/ maInitialisationParam = aInitialisationParam;
/*N*/ maInfoFileName = aInfoFileName;
/*N*/ maOldInfoFileName = aOldInfoFileName;
/*N*/ maLibElementFileExtension = aLibElementFileExtension;
/*N*/ maLibrariesDir = aLibrariesDir;
-/*N*/
+/*N*/
/*N*/ meInitMode = DEFAULT;
/*N*/ INetURLObject aInitUrlInetObj( maInitialisationParam );
/*N*/ OUString aInitFileName = aInitUrlInetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ if( aInitFileName.getLength() )
/*N*/ {
-/*N*/ // We need a BasicManager to avoid problems
-/*?*/ StarBASIC* pBas = new StarBASIC();
-/*?*/ mpBasMgr = new BasicManager( pBas );
-/*?*/ mbOwnBasMgr = sal_True;
-/*?*/
/*?*/ OUString aExtension = aInitUrlInetObj.getExtension();
/*?*/ if( aExtension.compareToAscii( "xlc" ) == COMPARE_EQUAL )
/*?*/ {
-/*?*/ meInitMode = CONTAINER_INIT_FILE;
+/*?*/ meInitMode = CONTAINER_INIT_FILE;
/*?*/ INetURLObject aLibPathInetObj( aInitUrlInetObj );
/*?*/ aLibPathInetObj.removeSegment();
/*?*/ maLibraryPath = aLibPathInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -348,7 +338,7 @@ namespace SfxContainer_Impl
/*N*/ // Default pathes
/*N*/ maLibraryPath = SvtPathOptions().GetBasicPath();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Reference< XParser > xParser( mxMSF->createInstance(
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
/*N*/ if( !xParser.is() )
@@ -356,15 +346,15 @@ namespace SfxContainer_Impl
/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
/*N*/ return sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Reference< XInputStream > xInput;
-/*N*/
+/*N*/
/*N*/ mxStorage = xStorage;
/*N*/ sal_Bool bStorage = mxStorage.Is();
/*N*/ SotStorageRef xLibrariesStor;
/*N*/ SotStorageStreamRef xStream;
/*N*/ String aFileName;
-/*N*/
+/*N*/
/*N*/ int nPassCount = 1;
/*N*/ if( !bStorage && meInitMode == DEFAULT )
/*N*/ nPassCount = 2;
@@ -374,23 +364,23 @@ namespace SfxContainer_Impl
/*N*/ {
/*N*/ OSL_ENSURE( meInitMode == DEFAULT || meInitMode == OFFICE_DOCUMENT,
/*N*/ "### Wrong InitMode for document\n" );
-/*N*/
+/*N*/
/*N*/ xLibrariesStor = xStorage->OpenSotStorage( maLibrariesDir, STREAM_READ | STREAM_NOCREATE );
/*N*/ if( xLibrariesStor.Is() && xLibrariesStor->GetError() == ERRCODE_NONE )
/*N*/ {
/*?*/ aFileName = maInfoFileName;
/*?*/ aFileName += String( RTL_CONSTASCII_USTRINGPARAM("-lc.xml") );
-/*?*/
+/*?*/
/*?*/ xStream = xLibrariesStor->OpenSotStream( aFileName, STREAM_READ | STREAM_NOCREATE );
/*?*/ if( xStream->GetError() != ERRCODE_NONE )
/*?*/ {
/*?*/ mbOldInfoFormat = true;
-/*?*/
+/*?*/
/*?*/ // Check old version
/*?*/ aFileName = maOldInfoFileName;
/*?*/ aFileName += String( RTL_CONSTASCII_USTRINGPARAM(".xml") );
/*?*/ xStream = xLibrariesStor->OpenSotStream( aFileName, STREAM_READ );
-/*?*/
+/*?*/
/*?*/ if( xStream->GetError() != ERRCODE_NONE )
/*?*/ {
/*?*/ // Check for EA2 document version with wrong extensions
@@ -399,7 +389,7 @@ namespace SfxContainer_Impl
/*?*/ xStream = xLibrariesStor->OpenSotStream( aFileName, STREAM_READ );
/*?*/ }
/*?*/ }
-/*N*/
+/*N*/
/*N*/ if( xStream->GetError() == ERRCODE_NONE )
/*N*/ {
/*N*/ xInput = new ::utl::OInputStreamWrapper( *xStream );
@@ -423,7 +413,7 @@ namespace SfxContainer_Impl
/*N*/ pLibInfoInetObj->setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
/*N*/ aFileName = pLibInfoInetObj->GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ try
/*N*/ {
/*N*/ xInput = mxSFI->openFileRead( aFileName );
@@ -438,7 +428,7 @@ namespace SfxContainer_Impl
//*N*/ ErrorHandler::HandleError( nErrorCode );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Old variant?
/*N*/ if( !xInput.is() && nPass == 0 )
/*?*/ {
@@ -446,7 +436,7 @@ namespace SfxContainer_Impl
/*?*/ aLibInfoInetObj.insertName( maOldInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
/*?*/ aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xli") ) );
/*?*/ aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
-/*?*/
+/*?*/
/*?*/ try
/*?*/ {
/*?*/ xInput = mxSFI->openFileRead( aFileName );
@@ -460,19 +450,19 @@ namespace SfxContainer_Impl
//*?*/ ErrorHandler::HandleError( nErrorCode );
/*?*/ }
/*?*/ }
-/*N*/
+/*N*/
/*N*/ delete pLibInfoInetObj;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( xInput.is() )
/*N*/ {
/*N*/ InputSource source;
/*N*/ source.aInputStream = xInput;
/*N*/ source.sSystemId = aFileName;
-/*N*/
+/*N*/
/*N*/ // start parsing
/*N*/ ::xmlscript::LibDescriptorArray* pLibArray = new ::xmlscript::LibDescriptorArray();
-/*N*/
+/*N*/
/*N*/ try
/*N*/ {
/*N*/ xParser->setDocumentHandler( ::xmlscript::importLibraryContainer( pLibArray ) );
@@ -488,12 +478,12 @@ namespace SfxContainer_Impl
/*N*/ OSL_ENSURE( 0, OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
/*N*/ return sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ sal_Int32 nLibCount = pLibArray->mnLibCount;
/*N*/ for( sal_Int32 i = 0 ; i < nLibCount ; i++ )
/*N*/ {
/*N*/ ::xmlscript::LibDescriptor& rLib = pLibArray->mpLibs[i];
-/*N*/
+/*N*/
/*N*/ // Check storage URL
/*N*/ OUString aStorageURL = rLib.aStorageURL;
/*N*/ if( !bStorage && !aStorageURL.getLength() && nPass == 0 )
@@ -504,7 +494,7 @@ namespace SfxContainer_Impl
/*N*/ else
/*N*/ aLibraryPath = String(maLibraryPath).GetToken(1);
/*N*/ INetURLObject aInetObj( aLibraryPath );
-/*N*/
+/*N*/
/*N*/ aInetObj.insertName( rLib.aName, sal_True, INetURLObject::LAST_SEGMENT,
/*N*/ sal_True, INetURLObject::ENCODE_ALL );
/*N*/ OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -527,14 +517,14 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ OUString aLibName = rLib.aName;
-/*N*/
+/*N*/
/*N*/ // If the same library name is used by the shared and the
/*N*/ // user lib container index files the user file wins
/*N*/ if( nPass == 1 && hasByName( aLibName ) )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ SfxLibrary_Impl* pImplLib;
/*N*/ if( rLib.bLink )
/*N*/ {
@@ -549,10 +539,10 @@ namespace SfxContainer_Impl
/*N*/ pImplLib->mbLoaded = sal_False;
/*N*/ pImplLib->mbReadOnly = rLib.bReadOnly;
/*N*/ if( !bStorage )
-/*N*/ checkStorageURL( rLib.aStorageURL, pImplLib->maLibInfoFileURL,
+/*N*/ checkStorageURL( rLib.aStorageURL, pImplLib->maLibInfoFileURL,
/*N*/ pImplLib->maStorageURL, pImplLib->maUnexpandedStorageURL );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Read library info files
/*N*/ if( !mbOldInfoFormat )
/*N*/ {
@@ -566,7 +556,7 @@ namespace SfxContainer_Impl
/*?*/ xLibraryStor = NULL;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Link is already initialised in createLibraryLink()
/*N*/ if( !pImplLib->mbInitialised && (!bStorage || xLibraryStor.Is()) )
/*N*/ {
@@ -587,20 +577,20 @@ namespace SfxContainer_Impl
SotStorageRef xLclStorage;
implStoreLibraryIndexFile( pImplLib, rLib, xLclStorage );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ implImportLibDescriptor( pImplLib, rLib );
-/*N*/
+/*N*/
/*N*/ if( nPass == 1 )
/*N*/ {
/*?*/ pImplLib->mbSharedIndexFile = sal_True;
/*?*/ pImplLib->mbReadOnly = sal_True;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Keep flag for documents to force writing the new index files
/*N*/ if( !bStorage )
/*N*/ mbOldInfoFormat = sal_False;
-/*N*/
+/*N*/
/*N*/ delete pLibArray;
/*N*/ }
/*N*/ // Only in the first pass it's an error when no index file is found
@@ -609,13 +599,13 @@ namespace SfxContainer_Impl
/*N*/ return sal_False;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // #56666, upgrade installation 6.0 -> 6.1
/*N*/ if( meInitMode == DEFAULT )
/*N*/ {
/*N*/ INetURLObject aUserBasicInetObj( String(maLibraryPath).GetToken(1) );
/*N*/ OUString aStandardStr( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-/*N*/
+/*N*/
/*N*/ static char str60FolderName_1[] = "__basic_60";
/*N*/ static char str60FolderName_2[] = "__basic_60_2";
/*N*/ INetURLObject aUserBasic60InetObj_1( aUserBasicInetObj );
@@ -623,7 +613,7 @@ namespace SfxContainer_Impl
/*N*/ INetURLObject aUserBasic60InetObj_2 = aUserBasic60InetObj_1;
/*N*/ aUserBasic60InetObj_1.Append( str60FolderName_1 );
/*N*/ aUserBasic60InetObj_2.Append( str60FolderName_2 );
-/*N*/
+/*N*/
/*N*/ INetURLObject aUserBasic60InetObj = aUserBasic60InetObj_1;
/*N*/ String aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ bool bSecondTime = false;
@@ -631,29 +621,29 @@ namespace SfxContainer_Impl
/*N*/ {
/*?*/ // #110101 Check if Standard folder exists and is complete
/*?*/ INetURLObject aUserBasicStandardInetObj( aUserBasicInetObj );
-/*?*/ aUserBasicStandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
+/*?*/ aUserBasicStandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
/*?*/ sal_True, INetURLObject::ENCODE_ALL );
/*?*/ INetURLObject aUserBasic60StandardInetObj( aUserBasic60InetObj );
-/*?*/ aUserBasic60StandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
+/*?*/ aUserBasic60StandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
/*?*/ sal_True, INetURLObject::ENCODE_ALL );
/*?*/ OUString aStandardFolder60 = aUserBasic60StandardInetObj.GetMainURL( INetURLObject::NO_DECODE );
/*?*/ if( mxSFI->isFolder( aStandardFolder60 ) )
/*?*/ {
/*?*/ OUString aXlbExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlb") ) );
/*?*/ OUString aCheckFileName;
-/*?*/
+/*?*/
/*?*/ // Check if script.xlb exists
/*?*/ aCheckFileName = OUString( RTL_CONSTASCII_USTRINGPARAM("script") );
/*?*/ checkAndCopyFileImpl( aUserBasicStandardInetObj,
/*?*/ aUserBasic60StandardInetObj,
/*?*/ aCheckFileName, aXlbExtension, mxSFI );
-/*?*/
+/*?*/
/*?*/ // Check if dialog.xlb exists
/*?*/ aCheckFileName = OUString( RTL_CONSTASCII_USTRINGPARAM("dialog") );
/*?*/ checkAndCopyFileImpl( aUserBasicStandardInetObj,
/*?*/ aUserBasic60StandardInetObj,
/*?*/ aCheckFileName, aXlbExtension, mxSFI );
-/*?*/
+/*?*/
/*?*/ // Check if module1.xba exists
/*?*/ OUString aXbaExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xba") ) );
/*?*/ aCheckFileName = OUString( RTL_CONSTASCII_USTRINGPARAM("Module1") );
@@ -666,7 +656,7 @@ namespace SfxContainer_Impl
/*?*/ String aStandardFolder = aUserBasicStandardInetObj.GetMainURL( INetURLObject::NO_DECODE );
/*?*/ mxSFI->copy( aStandardFolder, aStandardFolder60 );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ String aCopyToFolder60 = aUserBasic60InetObj_2.GetMainURL( INetURLObject::NO_DECODE );
/*?*/ mxSFI->copy( aFolder60, aCopyToFolder60 );
/*?*/ }
@@ -677,10 +667,10 @@ namespace SfxContainer_Impl
/*?*/ aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
/*N*/ if( mxSFI->isFolder( aFolder60 ) )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {
/*?*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return sal_True;
/*N*/ }
@@ -691,7 +681,7 @@ namespace SfxContainer_Impl
/*N*/ OUString aExpandedSourceURL = expand_url( aSourceURL );
/*N*/ if( aExpandedSourceURL != aSourceURL )
/*?*/ aUnexpandedStorageURL = aSourceURL;
-/*N*/
+/*N*/
/*N*/ INetURLObject aInetObj( aExpandedSourceURL );
/*N*/ OUString aExtension = aInetObj.getExtension();
/*N*/ if( aExtension.compareToAscii( "xlb" ) == COMPARE_EQUAL )
@@ -749,11 +739,11 @@ namespace SfxContainer_Impl
/*N*/ {
/*?*/ INetURLObject aInetObj( String(maLibraryPath).GetToken(1) );
/*?*/ aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
-/*?*/ checkStorageURL( aInetObj.GetMainURL( INetURLObject::NO_DECODE ), pLib->maLibInfoFileURL,
+/*?*/ checkStorageURL( aInetObj.GetMainURL( INetURLObject::NO_DECODE ), pLib->maLibInfoFileURL,
/*?*/ pLib->maStorageURL, pLib->maUnexpandedStorageURL );
/*?*/ aLibDirPath = pLib->maStorageURL;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( !mxSFI->isFolder( aLibDirPath ) )
/*N*/ {
/*N*/ try
@@ -763,7 +753,7 @@ namespace SfxContainer_Impl
/*N*/ catch( Exception& )
/*N*/ {}
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return aLibDirPath;
/*N*/ }
@@ -953,7 +943,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
/*N*/ return sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ sal_Bool bLink = sal_False;
/*N*/ sal_Bool bStorage = sal_False;
/*N*/ if( pLib )
@@ -961,7 +951,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ bLink = pLib->mbLink;
/*N*/ bStorage = xStorage.Is() && !bLink;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Read info file
/*N*/ Reference< XInputStream > xInput;
/*N*/ SotStorageStreamRef xInfoStream;
@@ -970,7 +960,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ {
/*?*/ aLibInfoPath = maInfoFileName;
/*?*/ aLibInfoPath += String( RTL_CONSTASCII_USTRINGPARAM("-lb.xml") );
-/*?*/
+/*?*/
/*?*/ xInfoStream = xStorage->OpenSotStream( aLibInfoPath, STREAM_READ );
/*?*/ if( xInfoStream->GetError() == ERRCODE_NONE )
/*?*/ {
@@ -981,7 +971,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ {
/*N*/ // Create Input stream
/*N*/ String aLclLibInfoPath;
-/*N*/
+/*N*/
/*N*/ if( pLib )
/*N*/ {
/*N*/ createAppLibraryFolder( pLib, rLib.aName );
@@ -989,7 +979,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ else
/*?*/ aLclLibInfoPath = aIndexFileName;
-/*N*/
+/*N*/
/*N*/ try
/*N*/ {
/*N*/ xInput = mxSFI->openFileRead( aLclLibInfoPath );
@@ -1004,12 +994,12 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ // OSL_ENSURE( 0, "### couln't open input stream\n" );
/*N*/ return sal_False;
/*N*/ }
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ InputSource source;
/*N*/ source.aInputStream = xInput;
/*N*/ source.sSystemId = aLibInfoPath;
-/*N*/
+/*N*/
/*N*/ // start parsing
/*N*/ try {
/*N*/ xParser->setDocumentHandler( ::xmlscript::importLibrary( rLib ) );
@@ -1020,19 +1010,19 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OSL_ENSURE( 0, "Parsing error\n" );
/*N*/ return sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( !pLib )
/*N*/ {
/*?*/ Reference< XNameContainer > xLib = createLibrary( rLib.aName );
/*?*/ pLib = static_cast< SfxLibrary_Impl* >( xLib.get() );
/*?*/ pLib->mbLoaded = sal_False;
/*?*/ rLib.aStorageURL = aIndexFileName;
-/*?*/ checkStorageURL( rLib.aStorageURL, pLib->maLibInfoFileURL, pLib->maStorageURL,
+/*?*/ checkStorageURL( rLib.aStorageURL, pLib->maLibInfoFileURL, pLib->maStorageURL,
/*?*/ pLib->maUnexpandedStorageURL );
-/*?*/
+/*?*/
/*?*/ implImportLibDescriptor( pLib, rLib );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return sal_True;
/*N*/ }
@@ -1051,7 +1041,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ pLib->mbPasswordProtected = rLib.bPasswordProtected;
/*N*/ pLib->mbReadOnly = rLib.bReadOnly;
/*N*/ pLib->mbModified = sal_False;
-/*N*/
+/*N*/
/*N*/ pLib->mbInitialised = sal_True;
/*N*/ }
/*N*/ }
@@ -1075,7 +1065,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ Sequence< OUString > aNames = maNameContainer.getElementNames();
/*N*/ const OUString* pNames = aNames.getConstArray();
/*N*/ sal_Int32 i, nNameCount = aNames.getLength();
-/*N*/
+/*N*/
/*N*/ // Don't count libs from shared index file
/*N*/ sal_Int32 nLibsToSave = nNameCount;
/*N*/ for( i = 0 ; i < nNameCount ; i++ )
@@ -1086,9 +1076,9 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ if( !nLibsToSave )
/*N*/ return;
-/*N*/
+/*N*/
/*N*/ ::xmlscript::LibDescriptorArray* pLibArray = new ::xmlscript::LibDescriptorArray( nLibsToSave );
-/*N*/
+/*N*/
/*N*/ // Write to storage?
/*N*/ sal_Bool bStorage = xStorage.Is();
/*N*/ SotStorageRef xLibrariesStor;
@@ -1105,19 +1095,19 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ if( !xNameAccess->hasElements() )
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*?*/ xLibrariesStor = xStorage->OpenUCBStorage( maLibrariesDir, STREAM_WRITE );
/*?*/ if( !xLibrariesStor.Is() || xLibrariesStor->GetError() != ERRCODE_NONE )
/*?*/ {
/*?*/ OSL_ENSURE( 0, "### couln't create libraries sub storage\n" );
/*?*/ return;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ xSourceLibrariesStor = mxStorage->OpenSotStorage( maLibrariesDir, STREAM_READ | STREAM_NOCREATE );
/*?*/ if( !xSourceLibrariesStor.Is() || xSourceLibrariesStor->GetError() != ERRCODE_NONE )
/*?*/ xSourceLibrariesStor = NULL;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ int iArray = 0;
/*N*/ for( i = 0 ; i < nNameCount ; i++ )
/*N*/ {
@@ -1127,14 +1117,14 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ ::xmlscript::LibDescriptor& rLib = pLibArray->mpLibs[iArray];
/*N*/ rLib.aName = pNames[ i ];
/*N*/ iArray++;
-/*N*/
+/*N*/
/*N*/ rLib.bLink = pImplLib->mbLink;
/*N*/ rLib.aStorageURL = ( pImplLib->maUnexpandedStorageURL.getLength() ) ?
/*N*/ pImplLib->maUnexpandedStorageURL : pImplLib->maLibInfoFileURL;
/*N*/ rLib.bReadOnly = pImplLib->mbReadOnly;
/*N*/ rLib.bPasswordProtected = pImplLib->mbPasswordProtected;
/*N*/ rLib.aElementNames = pImplLib->getElementNames();
-/*N*/
+/*N*/
/*N*/ if( pImplLib->mbModified || bComplete )
/*N*/ {
/*N*/ // Can we copy the storage?
@@ -1172,20 +1162,20 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
xLibraryStor->Commit();
}
}
-/*?*/
+/*?*/
/*?*/ mbModified = sal_True;
/*?*/ pImplLib->mbModified = sal_False;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // For container info ReadOnly refers to mbReadOnlyLink
/*N*/ rLib.bReadOnly = pImplLib->mbReadOnlyLink;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( !mbOldInfoFormat && !mbModified )
/*N*/ return;
/*N*/ mbModified = sal_False;
/*N*/ mbOldInfoFormat = sal_False;
-/*N*/
+/*N*/
/*N*/ // Write library container info
/*N*/ // Create sax writer
/*N*/ Reference< XExtendedDocumentHandler > xHandler(
@@ -1196,7 +1186,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OSL_ENSURE( 0, "### couln't create sax-writer component\n" );
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Write info file
/*N*/ Reference< XOutputStream > xOut;
/*N*/ SotStorageStreamRef xInfoStream;
@@ -1204,10 +1194,10 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ {
/*?*/ OUString aStreamName( maInfoFileName );
/*?*/ aStreamName += String( RTL_CONSTASCII_USTRINGPARAM("-lc.xml") );
-/*?*/
+/*?*/
/*?*/ xInfoStream = xLibrariesStor->OpenSotStream( aStreamName,
/*?*/ STREAM_WRITE | STREAM_SHARE_DENYWRITE );
-/*?*/
+/*?*/
/*?*/ if( xInfoStream->GetError() == ERRCODE_NONE )
/*?*/ {
/*?*/ String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
@@ -1215,12 +1205,12 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ Any aAny;
/*?*/ aAny <<= aMime;
/*?*/ xInfoStream->SetProperty( aPropName, aAny );
-/*?*/
+/*?*/
/*?*/ // #87671 Allow encryption
/*?*/ aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") );
/*?*/ aAny <<= sal_True;
/*?*/ xInfoStream->SetProperty( aPropName, aAny );
-/*?*/
+/*?*/
/*?*/ xOut = new ::utl::OOutputStreamWrapper( *xInfoStream );
/*N*/ }
/*N*/ }
@@ -1231,7 +1221,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ aLibInfoInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
/*N*/ aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
/*N*/ String aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
-/*N*/
+/*N*/
/*N*/ try
/*N*/ {
/*N*/ if( mxSFI->exists( aLibInfoPath ) )
@@ -1245,23 +1235,23 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
//*?*/ ULONG nErrorCode = ERRCODE_IO_GENERAL;
//*?*/ ErrorHandler::HandleError( nErrorCode );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ }
/*N*/ if( !xOut.is() )
/*N*/ {
/*N*/ OSL_ENSURE( 0, "### couln't open output stream\n" );
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Reference< XActiveDataSource > xSource( xHandler, UNO_QUERY );
/*N*/ xSource->setOutputStream( xOut );
-/*N*/
+/*N*/
/*N*/ xmlscript::exportLibraryContainer( xHandler, pLibArray );
/*N*/ if( xInfoStream.Is() )
/*?*/ xInfoStream->Commit();
/*N*/ if( xLibrariesStor.Is() )
/*?*/ xLibrariesStor->Commit();
-/*N*/
+/*N*/
/*N*/ delete pLibArray;
/*N*/ }
@@ -1269,7 +1259,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
// Methods XElementAccess
/*?*/ Type SfxLibraryContainer_Impl::getElementType()
/*?*/ throw(RuntimeException)
-/*?*/ {
+/*?*/ {
return maNameContainer.getElementType();
/*?*/ }
@@ -1324,23 +1314,23 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ //if( !ReadOnly )
/*N*/ //{
/*N*/ //}
-/*N*/
+/*N*/
/*N*/ OUString aLibInfoFileURL;
/*N*/ OUString aLibDirURL;
/*N*/ OUString aUnexpandedStorageURL;
/*N*/ checkStorageURL( StorageURL, aLibInfoFileURL, aLibDirURL, aUnexpandedStorageURL );
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ SfxLibrary_Impl* pNewLib = implCreateLibraryLink( aLibInfoFileURL, aLibDirURL, ReadOnly );
/*N*/ pNewLib->maLibElementFileExtension = maLibElementFileExtension;
/*N*/ pNewLib->maUnexpandedStorageURL = aUnexpandedStorageURL;
-/*N*/
+/*N*/
/*N*/ OUString aInitFileName;
/*N*/ SotStorageRef xDummyStor;
/*N*/ ::xmlscript::LibDescriptor aLibDesc;
/*N*/ /*sal_Bool bReadIndexFile =*/ implLoadLibraryIndexFile( pNewLib, aLibDesc, xDummyStor, aInitFileName );
/*N*/ implImportLibDescriptor( pNewLib, aLibDesc );
-/*N*/
+/*N*/
/*N*/ Reference< XNameAccess > xRet = static_cast< XNameAccess* >( pNewLib );
/*N*/ Any aElement;
/*N*/ aElement <<= xRet;
@@ -1351,7 +1341,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
/*N*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLoaded( const OUString& Name )
@@ -1370,7 +1360,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ Reference< XNameAccess > xNameAccess;
/*N*/ aLibAny >>= xNameAccess;
/*N*/ SfxLibrary_Impl* pImplLib = static_cast< SfxLibrary_Impl* >( xNameAccess.get() );
-/*N*/
+/*N*/
/*N*/ sal_Bool bLoaded = pImplLib->mbLoaded;
/*N*/ pImplLib->mbLoaded = sal_True;
/*N*/ if( !bLoaded && xNameAccess->hasElements() )
@@ -1380,10 +1370,10 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ implLoadPasswordLibrary( pImplLib, Name );
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ sal_Bool bLink = pImplLib->mbLink;
/*N*/ sal_Bool bStorage = mxStorage.Is() && !bLink;
-/*N*/
+/*N*/
/*N*/ SotStorageRef xLibrariesStor;
/*N*/ SotStorageRef xLibraryStor;
/*N*/ SotStorageStreamRef xElementStream;
@@ -1400,20 +1390,20 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ return;
/*?*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Sequence< OUString > aNames = pImplLib->getElementNames();
/*N*/ sal_Int32 nNameCount = aNames.getLength();
/*N*/ const OUString* pNames = aNames.getConstArray();
/*N*/ for( sal_Int32 i = 0 ; i < nNameCount ; i++ )
/*N*/ {
/*N*/ OUString aElementName = pNames[ i ];
-/*N*/
+/*N*/
/*N*/ OUString aFile;
/*N*/ if( bStorage )
/*N*/ {
/*?*/ aFile = aElementName;
/*?*/ aFile += String( RTL_CONSTASCII_USTRINGPARAM(".xml") );
-/*?*/
+/*?*/
/*?*/ xElementStream = xLibraryStor->OpenSotStream( aFile, STREAM_READ );
/*?*/ if( xElementStream->GetError() != ERRCODE_NONE )
/*?*/ {
@@ -1423,7 +1413,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ aFile += maLibElementFileExtension;
/*?*/ xElementStream = xLibraryStor->OpenSotStream( aFile, STREAM_READ );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( !xElementStream.Is() || xElementStream->GetError() != ERRCODE_NONE )
/*?*/ {
/*?*/ OSL_ENSURE( 0, "### couln't open library element stream\n" );
@@ -1439,7 +1429,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ aElementInetObj.setExtension( maLibElementFileExtension );
/*N*/ aFile = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Any aAny = importLibraryElement( aFile, xElementStream );
/*N*/ if( pImplLib->hasByName( aElementName ) )
/*N*/ {
@@ -1451,7 +1441,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ pImplLib->maNameContainer.insertByName( aElementName, aAny );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ pImplLib->mbModified = sal_False;
/*N*/ }
/*N*/ }
@@ -1467,7 +1457,9 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLink( const OUString& Name
/*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;
+/*?*/ {
+ OUString aRetStr;
+ return aRetStr;
/*?*/ }
sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& Name )
@@ -1480,36 +1472,39 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& /*Name*/, sal_Bool /*bReadOnly*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& /*Name*/, const OUString& /*NewName*/ )
/*?*/ throw (NoSuchElementException, ElementExistException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// Methods XLibraryContainerPassword
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& /*Name*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ {
+ return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ {
+ return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::verifyLibraryPassword
/*?*/ ( const OUString& /*Name*/, const OUString& /*Password*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
+/*?*/ {
+ return sal_False;
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& /*Name*/,
/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// Methods XContainer
@@ -1560,10 +1555,10 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
/*?*/ }
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( !mxMacroExpander.is() )
/*?*/ return url;
-/*?*/
+/*?*/
/*?*/ // cut protocol
/*?*/ OUString macro( url.copy( sizeof (EXPAND_PROTOCOL ":") -1 ) );
/*?*/ // decode uric class chars
@@ -1678,7 +1673,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
Any aRetAny;
- if ( !mbPasswordProtected || mbPasswordVerified )
+ if ( !mbPasswordProtected || mbPasswordVerified )
aRetAny = maNameContainer.getByName( aName );
return aRetAny;
}
@@ -1699,7 +1694,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
// Methods XNameReplace
/*?*/ void SfxLibrary_Impl::replaceByName( const OUString& /*aName*/, const Any& /*aElement*/ )
/*?*/ throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {
/*?*/ }
@@ -1709,14 +1704,14 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*N*/ {
/*N*/ if( mbReadOnly || (mbLink && mbReadOnlyLink) )
/*N*/ throw RuntimeException();
-/*N*/
+/*N*/
/*N*/ maNameContainer.insertByName( aName, aElement );
/*N*/ mbModified = sal_True;
/*N*/ }
/*?*/ void SfxLibrary_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
+/*?*/ {
/*?*/ }
// XTypeProvider
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 4d49be9..661ca22 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -34,8 +34,6 @@
#include "namecont.hxx"
-#include "bf_basic/basmgr.hxx"
-
#include "scriptcont.hxx"
#include <unotools/streamwrap.hxx>
@@ -46,7 +44,6 @@
#include <bf_svtools/sfxecode.hxx>
#include <bf_svtools/ehdl.hxx>
-#include "bf_basic/basmgr.hxx"
#include <xmlscript/xmlmod_imexp.hxx>
#include <app.hxx>
namespace binfilter {
@@ -75,7 +72,7 @@ using namespace osl;
/*N*/ {
/*N*/ maScriptLanguage = aScriptLanguage;
/*N*/ mpBasMgr = pBasMgr;
-/*N*/ return SfxLibraryContainer_Impl::init(
+/*N*/ return SfxLibraryContainer_Impl::init(
/*N*/ aInitialisationParam,
/*N*/ OUString ( RTL_CONSTASCII_USTRINGPARAM("script") ),
/*N*/ OUString ( RTL_CONSTASCII_USTRINGPARAM("script") ),
@@ -154,7 +151,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ SfxLibrary_Impl* SfxScriptLibraryContainer::implCreateLibraryLink
/*N*/ ( const OUString& aLibInfoFileURL, const OUString& StorageURL, sal_Bool ReadOnly )
/*N*/ {
-/*N*/ SfxLibrary_Impl* pRet =
+/*N*/ SfxLibrary_Impl* pRet =
/*N*/ (SfxLibrary_Impl*) new SfxScriptLibrary
/*N*/ ( mxMSF, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly );
/*N*/ return pRet;
@@ -177,10 +174,10 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*?*/ }
/*?*/ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
-/*?*/ (
+/*?*/ (
/*?*/ Any aElement,
-/*?*/ const OUString& aElementName,
-/*?*/ Reference< XOutputStream > xOutput
+/*?*/ const OUString& aElementName,
+/*?*/ Reference< XOutputStream > xOutput
/*?*/ )
/*?*/ throw(Exception)
/*?*/ {
@@ -209,7 +206,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ ( const OUString& aFile, SotStorageStreamRef xElementStream )
/*N*/ {
/*N*/ Any aRetAny;
-/*N*/
+/*N*/
/*N*/ Reference< XParser > xParser( mxMSF->createInstance(
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
/*N*/ if( !xParser.is() )
@@ -217,12 +214,12 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
/*N*/ return aRetAny;
/*N*/ }
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ // Read from storage?
/*N*/ sal_Bool bStorage = xElementStream.Is();
/*N*/ Reference< XInputStream > xInput;
-/*N*/
+/*N*/
/*N*/ if( bStorage )
/*N*/ {
/*?*/ xInput = new ::utl::OInputStreamWrapper( *xElementStream );
@@ -242,14 +239,14 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ }
/*N*/ if( !xInput.is() )
/*N*/ return aRetAny;
-/*N*/
+/*N*/
/*N*/ InputSource source;
/*N*/ source.aInputStream = xInput;
/*N*/ source.sSystemId = aFile;
-/*N*/
-/*N*/ // start parsing
+/*N*/
+/*N*/ // start parsing
/*N*/ xmlscript::ModuleDescriptor aMod;
-/*N*/
+/*N*/
/*N*/ try
/*N*/ {
/*N*/ xParser->setDocumentHandler( ::xmlscript::importScriptModule( aMod ) );
@@ -261,13 +258,13 @@ void SfxScriptLibraryContainer::setLibraryPassword(
//*N*/ ULONG nErrorCode = ERRCODE_IO_GENERAL;
//*N*/ ErrorHandler::HandleError( nErrorCode );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aRetAny <<= aMod.aCode;
-/*N*/
+/*N*/
/*N*/ // TODO: Check language
/*N*/ // aMod.aLanguage
/*N*/ // aMod.aName ignored
-/*N*/
+/*N*/
/*N*/ return aRetAny;
/*N*/ }
@@ -281,7 +278,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
// Storing with password encryption
// Methods XLibraryContainerPassword
-sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name )
+sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name )
throw (NoSuchElementException, RuntimeException)
{
SfxLibrary_Impl* pImplLib = getImplLib( Name );
@@ -289,7 +286,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O
return bRet;
}
-sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name )
+sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name )
throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
{
SfxLibrary_Impl* pImplLib = getImplLib( Name );
@@ -300,7 +297,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
}
/*?*/ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
-/*?*/ ( const OUString& Name, const OUString& Password )
+/*?*/ ( const OUString& Name, const OUString& Password )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
/*?*/ {
SfxLibrary_Impl* pImplLib = getImplLib( Name );
@@ -322,7 +319,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
if( bSuccess )
{
// The library gets modified by verifiying the password, because other-
- // wise for saving the storage would be copied and that doesn't work
+ // wise for saving the storage would be copied and that doesn't work
// with mtg's storages when the password is verified
pImplLib->mbModified = sal_True;
pImplLib->mbPasswordVerified = sal_True;
@@ -335,8 +332,8 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
return bSuccess;
/*?*/ }
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& /*Name*/,
-/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
+/*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& /*Name*/,
+/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
@@ -345,7 +342,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
// Impl methods
-/*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
+/*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
/*?*/ const ::rtl::OUString& /*aName*/, SotStorageRef /*xStorage*/ )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
@@ -359,8 +356,8 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
//============================================================================
// Methods XInitialization
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::initialize( const Sequence< Any >& aArguments )
-/*?*/ throw (::com::sun::star::uno::Exception,
+/*?*/ void SAL_CALL SfxScriptLibraryContainer::initialize( const Sequence< Any >& aArguments )
+/*?*/ throw (::com::sun::star::uno::Exception,
/*?*/ ::com::sun::star::uno::RuntimeException)
/*?*/ {
sal_Int32 nArgCount = aArguments.getLength();
@@ -372,7 +369,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
{
const Any* pArgs = aArguments.getConstArray();
pArgs[0] >>= aInitialisationParam;
- OSL_ENSURE( aInitialisationParam.getLength(),
+ OSL_ENSURE( aInitialisationParam.getLength(),
"SfxDialogLibraryContainer::initialize() called with empty url\n" );
if( nArgCount > 1 )
@@ -394,7 +391,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ {
/*N*/ static Sequence< OUString > seqServiceNames( 1 );
/*N*/ static sal_Bool bNeedsInit = sal_True;
-/*N*/
+/*N*/
/*N*/ MutexGuard aGuard( Mutex::getGlobalMutex() );
/*N*/ if( bNeedsInit )
/*N*/ {
@@ -409,7 +406,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ {
/*N*/ static OUString aImplName;
/*N*/ static sal_Bool bNeedsInit = sal_True;
-/*N*/
+/*N*/
/*N*/ MutexGuard aGuard( Mutex::getGlobalMutex() );
/*N*/ if( bNeedsInit )
/*N*/ {
@@ -420,10 +417,10 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ }
/*N*/ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::impl_createInstance
-/*N*/ ( const Reference< XMultiServiceFactory >& /*xServiceManager*/ )
+/*N*/ ( const Reference< XMultiServiceFactory >& /*xServiceManager*/ )
/*N*/ throw( Exception )
/*N*/ {
-/*N*/ Reference< XInterface > xRet =
+/*N*/ Reference< XInterface > xRet =
/*N*/ static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxScriptLibraryContainer()) );
/*N*/ return xRet;
/*N*/ }
@@ -444,7 +441,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
// Implementation class SfxScriptLibrary
// Ctor
-/*N*/ SfxScriptLibrary::SfxScriptLibrary( Reference< XMultiServiceFactory > xMSF,
+/*N*/ SfxScriptLibrary::SfxScriptLibrary( Reference< XMultiServiceFactory > xMSF,
/*N*/ Reference< XSimpleFileAccess > xSFI )
/*N*/ : SfxLibrary_Impl( getCppuType( (const OUString *)0 ), xMSF, xSFI )
/*N*/ , mbLoadedSource( sal_False )
@@ -452,10 +449,10 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ {
/*N*/ }
-/*N*/ SfxScriptLibrary::SfxScriptLibrary( Reference< XMultiServiceFactory > xMSF,
+/*N*/ SfxScriptLibrary::SfxScriptLibrary( Reference< XMultiServiceFactory > xMSF,
/*N*/ Reference< XSimpleFileAccess > xSFI,
-/*N*/ const OUString& aLibInfoFileURL,
-/*N*/ const OUString& aStorageURL,
+/*N*/ const OUString& aLibInfoFileURL,
+/*N*/ const OUString& aStorageURL,
/*N*/ sal_Bool ReadOnly )
/*N*/ : SfxLibrary_Impl( getCppuType( (const OUString *)0 ), xMSF, xSFI,
/*N*/ aLibInfoFileURL, aStorageURL, ReadOnly)
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index 8236359..7fe1796 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -75,7 +75,7 @@
#include "objuno.hxx"
#include "request.hxx"
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
#include "bf_basic/basmgr.hxx"
@@ -112,7 +112,7 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ SfxDocumentInfo &rDocInfo = GetDocInfo();
/*N*/ rDocInfo.SetTemplateConfig( HasTemplateConfig() );
-/*N*/
+/*N*/
/*N*/ if ( IsModified() )
/*N*/ {
/*N*/ // Keine Unterschiede mehr zwischen Save, SaveAs
@@ -125,25 +125,25 @@ using namespace ::com::sun::star::uno;
/*N*/ aCreated.SetName( String() );
/*N*/ rDocInfo.SetCreated( aCreated );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SfxStamp aPrinted = rDocInfo.GetPrinted();
/*N*/ if ( aUserName == aPrinted.GetName() )
/*N*/ {
/*N*/ aPrinted.SetName( String() );
/*N*/ rDocInfo.SetPrinted( aPrinted );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aUserName.Erase();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rDocInfo.SetChanged( aUserName );
/*N*/ if ( !HasName() || pImp->bIsSaving )
/*N*/ UpdateTime_Impl( rDocInfo );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( !pImp->bIsSaving )
/*N*/ rDocInfo.SetPasswd( pImp->bPasswd );
-/*N*/
+/*N*/
/*N*/ Broadcast( SfxDocumentInfoHint( &rDocInfo ) );
/*N*/ }
/*N*/ }
@@ -154,11 +154,11 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ //Demnaechst mal gemeinsame Teile zusammenfassen
/*N*/ UpdateDocInfoForSave();
-/*N*/
+/*N*/
/*N*/ #if !defined( SFX_KEY_MAXPREVIEWSIZE ) && defined( TFPLUGCOMM )
/*N*/ #define SFX_KEY_MAXPREVIEWSIZE SFX_KEY_ISFREE
/*N*/ #endif
-/*N*/
+/*N*/
/*N*/ #ifdef MI_doch_wieder_die_alte_preview
/*N*/ String aMaxSize = SFX_INIMANAGER()->Get( SFX_KEY_MAXPREVIEWSIZE );
/*N*/ ULONG nMaxSize = aMaxSize.Len() ? ULONG( aMaxSize ) : 50000;
@@ -167,7 +167,7 @@ using namespace ::com::sun::star::uno;
/*N*/ #endif
/*N*/ if( nMaxSize && !GetDocInfo().IsPasswd() &&
/*N*/ SFX_CREATE_MODE_STANDARD == eCreateMode )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ if( pImp->bIsSaving )
@@ -180,7 +180,7 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ SfxDocumentInfo& rDocInfo = GetDocInfo();
/*N*/ rDocInfo.Save(pNewStg);
-/*N*/
+/*N*/
/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses
/*N*/ // schreiben
/*N*/ if ( pImp->pBasicMgr )
@@ -207,11 +207,11 @@ using namespace ::com::sun::star::uno;
pNewStg );
/*N*/ #endif
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Windows-merken
/*N*/ if ( TRUE ) HACK(aus config)
/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
+/*N*/
/*N*/ // Konfiguration schreiben
/*N*/ if ( GetConfigManager() )
/*N*/ {
@@ -229,13 +229,13 @@ using namespace ::com::sun::star::uno;
/*N*/ // return FALSE;
/*N*/ /*SfxApplication *pSfxApp =*/ SFX_APP();
/*N*/ /*SfxMedium *pActMed =*/ GetMedium();
-/*N*/
+/*N*/
/*N*/ // alte DocInfo laden
/*N*/ SfxDocumentInfo &rDocInfo = GetDocInfo();
-/*N*/
+/*N*/
/*N*/ // DocInfo speichern
/*N*/ rDocInfo.Save( pNewStg );
-/*N*/
+/*N*/
/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses schreiben
/*N*/ if ( pImp->pBasicMgr )
/*N*/ pImp->pBasicMgr->Store(
@@ -264,7 +264,7 @@ using namespace ::com::sun::star::uno;
/*N*/ // Windows-merken
/*N*/ if ( TRUE ) HACK(aus config)
/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
+/*N*/
/*N*/ // Konfiguration schreiben
/*N*/ if (GetConfigManager())
/*N*/ {
@@ -272,7 +272,7 @@ using namespace ::com::sun::star::uno;
/*?*/ GetConfigManager()->StoreConfiguration(pNewStg);
}
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return TRUE;
/*N*/ }
/*N*/ }
@@ -284,24 +284,24 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ // Get old time from documentinfo
/*N*/ Time aOldTime(rInfo.GetTime());
-/*N*/
+/*N*/
/*N*/ // Initialize some local member! Its neccessary for wollow operations!
/*N*/ DateTime aNow ; // Date and time at current moment
/*N*/ Time n24Time (24,0,0,0) ; // Time-value for 24 hours - see follow calculation
/*N*/ ULONG nDays = 0 ; // Count of days between now and last editing
/*N*/ Time nAddTime (0) ; // Value to add on aOldTime
-/*N*/
+/*N*/
/*N*/ // Safe impossible cases!
/*N*/ // User has changed time to the past between last editing and now ... its not possible!!!
/*N*/ DBG_ASSERT( !(aNow.GetDate()<pImp->nTime.GetDate()), "Timestamp of last change is in the past ?!..." );
-/*N*/
+/*N*/
/*N*/ // Do the follow only, if user has NOT changed time to the past.
/*N*/ // Else add a time of 0 to aOldTime ... !!!
/*N*/ if (aNow.GetDate()>=pImp->nTime.GetDate())
/*N*/ {
/*N*/ // Get count of days last editing.
/*N*/ nDays = aNow.GetSecFromDateTime(pImp->nTime.GetDate())/86400 ;
-/*N*/
+/*N*/
/*N*/ if (nDays==0)
/*N*/ {
/*N*/ // If no day between now and last editing - calculate time directly.
@@ -319,10 +319,10 @@ using namespace ::com::sun::star::uno;
/*?*/ nAddTime += n24Time-(const Time&)pImp->nTime ;
/*?*/ nAddTime += aNow ;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aOldTime += nAddTime;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ rInfo.SetTime(aOldTime.GetTime());
/*N*/ pImp->nTime = aNow;
/*N*/ rInfo.IncDocumentNumber();
@@ -352,7 +352,7 @@ using namespace ::com::sun::star::uno;
/*N*/ pImp->pCfgMgr = new SfxConfigManager( *this );
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return pImp->pCfgMgr;
/*N*/ }
@@ -362,10 +362,10 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ // if ( pImp->pCfgMgr == SFX_CFGMANAGER() && pMgr)
/*N*/ // pMgr->Activate(pImp->pCfgMgr);
-/*N*/
+/*N*/
/*N*/ if ( pImp->pCfgMgr && pImp->pCfgMgr != pMgr )
/*?*/ delete pImp->pCfgMgr;
-/*N*/
+/*N*/
/*N*/ pImp->pCfgMgr = pMgr;
/*N*/ }
@@ -435,7 +435,7 @@ using namespace ::com::sun::star::uno;
rufen.
*/
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
//--------------------------------------------------------------------
@@ -450,7 +450,7 @@ using namespace ::com::sun::star::uno;
/*N*/ pImp->pEventConfig->Connect( pImp->pCfgMgr );
/*N*/ pImp->pEventConfig->Initialize();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return pImp->pEventConfig;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index 4dd1142..a560fc3 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -123,7 +123,7 @@ extern AsynchronLink* pPendingCloser;
/*N*/ , _pFactory( 0 )
/*N*/ {
/*N*/ DBG_CTOR(SfxObjectShell, 0);
-/*N*/
+/*N*/
/*N*/ bHasName = sal_False;
/*N*/ SfxShell::SetName( GetTitle() );
/*N*/ nViewNo = 0;
@@ -142,44 +142,42 @@ extern AsynchronLink* pPendingCloser;
/*N*/ SfxObjectShell::~SfxObjectShell()
/*N*/ {
/*N*/ DBG_DTOR(SfxObjectShell, 0);
-/*N*/
+/*N*/
/*N*/ if ( IsEnableSetModified() )
/*N*/ EnableSetModified( sal_False );
-/*N*/
+/*N*/
/*N*/ // Niemals GetInPlaceObject() aufrufen, der Zugriff auf den
/*N*/ // Ableitungszweig SfxInternObject ist wegen eines Compiler Bugs nicht
/*N*/ // erlaubt
/*N*/ SfxObjectShell::Close();
/*N*/ pImp->xModel = NULL;
-/*N*/
+/*N*/
/*N*/ String aPhysName;
/*N*/ if ( pMedium )
/*N*/ aPhysName = pMedium->GetPhysicalName();
-/*N*/
+/*N*/
/*N*/ DELETEX(pImp->pCfgMgr);
/*N*/ DELETEX(pImp->pReloadTimer );
-/*N*/
+/*N*/
/*N*/ SfxApplication *pSfxApp = SFX_APP();
/*N*/ if ( USHRT_MAX != pImp->nVisualDocumentNumber )
/*N*/ pSfxApp->ReleaseIndex(pImp->nVisualDocumentNumber);
-/*N*/
+/*N*/
/*N*/ // Basic-Manager zerst"oren
-/*N*/ if ( pImp->pBasicMgr )
-/*N*/ BasicManager::LegacyDeleteBasicManager( pImp->pBasicMgr );
/*N*/ if( pImp->pBasicLibContainer )
/*N*/ pImp->pBasicLibContainer->release();
/*N*/ if( pImp->pDialogLibContainer )
/*N*/ pImp->pDialogLibContainer->release();
-/*N*/
+/*N*/
/*N*/ delete pImp->pDocInfo;
/*N*/ if ( pImp->xModel.is() )
/*N*/ pImp->xModel = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > ();
-/*N*/
+/*N*/
/*N*/ if ( pMedium && pMedium->IsTemporary() )
/*N*/ HandsOff();
-/*N*/
+/*N*/
/*N*/ DELETEX( pMedium );
-/*N*/
+/*N*/
/*N*/ if ( pImp->aTempName.Len() )
/*N*/ {
/*?*/ if ( aPhysName == pImp->aTempName && !IsHandsOff() )
@@ -188,7 +186,7 @@ extern AsynchronLink* pPendingCloser;
/*?*/ ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp );
/*?*/ ::utl::UCBContentHelper::Kill( aTmp );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ delete pImp;
/*N*/ }
@@ -223,10 +221,10 @@ extern AsynchronLink* pPendingCloser;
/*N*/ // falls noch ein Progress l"auft, nicht schlie\sen
/*N*/ if ( !pImp->bDisposing && GetProgress() )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ pImp->bClosing = sal_True;
/*N*/ Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY );
-/*N*/
+/*N*/
/*N*/ if ( xCloseable.is() )
/*N*/ {
/*N*/ try
@@ -238,7 +236,7 @@ extern AsynchronLink* pPendingCloser;
/*N*/ pImp->bClosing = sal_False;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( pImp->bClosing )
/*N*/ {
/*N*/ // aus Document-Liste austragen
@@ -251,7 +249,7 @@ extern AsynchronLink* pPendingCloser;
/*N*/ pImp->bInList = sal_False;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return sal_True;
/*N*/ }
@@ -266,19 +264,19 @@ extern AsynchronLink* pPendingCloser;
/*N*/ )
/*N*/ {
/*N*/ SfxObjectShellArr_Impl &rDocs = SFX_APP()->GetObjectShells_Impl();
-/*N*/
+/*N*/
/*N*/ // seach for a SfxDocument of the specified type
/*N*/ for ( sal_uInt16 nPos = 0; nPos < rDocs.Count(); ++nPos )
/*N*/ {
/*N*/ SfxObjectShell* pSh = rDocs.GetObject( nPos );
/*N*/ if ( bOnlyVisible && pSh->IsPreview() && pSh->IsReadOnly() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ if ( ( !pType || pSh->IsA(*pType) ) &&
/*N*/ ( !bOnlyVisible ) )
/*N*/ return pSh;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return 0;
/*N*/ }
//--------------------------------------------------------------------
@@ -293,20 +291,20 @@ extern AsynchronLink* pPendingCloser;
/*N*/ )
/*N*/ {
/*N*/ SfxObjectShellArr_Impl &rDocs = SFX_APP()->GetObjectShells_Impl();
-/*N*/
+/*N*/
/*N*/ // refind the specified predecessor
/*N*/ sal_uInt16 nPos;
/*N*/ for ( nPos = 0; nPos < rDocs.Count(); ++nPos )
/*N*/ if ( rDocs.GetObject(nPos) == &rPrev )
/*N*/ break;
-/*N*/
+/*N*/
/*N*/ // search for the next SfxDocument of the specified type
/*N*/ for ( ++nPos; nPos < rDocs.Count(); ++nPos )
/*N*/ {
/*N*/ SfxObjectShell* pSh = rDocs.GetObject( nPos );
/*N*/ if ( bOnlyVisible && pSh->IsPreview() && pSh->IsReadOnly() )
/*N*/ continue;
-/*N*/
+/*N*/
/*N*/ if ( ( !pType || pSh->IsA(*pType) ) &&
/*N*/ ( !bOnlyVisible ) )
/*N*/ return pSh;
@@ -341,24 +339,24 @@ extern AsynchronLink* pPendingCloser;
/*N*/ if( pImp->bInPrepareClose || pImp->bPreparedForClose )
/*N*/ return sal_True;
/*N*/ BoolEnv_Impl aBoolEnv( pImp );
-/*N*/
+/*N*/
/*N*/ // DocModalDialog?
/*N*/ if ( IsInModalMode() )
/*N*/ return sal_False;
-/*N*/
+/*N*/
/*N*/ if( GetInPlaceObject() && GetInPlaceObject()->GetClient())
/*N*/ {
/*?*/ pImp->bPreparedForClose = sal_True;
/*?*/ return sal_True;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // ggf. nachfragen, ob gespeichert werden soll
/*N*/ // nur fuer in sichtbaren Fenstern dargestellte Dokumente fragen
-/*N*/
+/*N*/
/*N*/ SfxApplication *pSfxApp = SFX_APP();
/*N*/ pSfxApp->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, this) );
/*N*/ sal_Bool bClose = sal_False;
-/*N*/
+/*N*/
/*N*/ // ggf. hinweisen, da\s unter Fremdformat gespeichert
/*N*/ if( pMedium )
/*N*/ {
@@ -372,7 +370,7 @@ extern AsynchronLink* pPendingCloser;
/*N*/ // minimierte restoren
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxFrame* pTop = pFrame->GetTopFrame();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ pImp->bPreparedForClose = sal_True;
/*N*/ return sal_True;
/*N*/ }
@@ -441,7 +439,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ {
/*N*/ StarBASIC *pAppBasic = SFX_APP()->GetBasic();
/*N*/ DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicMgr, "Lokaler BasicManager bereits vorhanden");
-/*N*/
+/*N*/
/*N*/ pImp->bBasicInitialized = TRUE;
/*N*/ BasicManager* pBasicManager;
/*N*/ if ( pStor )
@@ -457,7 +455,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ aNewURL = ::binfilter::StaticBaseUrl::SmartRelToAbs( aNewURL );
/*N*/ }
/*N*/ ::binfilter::StaticBaseUrl::SetBaseURL( aNewURL );
-/*N*/
+/*N*/
/*N*/ // load BASIC-manager
//*N*/ SfxErrorContext aErrContext( ERRCTX_SFX_LOADBASIC, GetTitle() );
/*N*/ String aAppBasicDir = SvtPathOptions().GetBasicPath();
@@ -465,10 +463,10 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
*pStor,
::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE),
pAppBasic, &aAppBasicDir );
-/*N*/
+/*N*/
/*N*/ ::binfilter::StaticBaseUrl::SetBaseURL( aOldURL );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // not loaded?
/*N*/ if ( !pStor )
/*N*/ {
@@ -477,49 +475,49 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*?*/ pBas->SetFlag( SBX_EXTSEARCH );
/*?*/ pImp->pBasicMgr = pBasicManager = new BasicManager( pBas );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Basic container
/*N*/ SfxScriptLibraryContainer* pBasicCont = new SfxScriptLibraryContainer
/*N*/ ( DEFINE_CONST_UNICODE( "StarBasic" ), pBasicManager, pStor );
/*N*/ pBasicCont->acquire(); // Hold via UNO
/*N*/ Reference< XLibraryContainer > xBasicCont = static_cast< XLibraryContainer* >( pBasicCont );
/*N*/ pImp->pBasicLibContainer = pBasicCont;
-/*N*/
+/*N*/
/*N*/ // Dialog container
/*N*/ SfxDialogLibraryContainer* pDialogCont = new SfxDialogLibraryContainer( pStor );
/*N*/ pDialogCont->acquire(); // Hold via UNO
/*N*/ Reference< XLibraryContainer > xDialogCont = static_cast< XLibraryContainer* >( pDialogCont );
/*N*/ pImp->pDialogLibContainer = pDialogCont;
-/*N*/
+/*N*/
/*N*/ LibraryContainerInfo* pInfo = new LibraryContainerInfo
/*N*/ ( xBasicCont, xDialogCont, static_cast< OldBasicPassword* >( pBasicCont ) );
/*N*/ pBasicManager->SetLibraryContainerInfo( pInfo );
/*N*/ pBasicCont->setBasicManager( pBasicManager );
-/*N*/
+/*N*/
/*N*/ // damit auch Dialoge etc. 'qualifiziert' angesprochen werden k"onnen
/*N*/ StarBASIC *pBas = pImp->pBasicMgr->GetLib(0);
/*N*/ // Initialize Uno
/*N*/ //pBas->setRoot( GetModel() );
/*N*/ sal_Bool bWasModified = pBas->IsModified();
/*N*/ pBas->SetParent( pAppBasic );
-/*N*/
+/*N*/
/*N*/ // Properties im Doc-BASIC
/*N*/ // ThisComponent
/*?*/ // pBasicManager->InsertGlobalUNOConstant( "ThisComponent", makeAny( GetModel() ) );
-/*N*/
+/*N*/
/*N*/ // Standard lib name
/*N*/ ::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-/*N*/
+/*N*/
/*N*/ // Basic container
/*N*/ if ( xBasicCont.is() && !xBasicCont->hasByName( aStdLibName ) )
/*N*/ xBasicCont->createLibrary( aStdLibName ); // create Standard library
/*?*/ // pBasicManager->InsertGlobalUNOConstant( "BasicLibraries", makeAny( xBasicCont ) );
-/*N*/
+/*N*/
/*N*/ // Dialog container
/*N*/ if ( xDialogCont.is() && !xDialogCont->hasByName( aStdLibName ) )
/*N*/ xDialogCont->createLibrary( aStdLibName ); // create Standard library
/*?*/ // pBasicManager->InsertGlobalUNOConstant( "DialogLibraries", makeAny( xDialogCont ) );
-/*N*/
+/*N*/
/*N*/ // Modify-Flag wird bei MakeVariable gesetzt
/*N*/ pBas->SetModified( bWasModified );
/*N*/ }
@@ -545,7 +543,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ {
/*N*/ return GetEventNames_Impl();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SEQUENCE< OUSTRING > SfxObjectShell::GetEventNames_Impl()
/*N*/ {
/*N*/ SolarMutexGuard aGuard;
@@ -575,7 +573,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ {
/*N*/ if ( pImp->xModel.is() )
/*N*/ DBG_WARNING( "Model already set!" );
-/*N*/
+/*N*/
/*N*/ pImp->xModel = pModel;
/*N*/ }
@@ -590,7 +588,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ {
/*N*/ if ( pImp->xModel.is() && pModel )
/*N*/ DBG_WARNING( "Model already set!" );
-/*N*/
+/*N*/
/*N*/ pImp->xModel = pModel;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/inc/objshimp.hxx b/binfilter/bf_sfx2/source/inc/objshimp.hxx
index a9b2ac4..bce02db 100644
--- a/binfilter/bf_sfx2/source/inc/objshimp.hxx
+++ b/binfilter/bf_sfx2/source/inc/objshimp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
More information about the Libreoffice-commits
mailing list