diff options
Diffstat (limited to 'filter/source')
60 files changed, 711 insertions, 324 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 9c8206c8ecf8..dfae80338f27 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -61,7 +61,7 @@ BaseContainer::BaseContainer() m_rCache->load(FilterCache::E_CONTAINS_STANDARD); // GLOBAL SAFE (!) -> ----------------------- - // TODO use rtl pattern to create it realy threadsafe! + // TODO use rtl pattern to create it really threadsafe! ::osl::ResettableMutexGuard aGlobalLock(::osl::Mutex::getGlobalMutex()); if (!m_pPerformanceOptimizer) m_pPerformanceOptimizer = new ::salhelper::SingletonRef< FilterCache >(); @@ -107,7 +107,7 @@ void BaseContainer::impl_loadOnDemand() ::osl::ResettableMutexGuard aLock(m_aLock); // A generic container needs all items of a set of our cache! - // Of course it can block for a while, till the cache is realy filled. + // Of course it can block for a while, till the cache is really filled. // Note: dont load all sets supported by the cache here! FilterCache::EFillState eRequiredState = FilterCache::E_CONTAINS_NOTHING; @@ -151,7 +151,7 @@ void BaseContainer::impl_initFlushMode() m_pFlushCache = m_rCache->clone(); if (!m_pFlushCache) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant create write copy of internal used cache on demand."), + ::rtl::OUString::createFromAscii("Can't create write copy of internal used cache on demand."), dynamic_cast< css::container::XNameAccess* >(this)); // <- SAFE } @@ -274,7 +274,7 @@ void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) impl_initFlushMode(); FilterCache* pCache = impl_getWorkingCache(); - pCache->removeItem(m_eType, sItem); // throw exceptions automaticly + pCache->removeItem(m_eType, sItem); // throw exceptions automatically aLock.clear(); // <- SAFE ---------------------------------- @@ -333,7 +333,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) { if (!sItem.getLength()) throw css::container::NoSuchElementException( - ::rtl::OUString::createFromAscii("An empty item cant be part of this cache!"), + ::rtl::OUString::createFromAscii("An empty item can't be part of this cache!"), css::uno::Reference< css::uno::XInterface >(static_cast< css::container::XNameAccess* >(this), css::uno::UNO_QUERY)); css::uno::Any aValue; @@ -431,7 +431,7 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const ::rtl::OUString& sItem) css::uno::Type SAL_CALL BaseContainer::getElementType() throw (css::uno::RuntimeException) { - // no lock neccessary - because the type of our items + // no lock necessary - because the type of our items // is fix! no internal call or member needed ... return ::getCppuType(static_cast< css::uno::Sequence< css::beans::PropertyValue >* >(NULL)); } @@ -471,7 +471,7 @@ sal_Bool SAL_CALL BaseContainer::hasElements() css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const ::rtl::OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { - OSL_ENSURE(sal_False, "not pure virtual ... but not realy implemented .-)"); + OSL_ENSURE(sal_False, "not pure virtual ... but not really implemented .-)"); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< ::rtl::OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); @@ -505,7 +505,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea catch(const css::uno::Exception&) { // invalid cache, internal failure, wrong conversion ...!? - // doesnt matter + // doesn't matter lKeys.clear(); } @@ -538,7 +538,7 @@ void SAL_CALL BaseContainer::flush() if (!m_pFlushCache) throw css::lang::WrappedTargetRuntimeException( - ::rtl::OUString::createFromAscii("Cant guarantee cache consistency. Special flush container does not exists!"), + ::rtl::OUString::createFromAscii("Can't guarantee cache consistency. Special flush container does not exists!"), dynamic_cast< css::container::XNameAccess* >(this), css::uno::Any()); @@ -612,7 +612,7 @@ void SAL_CALL BaseContainer::flush() void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException) { - // no locks neccessary + // no locks necessary // used helper lives if we live and is threadsafe by itself ... m_lListener.addInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XFlushListener >* >(NULL)), xListener ); @@ -624,7 +624,7 @@ void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::ut void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException) { - // no locks neccessary + // no locks necessary // used helper lives if we live and is threadsafe by itself ... m_lListener.removeInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XFlushListener >* >(NULL)), xListener ); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index b79cfbb51ffc..eac70ce3459f 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -60,7 +60,7 @@ namespace filter{ should be available etc. @attention The base class BaseLock must be the first of declared ones. - Otherwhise we cant be shure, that our own mutex member (which is + Otherwise we can't be sure, that our own mutex member (which is present by this base class!) was full initialized inside our own ctor as first! */ @@ -97,7 +97,7 @@ class BaseContainer : public BaseLock /** @short local filter cache, which is used to collect changes on the filter configuration first and flush it later. - @descr Normaly this member isnt used nor initialized. Thats true, + @descr Normaly this member isn't used nor initialized. Thats true, if this container is used for reading only. The first write access (e.g. by calling insertByName()) creates a copy of the current global cache m_rCache to initialize the m_pFlushCache member. @@ -107,7 +107,7 @@ class BaseContainer : public BaseLock m_pFlushCache and m_rCache must not be synchronized manually here. m_rCache listen on the global configuration, where m_pFlushCache - write its data. m_rCache update itself automaticly. + write its data. m_rCache update itself automatically. */ FilterCache* m_pFlushCache; @@ -188,7 +188,7 @@ class BaseContainer : public BaseLock //--------------------------------------- /** @short check if the underlying configuration data was already loaded - and do it if neccessary automaticly. + and do it if necessary automatically. */ void impl_loadOnDemand(); @@ -222,7 +222,7 @@ class BaseContainer : public BaseLock FilterCache* p = impl_getWorkingCache(); p->doSomething(); aLock.clear(); - // after this point p cant b e guaranteed any longer! + // after this point p can't b e guaranteed any longer! */ FilterCache* impl_getWorkingCache() const; @@ -291,7 +291,7 @@ class BaseContainer : public BaseLock //--------------------------------------- // XContainerQuery - // must be implemented realy by derived class ... + // must be implemented really by derived class ... // We implement return of an empty result here only! // But we show an assertion :-) virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 05457a588cc7..9f6a2397cd20 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -158,7 +158,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap @param sActLocale must specify the current office locale. - Its needed to adress the UIName property inside + Its needed to address the UIName property inside the list of possible ones. */ void validateUINames(const ::rtl::OUString& sActLocale); @@ -170,7 +170,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap @descr Normaly the converter routines of the base class SequenceAsHashMap do this job already. - But it doesnt provide a "pack" mechanism to + But it doesn't provide a "pack" mechanism to ignore properties with empty (means "void") values. @return css::uno::Sequence< css::beans::PropertyValue > @@ -199,9 +199,9 @@ typedef ::std::hash_map< ::rtl::OUString , to an extension. Organization as an hash makes it faster then searching inside vectors. - On the other side e.g. URLPattern cant be realy adressed + On the other side e.g. URLPattern can't be really addressed by a hash value ... because the use wildcards. But - there we need key-value pairs too, which cant be provided + there we need key-value pairs too, which can't be provided by a pur vector! */ typedef ::std::hash_map< ::rtl::OUString , @@ -217,7 +217,7 @@ typedef ::std::hash_map< ::rtl::OUString , @descr Every type in this list is combined with an information, which property matched to the given URL. The user of this structure can decide then, if a deep detection should be - supressed e.g. if an URLPattern was used. + suppressed e.g. if an URLPattern was used. */ struct FlatDetectionInfo { diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 68ec1f7191c1..8667ca420652 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -122,7 +122,7 @@ void SAL_CALL ConfigFlush::refresh() void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) throw(css::uno::RuntimeException) { - // no locks neccessary + // no locks necessary // used helper lives if we live and is threadsafe by itself ... m_lListener.addInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XRefreshListener >* >(NULL)), xListener); @@ -132,7 +132,7 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) throw(css::uno::RuntimeException) { - // no locks neccessary + // no locks necessary // used helper lives if we live and is threadsafe by itself ... m_lListener.removeInterface(::getCppuType(static_cast< css::uno::Reference< css::util::XRefreshListener >* >(NULL)), xListener); diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index c0b6f9c9a7c1..48358e90fc4b 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -96,7 +96,7 @@ extern rtl::OUString pFilterStrings[]; #define CFGSET_FRAMELOADERS _FILTER_CONFIG_FROM_ASCII_("FrameLoaders" ) #define CFGSET_CONTENTHANDLERS _FILTER_CONFIG_FROM_ASCII_("ContentHandlers") -/** @short used to adress some configuration keys directly. +/** @short used to address some configuration keys directly. @descr Such direct keys should be used with function FilterCache::impl_getDirectCFGValue() only! @@ -181,7 +181,7 @@ extern rtl::OUString pFilterStrings[]; #define SERVICE_URLTRANSFORMER _FILTER_CONFIG_FROM_ASCII_("com.sun.star.util.URLTransformer" ) #define SERVICE_FILTERCONFIGREFRESH _FILTER_CONFIG_FROM_ASCII_("com.sun.star.document.FilterConfigRefresh" ) -/** @short some configuration pathes. +/** @short some configuration paths. */ #define CFGPACKAGE_TD_TYPES _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Types" ) #define CFGPACKAGE_TD_FILTERS _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Filter") diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index c52d65cfdf3d..7edcb85e9694 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -92,7 +92,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given handler name realy exist ... + check if the given handler name really exists ... Because our old implementation worked with an internal type name instead of a handler name. For a small migration time we must simulate this old feature :-( */ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 7c3952c01152..8387941c4b41 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -186,7 +186,7 @@ void FilterCache::takeOver(const FilterCache& rClone) m_eFillState = rClone.m_eFillState; // renew all dependencies and optimizations - // Because we cant be shure, that changed filters on one clone + // Because we can't be sure, that changed filters on one clone // and changed types of another clone work together. // But here we can check against the lates changes ... impl_validateAndOptimize(); @@ -222,7 +222,7 @@ void FilterCache::load(EFillState eRequired, ) ) { - OSL_ENSURE(sal_False, "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!"); + OSL_ENSURE(sal_False, "Who disturbs our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!"); } #endif @@ -429,14 +429,14 @@ CacheItem FilterCache::getItem( EItemType eType, { // ... or load it on demand from the // underlying configuration layer. - // Note: NoSuchElementException is thrown automaticly here if + // Note: NoSuchElementException is thrown automatically here if // item could not be loaded! pIt = impl_loadItemOnDemand(eType, sItem); } /* Workaround for #137955# Draw types and filters are installed ... but draw was disabled during setup. - We must supress accessing these filters. Otherwise the office can crash. + We must suppress accessing these filters. Otherwise the office can crash. Solution for the next major release: do not install those filters ! */ if (eType == E_FILTER) @@ -456,7 +456,7 @@ CacheItem FilterCache::getItem( EItemType eType, ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("The requested filter '" ); sMsg.append (sItem ); - sMsg.appendAscii("' exists ... but it shouldnt; because the corresponding OOo module was not installed."); + sMsg.appendAscii("' exists ... but it shouldn't; because the corresponding OOo module was not installed."); throw css::container::NoSuchElementException(sMsg.makeStringAndClear(), css::uno::Reference< css::uno::XInterface >()); } } @@ -505,13 +505,13 @@ void FilterCache::setItem( EItemType eType , CacheItemList& rList = impl_getItemList(eType); // name must be part of the property set too ... otherwhise our - // container query cant work correctly + // container query can't work correctly CacheItem aItem = aValue; aItem[PROPNAME_NAME] <<= sItem; aItem.validateUINames(m_sActLocale); // remove implicit properties as e.g. FINALIZED or MANDATORY - // They cant be saved here and must be readed on demand later, if they are needed. + // They can't be saved here and must be readed on demand later, if they are needed. removeStatePropsFromItem(aItem); rList[sItem] = aItem; @@ -564,8 +564,8 @@ void FilterCache::addStatePropsToItem( EItemType eType, { /* TODO Hack --> - The default frame loader cant be located inside te normal set of frame loaders. - Its an atomic property inside the misc cfg package. So we cant retrieve the information + The default frame loader can't be located inside te normal set of frame loaders. + Its an atomic property inside the misc cfg package. So we can't retrieve the information about FINALIZED and MANDATORY very easy ... :-( => set it to readonly/required everytimes :-) */ @@ -615,8 +615,8 @@ void FilterCache::addStatePropsToItem( EItemType eType, May by the following reason exists: - The item does not exists inside the new configuration package org.openoffice.TypeDetection - but we got it from the old package org.openoffice.Office/TypeDetection. We dont migrate such items - automaticly to the new format. Because it will disturb e.g. the deinstallation of an external filter - package. Because such external filter can remove the old file - but not the automaticly created new one ... + automatically to the new format. Because it will disturb e.g. the deinstallation of an external filter + package. Because such external filter can remove the old file - but not the automatically created new one ... => mark item as FINALIZED / MANDATORY, we dont support writing to the old format */ @@ -715,7 +715,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN // special case. no exception - but not a valid item => set must be finalized or mandatory! // Reject flush operation by throwing an exception. At least one item couldnt be flushed. if (!xItem.is()) - throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant add item. Set is finalized or mandatory!"), + throw css::uno::Exception(::rtl::OUString::createFromAscii("Can't add item. Set is finalized or mandatory!"), css::uno::Reference< css::uno::XInterface >() ); CacheItemList::const_iterator pItem = rCache.find(sItem); @@ -732,7 +732,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN // special case. no exception - but not a valid item => it must be finalized or mandatory! // Reject flush operation by throwing an exception. At least one item couldnt be flushed. if (!xItem.is()) - throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant change item. Its finalized or mandatory!"), + throw css::uno::Exception(::rtl::OUString::createFromAscii("Can't change item. Its finalized or mandatory!"), css::uno::Reference< css::uno::XInterface >() ); CacheItemList::const_iterator pItem = rCache.find(sItem); @@ -767,7 +767,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , // i) Step over all well known URL pattern // and add registered types to the return list too // Do it as first one - because: if a type match by a - // pattern a following deep detection can be supressed! + // pattern a following deep detection can be suppressed! // Further we can stop after first match ... for (CacheItemRegistration::const_iterator pPattReg = m_lURLPattern2Types.begin(); pPattReg != m_lURLPattern2Types.end() ; @@ -899,7 +899,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig } break; - default : throw css::uno::Exception(::rtl::OUString::createFromAscii("These configuration node isnt supported here for open!"), 0); + default : throw css::uno::Exception(::rtl::OUString::createFromAscii("These configuration node isn't supported here for open!"), 0); } { @@ -1074,7 +1074,7 @@ void FilterCache::impl_validateAndOptimize() } // Create a log for all detected problems, which - // occure in the next feew lines. + // occur in the next feew lines. // If there are some real errors throw a RuntimException! // If there are some warnings only, show an assertion. sal_Int32 nErrors = 0; @@ -1095,7 +1095,7 @@ void FilterCache::impl_validateAndOptimize() impl_resolveItem4TypeRegistration(&m_lDetectServices, sDetectService, sType); // get its registration for file Extensions AND(!) URLPattern ... - // It doesnt matter if these items exists or if our + // It doesn't matter if these items exists or if our // used index access create some default ones ... // only in case there is no filled set of Extensions AND // no filled set of URLPattern -> we must try to remove this invalid item @@ -1134,8 +1134,8 @@ void FilterCache::impl_validateAndOptimize() // its set list of extensions/url pattern. If its a "normal" type // set it at the end of this optimized list. But if its // a "Preferred" one - set it to the front of this list. - // Of course multiple "Preferred" registrations can occure - // (they shouldnt - but they can!) ... Ignore it. The last + // Of course multiple "Preferred" registrations can occur + // (they shouldn't - but they can!) ... Ignore it. The last // preferred type is useable in the same manner then every // other type! sal_Bool bPreferred = sal_False; @@ -1144,7 +1144,7 @@ void FilterCache::impl_validateAndOptimize() const ::rtl::OUString* pExtensions = lExtensions.getConstArray(); for (sal_Int32 e=0; e<ce; ++e) { - // Note: We must be shure that adress the right hash entry + // Note: We must be sure that address the right hash entry // does not depend from any upper/lower case problems ... ::rtl::OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase(); @@ -1176,7 +1176,7 @@ void FilterCache::impl_validateAndOptimize() // Dont check cross references between types and filters, if // not all filters read from disk! // OK - this cache can read single filters on demand too ... - // but then the fill state of this cache shouldnt be set to E_CONTAINS_FILTERS! + // but then the fill state of this cache shouldn't be set to E_CONTAINS_FILTERS! if (!bAllFiltersShouldExist) continue; @@ -1204,7 +1204,7 @@ void FilterCache::impl_validateAndOptimize() sLog.appendAscii("Warning\t:\t" ); sLog.appendAscii("The type \"" ); sLog.append (sType ); - sLog.appendAscii("\" isnt used by any filter, loader or content handler.\n"); + sLog.appendAscii("\" isn't used by any filter, loader or content handler.\n"); ++nWarnings; } } @@ -1391,7 +1391,7 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: EItemFlushState eState( E_ITEM_UNCHANGED ); - // !? ... such situation can occure, if an item was added and(!) removed before it was flushed :-) + // !? ... such situation can occur, if an item was added and(!) removed before it was flushed :-) if (!bExistsInConfigLayer && !bExistsInMemory) eState = E_ITEM_UNCHANGED; else @@ -1416,7 +1416,7 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; - // In case its a new created entry (automaticly done by the hash_map index operator!) + // In case its a new created entry (automatically done by the hash_map index operator!) // we must be shure, that this entry has its own name as property available. // Its needed later at our container interface! rItem[PROPNAME_NAME] <<= sItem; @@ -1449,7 +1449,7 @@ void FilterCache::impl_load(EFillState eRequiredState) ) { // Attention! If config couldnt be opened successfully - // and exception os thrown automaticly and must be forwarded + // and exception os thrown automatically and must be forwarded // to our calli ... css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); { @@ -1466,7 +1466,7 @@ void FilterCache::impl_load(EFillState eRequiredState) ) { // Attention! If config couldnt be opened successfully - // and exception os thrown automaticly and must be forwarded + // and exception os thrown automatically and must be forwarded // to our calli ... css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); { @@ -1483,7 +1483,7 @@ void FilterCache::impl_load(EFillState eRequiredState) ) { // Attention! If config couldnt be opened successfully - // and exception os thrown automaticly and must be forwarded + // and exception os thrown automatically and must be forwarded // to our calli ... css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY); { @@ -1500,7 +1500,7 @@ void FilterCache::impl_load(EFillState eRequiredState) ) { // Attention! If config couldnt be opened successfully - // and exception os thrown automaticly and must be forwarded + // and exception os thrown automatically and must be forwarded // to our calli ... css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); { @@ -1517,7 +1517,7 @@ void FilterCache::impl_load(EFillState eRequiredState) ) { // Attention! If config couldnt be opened successfully - // and exception os thrown automaticly and must be forwarded + // and exception os thrown automatically and must be forwarded // to our calli ... css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); { @@ -1788,7 +1788,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: throw(css::uno::Exception) { // try to get an API object, which points directly to the - // requested item. If it fail an exception should occure and + // requested item. If it fail an exception should occur and // break this operation. Of course returned API object must be // checked too. css::uno::Reference< css::container::XNameAccess > xItem; @@ -1883,7 +1883,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: aItem[PROPNAME_USERDATA ] = xItem->getByName(PROPNAME_USERDATA ); aItem[PROPNAME_TEMPLATENAME] = xItem->getByName(PROPNAME_TEMPLATENAME); //TODO remove it if moving of filter uinames to type uinames -// will be finished realy +// will be finished really #ifdef AS_ENABLE_FILTER_UINAMES impl_readPatchUINames(xItem, aItem); #endif // AS_ENABLE_FILTER_UINAMES @@ -1951,7 +1951,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType case E_DETECTSERVICE : { - OSL_ENSURE(sal_False, "Cant load detect services on demand. Who use this unsupported feature?"); + OSL_ENSURE(sal_False, "Can't load detect services on demand. Who use this unsupported feature?"); } break; } @@ -2068,7 +2068,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName } //TODO remove it if moving of filter uinames to type uinames -// will be finished realy +// will be finished really #ifdef AS_ENABLE_FILTER_UINAMES css::uno::Reference< css::container::XNameReplace > xUIName; xItem->getByName(PROPNAME_UINAME) >>= xUIName; @@ -2092,7 +2092,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName /*----------------------------------------------- 20.10.2003 09:45 - static! => no locks neccessary + static! => no locks necessary -----------------------------------------------*/ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) { @@ -2127,7 +2127,7 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam /*----------------------------------------------- 27.06.2003 09:26 - static! => no locks neccessary + static! => no locks necessary -----------------------------------------------*/ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames) { @@ -2338,7 +2338,7 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, /*----------------------------------------------- 12.02.2004 08:30 TODO work on a cache copy first, which can be flushed afterwards - That would be usefully to gurantee a consistent cache. + That would be usefully to guarantee a consistent cache. -----------------------------------------------*/ void FilterCache::impl_readOldFormat() throw(css::uno::Exception) @@ -2347,7 +2347,7 @@ void FilterCache::impl_readOldFormat() static ::rtl::OUString FILTER_SET = ::rtl::OUString::createFromAscii("Filters"); // Attention: Opening/Reading of this old configuration format has to be handled gracefully. - // Its optional and shouldnt disturb our normal work! + // Its optional and shouldn't disturb our normal work! // E.g. we must check, if the package exists ... css::uno::Reference< css::container::XNameAccess > xCfg; @@ -2398,14 +2398,14 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe xSet->getByName(sItem) >>= xItem; if (!xItem.is()) throw css::uno::Exception( - ::rtl::OUString::createFromAscii("Cant read old item."), + ::rtl::OUString::createFromAscii("Can't read old item."), css::uno::Reference< css::uno::XInterface >()); CacheItem aItem; aItem[PROPNAME_NAME] <<= sItem; // Installed flag ... - // Isnt used any longer! + // Isn't used any longer! // UIName impl_readPatchUINames(xItem, aItem); @@ -2421,7 +2421,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe ) { throw css::uno::Exception( - ::rtl::OUString::createFromAscii("Cant read old item property DATA."), + ::rtl::OUString::createFromAscii("Can't read old item property DATA."), css::uno::Reference< css::uno::XInterface >()); } diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index c955e1ab6541..5aa1ec915c4b 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -153,7 +153,7 @@ class FilterCache : public BaseLock */ enum EItemFlushState { - /// indicates an unchanged item (can occure e.g. if an item was added and(!) removed before it was flushed ... + /// indicates an unchanged item (can occur e.g. if an item was added and(!) removed before it was flushed ... E_ITEM_UNCHANGED = 0, /// indicates an item, which exists inside config layer but not inside our own cache E_ITEM_REMOVED = 1, @@ -281,7 +281,7 @@ class FilterCache : public BaseLock /** @short standard ctor @descr Its not allowed to do anything here ... - especialy is forbidden to start operations, + especially is forbidden to start operations, which needs a FilterCache instance too! Why? Because thie FilterCache instance will be used as a singleton! And if during this ctor any @@ -309,12 +309,12 @@ class FilterCache : public BaseLock After its changed data was flushed to the configuration it can be removed. - The original container will get these new data automaticly + The original container will get these new data automatically because it listen for changes on the internal used configuration layer. - If the new data are needed immediatly inside the original container, + If the new data are needed immediately inside the original container, the method takeOver() can be used to copy all changes back. The may be following notifications of the configuration will be superflous then. - But they cant be stopped ... + But they can't be stopped ... All internal structures will be copied here. But the internal used configuration (update) access wont be copied. The cloned instance contains @@ -348,7 +348,7 @@ class FilterCache : public BaseLock if this "load-on-demand" thread does not finished its work before. This method "load(xxx)" synchronize such load-on-demand requests. - Of course it would be possible to supress this special load thread + Of course it would be possible to suppress this special load thread in general and start it manualy inside this load() request. The outside code decide then, if and when this cache will be filled with all available informations ... @@ -361,7 +361,7 @@ class FilterCache : public BaseLock "load-on-demand-thread", which tries to optimize our startup performance and start this load() only in case the office startup was already finished! - @throw An exception if the cache could not be filled realy + @throw An exception if the cache could not be filled really or seems to be invalid afterwards. But there is no reaction at all if this method does nothing inside, because the cache is already full filled! @@ -482,7 +482,7 @@ class FilterCache : public BaseLock @attention This method exists to supports some UNO container interfaces only. (e.g. XNameAccess.hasByName()). But inside multithreaded environments there is no guarantee, that this item still exists, if - its realy requested e.g. by calling getItem()! + its really requested e.g. by calling getItem()! Be aware of some NoSuchElementExistExceptions ... @param eType @@ -505,7 +505,7 @@ class FilterCache : public BaseLock /** @short return an item, which match the specified type and name. @descr Because this cache can be used inside multithreaded environments - the caller must be aware of some exceptions - especialy a "NoSuchElementExcepotion". + the caller must be aware of some exceptions - especially a "NoSuchElementExcepotion". May another thread already removed the required item before ... @param eType @@ -561,7 +561,7 @@ class FilterCache : public BaseLock cache item reference. @descr Such properties can e.g. finalized or mandatory. - They are not persistent and not realy part of e.g. a + They are not persistent and not really part of e.g. a filter not. But they are attributes of a configuration entry and can influence our container interface. @@ -584,12 +584,12 @@ class FilterCache : public BaseLock attributes there. @throw [css::uno::Exception] - if an internal error occured. + if an internal error occurred. Note: If the item is missing inside the underlying configuration no exception will be thrown. In such case the item is marked as - finalized/mandatory automaticly + finalized/mandatory automatically Reason: May be the item cames from the old configuration package and - was not migrated to the new one. So we cant provide write access + was not migrated to the new one. So we can't provide write access to such items ... */ virtual void addStatePropsToItem( EItemType eType, @@ -628,7 +628,7 @@ class FilterCache : public BaseLock @param aURL URL of the content, which type should be detected. - Its already parsed and splitted into its differnt parts, + Its already parsed and splitted into its different parts, like e.g.: main, jump marks etcpp. @param rFlatTypes @@ -689,7 +689,7 @@ class FilterCache : public BaseLock see EConfigProvider for further informations ... @attention If a configuration access was opened successfully - all neccessary listener connections will be established + all necessary listener connections will be established too. So this cache will be informed about outside updates. */ css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide) @@ -737,7 +737,7 @@ class FilterCache : public BaseLock @return [css::uno::Any] the value of the requested key. - Can be empty if an internal error occured or if the requested + Can be empty if an internal error occurred or if the requested key does not exists! */ css::uno::Any impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey); @@ -762,8 +762,8 @@ class FilterCache : public BaseLock /** @short validate the whole cache and create structures for optimized items access. - @descr Wrong cache items will be removed automaticly. - Wrong dependencies will be corrected automaticly. + @descr Wrong cache items will be removed automatically. + Wrong dependencies will be corrected automatically. If something could not be repaired - an exception is thrown. Further some optmized structures will be created. @@ -783,9 +783,9 @@ class FilterCache : public BaseLock /** @short register the specified item for the given type. @descr Because detect services, frame loader or content handler - are not listed inside the xml configuration as seperated + are not listed inside the xml configuration as separated items (they are properties of any type entry!), this method update - the internal lists of such items. Thats neccessary to have + the internal lists of such items. Thats necessary to have it accessible for our container interfaces of detect, frame loader and content handler services. @@ -839,7 +839,7 @@ class FilterCache : public BaseLock points to the cache member, which should be filled or updated. @throw [css::uno::Exception] - if an unrecoverable error occure inside this operation. + if an unrecoverable error occur inside this operation. */ void impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig, EItemType eType , @@ -861,15 +861,15 @@ class FilterCache : public BaseLock specify, which container item type must be readed. @param sItem - means the internal name, which can be used to adress the item + means the internal name, which can be used to address the item properties relativ to the given configuration set. @param eOption regulate, which properties of the requested item should be read. - See defintion of EReadOption for further informations. + See definition of EReadOption for further informations. @throw [css::uno::Exception] - if an unrecoverable error occure inside this operation. + if an unrecoverable error occur inside this operation. */ CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , @@ -884,7 +884,7 @@ class FilterCache : public BaseLock @descr The outside code has to be shure, that the item does not already exists inside this cachse. Otherwise it will be loaded twice. This method - doesnt check such constellations! + doesn't check such constellations! @param eType specify the type of config item, which must be interpreted. @@ -895,14 +895,14 @@ class FilterCache : public BaseLock the set node name of the requested item. @return An iterator, which points directly to the new cached item. - Is a valid iterator if no exception occured here! + Is a valid iterator if no exception occurred here! But to improve robustness - it should be checked :-) @throw [css::container::NoSuchElementException] if the item does not exists inside the configuration layer too! @throw [css::uno::Exception] - if an unrecoverable error occure inside this operation. + if an unrecoverable error occurs inside this operation. */ CacheItemList::iterator impl_loadItemOnDemand( EItemType eType, const ::rtl::OUString& sItem) @@ -935,7 +935,7 @@ class FilterCache : public BaseLock //--------------------------------------- - /** @short specify, which save operation is neccessary for the specified item. + /** @short specify, which save operation is necessary for the specified item. @desrc If an item of this cache will be added/removed or modified it will be changed inside memory only first. But we save its name inside a special diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index a5f84bd3a183..14eb34ab470c 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given filter name realy exist ... + check if the given filter name really exists ... Because our old implementation worked with an internal type name instead of a filter name. For a small migration time we must simulate this old feature :-( */ @@ -208,9 +208,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic throw(css::uno::RuntimeException) { /* Attention: Instead of getElementNames() this method have to return only filter names, - which can be created as UNO Services realy. Thats why we search for filters, + which can be created as UNO Services really. Thats why we search for filters, which dont have a valid value for the property "FilterService". - Of course we cant check for corrupted service names here. We can check + Of course we can't check for corrupted service names here. We can check for empty strings only ... */ CacheItem lIProps; @@ -415,9 +415,9 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize const CacheItem aFilter = pCache->getItem(FilterCache::E_FILTER, sName); CacheItem::const_iterator pProp ; - // "matchByDocumentService=" => any filter will be adressed here - // "matchByDocumentService=all" => any filter will be adressed here - // "matchByDocumentService=com.sun.star..." => only filter matching this document service will be adressed + // "matchByDocumentService=" => any filter will be addressed here + // "matchByDocumentService=all" => any filter will be addressed here + // "matchByDocumentService=com.sun.star..." => only filter matching this document service will be addressed ::rtl::OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, ::rtl::OUString()); if ( ( sDocumentService.getLength() ) && @@ -430,8 +430,8 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize // "iflags=" => not allowed // "iflags=-1" => not allowed - // "iflags=0" => not usefull - // "iflags=283648" => only filter, which has set these flag field will be adressed + // "iflags=0" => not useful + // "iflags=283648" => only filter, which has set these flag field will be addressed sal_Int32 nCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_FLAGS, (sal_Int32)0); if ( (nIFlags > 0 ) && @@ -443,8 +443,8 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize // "eflags=" => not allowed // "eflags=-1" => not allowed - // "eflags=0" => not usefull - // "eflags=283648" => only filter, which has not set these flag field will be adressed + // "eflags=0" => not useful + // "eflags=283648" => only filter, which has not set these flag field will be addressed if ( (nEFlags > 0 ) && ((nCheckValue & nEFlags) == nEFlags) @@ -674,7 +674,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS xUISortConfig->getByName(sModule) >>= xModule; if (xModule.is()) // only to be on the safe side of life if the exception was not thrown .-) { - // Note: convertion of the returned Any to OUStringList throws + // Note: conversion of the returned Any to OUStringList throws // an IllegalArgumentException if the type does not match ... // but it resets the OUStringList to a length of 0 if the Any is empty! OUStringList lSortedFilters(xModule->getByName(PROPNAME_SORTEDFILTERLIST)); diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 731c8d3ef8fe..23cff43ba4f0 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -89,7 +89,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given loader name realy exist ... + check if the given loader name really exists ... Because our old implementation worked with an internal type name instead of a loader name. For a small migration time we must simulate this old feature :-( */ diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 3fdd10a2e86a..f7f90ff7957a 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -119,7 +119,7 @@ void SAL_CALL LateInitListener::disposing(const css::lang::EventObject& /* aEven // Normaly it should never be called. Because we cancel our listener connection // if we got the event about finished open of the first office document. // But if this method was reached, it indicates an office, which was started - // (might as remote script container for an external API client) but not realy used. + // (might as remote script container for an external API client) but not really used. // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 628778c50609..0d1d3c173bd8 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -53,7 +53,7 @@ namespace filter{ </ul> uses this schema. - @attention This class is not threadsafe implemented. Because its not neccessary. + @attention This class is not threadsafe implemented. Because its not necessary. But you have to make shure, that ist not used as such :-) */ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString , @@ -83,7 +83,7 @@ class QueryTokenizer : public ::std::hash_map< ::rtl::OUString a new query. @descr The given query is immidiatly analyzed - and seperated into its token, which can + and separated into its token, which can be access by some specialized method later. @param sQuery diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index c13d608051bc..70644910c2a9 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -169,7 +169,7 @@ TypeDetection::~TypeDetection() // verify every flat detected (or preselected!) type // by calling its registered deep detection service. // But break this loop if a type match to the given descriptor - // by an URL pattern(!) or if deep detection isnt allowed from + // by an URL pattern(!) or if deep detection isn't allowed from // outside (bAllowDeep=sal_False) or break the whole detection by // throwing an exception if creation of the might needed input // stream failed by e.g. an IO exception ... @@ -179,7 +179,7 @@ TypeDetection::~TypeDetection() //******************************************* // if no flat detected (nor preselected!) type could be - // verified and no error occured during creation of + // verified and no error occurred during creation of // the might needed input stream, start detection // which uses all registered deep detection services. if ( @@ -415,9 +415,9 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS const css::util::URL& aParsedURL , FlatDetection& rFlatTypes ) { - // Can be used to supress execution of some parts of this method + // Can be used to suppress execution of some parts of this method // if its already clear that detected type is valid or not. - // Its neccessary to use shared code at the end, which update + // Its necessary to use shared code at the end, which update // all return parameters constistency! sal_Bool bBreakDetection = sal_False; @@ -456,7 +456,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS if (!bBreakDetection) { - // We cant check a preselected type for a given stream! + // We can't check a preselected type for a given stream! // So we must believe, that it can work ... if (aParsedURL.Complete.equalsAsciiL("private:stream", 14)) bBreakDetection = sal_True; @@ -471,8 +471,8 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); - // otherwhise we must know, if it matches to the given URL realy. - // especialy if it matches by its extension or pattern registration. + // otherwise we must know, if it matches to the given URL really. + // especially if it matches by its extension or pattern registration. OUStringList lExtensions(aType[PROPNAME_EXTENSIONS]); OUStringList lURLPattern(aType[PROPNAME_URLPATTERN]); @@ -549,9 +549,9 @@ sal_Bool TypeDetection::impl_getPreselectionForFilter(const ::rtl::OUString& sPr const css::util::URL& aParsedURL , FlatDetection& rFlatTypes ) { - // Can be used to supress execution of some parts of this method + // Can be used to suppress execution of some parts of this method // if its already clear that detected filter is valid or not. - // Its neccessary to use shared code at the end, which update + // Its necessary to use shared code at the end, which update // all return parameters constistency! sal_Bool bBreakDetection = sal_False; @@ -701,9 +701,9 @@ void TypeDetection::impl_getPreselection(const css::util::URL& aP And the user normaly preselects a filter or type. The preslected document service cames from the dialog. - Further it doesnt matter if the user preselected a filter or a document service. + Further it doesn't matter if the user preselected a filter or a document service. A filter selection is always more explicit then a document service selection. - So it must be pereferred. An order between type and filter selection cant be discussed .-) + So it must be pereferred. An order between type and filter selection can't be discussed .-) */ ::rtl::OUString sSelectedType = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString()); @@ -737,8 +737,8 @@ void TypeDetection::impl_getPreselection(const css::util::URL& aP // solutions: // a) no types => no detection // b) deep detection not allowed => return first valid type of list (because its the preferred or the first valid one) - // or(!) match by URLPattern => in such case a deep detection will be supressed! - // c) type has no detect service => safe the first occured type without a detect service + // or(!) match by URLPattern => in such case a deep detection will be suppressed! + // c) type has no detect service => safe the first occurred type without a detect service // as "last chance"(!). It will be used outside of this method // if no further type could be detected. // It must be the first one, because it can be a preferred type. @@ -1005,7 +1005,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // <- SAFE // Attention! If e.g. an office module was not installed sometimes we find a - // registered detect service, which is referred inside the configuration ... but not realy + // registered detect service, which is referred inside the configuration ... but not really // installed. On the other side we use third party components here, which can make trouble anyway. // So we should handle errors during creation of such services more gracefully .-) xDetector = css::uno::Reference< css::document::XExtendedFilterDetection >( @@ -1087,8 +1087,8 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // Dont distrub the user for "non existing files - means empty URLs" or // if we was forced to detect a stream. // Reason behind: We must be shure to ask user for "unknown contents" only ... - // and not for "missing files". Especialy if detection is done by a stream only - // we cant check if the stream points to an "existing content"! + // and not for "missing files". Especially if detection is done by a stream only + // we can't check if the stream points to an "existing content"! if ( (!sURL.getLength() ) || // "non existing file" ? (!xStream.is() ) || // non existing file ! diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 398d9f8af788..9aa41434fcf3 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -101,11 +101,11 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer MediaDescriptor and validate this information. @descr Only in case the preselected filter exists and its type registration - seems to be usefully, it would be used realy as valid type detection - result. This method doesnt make any deep detection here. It checks only + seems to be usefully, it would be used really as valid type detection + result. This method doesn't make any deep detection here. It checks only if the preselection match to the URL by an URLPattern. This information has to be added to the given rFlatTypes list too. - The outside code can use it to supress a deep detection then in general. + The outside code can use it to suppress a deep detection then in general. Because pattern are defined as non detectable at all! @param pDescriptor @@ -130,16 +130,16 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer @descr It steps over all flat detected types (given by the parameter lFlatTypes), try it and search for most suitable one. The specified MediaDescriptor will be patched, so it contain - the right values everytime. Using of any deep detection service + the right values every time. Using of any deep detection service can be enabled/disabled. And last but not least: If the results - wont be realy clear (because a flat detected type has no deep + wont be really clear (because a flat detected type has no deep detection service), a "sugested" type name will be returned as "rLastChance". It can be used after e.g. all well known deep detection services was used without getting any result. Then this "last-chance-type" should be returned. Of course using of it can fail too ... but its a try :-) As an optimization - this method collects the names of all used deep - detection services. This information can be usefull inside the may be + detection services. This information can be useful inside the may be afterwards called method "impl_detectTypeDeepOnly()"! @param rDescriptor @@ -183,7 +183,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer and check her results. The first positive result will be used for return. Its more a "try and error" algorithm then a real type detection and will be used if a flat detection - cant work realy ... e.g. if the extension of an URL is + can't work really ... e.g. if the extension of an URL is missing or wrong. @param rDescriptor @@ -207,7 +207,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer /** @short seek a might existing stream to position 0. @descr This is an optinal action to be more robust - in case any detect service doesnt make this seek ... + in case any detect service doesn't make this seek ... Normaly it's part of any called detect service or filter ... but sometimes it's not done there. @@ -222,7 +222,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer detect service (threadsafe!). @descr It creates the right uno service, prepare the - needed MediaDescriptor, call ths right interfaces, + needed MediaDescriptor, call this right interfaces, and return the results. @attention The results (means type and corresponding filter) @@ -258,7 +258,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- /** @short check if an input stream is already part of the - given MediaDesciptor and creates a new one if neccessary. + given MediaDesciptor and creates a new one if necessary. @attention This method does further something special! <ul> @@ -286,7 +286,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer Note : Its content will be adapted to returned result of this method. Means: The stream will be added to it. - @throw Any suitable exception if stream should be opened but operation was not sucessfull. + @throw Any suitable exception if stream should be opened but operation was not successful. Note: If an interactionHandler is part of the given descriptor too, it was already used. Means: let the exception pass trough the top most interface method! */ @@ -379,7 +379,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer types too ! @note #i60158# - sometimes our text ascii and our csv filter cant work together. + sometimes our text ascii and our csv filter can't work together. Then we overwrite our detection hardly. sType param is used as out parameter then too ... and rDescriptor will be changed by selecting another filter. diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index b0ae3a56d625..53e13baf29aa 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -27,6 +27,6 @@ //_______________________________________________ //#define _FILTER_CONFIG_Q_ // final Q code base -#define _FILTER_CONFIG_MIGRATION_Q_ // usefull for migration time, to support some old functionality temp. :-) +#define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) #endif // _FILTER_CONFIG_VERSIONS_HXX_ diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk index 84497eebdd17..971c1bca405e 100644 --- a/filter/source/config/fragments/makefile.mk +++ b/filter/source/config/fragments/makefile.mk @@ -156,7 +156,7 @@ PACKLANG_PARAM := --stringparam PACKLANG_XSL := # ----------------------------------------------------------------------------- -# build every module seperated +# build every module separated # ----------------------------------------------------------------------------- $(REALFILTERPACKAGES_TYPES_FLAG) : $$(TYPES_4$$(@:b)) diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index 8015de567522..1adc1f1aa503 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -311,7 +311,7 @@ def printHelp(): print("parameters:") print("\tcfg=<file name>") print("\t\tmust point to a system file, which contains") - print("\t\tall neccessary configuration data for the merge process.") + print("\t\tall necessary configuration data for the merge process.") print("\tFurther cou can specify every parameter allowed in the") print("\tconfig file as command line parameter too, to overwrite") print("\tthe value from the file.") @@ -502,7 +502,7 @@ class Merger: self.m_aCfg.getValue(PROP_XMLPACKAGE ),\ self.m_aCfg.getValueWithDefault(PROP_LANGUAGEPACK, False)) - # counts all transfered fragments + # counts all transferred fragments # Can be used later to decide, if a generated package file # contains "nothing"! nItemCount = 0 diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java index afd4656ba3b5..24ff179e75f9 100644 --- a/filter/source/config/tools/split/FCFGSplit.java +++ b/filter/source/config/tools/split/FCFGSplit.java @@ -182,7 +182,7 @@ public class FCFGSplit * Its meaned relativ to m_sOutDir. */ private static java.lang.String m_sSubDirContentHandlers; - /** enable/disable generating of filter groups - seperated by + /** enable/disable generating of filter groups - separated by * application modules. */ private static boolean m_bSeperateFiltersByModule; @@ -466,7 +466,7 @@ public class FCFGSplit sTimes.append(" ms\n" ); m_aDebug.setDetailedInfo(sTimes.toString()); - // everyting seems to be ok. + // everything seems to be ok. // Return "OK" to calli. m_aDebug.setGlobalInfo("Finish."); System.exit(0); diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java index 69461bda2b8a..94c94b37efdb 100644 --- a/filter/source/config/tools/split/Splitter.java +++ b/filter/source/config/tools/split/Splitter.java @@ -80,7 +80,7 @@ public class Splitter createDirectoryStructures(); // use some statistic values to check if all cache items - // will be transformed realy. + // will be transformed really. int nTypes = m_aDataSet.m_aCache.getItemCount(Cache.E_TYPE ); int nFilters = m_aDataSet.m_aCache.getItemCount(Cache.E_FILTER ); int nDetectServices = m_aDataSet.m_aCache.getItemCount(Cache.E_DETECTSERVICE ); diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 256dceac5c9f..4c4acf33f1ac 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -171,7 +171,7 @@ Dialog* SWFDialog::createDialog( Window* pParent ) if( mpResMgr && mxSrcDoc.is() ) { -/* TODO: From the controler we may get information what page is visible and what shapes +/* TODO: From the controller we may get information what page is visible and what shapes are selected, if we optionaly want to limit output to that Any aSelection; diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 2e7b8ebe57ef..25fd96506e4e 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -99,14 +99,33 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo ) // ----------------------------------------------------------------------------- -FlashExporter::FlashExporter(const Reference< XMultiServiceFactory > &rxMSF, sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG) -: mxMSF( rxMSF ), - mpWriter( NULL ), +FlashExporter::FlashExporter( + const Reference< XMultiServiceFactory > &rxMSF, + + // #56084# variables for selection export + const Reference< XShapes >& rxSelectedShapes, + const Reference< XDrawPage >& rxSelectedDrawPage, + + sal_Int32 nJPEGCompressMode, + sal_Bool bExportOLEAsJPEG) +: mxMSF(rxMSF), + + // #56084# variables for selection export + mxSelectedShapes(rxSelectedShapes), + mxSelectedDrawPage(rxSelectedDrawPage), + mbExportSelection(false), + + mpWriter(NULL), mnJPEGcompressMode(nJPEGCompressMode), mbExportOLEAsJPEG(bExportOLEAsJPEG), mbPresentation(true), - mnPageNumber( - 1 ) + mnPageNumber(-1) { + if(mxSelectedDrawPage.is() && mxSelectedShapes.is() && mxSelectedShapes->getCount()) + { + // #56084# determine export selection + mbExportSelection = true; + } } // ----------------------------------------------------------------------------- @@ -146,7 +165,16 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut return sal_False; Reference< XDrawPage > xDrawPage; - xDrawPages->getByIndex(0) >>= xDrawPage; + + // #56084# set xDrawPage directly when exporting selection + if(mbExportSelection) + { + xDrawPage = mxSelectedDrawPage; + } + else + { + xDrawPages->getByIndex(0) >>= xDrawPage; + } Reference< XPropertySet > xProp( xDrawPage, UNO_QUERY ); try @@ -165,17 +193,29 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut return false; // no writer, no cookies } - const sal_Int32 nPageCount = xDrawPages->getCount(); + // #56084# nPageCount is 1 when exporting selection + const sal_Int32 nPageCount = mbExportSelection ? 1 : xDrawPages->getCount(); sal_uInt16 nPage; + if ( xStatusIndicator.is() ) + { xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Macromedia Flash (SWF)" )), nPageCount); + } + for( nPage = 0; nPage < nPageCount; nPage++) { + // #56084# keep PageNumber? We could determine the PageNumber of the single to-be-eported page + // when exporting the selection, but this is only used for swf internal, so no need to do so (AFAIK) mnPageNumber = nPage + 1; if ( xStatusIndicator.is() ) xStatusIndicator->setValue( nPage ); - xDrawPages->getByIndex(nPage) >>= xDrawPage; + + // #56084# get current xDrawPage when not exporting selection; else alraedy set above + if(!mbExportSelection) + { + xDrawPages->getByIndex(nPage) >>= xDrawPage; + } if( !xDrawPage.is()) continue; @@ -189,11 +229,25 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut continue; } - exportBackgrounds( xDrawPage, nPage, false ); - exportBackgrounds( xDrawPage, nPage, true ); + // #56084# no background when exporting selection + if(!mbExportSelection) + { + exportBackgrounds( xDrawPage, nPage, false ); + exportBackgrounds( xDrawPage, nPage, true ); + } maPagesMap[nPage].mnForegroundID = mpWriter->startSprite(); - exportDrawPageContents( xDrawPage, false, false ); + + // #56084# directly export selection in export selection mode + if(mbExportSelection) + { + exportShapes( mxSelectedShapes, false, false ); + } + else + { + exportDrawPageContents( xDrawPage, false, false ); + } + mpWriter->endSprite(); // AS: If the background is different than the previous slide, @@ -490,7 +544,7 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X /** export's the definition of the shapes inside this drawing page and adds the shape infos to the current PageInfo */ -void FlashExporter::exportDrawPageContents( Reference< XDrawPage >& xPage, bool bStream, bool bMaster ) +void FlashExporter::exportDrawPageContents( const Reference< XDrawPage >& xPage, bool bStream, bool bMaster ) { Reference< XShapes > xShapes( xPage, UNO_QUERY ); exportShapes(xShapes, bStream, bMaster); @@ -500,7 +554,7 @@ void FlashExporter::exportDrawPageContents( Reference< XDrawPage >& xPage, bool /** export's the definition of the shapes inside this XShapes container and adds the shape infos to the current PageInfo */ -void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, bool bMaster ) +void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStream, bool bMaster ) { OSL_ENSURE( (xShapes->getCount() <= 0xffff), "overflow in FlashExporter::exportDrawPageContents()" ); @@ -532,7 +586,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b // ----------------------------------------------------------------------------- /** export this shape definition and adds it's info to the current PageInfo */ -void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster ) +void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster ) { Reference< XPropertySet > xPropSet( xShape, UNO_QUERY ); if( !xPropSet.is() ) diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 6c7167f55579..03e5e6d06052 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -155,7 +155,15 @@ typedef ::std::map<sal_uInt32, PageInfo> PageInfoMap; class FlashExporter { public: - FlashExporter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, sal_Int32 nJPEGCompressMode = -1, sal_Bool bExportOLEAsJPEG = false); + FlashExporter( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, + + // #56084# variables for selection export + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxSelectedShapes, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxSelectedDrawPage, + + sal_Int32 nJPEGCompressMode = -1, + sal_Bool bExportOLEAsJPEG = false); ~FlashExporter(); void Flush(); @@ -176,6 +184,12 @@ public: private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; + + // #56084# variables for selection export + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxSelectedShapes; + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxSelectedDrawPage; + bool mbExportSelection; + ::com::sun::star::uno::Reference< ::com::sun::star::document::XExporter > mxGraphicExporter; PageInfoMap maPagesMap; @@ -183,9 +197,9 @@ private: sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage); sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage); - void exportDrawPageContents( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage, bool bStream, bool bMaster ); - void exportShapes( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes, bool bStream, bool bMaster ); - void exportShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bMaster); + void exportDrawPageContents( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage, bool bStream, bool bMaster ); + void exportShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes, bool bStream, bool bMaster ); + void exportShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bMaster); sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); sal_uInt32 ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes); diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 511c7be38b9f..aafbfe60eb1d 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -35,6 +35,13 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/io/XOutputStream.hpp> + +#include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/frame/XDesktop.hdl> +#include <com/sun/star/frame/XController.hdl> +#include <com/sun/star/view/XSelectionSupplier.hpp> + #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> #include <osl/file.hxx> @@ -51,6 +58,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::task; +using namespace ::com::sun::star::view; using ::rtl::OUString; using ::rtl::OString; @@ -152,6 +160,11 @@ class FlashExportFilter : public cppu::WeakImplHelper4 Reference< XMultiServiceFactory > mxMSF; Reference< XStatusIndicator> mxStatusIndicator; + // #56084# variables for selection export + Reference< XShapes > mxSelectedShapes; + Reference< XDrawPage > mxSelectedDrawPage; + bool mbExportSelection; + osl::File* mpFile; public: @@ -180,7 +193,13 @@ public: // ----------------------------------------------------------------------------- FlashExportFilter::FlashExportFilter(const Reference< XMultiServiceFactory > &rxMSF) -: mxMSF( rxMSF ) +: mxDoc(), + mxMSF( rxMSF ), + mxStatusIndicator(), + mxSelectedShapes(), + mxSelectedDrawPage(), + mbExportSelection(false), + mpFile(0) { } @@ -192,7 +211,7 @@ OUString exportBackground(FlashExporter &aFlashExporter, Reference< XDrawPage > OUString filename = STR("slide") + VAL(nPage+1) + STR(suffix) + STR(".swf"); OUString fullpath = sPath + STR("/") + filename; - // AS: If suffix is "o" then the last paramter is true (for exporting objects). + // AS: If suffix is "o" then the last parameter is true (for exporting objects). Reference<XOutputStream> xOutputStreamWrap(*(new OslOutputStreamWrapper(fullpath)), UNO_QUERY); sal_uInt16 nCached = aFlashExporter.exportBackgrounds( xDrawPage, xOutputStreamWrap, sal::static_int_cast<sal_uInt16>( nPage ), *suffix == 'o' ); aFlashExporter.Flush(); @@ -238,7 +257,56 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequen Sequence< PropertyValue > aFilterData; aFilterData = findPropertyValue<Sequence< PropertyValue > >(aDescriptor, "FilterData", aFilterData); - if (findPropertyValue<sal_Bool>(aFilterData, "ExportMultipleFiles", false )) + // #56084# check if selection shall be exported only; if yes, get the selected page and the selection itself + if(findPropertyValue<sal_Bool>(aDescriptor, "SelectionOnly", sal_False)) + { + Reference< XDesktop > xDesktop(mxMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY); + + if(xDesktop.is()) + { + Reference< XFrame > xFrame(xDesktop->getCurrentFrame()); + + if(xFrame.is()) + { + Reference< XController > xController(xFrame->getController()); + + if(xController.is()) + { + Reference< XDrawView > xDrawView(xController, UNO_QUERY); + + if(xDrawView.is()) + { + mxSelectedDrawPage = xDrawView->getCurrentPage(); + } + + if(mxSelectedDrawPage.is()) + { + Reference< XSelectionSupplier > xSelection(xController, UNO_QUERY); + + if(xSelection.is()) + { + Any aSelection; + + if(xSelection->getSelection() >>= aSelection) + { + aSelection >>= mxSelectedShapes; + } + } + } + } + } + } + } + + if(mxSelectedDrawPage.is() && mxSelectedShapes.is() && mxSelectedShapes->getCount()) + { + // #56084# to export selection we need the selected page and the selected shapes. + // There must be shapes selected, else fallback to regular export (export all) + mbExportSelection = true; + } + + // #56084# no multiple files (suppress) when selection since selection can only export a single page + if (!mbExportSelection && findPropertyValue<sal_Bool>(aFilterData, "ExportMultipleFiles", false )) { ExportAsMultipleFiles(aDescriptor); } @@ -332,8 +400,12 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue err = osl_writeFile(xBackgroundConfig, "slides=", strlen("slides="), &bytesWritten); } - FlashExporter aFlashExporter( mxMSF, findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75), - findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false)); + FlashExporter aFlashExporter( + mxMSF, + mxSelectedShapes, + mxSelectedDrawPage, + findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75), + findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false)); const sal_Int32 nPageCount = xDrawPages->getCount(); if ( mxStatusIndicator.is() ) @@ -424,8 +496,12 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& return sal_False; } - FlashExporter aFlashExporter( mxMSF, findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75), - findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false)); + FlashExporter aFlashExporter( + mxMSF, + mxSelectedShapes, + mxSelectedDrawPage, + findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75), + findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false)); return aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator ); } diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index a6a2793b947e..f270a269b852 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -545,7 +545,7 @@ sal_Bool Writer::streamSound( const char * filename ) // not the sum of the number of samples in the L and R channels. // // The return code = number of bytes output in mp3buffer. This can be 0. -// If it is <0, an error occured. +// If it is <0, an error occurred. for (int samples_written = 0; samples_written < info.frames; samples_written += samples_per_frame) diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 018cae8e2b7f..16b68d4b190b 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -607,7 +607,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I // write text element -/* test code to create a bound rect, not realy working for rotated text +/* test code to create a bound rect, not really working for rotated text Size aTextSize( map( Size( mpVDev->GetTextWidth( rText ), mpVDev->GetTextHeight() ) ) ); Point aMetricPoint( map( Point( aMetric.GetLeading(), aMetric.GetAscent() ) ) ); @@ -710,7 +710,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I maShapeIds.push_back( nTextId ); - // AS: Write strikeout and underline, if neccessary. This code was originally taken from the SVG + // AS: Write strikeout and underline, if necessary. This code was originally taken from the SVG // export facility, although the positioning had to be tweaked a little. I can't explain the // numbers, but the flash lines up very well with the original OOo document. All of this should // probably be converted to polygons as part of the meta file, though, as we don't handle any @@ -757,9 +757,9 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I } // ----------------------------------------------------------------------------- -// AS: Because JPEGs require the alpha channel provided seperately (JPEG does not -// natively support alpha channel, but SWF lets you provide it seperately), we -// extract the alpha channel into a seperate array here. +// AS: Because JPEGs require the alpha channel provided separately (JPEG does not +// natively support alpha channel, but SWF lets you provide it separately), we +// extract the alpha channel into a separate array here. void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tgaAlphadata, sal_uInt32& nWidth, sal_uInt32& nHeight ) { if( !aBmpEx.IsEmpty() ) @@ -860,7 +860,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali #endif // AS: SWF files let you provide an Alpha mask for JPEG images, but we have - // to ZLIB compress the alpha channel seperately. + // to ZLIB compress the alpha channel separately. uLong alpha_compressed_size = 0; sal_uInt8 *pAlphaCompressed = NULL; if (bmpSource.IsAlpha() || bmpSource.IsTransparent()) @@ -1043,7 +1043,7 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size ) { - // AS: Go through the actuall JPEG bits, seperating out the + // AS: Go through the actuall JPEG bits, separating out the // header fields from the actual image fields. Fields are // identifed by 0xFFXX where XX is the field type. Both // the header and the image need start and stop (D8 and D9), @@ -1092,7 +1092,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal nLength = 2 + (pJpgSearch[2]<<8) + pJpgSearch[3]; } - // AS: I'm refering to libjpeg for a list of what these + // AS: I'm referring to libjpeg for a list of what these // markers are. See jdmarker.c for a list. // AS: I'm ignoring application specific markers 0xE1...0xEF // and comments 0xFE. I don't know what diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 588c0584a47e..b81bd79d5717 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -173,7 +173,7 @@ static oslProcessError runProcessWithPathSearch(const rtl::OUString &rProgName, * * Because one of our programs is called "convert" and there is a convert * in the windows system directory, we want to explicitly search the PATH - * to avoid picking up on that one if ImageMagick's convert preceeds it in + * to avoid picking up on that one if ImageMagick's convert precedes it in * PATH. * */ diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index b8ca0d1434db..a25a54fda4a7 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -107,7 +107,8 @@ sal_Bool PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic ) { case 0 : maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 ); - if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False ) + mpAcc = maBmp.AcquireWriteAccess(); + if ( !mpAcc ) return sal_False; mpAcc->SetPaletteEntryCount( 2 ); mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) ); @@ -122,7 +123,8 @@ sal_Bool PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic ) else maBmp = Bitmap( Size( mnWidth, mnHeight ), 8); - if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False ) + mpAcc = maBmp.AcquireWriteAccess(); + if ( !mpAcc ) return sal_False; mnCol = (sal_uInt16)mnMaxVal + 1; if ( mnCol > 256 ) @@ -137,7 +139,8 @@ sal_Bool PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic ) break; case 2 : maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 ); - if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False ) + mpAcc = maBmp.AcquireWriteAccess(); + if ( !mpAcc ) return sal_False; break; } diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 58b6c648f681..ec65b26d4308 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -155,7 +155,8 @@ sal_Bool PCDReader::ReadPCD( SvStream & rPCD, Graphic & rGraphic, FilterConfigIt nBMPHeight = nWidth; } aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 ); - if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == sal_False ) + mpAcc = aBmp.AcquireWriteAccess(); + if ( !mpAcc ) return sal_False; ReadImage( 5 ,65 ); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 6f3340ecaffa..dd25dceb3d15 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -114,7 +114,8 @@ sal_Bool PCXReader::ReadPCX( SvStream & rPCX, Graphic & rGraphic ) if ( nStatus ) { aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel ); - if ( ( pAcc = aBmp.AcquireWriteAccess() ) == sal_False ) + pAcc = aBmp.AcquireWriteAccess(); + if ( !pAcc ) return sal_False; if ( nDestBitsPerPixel <= 8 ) diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 7efafda5fcb0..48224e7605ac 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -103,7 +103,8 @@ sal_Bool RASReader::ReadRAS( SvStream & rRAS, Graphic & rGraphic ) return sal_False; maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix ); - if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False ) + mpAcc = maBmp.AcquireWriteAccess(); + if ( !mpAcc ) return sal_False; if ( mnDstBitsPerPix <= 8 ) // paletten bildchen diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 7e51d82979c4..7243fa96de48 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -685,7 +685,7 @@ sal_Bool TGAReader::ImplReadPalette() mpFileHeader->nColorMapEntrySize = 0x3f; // patch for the following switch routine } mpColorMap = new sal_uInt32[ nColors ]; // we will always index dwords - if ( mpColorMap == sal_False ) + if ( !mpColorMap ) // NOTE: check for new-result==NULL because exceptions are disabled in this module return sal_False; // out of memory %&!$&/!"�$ switch( mpFileHeader->nColorMapEntrySize ) diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index b6c5d25d89ce..a3795a94c574 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -325,7 +325,7 @@ CountryId ConvertLanguageToCountry( LanguageType eLanguage ) LanguageType ConvertCountryToLanguage( CountryId eCountry ) { - // just find the first occurance of eCountry and return the language type + // just find the first occurrence of eCountry and return the language type const CountryEntry* pEntry = std::find_if( pTable, pEnd, CountryEntryPred_Country( eCountry ) ); return (pEntry != pEnd) ? pEntry->meLanguage : LANGUAGE_DONTKNOW; } diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index e96283ec98d0..80c3c839a893 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1132,7 +1132,7 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly ) sal_uInt32 nMergeFlags = nContent; nMergeFlags &= ( nMergeFlags >> 16 ) | 0xffff0000; // clearing low word - nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 ) // remove allready hard set + nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 ) // remove already hard set | ( nCurrentFlags >> 16 ) ) ^ 0xffffffff; // attributes from mergeflags nCurrentFlags &= ( ( nMergeFlags & 0xffff0000 ) // apply zero master bits | ( nMergeFlags >> 16 ) ) ^ 0xffffffff; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index bc3399e1ba96..1f6db0d8b530 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2598,7 +2598,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, if ( pAny ) *pAny >>= sEquationSource; sal_Int32 nEquationSourceCount = sEquationSource.getLength(); - if ( nEquationSourceCount ) + if ( nEquationSourceCount && (nEquationSourceCount <= 128) ) { sal_Int32 i; for ( i = 0; i < nEquationSourceCount; i++ ) @@ -2644,7 +2644,18 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, if ( aIter->nOperation & nMask ) { aIter->nOperation ^= nMask; - aIter->nPara[ i ] = rEquationOrder[ aIter->nPara[ i ] & 0x3ff ] | 0x400; + const sal_Int32 nIndex(aIter->nPara[ i ] & 0x3ff); + + // #124661# check index access, there are cases where this is out of bound leading + // to errors up to crashes when executed + if(nIndex < rEquationOrder.size()) + { + aIter->nPara[ i ] = rEquationOrder[ nIndex ] | 0x400; + } + else + { + OSL_ENSURE(false, "Attempted out of bound access to rEquationOrder of CustomShape (!)"); + } } nMask <<= 1; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c9bb76029dd6..c65cfc057832 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2012,20 +2012,23 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt if ( SeekToContent( DFF_Prop_pFormulas, rIn ) ) rIn >> nNumElem >> nNumElemMem >> nElemSize; - sal_Int16 nP1, nP2, nP3; - sal_uInt16 nFlags; - - uno::Sequence< rtl::OUString > aEquations( nNumElem ); - for ( i = 0; i < nNumElem; i++ ) + if ( nNumElem <= 128 ) { - rIn >> nFlags >> nP1 >> nP2 >> nP3; - aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, nP1, nP2, nP3 ); + sal_Int16 nP1, nP2, nP3; + sal_uInt16 nFlags; + + uno::Sequence< rtl::OUString > aEquations( nNumElem ); + for ( i = 0; i < nNumElem; i++ ) + { + rIn >> nFlags >> nP1 >> nP2 >> nP3; + aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, nP1, nP2, nP3 ); + } + // pushing the whole Equations element + const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM ( "Equations" ) ); + aProp.Name = sEquations; + aProp.Value <<= aEquations; + aPropVec.push_back( aProp ); } - // pushing the whole Equations element - const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM ( "Equations" ) ); - aProp.Name = sEquations; - aProp.Value <<= aEquations; - aPropVec.push_back( aProp ); } //////////////////////////////////////// @@ -2732,42 +2735,55 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj } if ( bHasShadow ) { - // #160376# sj: activating shadow only if fill and or linestyle is used - // this is required because of the latest drawing layer core changes. - // Issue i104085 is related to this. - sal_uInt32 nLineFlags(GetPropertyValue( DFF_Prop_fNoLineDrawDash )); - if(!IsHardAttribute( DFF_Prop_fLine ) && !IsCustomShapeStrokedByDefault( rObjData.eShapeType )) - nLineFlags &= ~0x08; - sal_uInt32 nFillFlags(GetPropertyValue( DFF_Prop_fNoFillHitTest )); - if(!IsHardAttribute( DFF_Prop_fFilled ) && !IsCustomShapeFilledByDefault( rObjData.eShapeType )) - nFillFlags &= ~0x10; - if ( nFillFlags & 0x10 ) - { - MSO_FillType eMSO_FillType = (MSO_FillType)GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ); - switch( eMSO_FillType ) + static bool bCheckShadow(false); + + // #124477# Found no reason not to set shadow, esp. since it is applied to evtl. existing text + // and will lead to an error of in PPT someone used text and added the object shadow to the + // object carryintg that text. I found no cases where this leads to problems (the old bugtracker + // task #160376# from sj is unfortunately no longer available). Keeping the code for now + // to allow easy fallback when this shows problems in the future + if(bCheckShadow) + { + // #160376# sj: activating shadow only if fill and or linestyle is used + // this is required because of the latest drawing layer core changes. + // Issue i104085 is related to this. + sal_uInt32 nLineFlags(GetPropertyValue( DFF_Prop_fNoLineDrawDash )); + if(!IsHardAttribute( DFF_Prop_fLine ) && !IsCustomShapeStrokedByDefault( rObjData.eShapeType )) + nLineFlags &= ~0x08; + sal_uInt32 nFillFlags(GetPropertyValue( DFF_Prop_fNoFillHitTest )); + if(!IsHardAttribute( DFF_Prop_fFilled ) && !IsCustomShapeFilledByDefault( rObjData.eShapeType )) + nFillFlags &= ~0x10; + if ( nFillFlags & 0x10 ) { - case mso_fillSolid : - case mso_fillPattern : - case mso_fillTexture : - case mso_fillPicture : - case mso_fillShade : - case mso_fillShadeCenter : - case mso_fillShadeShape : - case mso_fillShadeScale : - case mso_fillShadeTitle : - break; - // case mso_fillBackground : - default: - nFillFlags &=~0x10; // no fillstyle used - break; + MSO_FillType eMSO_FillType = (MSO_FillType)GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ); + switch( eMSO_FillType ) + { + case mso_fillSolid : + case mso_fillPattern : + case mso_fillTexture : + case mso_fillPicture : + case mso_fillShade : + case mso_fillShadeCenter : + case mso_fillShadeShape : + case mso_fillShadeScale : + case mso_fillShadeTitle : + break; + // case mso_fillBackground : + default: + nFillFlags &=~0x10; // no fillstyle used + break; + } } + if ( ( ( nLineFlags & 0x08 ) == 0 ) && ( ( nFillFlags & 0x10 ) == 0 ) && ( rObjData.eShapeType != mso_sptPictureFrame )) // if there is no fillstyle and linestyle + bHasShadow = sal_False; // we are turning shadow off. } - if ( ( ( nLineFlags & 0x08 ) == 0 ) && ( ( nFillFlags & 0x10 ) == 0 ) && ( rObjData.eShapeType != mso_sptPictureFrame )) // if there is no fillstyle and linestyle - bHasShadow = sal_False; // we are turning shadow off. - if ( bHasShadow ) - rSet.Put( SdrOnOffItem(SDRATTR_SHADOW, bHasShadow ) ); + if(bHasShadow) + { + rSet.Put(SdrOnOffItem(SDRATTR_SHADOW, bHasShadow)); + } } + ApplyLineAttributes( rSet, rObjData.eShapeType ); // #i28269# ApplyFillAttributes( rIn, rSet, rObjData ); if ( rObjData.eShapeType != mso_sptNil || IsProperty( DFF_Prop_pVertices ) ) @@ -3392,7 +3408,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa } while ( rSt.GetError() == 0 && rSt.Tell() < nMaxFilePos && !bRet ); if ( !bRet ) - rSt.Seek( nFPosMerk ); // restore orginal FilePos + rSt.Seek( nFPosMerk ); // restore original FilePos return bRet; } @@ -3633,7 +3649,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte aColor = Color( (sal_uInt8)nR, (sal_uInt8)nG, (sal_uInt8)nB ); } break; - case 0x04 : // substract grey level RGB(p,p,p) + case 0x04 : // subtract grey level RGB(p,p,p) { sal_Int16 nR = (sal_Int16)aColor.GetRed() - (sal_Int16)nParameter; sal_Int16 nG = (sal_Int16)aColor.GetGreen() - (sal_Int16)nParameter; @@ -3647,7 +3663,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte aColor = Color( (sal_uInt8)nR, (sal_uInt8)nG, (sal_uInt8)nB ); } break; - case 0x05 : // substract from grey level RGB(p,p,p) + case 0x05 : // subtract from grey level RGB(p,p,p) { sal_Int16 nR = (sal_Int16)nParameter - (sal_Int16)aColor.GetRed(); sal_Int16 nG = (sal_Int16)nParameter - (sal_Int16)aColor.GetGreen(); @@ -6160,25 +6176,46 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe nLenFBSE = nLength; // ist FBSE gross genug fuer unsere Daten sal_Bool bOk = ( nSkipBLIPLen + 4 + nSkipBLIPPos + 4 <= nLenFBSE ); + bool bBLIPIsDirectlyEmbedded(false); - if( bOk ) + if(bOk) { - rSt.SeekRel( nSkipBLIPLen ); + rSt.SeekRel(nSkipBLIPLen); rSt >> nBLIPLen; - rSt.SeekRel( nSkipBLIPPos ); + + // #125187# do not simply skip these four bytes, but read them. This value + // is zero when the BLIP is embedded to the FBSE directly following in the + // stream, else 1. Use this as hint to be more reliable (see below) + rSt >> nBLIPPos; + + if(0 == nBLIPPos) + { + bBLIPIsDirectlyEmbedded = true; + } + rSt >> nBLIPPos; bOk = rSt.GetError() == 0; - nLength -= nSkipBLIPLen+ 4 + nSkipBLIPPos + 4; + nLength -= nSkipBLIPLen + 4 + nSkipBLIPPos + 4; } if( bOk ) { - // Besonderheit: - // Falls nBLIPLen kleiner ist als nLenFBSE UND nBLIPPos Null ist, - // nehmen wir an, dass das Bild IM FBSE drin steht! - if( (!nBLIPPos) && (nBLIPLen < nLenFBSE) ) + // #125187# the original check to test if the BLIP is following embeded in the FBSE was + // was (!nBLIPPos && nBLIPLen < nLenFBSE), but there are ppt documents + // where this is not sufficient (what means that for BLIPs in the picture + // stream the same conditions can be true sometimes). I experimented with various + // ppt files and detected that the four bytes before reading the nBLIPPos + // contain a flag which describes that embedding more reliable, thus I will + // use it here now in the form of the bBLIPIsDirectlyEmbedded variable (see above). + // This modification works with all ppt files I found which use directly embedded + // BLIPs and with the file which showed the error. More work may be needed when + // exceptions to this more strict schema may show up, though. + if(0 == nBLIPPos && nBLIPLen < nLenFBSE && bBLIPIsDirectlyEmbedded) + { + // get BLIP file position as directly following embedded nBLIPPos = rSt.Tell() + 4; + } // Das hat ja fein geklappt! // Wir merken uns, dass wir einen FBSE mehr im Pointer Array haben. diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index f101c3cc4d16..9b2a72cc96e8 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -113,7 +113,7 @@ long ReadAlign(SvStorageStream *pS, long nPos, int nAmount) // referenced externally. On import from ms document try to save images for controls here. // Images are stored in directory called temp in the user installation directory. Next version of OO/SO // hopefully will address this issue and allow a choice e.g. images for controls to be stored as links -// or embeded in the document. +// or embedded in the document. // [out]location path to the stream to where the image is to be stored, // if same name exists in folder then this function calcuates a new name @@ -740,7 +740,7 @@ class ContainerRecReader { sal_uInt32 nUnknown_32b; // unknown 32 bit structure, flags ? sal_uInt16 nUnknown_16b; // unknown 16 bit structure - sal_uInt16 nMysteryLen; // lenght of unknown sub record + sal_uInt16 nMysteryLen; // length of unknown sub record *pS >> nUnknown_32b; *pS >> nUnknown_16b; @@ -4487,7 +4487,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory( //Begin nasty hack /* There is a truly horrible thing with EditControls and FormattedField - Controls, they both pretend to have an EDITBOX ClassId for compability + Controls, they both pretend to have an EDITBOX ClassId for compatibility reasons, at some stage in the future hopefully there will be a proper FormulaField ClassId rather than this piggybacking two controls onto the same ClassId, when this happens uncomment the FORMULAFIELD in the OCX_Tab @@ -4566,8 +4566,8 @@ sal_Bool SvxMSConvertOCXControls::ReadOCXStream( SvStorageRef& rSrc1, pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); /*Get Class Id of this object, see if it is one of the types - *that this importer can handle, call the appropiate handler - to read that control, and call the appropiate handler to + *that this importer can handle, call the appropriate handler + to read that control, and call the appropriate handler to insert that control */ @@ -4603,8 +4603,8 @@ sal_Bool SvxMSConvertOCXControls::ReadOCXExcelKludgeStream( { sal_Bool bRet=sal_False; /*Get Class Id of this object, see if it is one of the types - *that this importer can handle, call the appropiate handler - to read that control, and call the appropiate handler to + *that this importer can handle, call the appropriate handler + to read that control, and call the appropriate handler to insert that control */ /*The Excel Kludge is to concatenate a class id with a contents diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 431262cc78bc..e9f657447c45 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -423,7 +423,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& return aRes; } -// Treat the args as possible inouts ( convertion at bottom of method ) +// Treat the args as possible inouts ( conversion at bottom of method ) sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet, const uno::Any& /*aCaller*/) { sal_Bool bRes = sal_False; diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx index 5c02f056b154..309faf40dac8 100644 --- a/filter/source/msfilter/svxmsbas.cxx +++ b/filter/source/msfilter/svxmsbas.cxx @@ -313,7 +313,7 @@ sal_Bool SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, const String &sBasicModule = aVBA.GetStreamName( i); #endif /* #117718# expose information regarding type of Module - * Class, Form or plain 'ould VBA module with a REM statment + * Class, Form or plain 'ould VBA module with a REM statement * at the top of the module. Mapping of Module Name * to type is performed in VBA_Impl::Open() method, * ( msvbasic.cxx ) by examining the PROJECT stream. diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 1938ee451db2..bf47d2a7d529 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -31,6 +31,8 @@ #include "svgfilter.hxx" #include "impsvgdialog.hxx" +#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp> + #include <svx/unopage.hxx> #include <svx/unoshape.hxx> #include <svx/svdpage.hxx> @@ -41,6 +43,8 @@ #include <svx/svdlegacy.hxx> #include <svx/svdetc.hxx> +using namespace ::com::sun::star::graphic; +using namespace ::com::sun::star::geometry; using ::rtl::OUString; // ------------- @@ -215,6 +219,11 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) { pValue[ i ].Value >>= maFilterData; } + else if( pValue[ i ].Name.equalsAscii( "ShapeSelection" ) ) + { + // #124608# read selection if given + pValue[ i ].Value >>= maShapeSelection; + } } // if no filter data is given use stored/prepared ones @@ -395,6 +404,7 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP "SVGFilter::implExportDocument: invalid parameter" ); OUString aAttr; + sal_Int32 nDocX = 0, nDocY = 0; // #124608# sal_Int32 nDocWidth = 0, nDocHeight = 0; sal_Int32 nVisible = -1, nVisibleMaster = -1; sal_Bool bRet = sal_False; @@ -405,10 +415,61 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP const Reference< XPropertySet > xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY ); const Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY ); - if( xDefaultPagePropertySet.is() ) + // #124608# + mbExportSelection = maShapeSelection.is() && maShapeSelection->getCount(); + + if(xDefaultPagePropertySet.is()) { - xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Width" ) ) >>= nDocWidth; - xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Height" ) ) >>= nDocHeight; + xDefaultPagePropertySet->getPropertyValue(B2UCONST("Width")) >>= nDocWidth; + xDefaultPagePropertySet->getPropertyValue(B2UCONST("Height")) >>= nDocHeight; + } + + if(mbExportSelection) + { + // #124608# create BoundRange and set nDocX, nDocY, nDocWidth and nDocHeight + basegfx::B2DRange aShapeRange; + + Reference< XPrimitiveFactory2D > xPrimitiveFactory( + mxMSF->createInstance( + String(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.graphic.PrimitiveFactory2D"))), + UNO_QUERY); + + // use XPrimitiveFactory2D and go the way over getting the primitives; this + // will give better precision (doubles) and be based on the true object + // geometry. If needed aViewInformation may be expanded to carry a view + // resolution for which to prepare the geometry. + if(xPrimitiveFactory.is()) + { + Reference< XShape > xShapeCandidate; + const Sequence< PropertyValue > aViewInformation; + const Sequence< PropertyValue > aParams; + + for(sal_Int32 a(0); a < maShapeSelection->getCount(); a++) + { + if((maShapeSelection->getByIndex(a) >>= xShapeCandidate) && xShapeCandidate.is()) + { + const Sequence< Reference< XPrimitive2D > > aPrimitiveSequence( + xPrimitiveFactory->createPrimitivesFromXShape( xShapeCandidate, aParams )); + const sal_Int32 nCount(aPrimitiveSequence.getLength()); + + for(sal_Int32 nIndex = 0; nIndex < nCount; nIndex++) + { + const RealRectangle2D aRect(aPrimitiveSequence[nIndex]->getRange(aViewInformation)); + + aShapeRange.expand(basegfx::B2DTuple(aRect.X1, aRect.Y1)); + aShapeRange.expand(basegfx::B2DTuple(aRect.X2, aRect.Y2)); + } + } + } + } + + if(!aShapeRange.isEmpty()) + { + nDocX = basegfx::fround(aShapeRange.getMinX()); + nDocY = basegfx::fround(aShapeRange.getMinY()); + nDocWidth = basegfx::fround(aShapeRange.getWidth()); + nDocHeight = basegfx::fround(aShapeRange.getHeight()); + } } if( xExtDocHandler.is() && !mpSVGExport->IsUseTinyProfile() ) @@ -431,11 +492,23 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr ); #endif - aAttr = B2UCONST( "0 0 " ); + // #124608# set viewBox explicitely to the exported content + if(mbExportSelection) + { + aAttr = OUString::valueOf( nDocX ); + aAttr += B2UCONST( " " ); + aAttr += OUString::valueOf( nDocY ); + aAttr += B2UCONST( " " ); + } + else + { + aAttr = B2UCONST( "0 0 " ); + } + aAttr += OUString::valueOf( nDocWidth ); aAttr += B2UCONST( " " ); aAttr += OUString::valueOf( nDocHeight ); - mpSVGExport->SetViewBox( Rectangle( Point(), Size( nDocWidth, nDocHeight ) ) ); + mpSVGExport->SetViewBox( Rectangle( Point(nDocX, nDocY), Size( nDocWidth, nDocHeight ) ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", B2UCONST( "xMidYMid" ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", B2UCONST( "evenodd" ) ); @@ -509,8 +582,17 @@ sal_Bool SVGFilter::implExportDocument( const Reference< XDrawPages >& rxMasterP if( -1 != nVisible ) { - if( bSinglePage ) - implExportPages( rxMasterPages, nVisibleMaster, nVisibleMaster, nVisibleMaster, sal_True ); + if(bSinglePage) + { + if(mbExportSelection) + { + // #124608# export a given object selection, so no MasterPage export at all + } + else + { + implExportPages(rxMasterPages,nVisibleMaster,nVisibleMaster,nVisibleMaster,sal_True); + } + } else { implGenerateMetaData( rxMasterPages, rxDrawPages ); @@ -625,7 +707,17 @@ sal_Bool SVGFilter::implExportPages( const Reference< XDrawPages >& rxPages, if( xDrawPage.is() ) { - Reference< XShapes > xShapes( xDrawPage, UNO_QUERY ); + Reference< XShapes > xShapes; + + if(mbExportSelection) + { + // #124608# export a given object selection + xShapes = maShapeSelection; + } + else + { + xShapes = Reference< XShapes >( xDrawPage, UNO_QUERY ); + } if( xShapes.is() ) { @@ -862,6 +954,7 @@ sal_Bool SVGFilter::implCreateObjects( const Reference< XDrawPages >& rxMasterPa { if( SVG_EXPORT_ALLPAGES == nPageToExport ) { + // export the whole document sal_Int32 i, nCount; for( i = 0, nCount = rxMasterPages->getCount(); i < nCount; ++i ) @@ -901,34 +994,43 @@ sal_Bool SVGFilter::implCreateObjects( const Reference< XDrawPages >& rxMasterPa DBG_ASSERT( nPageToExport >= 0 && nPageToExport < rxDrawPages->getCount(), "SVGFilter::implCreateObjects: invalid page number to export" ); - Reference< XDrawPage > xDrawPage; - - rxDrawPages->getByIndex( nPageToExport ) >>= xDrawPage; + if(mbExportSelection) + { + // #124608# export a given object selection + implCreateObjectsFromShapes(maShapeSelection); + } + else + { + // export a given xDrawPage + Reference< XDrawPage > xDrawPage; - if( xDrawPage.is() ) - { - Reference< XMasterPageTarget > xMasterTarget( xDrawPage, UNO_QUERY ); + rxDrawPages->getByIndex(nPageToExport) >>= xDrawPage; - if( xMasterTarget.is() ) + if(xDrawPage.is()) { - Reference< XDrawPage > xMasterPage( xMasterTarget->getMasterPage() ); + Reference< XMasterPageTarget > xMasterTarget(xDrawPage,UNO_QUERY); - if( xMasterPage.is() ) + if(xMasterTarget.is()) { - Reference< XShapes > xShapes( xMasterPage, UNO_QUERY ); + Reference< XDrawPage > xMasterPage(xMasterTarget->getMasterPage()); - implCreateObjectsFromBackground( xMasterPage ); + if(xMasterPage.is()) + { + Reference< XShapes > xShapes(xMasterPage,UNO_QUERY); + + implCreateObjectsFromBackground(xMasterPage); - if( xShapes.is() ) - implCreateObjectsFromShapes( xShapes ); + if(xShapes.is()) + implCreateObjectsFromShapes(xShapes); + } } - } - Reference< XShapes > xShapes( xDrawPage, UNO_QUERY ); + Reference< XShapes > xShapes(xDrawPage,UNO_QUERY); - if( xShapes.is() ) - implCreateObjectsFromShapes( xShapes ); - } + if(xShapes.is()) + implCreateObjectsFromShapes(xShapes); + } + } } return sal_True; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index e7f3a3f5c8f8..4e4c5abfd47c 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/frame/XDesktop.hdl> #include <com/sun/star/frame/XController.hdl> +#include <com/sun/star/view/XSelectionSupplier.hpp> #define SVG_FILTER_SERVICE_NAME "com.sun.star.comp.Draw.SVGFilter" #define SVG_FILTER_IMPLEMENTATION_NAME SVG_FILTER_SERVICE_NAME @@ -51,7 +52,22 @@ SVGFilter::SVGFilter( const Reference< XMultiServiceFactory > &rxMSF ) : mpSVGWriter( NULL ), mpDefaultSdrPage( NULL ), mpSdrModel( NULL ), - mbPresentation( sal_False ) + mbPresentation( sal_False ), + mpObjects( NULL ), + mxSrcDoc(), +#ifdef SOLAR_JAVA + mxDstDoc(), +#endif + mxDefaultPage(), + maFilterData(), + maShapeSelection(), + mbExportSelection(false), + maUniqueIdVector(), + mnMasterSlideId(0), + mnSlideId(0), + mnDrawingGroupId(0), + mnDrawingId(0), + maOldFieldHdl() { } @@ -86,6 +102,20 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto #endif if( mxSrcDoc.is() ) { + // #124608# detext selection + sal_Bool bSelectionOnly = sal_False; + bool bGotSelection(false); + Reference< drawing::XShapes > xShapes; + + // #124608# extract Single selection wanted from dialog return values + for ( sal_Int32 nInd = 0; nInd < rDescriptor.getLength(); nInd++ ) + { + if ( rDescriptor[nInd].Name.equalsAscii( "SelectionOnly" ) ) + { + rDescriptor[nInd].Value >>= bSelectionOnly; + } + } + uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY); if( xDesktop.is() ) @@ -110,22 +140,66 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Number" ) ) ) >>= nCurrentPageNumber; } } + + if(bSelectionOnly) + { + // #124608# when selection only is wanted, get the current object selection + // from the DrawView + Reference< view::XSelectionSupplier > xSelection (xController, UNO_QUERY); + + if (xSelection.is()) + { + uno::Any aSelection; + + if(xSelection->getSelection() >>= aSelection) + { + bGotSelection = (sal_True == ( aSelection >>= xShapes )); + } + } + } } } } - Sequence< PropertyValue > aNewDescriptor( rDescriptor ); - - if( nCurrentPageNumber > 0 ) + if(bSelectionOnly && bGotSelection && 0 == xShapes->getCount()) { - const sal_uInt32 nOldLength = rDescriptor.getLength(); - - aNewDescriptor.realloc( nOldLength + 1 ); - aNewDescriptor[ nOldLength ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagePos" ) ); - aNewDescriptor[ nOldLength ].Value <<= static_cast< sal_Int16 >( nCurrentPageNumber - 1 ); + // #124608# export selection, got xShapes but no shape selected -> nothing + // to export, we are done (maybe return true, but a hint that nothing was done + // may be useful; it may have happened by error) + bRet = sal_False; } + else + { + Sequence< PropertyValue > aNewDescriptor(rDescriptor); + const bool bSinglePage(nCurrentPageNumber > 0); + + if(bSinglePage || bGotSelection) + { + const sal_uInt32 nOldLength = rDescriptor.getLength(); + sal_uInt32 nInsert(nOldLength); + + aNewDescriptor.realloc(nOldLength + (bSinglePage ? 1 : 0) + (bGotSelection ? 1 : 0)); + + if(bSinglePage) + { + aNewDescriptor[nInsert].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PagePos")); + aNewDescriptor[nInsert].Value <<= static_cast<sal_Int16>(nCurrentPageNumber - 1); + nInsert++; + } - bRet = implExport( aNewDescriptor ); + if(bGotSelection) + { + // #124608# add retrieved ShapeSelection if export of only selected shapes is wanted + // so that the filter implementation can use it + aNewDescriptor[nInsert].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShapeSelection")); + aNewDescriptor[nInsert].Value <<= xShapes; + // reactivate this when you add other properties to aNewDescriptor + // nInsert++; + } + } + + bRet = implExport(aNewDescriptor); + } } else bRet = sal_False; diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 97a660eed7f1..b4822079ad2f 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -246,6 +246,11 @@ private: #endif Reference< XDrawPage > mxDefaultPage; Sequence< PropertyValue > maFilterData; + + // #124608# explicit ShapeSelection for export when export of the selection is wanted + Reference< XShapes > maShapeSelection; + bool mbExportSelection; + UniqueIdVector maUniqueIdVector; sal_Int32 mnMasterSlideId; sal_Int32 mnSlideId; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 416020c03d62..26f3d2ad78d7 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1647,7 +1647,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if(aStartArrow.Count()) { mapCurShape->maShapePolyPoly = aStartArrow; - mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + + if( pElementId ) // #i124825# pElementId is optinal, may be zero + { + mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + } ImplWriteShape( *mapCurShape ); } @@ -1655,7 +1659,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if(aEndArrow.Count()) { mapCurShape->maShapePolyPoly = aEndArrow; - mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + + if( pElementId ) // #i124825# pElementId is optinal, may be zero + { + mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + } ImplWriteShape( *mapCurShape ); } diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 0e07630961c3..cf7c28da852b 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -186,7 +186,7 @@ Reference< com::sun::star::frame::XModel > xModel; } catch(Exception &) { - OSL_ENSURE( sal_False, "An Exception occured while opening File stream" ); + OSL_ENSURE( sal_False, "An Exception occurred while opening File stream" ); } if(sTypeName.equalsAscii("")) { diff --git a/filter/source/xslt/common/math.xsl b/filter/source/xslt/common/math.xsl index 6f2c9afd1064..5ea625607c97 100644 --- a/filter/source/xslt/common/math.xsl +++ b/filter/source/xslt/common/math.xsl @@ -35,7 +35,7 @@ Public Functions abs(x) max(x1,x2) min(x1,x2) - power(x,power(interger only), rounding-factor=100) + power(x,power(integer only), rounding-factor=100) sqrt(x, rounding-factor=100) convert2radian(x,rounding-factor=100) convert2degree(x,rounding-factor=100) diff --git a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl index 48f846b75b68..439ae4ed3ca6 100644 --- a/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl +++ b/filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl @@ -83,7 +83,7 @@ <xsl:param name="targetBaseURL" select="'./'" /> <!-- OPTIONAL: (MANDATORY: for input document with relative internal links) - To access contents of a office file (content like the meta.xml, styles.xml file or graphics) a URL could be choosen. + To access contents of a office file (content like the meta.xml, styles.xml file or graphics) a URL could be chosen. This could be even a JAR URL. The sourceBase of the content URL "jar:file:/C:/temp/Test.sxw!/content.xml" would be "jar:file:/C:/temp/Test.sxw!/" for example. When working with OpenOffice API a Package-URL encoded over HTTP can be used to access the jared contents of the the jared document. --> diff --git a/filter/source/xslt/export/spreadsheetml/table.xsl b/filter/source/xslt/export/spreadsheetml/table.xsl index 7aae5ddfa0db..e2accc359fc1 100644 --- a/filter/source/xslt/export/spreadsheetml/table.xsl +++ b/filter/source/xslt/export/spreadsheetml/table.xsl @@ -471,7 +471,7 @@ <xsl:param name="calculatedCellPosition" select="1" /><!-- the later table position of the current cell --> <xsl:param name="calculatedRowPosition" /><!-- the later table position of the current row --> <xsl:param name="setIndex" select="false()" /> <!-- if not '0' @ss:Index used for neglecting repeteated empty cells --> - <xsl:param name="repetition" select="@table:number-columns-repeated" /> <!-- used for explicit writen out cells --> + <xsl:param name="repetition" select="@table:number-columns-repeated" /> <!-- used for explicit written out cells --> <xsl:param name="repetitionCellPosition" select="$calculatedCellPosition" /><!-- during repetition formula needs exact cell positioning --> <xsl:param name="nextMatchedCellPosition"><!-- the later table position of the next cell --> <xsl:choose> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl index 76b5bcb8cebb..5f4013e64202 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl @@ -49,7 +49,7 @@ </xsl:variable> <xsl:choose> <!-- - deal with captions and frames first. draw:text-box is a powerfull element in OOo, its GUI name is frame. And OOo use it to contain Captions + deal with captions and frames first. draw:text-box is a powerful element in OOo, its GUI name is frame. And OOo use it to contain Captions Since there is not a corresponding object in word, so we draw the text-box itself and its children separately. If it look like a Caption only frame we'll adjust the text-box position to make it look pretty --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl index 954b79d42a79..6909b71aa07d 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl @@ -359,7 +359,7 @@ $field_number_format_style ='壹, 贰, 叁, ...' "> </w:fldSimple> </xsl:template> <xsl:template name="field_convert_linebreak"> - <!-- this template convert the linebreak (
 and 
) in continous text to Ms word element<w:br/> --> + <!-- this template convert the linebreak (
 and 
) in continuous text to Ms word element<w:br/> --> <xsl:param name="field_input_text"/> <xsl:if test="not (contains($field_input_text,'
'))"> <w:t> diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index 934f0fa662e6..e6e19d0900e0 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -4274,7 +4274,7 @@ <xsl:when test="ss:Alignment/@ss:Vertical = 'Center'">middle</xsl:when> <xsl:when test="ss:Alignment/@ss:Vertical = 'Bottom'">bottom</xsl:when> <xsl:when test="ss:Alignment/@ss:Vertical = 'Automatic'">middle</xsl:when> - <!-- actually for vertical writen characters, not supported by StarOffice/OpenOffice now yet --> + <!-- actually for vertical written characters, not supported by StarOffice/OpenOffice now yet --> <xsl:otherwise>middle</xsl:otherwise> </xsl:choose> </xsl:variable> diff --git a/filter/source/xslt/import/uof2/uof2odf.xsl b/filter/source/xslt/import/uof2/uof2odf.xsl index be6c3fbd877e..363c7f26f928 100644 --- a/filter/source/xslt/import/uof2/uof2odf.xsl +++ b/filter/source/xslt/import/uof2/uof2odf.xsl @@ -2162,10 +2162,10 @@ </xsl:for-each> </xsl:template> <xsl:template match="字:上下标类型_4143" mode="sentence"> - <xsl:variable name="positon"> + <xsl:variable name="position"> <xsl:value-of select="."/> </xsl:variable> - <xsl:attribute name="style:text-position"><xsl:choose><xsl:when test="contains($positon,'sup')">super 58%</xsl:when><xsl:when test="contains($positon,'sub')">sub 58%</xsl:when></xsl:choose></xsl:attribute> + <xsl:attribute name="style:text-position"><xsl:choose><xsl:when test="contains($position,'sup')">super 58%</xsl:when><xsl:when test="contains($position,'sub')">sub 58%</xsl:when></xsl:choose></xsl:attribute> </xsl:template> <xsl:template match="字:缩放_4144" mode="sentence"> <xsl:attribute name="style:text-scale"><xsl:value-of select="."/>%</xsl:attribute> @@ -13233,7 +13233,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAKElEQVR4nGNRZrhz57+yCuNdBjCAs1kg </xsl:when> </xsl:choose> <xsl:attribute name="draw:opacity">100%</xsl:attribute> - <!-- no Foreward Color data in ODF --> + <!-- no Forward Color data in ODF --> <xsl:if test="图表:数据标记_E70E/@背景色E711"> <xsl:attribute name="draw:stroke" select="'solid'"/> <xsl:attribute name="svg:stroke-color" select="图表:数据标记_E70E/@背景色E711"/> diff --git a/filter/source/xslt/import/wordml/wordml2ooo.xsl b/filter/source/xslt/import/wordml/wordml2ooo.xsl index 89ac99ddeb07..1f4b1fb4632f 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo.xsl @@ -233,7 +233,7 @@ <xsl:template match="w:body"> <xsl:element name="office:body"> <xsl:element name="office:text"> - <!-- to add the sequece variable declaration at the begining of the office:body G.Y.--> + <!-- to add the sequece variable declaration at the beginning of the office:body G.Y.--> <text:sequence-decls> <xsl:call-template name="default_seqence_declaration"/> <xsl:apply-templates select="/w:wordDocument/w:body//w:instrText[substring(normalize-space(text()),1,3) = 'SEQ' ] | /w:wordDocument/w:body//w:fldSimple[substring(normalize-space(@w:instr),1,3) = 'SEQ' ] " mode="sequence_declare"/> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl index bbc202e90d1f..afe739dd213f 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl @@ -1720,7 +1720,7 @@ <xsl:number from="/w:wordDocument/w:body" level="any" count="v:textpath" format="1"/> </xsl:variable> <xsl:variable name="font-family"> - <!-- we need remove the addtional " from font-family --> + <!-- we need remove the additional " from font-family --> <xsl:value-of select="translate(substring-before(substring-after(@style,'font-family:'),';'), '"' ,'')"/> </xsl:variable> <xsl:variable name="font-size"> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl index 1deb000815a9..4c9d1da103ea 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl @@ -1529,7 +1529,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'n' "> @@ -1546,7 +1546,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'w' "> @@ -1563,7 +1563,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'q' "> @@ -1581,7 +1581,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="$curr-char = 'h' "> @@ -1597,7 +1597,7 @@ <xsl:value-of select="concat( $curr-char,$second-char , ':' , $position +2)"/> </xsl:if> <xsl:if test="$isvalid = '0' "> - <xsl:message>ooo2wordml_path.xsl: Error command occured </xsl:message> + <xsl:message>ooo2wordml_path.xsl: Error command occurred </xsl:message> </xsl:if> </xsl:when> <xsl:when test="string-length(translate($curr-char , 'mlcxetrv' ,'')) = 0 "> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl index abbb3fa5b4cf..b4a042f77967 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl @@ -64,7 +64,7 @@ <!-- matching cells to give out -> covered table cells are not written out --> <xsl:template match="table:table-cell"> <xsl:param name="globalData" /> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:param name="allTableColumns" /> <xsl:param name="maxRowLength" /> <xsl:param name="tableDataType" /> @@ -101,7 +101,7 @@ <xsl:choose> <xsl:when test="function-available('common:node-set')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(common:node-set($precedingCells)/*)" /> @@ -111,7 +111,7 @@ </xsl:when> <xsl:when test="function-available('xalan:nodeset')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(xalan:nodeset($precedingCells)/*)" /> @@ -121,7 +121,7 @@ </xsl:when> <xsl:when test="function-available('xt:node-set')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(xt:node-set($precedingCells)/*)" /> @@ -138,7 +138,7 @@ <!-- current node is a table:table-cell --> <xsl:template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:param name="allTableColumns" /> <xsl:param name="globalData" /> <xsl:param name="maxRowLength" /> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl index ece5fb12b04e..6fb56108b295 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl @@ -66,7 +66,7 @@ <xsl:param name="allTableColumns" /> <!-- Some Office Calc documents simulate a background by repeating one of the later cells until end of used space - (The value of "table:number-columns-repeated" is enourmous). Writing out all these cells would be fatal in time + (The value of "table:number-columns-repeated" is enormous). Writing out all these cells would be fatal in time and output size. Therefore, this global variable shows us the longest row with content. --> <xsl:variable name="maxRowLength" select="count($allTableColumns/table:table-column)" /> <xsl:if test="$debugEnabled"> diff --git a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl index 31b31b44efed..42b1b3b05040 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl @@ -452,7 +452,7 @@ Scenarios unmatched: </xsl:choose> </xsl:template> - <!-- As the span width will be mapped to column width, the preceding span widths have to be substracted --> + <!-- As the span width will be mapped to column width, the preceding span widths have to be subtracted --> <xsl:template name="create-cell-width"> <xsl:param name="width"/> <xsl:param name="unit"/> diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index a2373c5685b2..b8aae4774e31 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -797,7 +797,7 @@ <xsl:when test="$createDiv and normalize-space(.) != ''"> <!-- every following frame sibling till the next draw:frame have to be incapuslated within a div with left indent. - To be moved alltogether arcording the indent (usually right) --> + To be moved altogether arcording the indent (usually right) --> <xsl:comment>Next 'div' added for floating.</xsl:comment> <xsl:element name="div"> <xsl:attribute name="style"> @@ -881,7 +881,7 @@ - <!-- As draw:fame may occure within more elements than in text:p and draw:page --> + <!-- As draw:fame may occur within more elements than in text:p and draw:page --> <xsl:template match="draw:frame"> <xsl:param name="globalData"/> <xsl:param name="previousFrameWidths" select="0"/> @@ -990,7 +990,7 @@ <xsl:if test="@text:anchor-type='paragraph'"> <xsl:comment>Next 'div' is emulating the top hight of a draw:frame.</xsl:comment> <!-- When the svg:y is set relativ to the paragraph content, the best way to emulate a positive height, - is to add an invisbile division inbetween with a height. + is to add an invisbile division between with a height. Often text will flow into this 'gap', which is handled separately! --> <xsl:if test="$svgY > 0"> @@ -1551,7 +1551,7 @@ B) Since OASIS Open Document XML (implemented in OOo2.0) only one parent type exists for list items - the 'text:list' element. The XHTML element 'ol', 'ul' will be choosen upon the list style type. + the 'text:list' element. The XHTML element 'ol', 'ul' will be chosen upon the list style type. C) An Office list may be spread over the whole document. Linked by their style and text:continue-numbering='true'. diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl index 2652e321167c..34868592f3b4 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl @@ -95,7 +95,7 @@ <xsl:param name="targetURL" select="'./'" /> <!-- OPTIONAL: (MANDATORY: for input document with relative internal links) - To access contents of a office file (content like the meta.xml, styles.xml file or graphics) a URL could be choosen. + To access contents of a office file (content like the meta.xml, styles.xml file or graphics) a URL could be chosen. This could be even a JAR URL. The sourceBase of the content URL "jar:file:/C:/temp/Test.sxw!/content.xml" would be "jar:file:/C:/temp/Test.sxw!/" for example. When working with OpenOffice API a Package-URL encoded over HTTP can be used to access the jared contents of the the jared document. --> diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 5530e51c8028..06c2467a4d34 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -378,7 +378,7 @@ void XMLFilterTestDialog::onExportBrowse() if( (nFound == 15) && (aType.getLength() && aService == mpFilterInfo->maDocumentService) ) { - // see if this filter is not supressed in dialog + // see if this filter is not suppressed in dialog if( (nFlags & 0x1000) == 0 ) { aAny = xTypeDetection->getByName( aType ); diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java index b51fe7e6e3c7..ee1464ca38ac 100644 --- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java +++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java @@ -473,7 +473,7 @@ public class Base64 * anywhere along their length by specifying * <var>srcOffset</var> and <var>destOffset</var>. * This method does not check to make sure your arrays - * are large enough to accomodate <var>srcOffset</var> + 3 for + * are large enough to accommodate <var>srcOffset</var> + 3 for * the <var>source</var> array or <var>destOffset</var> + 4 for * the <var>destination</var> array. * The actual number of significant bytes in your array is @@ -826,7 +826,7 @@ public class Base64 * anywhere along their length by specifying * <var>srcOffset</var> and <var>destOffset</var>. * This method does not check to make sure your arrays - * are large enough to accomodate <var>srcOffset</var> + 4 for + * are large enough to accommodate <var>srcOffset</var> + 4 for * the <var>source</var> array or <var>destOffset</var> + 3 for * the <var>destination</var> array. * This method returns the actual number of bytes that |