diff options
| -rw-r--r-- | avmedia/source/xine/window.cxx | 104 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 155 | ||||
| -rw-r--r-- | framework/test/test.cxx | 47 | ||||
| -rw-r--r-- | framework/test/typecfg/xml2xcd.cxx | 47 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 203 | ||||
| -rw-r--r-- | idl/source/prj/svidl.cxx | 76 | ||||
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 67 | ||||
| -rw-r--r-- | sfx2/source/control/macro.cxx | 100 | ||||
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.cxx | 67 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 192 | ||||
| -rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 60 |
11 files changed, 2 insertions, 1116 deletions
diff --git a/avmedia/source/xine/window.cxx b/avmedia/source/xine/window.cxx index 4634233769..12caca6a27 100644 --- a/avmedia/source/xine/window.cxx +++ b/avmedia/source/xine/window.cxx @@ -57,110 +57,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() return *pMutex; } -// ----------- -// - WndProc - -// ----------- - -/* -LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 ) -{ - Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 ); - bool bProcessed = true; - - if( pWindow ) - { - switch( nMsg ) - { - case( WM_SETCURSOR ): - pWindow->updatePointer(); - break; - - case( WM_GRAPHNOTIFY ): - pWindow->processGraphEvent(); - break; - - case( WM_MOUSEMOVE ): - case( WM_LBUTTONDOWN ): - case( WM_MBUTTONDOWN ): - case( WM_RBUTTONDOWN ): - case( WM_LBUTTONUP ): - case( WM_MBUTTONUP ): - case( WM_RBUTTONUP ): - { - awt::MouseEvent aUNOEvt; - POINT aWinPoint; - - if( !::GetCursorPos( &aWinPoint ) || !::ScreenToClient( hWnd, &aWinPoint ) ) - { - aWinPoint.x = GET_X_LPARAM( nPar2 ); - aWinPoint.y = GET_Y_LPARAM( nPar2 ); - } - aUNOEvt.Modifiers = 0; - aUNOEvt.Buttons = 0; - aUNOEvt.X = aWinPoint.x; - aUNOEvt.Y = aWinPoint.y; - aUNOEvt.PopupTrigger = false; - - // Modifiers - if( nPar1 & MK_SHIFT ) - aUNOEvt.Modifiers |= awt::KeyModifier::SHIFT; - - if( nPar1 & MK_CONTROL ) - aUNOEvt.Modifiers |= awt::KeyModifier::MOD1; - - // Buttons - if( WM_LBUTTONDOWN == nMsg || WM_LBUTTONUP == nMsg ) - aUNOEvt.Buttons |= awt::MouseButton::LEFT; - - if( WM_MBUTTONDOWN == nMsg || WM_MBUTTONUP == nMsg ) - aUNOEvt.Buttons |= awt::MouseButton::MIDDLE; - - if( WM_RBUTTONDOWN == nMsg || WM_RBUTTONUP == nMsg ) - aUNOEvt.Buttons |= awt::MouseButton::RIGHT; - - // event type - if( WM_LBUTTONDOWN == nMsg || - WM_MBUTTONDOWN == nMsg || - WM_RBUTTONDOWN == nMsg ) - { - aUNOEvt.ClickCount = 1; - pWindow->fireMousePressedEvent( aUNOEvt ); - } - else if( WM_LBUTTONUP == nMsg || - WM_MBUTTONUP == nMsg || - WM_RBUTTONUP == nMsg ) - { - aUNOEvt.ClickCount = 1; - pWindow->fireMouseReleasedEvent( aUNOEvt ); - } - else if( WM_MOUSEMOVE == nMsg ) - { - aUNOEvt.ClickCount = 0; - pWindow->fireMouseMovedEvent( aUNOEvt ); - pWindow->updatePointer(); - } - } - break; - - case( WM_SETFOCUS ): - { - const awt::FocusEvent aUNOEvt; - pWindow->fireSetFocusEvent( aUNOEvt ); - } - break; - - default: - bProcessed = false; - break; - } - } - else - bProcessed = false; - - return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) ); -} -*/ - // --------------- // - Window - // --------------- diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 4127bb66b5..db799fd39a 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -112,100 +112,6 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ModuleUIConfigurationManagerSupplier DEFINE_INIT_SERVICE ( ModuleUIConfigurationManagerSupplier, {} ) -/*TODO_AS -void ModuleUIConfigurationManagerSupplier::impl_initStorages() -{ -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::impl_initStorages" ); - if ( !m_bInit ) - { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ModuleUIConfigurationManagerSupplier::impl_initStorages" ); - - rtl::OUString aFinalSlash( RTL_CONSTASCII_USTRINGPARAM( "/" )); - rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules" )); - rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules/soffice.cfg" )); - rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg" )); - rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/soffice.cfg" )); - rtl::OUString aConfigFileName( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/uiconfig.zip" )); - - Reference< XPropertySet > xPathSettings( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" ))), - UNO_QUERY_THROW ); - - Any a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIConfig" ))); - a >>= m_aDefaultConfigURL; - a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfig" ))); - a >>= m_aUserConfigURL; - - // Use only the first entry from "UIConfig" - sal_Int32 nIndex = m_aDefaultConfigURL.indexOf( ';' ); - if ( nIndex > 0 ) - m_aDefaultConfigURL = m_aDefaultConfigURL.copy( 0, nIndex ); - - rtl::OUString aDefaultConfigFolderURL( m_aDefaultConfigURL ); - - nIndex = m_aDefaultConfigURL.lastIndexOf( '/' ); - if (( nIndex > 0 ) && ( nIndex != ( m_aDefaultConfigURL.getLength()-1 ))) - { - m_aDefaultConfigURL += aFinalSlash; - aDefaultConfigFolderURL += aFinalSlash; - } - - nIndex = m_aUserConfigURL.lastIndexOf( '/' ); - if (( nIndex > 0 ) && ( nIndex != ( m_aUserConfigURL.getLength()-1 ))) - m_aUserConfigURL += aFinalSlash; - -// aDefaultConfigFolderURL += aConfigRootFolder; - - // Create root storages for user interface configuration data (default and customizable) - Reference< XSingleServiceFactory > xStorageFactory( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" ))), - UNO_QUERY_THROW ); - - Sequence< Any > aArgs( 2 ); - - // Default root storage (READ-ACCESS) - aArgs[0] <<= m_aDefaultConfigURL + aConfigFileName; //aConfigSubFolder; - aArgs[1] <<= ElementModes::READ; - m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW ); - - Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), - UNO_QUERY ); - - Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.PackageStructureCreator" ))), - UNO_QUERY_THROW ); - - RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ convertToPackage" ); - xPackageStructCreator->convertToPackage( aDefaultConfigFolderURL, xTempOut ); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "} convertToPackage" ); - - xTempOut->closeOutput(); - Reference< XInputStream > xTempIn( xTempOut, UNO_QUERY ); - Reference< XSeekable > xTempSeek( xTempOut, UNO_QUERY ); - - // Default root storage (READ-ACCESS) - xTempSeek->seek( 0 ); - - aArgs[0] <<= xTempIn; - aArgs[1] <<= ElementModes::READ; - m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW ); - - // Customizable root storage (READWRITE-ACCESS) - aArgs[0] <<= m_aUserConfigURL + aConfigSubFolder; - aArgs[1] <<= ElementModes::READWRITE; - m_xUserCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY ); - - // Create wrapper object for module user interface configuration managers, so they are able to call commit/revert on - // root storage and nothing more (saftey)! - RootStorageWrapper* pUserRootStorageWrapper = new RootStorageWrapper( Reference< XTransactedObject >( m_xUserCfgRootStorage, UNO_QUERY )); - m_xUserRootCommit = Reference< XTransactedObject>( static_cast< OWeakObject *>( pUserRootStorageWrapper ), UNO_QUERY ); - } - - m_bInit = true; -} -*/ - ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( const Reference< XMultiServiceFactory >& xServiceManager ) : ThreadHelpBase( &Application::GetSolarMutex() ) @@ -237,20 +143,6 @@ ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier() xComponent->dispose(); ++pIter; } -/*TODO_AS - // Dispose our root configuration storages - if ( m_xDefaultCfgRootStorage.is() ) - { - Reference< XComponent > xComponent( m_xDefaultCfgRootStorage, UNO_QUERY ); - xComponent->dispose(); - } - - if ( m_xUserCfgRootStorage.is() ) - { - Reference< XComponent > xComponent( m_xUserCfgRootStorage, UNO_QUERY ); - xComponent->dispose(); - } -*/ } // XComponent @@ -311,53 +203,6 @@ throw ( NoSuchElementException, RuntimeException) // Create instance on demand if ( !pIter->second.is() ) { - /*TODO_AS - Reference< XStorage > xDefaultConfigModuleStorage; - Reference< XStorage > xUserConfigModuleStorage; - - try - { - xDefaultConfigModuleStorage = Reference< XStorage >( m_xDefaultCfgRootStorage->openStorageElement( - sShort, ElementModes::READ ), UNO_QUERY_THROW ); - - if ( m_xUserCfgRootStorage.is() ) - { - try - { - xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement( - sShort, ElementModes::READWRITE ), UNO_QUERY ); - } - catch( ::com::sun::star::io::IOException& ) - { - try - { - xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement( - sShort, ElementModes::READ ), UNO_QUERY ); - } - catch( com::sun::star::uno::Exception& ) - { - } - } - } - } - catch ( com::sun::star::uno::Exception& ) - { - } - PropertyValue aArg; - Sequence< Any > aArgs( 5 ); - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" )); - aArg.Value <<= ModuleIdentifier; - aArgs[0] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultConfigStorage" )); - aArg.Value <<= xDefaultConfigModuleStorage; - aArgs[1] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); - aArg.Value <<= xUserConfigModuleStorage; - aArgs[2] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" )); - aArg.Value <<= m_xUserRootCommit; - aArgs[3] <<= aArg; - */ ::rtl::OUString sShort; try { diff --git a/framework/test/test.cxx b/framework/test/test.cxx index 3f817ae590..f69a9f175f 100644 --- a/framework/test/test.cxx +++ b/framework/test/test.cxx @@ -369,52 +369,7 @@ void TestApplication::impl_testFilterCache() } else { -/* - // Step over all types and log his values. - // These simulate a XNameAccess! - const Sequence< OUString > seqAllTypeNames = aCache.getAllTypeNames(); - sal_uInt32 nCount = seqAllTypeNames.getLength(); - for( sal_uInt32 nPosition=0; nPosition<nCount; ++nPosition ) - { - sBuffer.appendAscii( "--------------------------------------------------------------------------------\n" ); - const TType* pType = aCache.getTypeByName( seqAllTypeNames[nPosition] ); - if( pType == NULL ) - { - sBuffer.appendAscii ( "Type [" ); - sBuffer.append ( (sal_Int32)nPosition ); - sBuffer.appendAscii ( "] \"" ); - sBuffer.append ( seqAllTypeNames[nPosition]); - sBuffer.appendAscii ( "\" isn't valid!" ); - } - else - { - sBuffer.appendAscii ( "Type [" ); - sBuffer.append ( (sal_Int32)nPosition ); - sBuffer.appendAscii ( "] \"" ); - sBuffer.append ( seqAllTypeNames[nPosition] ); - sBuffer.appendAscii ( "\"\n\t\tUIName\t=\t" ); - sBuffer.append ( pType->sUIName ); - sBuffer.appendAscii ( "\n\t\tMediaType\t=\t" ); - sBuffer.append ( pType->sMediaType ); - sBuffer.appendAscii ( "\n\t\tClipboardFormat\t=\t" ); - sBuffer.append ( pType->sClipboardFormat ); - sBuffer.appendAscii ( "\n\t\tURLPattern\t=\t{" ); - for( TConstStringIterator aIterator=pType->lURLPattern.begin(); aIterator!=pType->lURLPattern.end(); ++aIterator ) - { - sBuffer.append ( *aIterator ); - sBuffer.appendAscii ( ";\n\t\t" ); - } - sBuffer.appendAscii( "}\nExtensions\t=\t" ); - for( aIterator=pType->lExtensions.begin(); aIterator!=pType->lExtensions.end(); ++aIterator ) - { - sBuffer.append ( *aIterator ); - sBuffer.appendAscii ( ";\n\t\t" ); - } - sBuffer.appendAscii ( "}\nDocumentIconID\t=\t" ); - sBuffer.append ( (sal_Int32)pType->nDocumentIconID ); - } - } -*/ + // searchFirstType( URL, MediaType, ClipboardFormat, startEntry ) TCheckedTypeIterator aIterator; sBuffer.appendAscii( "search type for \"file://c|/temp/test.sdw\"; no media type; no clipboard format\n" ); diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx index adb4cea5a2..420da0ee6b 100644 --- a/framework/test/typecfg/xml2xcd.cxx +++ b/framework/test/typecfg/xml2xcd.cxx @@ -2310,53 +2310,6 @@ sal_Bool XCDGenerator::impl_isUsAsciiAlphaDigit(sal_Unicode c, sal_Bool bDigitAl ::rtl::OUString XCDGenerator::impl_encodeSetName( const ::rtl::OUString& rSource ) { return impl_encodeSpecialSigns( rSource ); -/* - rtl::OUStringBuffer aTarget; - - sal_Unicode const * pBegin = rSource.getStr(); - sal_Unicode const * pEnd = pBegin + rSource.getLength(); - sal_Unicode const * pCopyEnd = pBegin; - sal_Unicode const * p = pBegin; - while (p != pEnd) - { - sal_Unicode c = *p; - if (!impl_isUsAsciiAlphaDigit(c,p != pBegin)) - switch (c) - { - case '-': - case '.': - if (p != pBegin) - break; - default: - aTarget.append(pCopyEnd, p - pCopyEnd); - aTarget.append(sal_Unicode('_')); - ModifiedUTF7Buffer aBuffer(&aTarget); - for (;;) - { - aBuffer.write(c); - ++p; - if (p == pEnd) - break; - c = *p; - if (impl_isUsAsciiAlphaDigit(c) || c == '-' || c == '.') - break; - } - aBuffer.flush(); - aTarget.append(sal_Unicode('_')); - pCopyEnd = p; - continue; - } - ++p; - } - - if (pCopyEnd == pBegin) - return rSource; - else - { - aTarget.append(pCopyEnd, pEnd - pCopyEnd); - return aTarget.makeStringAndClear(); - } -*/ } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index d8085e3b2b..e57a41814e 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -241,99 +241,6 @@ ByteString SvMetaAttribute::GetMangleName( BOOL ) const return GetName(); } -/************************************************************************* -|* SvMetaAttribute::FillSbxObject() -|* -|* Beschreibung -*************************************************************************/ -/* -void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags ) -{ - SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ); - if( !nSbxFlags ) - { // Flags koennen vom Aufrufer ueberschrieben werden - if( pType->GetOut() ) - { - nSbxFlags |= SBX_WRITE; - if( pType->GetIn() ) - nSbxFlags |= SBX_READ; - } - else - nSbxFlags |= SBX_READ; - } - SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ); - if( pBaseType->GetType() == TYPE_STRUCT ) - { - const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList(); - ULONG nCount = rList.Count(); - for( ULONG i = 0; i < nCount; i++ ) - rList.GetObject( i )->FillSbxObject( pInfo, nSbxFlags ); - } - else - //MI: pInfo->AddParam( GetName(), pBaseType->GetSbxDataType(), nSbxFlags ); - pInfo->AddParam( GetName(), SbxVARIANT, nSbxFlags ); -} -*/ - -/************************************************************************* -|* SvMetaAttribute::FillSbxObject() -|* -|* Beschreibung -*************************************************************************/ -/* -void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase, - SbxObject * pObj, BOOL bVariable ) -{ - // keine Attribut fuer Automation - if( !GetAutomation() || !GetExport() ) - return; - - if( bVariable && IsVariable() ) - { - SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ); - SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ); - - if( pBaseType->GetType() == TYPE_STRUCT ) - { - SvNumberIdentifier aSlotId = rBase.aStructSlotId; - if ( GetSlotId().Len() ) - rBase.aStructSlotId = GetSlotId(); - const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList(); - ULONG nCount = rList.Count(); - for( ULONG i = 0; i < nCount; i++ ) - rList.GetObject( i )->FillSbxObject( rBase, pObj, bVariable ); - rBase.aStructSlotId = aSlotId; - } - else - { - SbxPropertyRef xProp = new SbxProperty( GetName(), SbxVARIANT ); - //MI: pBaseType->GetSbxDataType() ); - if ( GetReadonly() || IsMethod() ) - xProp->ResetFlag( SBX_WRITE ); - xProp->SetUserData( MakeSlotValue( rBase, TRUE ) ); - pType->FillSbxObject( xProp, bVariable ); - - pObj->Insert( &xProp ); - } - } - else if( !bVariable && IsMethod() ) - { - SvMetaType * pType = GetType(); - SvMetaType * pRetBaseType = GetType()->GetReturnType()->GetBaseType(); - SbxMethodRef xMeth = new SbxMethod( GetName(), - pRetBaseType->GetSbxDataType() ); - xMeth->ResetFlag( SBX_WRITE ); - xMeth->SetUserData( MakeSlotValue( rBase, FALSE ) ); - pType->FillSbxObject( xMeth, bVariable ); - - pObj->Insert( &xMeth ); - } -} -*/ #ifdef IDL_COMPILER /************************************************************************* |* SvMetaAttribute::Test() @@ -350,14 +257,6 @@ BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase, rBase.WriteError( rInStm ); bOk = FALSE; } - /* - if( !GetType()->IsItem() && GetSlotId().IsSet() ) - { - rBase.SetError( "slot without item declared", rInStm.GetToken() ); - rBase.WriteError( rInStm ); - bOk = FALSE; - } - */ return bOk; } @@ -569,14 +468,6 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase, } } } -/* - else if( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE ) - { - pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT ); - rOutStm << ' '; - rOutStm << GetName().GetBuffer(); - } -*/ } /************************************************************************* @@ -661,10 +552,6 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm, // Methoden/Funktions-Body ausgeben rOutStm << '{' << endl; WriteTab( rOutStm, 1 ); -// rOutStm << "if( SvIPCIsConnected() )" << endl; -// WriteTab( rOutStm, 1 ); -// rOutStm << '{' << endl; -// WriteTab( rOutStm, 2 ); if( !bVoid ) { @@ -723,13 +610,6 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm, } rOutStm << " );" << endl; -// WriteTab( rOutStm, 1 ); -// rOutStm << '}' << endl; -// if( !bVoid ) -// { -// WriteTab( rOutStm, 1 ); -// rOutStm << "return 0;" << endl; -// } rOutStm << '}' << endl; } @@ -862,9 +742,6 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, // Zuweisung WriteTab( rOutStm, nTab ); rOutStm << "void "; -// rOutStm << "SYSCALL "; -// if ( rBase.GetActModulePrefix().Len() ) -// rOutStm << rBase.GetActModulePrefix().GetBuffer(); rOutStm << rBase.aIFaceName.GetBuffer() << "Set" << name.GetBuffer() << "( " << C_PREF << "Object h" << rBase.aIFaceName.GetBuffer() << ", " << endl; @@ -881,9 +758,6 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, WriteTab( rOutStm, nTab ); pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT ); rOutStm << ' '; -// rOutStm << "SYSCALL "; -// if ( rBase.GetActModulePrefix().Len() ) -// rOutStm << rBase.GetActModulePrefix().GetBuffer(); rOutStm << rBase.aIFaceName.GetBuffer() << "Get" << name.GetBuffer() << "( " << C_PREF << "Object h" << rBase.aIFaceName.GetBuffer() << " )"; @@ -1223,14 +1097,6 @@ ByteString SvMetaType::GetBasicPostfix() const ByteString aRet; // MBN und Co wollen immer "As xxx" -/* - if( aBasicPostfix.IsSet() || !GetRef() ) - aRet = aBasicPostfix; - else - aRet = ((SvMetaType*)GetRef())->GetBasicPostfix(); - - if ( !aRet.Len() && GetBasicName().Len() ) -*/ { aRet = " As "; @@ -1401,34 +1267,6 @@ BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase ) return SvMetaReference::SetName( rName, pBase ); } -/************************************************************************* -|* SvMetaType::FillSbxObject() -|* -|* Beschreibung -*************************************************************************/ -/* -void SvMetaType::FillSbxObject( SbxVariable * pObj, BOOL bVariable ) -{ - if( PTR_CAST( SbxMethod, pObj ) ) - { - if( GetType() == TYPE_METHOD ) - { - ULONG nCount = GetAttrCount(); - if( nCount ) - { - SbxInfoRef xInfo = pObj->GetInfo(); - if( !xInfo.Is() ) - { - xInfo = new SbxInfo(); - pObj->SetInfo( xInfo ); - } - for( ULONG n = nCount; n > 0; n-- ) - pAttrList->GetObject( n -1 )->FillSbxObject( xInfo ); - } - } - } -} -*/ #ifdef IDL_COMPILER /************************************************************************* |* SvMetaType::GetString() @@ -1690,27 +1528,7 @@ BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { BOOL bOk = ReadNameSvIdl( rBase, rInStm ); -/* - if( bOk ) - { - UINT32 nTokPos = rInStm.Tell(); - SvToken * pTok = rInStm.GetToken_Next(); - if( pTok->IsIdentifier() ) - { - aSbxName = pTok->GetString(); - - nTokPos = rInStm.Tell(); - pTok = rInStm.GetToken_Next(); - if( pTok->IsIdentifier() ) - { - aItemName = pTok->GetString(); - nTokPos = rInStm.Tell(); - } - } - rInStm.Seek( nTokPos ); - } -*/ return bOk; } @@ -2444,27 +2262,6 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); } -/************************************************************************* -|* -|* SvMetaTypeEnum::GetMaxValue() -|* -|* Beschreibung -|* -*************************************************************************/ -/* -USHORT SvMetaTypeEnum::GetMaxValue() const -{ - USHORT nMax = 0; - for( ULONG n = 0; n < aEnumValueList.Count(); n++ ) - { - SvMetaEnumValue * pObj = aEnumValueList.GetObject( n ); - if( nMax < pObj->GetValue() ) - nMax = pObj->GetValue(); - } - return nMax; -} -*/ - #ifdef IDL_COMPILER /************************************************************************* |* diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index ad65215f02..70c6cd3e96 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -85,13 +85,6 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer aF2.Kill(); return FALSE; } -/* - else - { - printf( "%s to %s moved\n", - rFile2.GetStr(), rFile1.GetStr() ); - } -*/ return TRUE; } return 0 == aF2.Kill(); @@ -110,15 +103,6 @@ int cdecl main ( int argc, char ** argv) { #endif -/* - pStr = ::ResponseFile( &aCmdLine, argv, argc ); - if( pStr ) - { - printf( "Cannot open response file <%s>\n", pStr ); - return( 1 ); - }; -*/ - String aTmpListFile; String aTmpSlotMapFile; String aTmpSfxItemFile; @@ -247,66 +231,6 @@ int cdecl main ( int argc, char ** argv) fprintf( stderr, "%s\n", aStr.GetBuffer() ); } } -/* - if( nExit == 0 && aCommand.aCallingFile.Len() ) - { - DirEntry aDE( aCommand.aCallingFile ); - aDE.ToAbs(); - aTmpCallingFile = aDE.GetPath().TempName().GetFull(); - SvFileStream aOutStm( aTmpCallingFile, STREAM_READWRITE | STREAM_TRUNC ); - pDataBase->WriteSbx( aOutStm ); - //pDataBase->Save( aOutStm, aCommand.nFlags | IDL_WRITE_CALLING ); - if( aOutStm.GetError() != SVSTREAM_OK ) - { - nExit = -1; - ByteString aStr = "cannot write calling file: "; - aStr += aCommand.aCallingFile; - fprintf( stderr, "%s\n", aStr.GetStr() ); - } - } - if( nExit == 0 && aCommand.aCxxFile.Len() ) - { - DirEntry aDE( aCommand.aCxxFile ); - aDE.ToAbs(); - aTmpCxxFile = aDE.GetPath().TempName().GetFull(); - SvFileStream aOutStm( aTmpCxxFile, STREAM_READWRITE | STREAM_TRUNC ); - - aOutStm << "#pragma hdrstop" << endl; - aOutStm << "#include <"; - if( aCommand.aHxxFile.Len() ) - aOutStm << DirEntry(aCommand.aHxxFile).GetName().GetBuffer(); - else - { - DirEntry aDE( aCommand.aCxxFile ); - aDE.SetExtension( "hxx" ); - aOutStm << aDE.GetName().GetBuffer); - } - aOutStm << '>' << endl; - if( !pDataBase->WriteCxx( aOutStm ) ) - { - nExit = -1; - ByteString aStr = "cannot write cxx file: "; - aStr += ByteString( aCommand.aCxxFile, RTL_TEXTENCODING_UTF8 ); - fprintf( stderr, "%s\n", aStr.GetBuffer() ); - } - } - if( nExit == 0 && aCommand.aHxxFile.Len() ) - { - DirEntry aDE( aCommand.aHxxFile ); - aDE.ToAbs(); - aTmpHxxFile = aDE.GetPath().TempName().GetFull(); - SvFileStream aOutStm( aTmpHxxFile, STREAM_READWRITE | STREAM_TRUNC ); - - aOutStm << "#include <somisc.hxx>" << endl; - if( !pDataBase->WriteHxx( aOutStm ) ) - { - nExit = -1; - ByteString aStr = "cannot write cxx file: "; - aStr += ByteString( aCommand.aHxxFile, RTL_TEXTENCODING_UTF8 ); - fprintf( stderr, "%s\n", aStr.GetBuffer() ); - } - } - */ } else nExit = -1; diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 4ea005350d..5ed3fd4803 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -201,74 +201,7 @@ void SfxApplication::EnterBasicCall() // zuerst das BASIC laden GetBasic(); -/* - // als erstes SfxShellObject das SbxObject der SfxApplication erzeugen - SbxObject *pSbx = GetSbxObject(); - DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject for SfxApplication" ); - - // die SbxObjects aller Module erzeugen - SfxModuleArr_Impl& rArr = GetModules_Impl(); - for ( sal_uInt16 n = 0; n < rArr.Count(); ++n ) - { - SfxModule *pMod = rArr.GetObject(n); - if ( pMod->IsLoaded() ) - { - pSbx = pMod->GetSbxObject(); - DBG_ASSERT( pSbx, "SfxModule: can't create SbxObject" ); - } - } - - // die SbxObjects aller Tasks erzeugen - for ( SfxTask *pTask = SfxTask::GetFirst(); pTask; pTask = SfxTask::GetNext( *pTask ) ) - pTask->GetSbxObject(); - // die SbxObjects aller SfxObjectShells erzeugen (ggf. Frame-los!) - for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst( NULL, sal_False ); - pObjSh; - pObjSh = SfxObjectShell::GetNext(*pObjSh, NULL, sal_False) ) - { - // kein IP-Object oder wenn doch dann initialisiert? - SvStorageRef aStorage; - if ( !pObjSh->IsHandsOff() ) - aStorage = pObjSh->GetStorage(); - if ( !pObjSh->GetInPlaceObject() || aStorage.Is() ) - { - DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for %s", - pObjSh->SfxShell::GetName().GetBuffer() ) ); - pSbx = pObjSh->GetSbxObject(); - DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" ); - } - } - - // die SbxObjects der SfxShells auf den Stacks der Frames erzeugen - for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst(0,sal_False); - pFrame; - pFrame = SfxViewFrame::GetNext(*pFrame,0,0,sal_False) ) - { - // den Dispatcher des Frames rausholen - SfxDispatcher *pDispat = pFrame->GetDispatcher(); - pDispat->Flush(); - - // "uber alle SfxShells auf dem Stack des Dispatchers iterieren - // Frame selbst wird ausgespart, da er indirekt angezogen wird, - // sofern er ein Dokument enth"alt. - for ( sal_uInt16 nStackIdx = pDispat->GetShellLevel(*pFrame); - 0 != nStackIdx; - --nStackIdx ) - { - DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for level %u", nStackIdx-1 ); ) - pSbx = pDispat->GetShell(nStackIdx - 1)->GetSbxObject(); - DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" ); - } - - if ( !pFrame->GetObjectShell() ) - { - DBG( DbgOutf( "SfxShellObject: BASIC-on-demand for empty frame" ); ) - pSbx = pFrame->GetSbxObject(); - DBG_ASSERT( pSbx, "SfxShellObject: can't create SbxObject" ); - } - } -*/ // Factories anmelden // SbxBase::AddFactory( new SfxSbxObjectFactory_Impl ); } diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx index 3990e3a582..33eba4d2cf 100644 --- a/sfx2/source/control/macro.cxx +++ b/sfx2/source/control/macro.cxx @@ -125,99 +125,7 @@ SfxMacroStatement::SfxMacroStatement // Workaround Recording nicht exportierter Slots (#25386#) if ( !rSlot.pName ) return; -/* - // Objekt-Typ bestimmen - bool bIsApp = rShell.ISA(SfxApplication); - bool bIsDoc = rShell.ISA(SfxObjectShell); - bool bIsWin = !bIsApp && !bIsDoc && - ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) ); - bool bIsSel = !bIsApp && !bIsDoc && !bIsWin; - - // Objekt nicht schon im Slot-Namen enthalten? - if ( bIsSel || rSlot.pName[0] == '.' ) - { - // absolutes Aufzeichnen? - if ( rSlot.IsMode( SFX_SLOT_RECORDABSOLUTE ) ) - { - // an der Applikation oder am Modul - if ( rShell.ISA(SfxApplication) || rShell.ISA(SfxModule) ) - aStatement = rTarget; - - // am Dokument? - // '[' = 5Bh - // ']' = 5Dh - else if ( rShell.ISA(SfxObjectShell) ) - { - aStatement = 0x005B; - aStatement += rTarget; - aStatement += 0x005D; - } - - else if ( rShell.ISA(SfxViewFrame) ) - { - aStatement = 0x005B; - aStatement += String::CreateFromAscii("ViewFrame");//rShell.GetSbxObject()->GetName(); - aStatement += 0x005D; - } - - else - { - // an der View oder Sub-Shell - SfxViewShell *pViewShell = rShell.GetViewShell(); - aStatement = 0x005B; - aStatement += String::CreateFromAscii("ViewShell");//pViewShell->GetViewFrame()->GetSbxObject()->GetName(); - aStatement += 0x005D; - if ( !rShell.ISA(SfxViewFrame) ) - // an einer Sub-Shell zus"atlich ".Selection" anh"angen - aStatement += DEFINE_CONST_UNICODE(".Selection"); - } - } - else // relatives Aufzeichnen - { - // an der Application? - if ( rShell.ISA(SfxApplication) ) - aStatement = DEFINE_CONST_UNICODE("Application"); - - // am Modul? - else if ( rShell.ISA(SfxModule) ) - aStatement = DEFINE_CONST_UNICODE("ActiveModule"); - - // am Dokument - else if ( rShell.ISA(SfxObjectShell) ) - aStatement = DEFINE_CONST_UNICODE("ActiveDocument"); - // am Window - else if ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) ) - aStatement = DEFINE_CONST_UNICODE("ActiveWindow"); - - else - // an einer Sub-Shell - aStatement = DEFINE_CONST_UNICODE("Selection"); - } - } - - if ( bIsSel ) - { - // bei Selection ggf. noch den Namen der SubShell anh"angen - const SfxShellObject *pShObj = - (const SfxShellObject*) rShell.GetSbxObject(); - if ( pShObj ) - { - const SfxShellObject *pParentObj = - (const SfxShellObject*) pShObj->GetParent(); - SfxShell *pParentSh = pParentObj->GetShell(); - DBG_ASSERT( pParentSh->ISA(SfxViewFrame), - "parent of SubShell must be a Frame" ); - if ( rSlot.pName[0] == '.' ) - { - aStatement += '.'; - aStatement += rShell.GetSbxObject()->GetName(); - } - } - else - DBG_ASSERT( rSlot.pName[0] != '0', "recording unnamed object" ); - } -*/ aStatement = DEFINE_CONST_UNICODE("Selection"); // an diesen Objekt-Ausdruck den Methoden-/Property-Namen und Parameter @@ -422,14 +330,6 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl aArg += aRecordable; aArg += '"'; } -/* - case SbxBYTE: - { - // als Zahl darstellen - aArg = (USHORT) rVar.GetByte(); - break; - } -*/ } else { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 8fa023671a..9a87b67f52 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -166,73 +166,6 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub } } return *pTypes; - /* - static cppu::OTypeCollection * pCollection = 0; - if (!pCollection) - { - osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); - if (!pCollection) - { - static cppu::OTypeCollection - aTheCollection( - getCppuType( - static_cast< Reference< XTypeProvider > - const * >( - 0)), - getCppuType( - static_cast< Reference< XServiceInfo > - const * >( - 0)), - getCppuType( - static_cast< Reference< XComponent > - const * >( - 0)), - getCppuType( - static_cast< Reference< XCloseable > - const * >( - 0)), - getCppuType( - static_cast< Reference< XResultSetMetaDataSupplier > - const * >( - 0)), - getCppuType( - static_cast< Reference< XPropertySet > - const * >( - 0)), - getCppuType( - static_cast< Reference< XPropertyChangeListener > - const * >( - 0)), - getCppuType( - static_cast< Reference< XVetoableChangeListener > - const * >( - 0)), - getCppuType( - static_cast< Reference< XResultSet > - const * >( - 0)), - getCppuType( - static_cast< Reference< XContentAccess > - const * >( - 0)), - getCppuType( - static_cast< Reference< XRow > - const * >( - 0)), - getCppuType( - static_cast< Reference< XFetchProvider > - const * >( - 0)), - getCppuType( - static_cast< Reference< XFetchProviderForContentAccess > - const * >( - 0)) - ); - pCollection = &aTheCollection; - } - } - return pCollection->getTypes(); - */ } //-------------------------------------------------------------------------- diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 68cd2a594e..b312f9dfdc 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -231,16 +231,7 @@ XMLShapeImportHelper::~XMLShapeImportHelper() if(mpGroupShapeElemTokenMap) delete mpGroupShapeElemTokenMap; if(mpFrameShapeElemTokenMap) delete mpFrameShapeElemTokenMap; -/* - if(mpShapeAttrTokenMap) delete mpShapeAttrTokenMap; - if(mpRectShapeAttrTokenMap) delete mpRectShapeAttrTokenMap; - if(mpLineShapeAttrTokenMap) delete mpLineShapeAttrTokenMap; - if(mpEllipseShapeAttrTokenMap) delete mpEllipseShapeAttrTokenMap; - if(mpTextBoxShapeAttrTokenMap) delete mpTextBoxShapeAttrTokenMap; - if(mpControlShapeAttrTokenMap) delete mpControlShapeAttrTokenMap; - if(mpPageShapeAttrTokenMap) delete mpPageShapeAttrTokenMap; - if(mpGraphicObjectShapeAttrTokenMap) delete mpGraphicObjectShapeAttrTokenMap; -*/ + if(mpPolygonShapeAttrTokenMap) delete mpPolygonShapeAttrTokenMap; if(mpPathShapeAttrTokenMap) delete mpPathShapeAttrTokenMap; if(mp3DSceneShapeElemTokenMap) delete mp3DSceneShapeElemTokenMap; @@ -358,31 +349,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() } ////////////////////////////////////////////////////////////////////////////// -/* - -const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap() -{ - if(!mpShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_SHAPE_NAME }, - { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS }, - { XML_NAMESPACE_PRESENTATION, XML_CLASS, XML_TOK_SHAPE_PRESENTATION_CLASS }, - { XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_PRESENTATION }, - { XML_NAMESPACE_SVG, XML_TRANSFORM, XML_TOK_SHAPE_TRANSFORM }, - { XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TOK_SHAPE_IS_PLACEHOLDER }, - { XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TOK_SHAPE_IS_USER_TRANSFORMED }, - XML_TOKEN_MAP_END -}; - - mpShapeAttrTokenMap = new SvXMLTokenMap(aShapeAttrTokenMap); - } - - return *mpShapeAttrTokenMap; -} -*/ -////////////////////////////////////////////////////////////////////////////// const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() @@ -463,75 +429,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() } ////////////////////////////////////////////////////////////////////////////// -/* - -const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap() -{ - if(!mpRectShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aRectShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_RECTSHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_RECTSHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_RECTSHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_RECTSHAPE_HEIGHT }, - { XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, XML_TOK_RECTSHAPE_CORNER_RADIUS }, - XML_TOKEN_MAP_END -}; - - mpRectShapeAttrTokenMap = new SvXMLTokenMap(aRectShapeAttrTokenMap); - } - - return *mpRectShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - - -const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap() -{ - if(!mpLineShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aLineShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X1, XML_TOK_LINESHAPE_X1 }, - { XML_NAMESPACE_SVG, XML_Y1, XML_TOK_LINESHAPE_Y1 }, - { XML_NAMESPACE_SVG, XML_X2, XML_TOK_LINESHAPE_X2 }, - { XML_NAMESPACE_SVG, XML_Y2, XML_TOK_LINESHAPE_Y2 }, - XML_TOKEN_MAP_END -}; - - mpLineShapeAttrTokenMap = new SvXMLTokenMap(aLineShapeAttrTokenMap); - } - - return *mpLineShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - - -const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap() -{ - if(!mpEllipseShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_RX, XML_TOK_ELLIPSESHAPE_RX }, - { XML_NAMESPACE_SVG, XML_RY, XML_TOK_ELLIPSESHAPE_RY }, - { XML_NAMESPACE_SVG, XML_CX, XML_TOK_ELLIPSESHAPE_CX }, - { XML_NAMESPACE_SVG, XML_CY, XML_TOK_ELLIPSESHAPE_CY }, - { XML_NAMESPACE_SVG, XML_R, XML_TOK_ELLIPSESHAPE_R }, - XML_TOKEN_MAP_END -}; - - mpEllipseShapeAttrTokenMap = new SvXMLTokenMap(aEllipseShapeAttrTokenMap); - } - - return *mpEllipseShapeAttrTokenMap; -} -////////////////////////////////////////////////////////////////////////////// -*/ const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap() { @@ -569,54 +467,10 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap() return *mpPathShapeAttrTokenMap; } -/* -////////////////////////////////////////////////////////////////////////////// - - -const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap() -{ - if(!mpTextBoxShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXTBOXSHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXTBOXSHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXTBOXSHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXTBOXSHAPE_HEIGHT }, - XML_TOKEN_MAP_END -}; - - mpTextBoxShapeAttrTokenMap = new SvXMLTokenMap(aTextBoxShapeAttrTokenMap); - } - - return *mpTextBoxShapeAttrTokenMap; -} ////////////////////////////////////////////////////////////////////////////// -const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap() -{ - if(!mpControlShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aControlShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_CONTROLSHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_CONTROLSHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CONTROLSHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CONTROLSHAPE_HEIGHT }, - XML_TOKEN_MAP_END -}; - - mpControlShapeAttrTokenMap = new SvXMLTokenMap(aControlShapeAttrTokenMap); - } - - return *mpControlShapeAttrTokenMap; -} -*/ -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap() { if(!mp3DSceneShapeAttrTokenMap) @@ -666,51 +520,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() } ////////////////////////////////////////////////////////////////////////////// -/* - -const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap() -{ - if(!mpPageShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aPageShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PAGESHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PAGESHAPE_HEIGHT }, - XML_TOKEN_MAP_END -}; - - mpPageShapeAttrTokenMap = new SvXMLTokenMap(aPageShapeAttrTokenMap); - } - - return *mpPageShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - -const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap() -{ - if(!mpGraphicObjectShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_GOSHAPE_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_GOSHAPE_HEIGHT }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_GOSHAPE_URL }, - XML_TOKEN_MAP_END -}; - - mpGraphicObjectShapeAttrTokenMap = new SvXMLTokenMap(aGraphicObjectShapeAttrTokenMap); - } - - return *mpGraphicObjectShapeAttrTokenMap; -} -*/ -////////////////////////////////////////////////////////////////////////////// SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 34782a48b7..64cc139a67 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -124,66 +124,6 @@ void SdXML3DObjectContext::EndElement() SdXMLShapeContext::EndElement(); } -////////////////////////////////////////////////////////////////////////////// -/* -void SdXML3DObjectContext::AddShape(uno::Reference< drawing::XShape >& xShape) -{ - if(xShape.is() && mxShapes.is()) - { - // set shape local - mxShape = xShape; - - // add new shape to parent - mxShapes->add( xShape ); - } -} -*/ -////////////////////////////////////////////////////////////////////////////// -/* -void SdXML3DObjectContext::SetStyle() -{ - // set style on shape - if(maDrawStyleName.getLength() && mxShape.is()) - { - const SvXMLStyleContext* pStyle = 0L; - sal_Bool bAutoStyle(FALSE); - - if(GetImport().GetShapeImport()->GetAutoStylesContext()) - pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext( - XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName); - - if(pStyle) - bAutoStyle = TRUE; - - if(!pStyle && GetImport().GetShapeImport()->GetStylesContext()) - pStyle = GetImport().GetShapeImport()->GetStylesContext()-> - FindStyleChildContext(XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName); - - if(pStyle && pStyle->ISA(XMLShapeStyleContext)) - { - uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); - if(xPropSet.is()) - { - XMLShapeStyleContext* pDocStyle = (XMLShapeStyleContext*)pStyle; - - if(pDocStyle->GetStyle().is()) - { - // set style on object - uno::Any aAny; - aAny <<= pDocStyle->GetStyle(); - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Style")), aAny); - } - - if(bAutoStyle) - { - // set PropertySet on object - pDocStyle->FillPropertySet(xPropSet); - } - } - } - } -} -*/ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |