[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - filter/source Module_ooo.mk officecfg/registry rat-excludes sc/source testgraphical/Ant_ConvwatchGUIProject.mk testgraphical/Makefile testgraphical/Module_testgraphical.mk testgraphical/prj wizards/source
Matthias Seidel (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 17 11:50:00 UTC 2019
Module_ooo.mk | 1
filter/source/config/cache/filtercache.cxx | 152 ++++++++---------
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 37 +++-
rat-excludes | 5
sc/source/core/tool/interpr2.cxx | 5
testgraphical/Ant_ConvwatchGUIProject.mk | 28 +++
testgraphical/Makefile | 32 +++
testgraphical/Module_testgraphical.mk | 34 +++
testgraphical/prj/build.lst | 3
testgraphical/prj/makefile.mk | 44 ++++
wizards/source/euro/Common.xba | 28 +--
wizards/source/euro/DlgConvert.xdl | 2
wizards/source/euro/Protect.xba | 18 +-
13 files changed, 282 insertions(+), 107 deletions(-)
New commits:
commit 7c244d0f7d0f47a39375afbc056af1fd2df00f3b
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Thu May 16 15:08:22 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Thu May 16 15:08:22 2019 +0000
Fixed a lot of typos
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 17b7b453c4a1..e80f9ed289a4 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -72,8 +72,8 @@ namespace css = ::com::sun::star;
// definitions
// Error message in case filter config seems to be corrupted.
-// Note: Dont tell user something about "setup -repair"!
-// Its no longer supported by using native installers ...
+// Note: Don't tell user something about "setup -repair"!
+// It's no longer supported by using native installers ...
static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG = ::rtl::OUString::createFromAscii("The filter configuration appears to be defective. Please install the office suite again.");
/*-----------------------------------------------
@@ -105,7 +105,7 @@ FilterCache* FilterCache::clone() const
FilterCache* pClone = new FilterCache();
- // Dont copy the configuration access points here.
+ // Don't copy the configuration access points here.
// They will be created on demand inside the cloned instance,
// if they are needed.
@@ -145,7 +145,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
::osl::ResettableMutexGuard aLock(m_aLock);
// a)
- // Dont copy the configuration access points here!
+ // Don't copy the configuration access points here!
// We must use our own ones ...
// b)
@@ -154,7 +154,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
// c)
// Take over only changed items!
- // Otherwhise we risk the following scenario:
+ // Otherwise we risk the following scenario:
// c1) clone_1 contains changed filters
// c2) clone_2 container changed types
// c3) clone_1 take over changed filters and unchanged types
@@ -178,12 +178,12 @@ void FilterCache::takeOver(const FilterCache& rClone)
m_lChangedFrameLoaders.clear();
m_lChangedContentHandlers.clear();
- m_sActLocale = rClone.m_sActLocale;
+ m_sActLocale = rClone.m_sActLocale;
m_sProductName = rClone.m_sProductName;
m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName;
m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion;
- m_eFillState = rClone.m_eFillState;
+ m_eFillState = rClone.m_eFillState;
// renew all dependencies and optimizations
// Because we can't be sure, that changed filters on one clone
@@ -226,10 +226,10 @@ void FilterCache::load(EFillState eRequired,
}
#endif
- // Otherwhise load the missing items.
+ // Otherwise load the missing items.
// ------------------------------------------
- // a) load some const values from configration.
+ // a) load some const values from configuration.
// These values are needed there for loading
// config items ...
// Further we load some std items from the
@@ -260,13 +260,13 @@ void FilterCache::load(EFillState eRequired,
m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION;
}
- // Support the old configuration support. Read it only one times during office runtime!
+ // Support the old configuration support. Read it only one time during office runtime!
impl_readOldFormat();
// enable "loadOnDemand" feature ...
// Create uno listener, which waits for finishing the office startup
// and starts a thread, which calls loadAll() at this filter cache.
- // Note: Its not a leak to create this listener with new here.
+ // Note: It's not a leak to create this listener with new here.
// It kills itself after working!
/* LateInitListener* pLateInit = */ new LateInitListener(m_xSMGR);
}
@@ -303,8 +303,8 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType ,
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
OUStringList lKeys;
@@ -340,8 +340,8 @@ sal_Bool FilterCache::hasItems(EItemType eType) const
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
return (rList.size()>0);
@@ -358,8 +358,8 @@ OUStringList FilterCache::getItemNames(EItemType eType) const
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
OUStringList lKeys;
@@ -384,8 +384,8 @@ sal_Bool FilterCache::hasItem( EItemType eType,
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
// if item could not be found - check if it can be loaded
@@ -420,7 +420,7 @@ CacheItem FilterCache::getItem( EItemType eType,
// search for right list
// An exception is thrown if "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
// check if item exists ...
@@ -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 shouldn't; because the corresponding OOo module was not installed.");
+ sMsg.appendAscii("' exists ... but it shouldn't; because the corresponding AOO module was not installed.");
throw css::container::NoSuchElementException(sMsg.makeStringAndClear(), css::uno::Reference< css::uno::XInterface >());
}
}
@@ -476,8 +476,8 @@ void FilterCache::removeItem( EItemType eType,
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
CacheItemList::iterator pItem = rList.find(sItem);
@@ -500,18 +500,18 @@ void FilterCache::setItem( EItemType eType ,
::osl::ResettableMutexGuard aLock(m_aLock);
// search for right list
- // An exception is thrown �f "eType" is unknown.
- // => rList will be valid everytimes next line is reached.
+ // An exception is thrown if "eType" is unknown.
+ // => rList will be valid every time the next line is reached.
CacheItemList& rList = impl_getItemList(eType);
- // name must be part of the property set too ... otherwhise our
+ // name must be part of the property set too ... otherwise our
// 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 can't be saved here and must be readed on demand later, if they are needed.
+ // They can't be saved here and must be read on demand later, if they are needed.
removeStatePropsFromItem(aItem);
rList[sItem] = aItem;
@@ -541,7 +541,7 @@ void FilterCache::addStatePropsToItem( EItemType eType,
::osl::ResettableMutexGuard aLock(m_aLock);
// Note: Opening of the configuration layer throws some exceptions
- // if it failed. So we dont must check any reference here ...
+ // if it failed. So we don't have to check any reference here ...
css::uno::Reference< css::container::XNameAccess > xPackage;
css::uno::Reference< css::container::XNameAccess > xSet;
switch(eType)
@@ -564,10 +564,10 @@ void FilterCache::addStatePropsToItem( EItemType eType,
{
/* TODO
Hack -->
- 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
+ The default frame loader can't be located inside the normal set of frame loaders.
+ It's 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 :-)
+ => set it to readonly/required every time :-)
*/
css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER);
::rtl::OUString sDefaultFrameLoader;
@@ -612,13 +612,13 @@ void FilterCache::addStatePropsToItem( EItemType eType,
catch(const css::container::NoSuchElementException&)
{
/* Ignore exceptions for missing elements inside configuration.
- May by the following reason exists:
+ Maybe 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
+ we got it from the old package org.openoffice.Office/TypeDetection. We don't migrate such items
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
+ => mark item as FINALIZED / MANDATORY, we don't support writing to the old format
*/
rItem[PROPNAME_FINALIZED] <<= sal_True;
rItem[PROPNAME_MANDATORY] <<= sal_True;
@@ -713,7 +713,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
css::uno::Reference< css::container::XNameReplace > xItem (xFactory->createInstance(), css::uno::UNO_QUERY);
// 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.
+ // Reject flush operation by throwing an exception. At least one item couldn't be flushed.
if (!xItem.is())
throw css::uno::Exception(::rtl::OUString::createFromAscii("Can't add item. Set is finalized or mandatory!"),
css::uno::Reference< css::uno::XInterface >() );
@@ -730,9 +730,9 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
xSet->getByName(sItem) >>= xItem;
// 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.
+ // Reject flush operation by throwing an exception. At least one item couldn't be flushed.
if (!xItem.is())
- throw css::uno::Exception(::rtl::OUString::createFromAscii("Can't change item. Its finalized or mandatory!"),
+ throw css::uno::Exception(::rtl::OUString::createFromAscii("Can't change item. It's finalized or mandatory!"),
css::uno::Reference< css::uno::XInterface >() );
CacheItemList::const_iterator pItem = rCache.find(sItem);
@@ -789,8 +789,8 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL ,
//*******************************************
// ii) search types matching to the given extension.
- // Copy every macthing type without changing its order!
- // Because preferred types was added as first one during
+ // Copy every matching type without changing its order!
+ // Because preferred type was added as first one during
// loading configuration.
CacheItemRegistration::const_iterator pExtReg = m_lExtensions2Types.find(sExtension);
if (pExtReg != m_lExtensions2Types.end())
@@ -892,7 +892,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
case E_PROVIDER_OLD :
{
// This special provider is used to work with
- // the old configuration format only. Its not cached!
+ // the old configuration format only. It's not cached!
sPath = CFGPACKAGE_TD_OLD;
pConfig = &xOld;
sRtlLog = ::rtl::OString("framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OLD)");
@@ -911,7 +911,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
// Start listening for changes on that configuration access.
// We must not control the lifetime of this listener. Itself
- // checks, when ist time to die :-)
+ // checks, when it's time to die :-)
if (bStartListening)
{
CacheUpdateListener* pListener = new CacheUpdateListener(m_xSMGR, *pConfig, eItemType);
@@ -1011,7 +1011,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
else
xCfg = xConfigProvider->createInstanceWithArguments(SERVICE_CONFIGURATIONUPDATEACCESS, lParams.getAsConstList());
- // If configuration could not be opened ... but factory method does not throwed an exception
+ // If configuration could not be opened ... but factory method does not throw an exception
// trigger throwing of our own CorruptedFilterConfigurationException.
// Let message empty. The normal exception text show enough informations to the user.
if (! xCfg.is())
@@ -1042,7 +1042,7 @@ void FilterCache::impl_validateAndOptimize()
RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::impl_validateAndOptimize");
- // First check if any filter or type could be readed
+ // First check if any filter or type could be read
// from the underlying configuration!
sal_Bool bSomeTypesShouldExist = ((m_eFillState & E_CONTAINS_STANDARD ) == E_CONTAINS_STANDARD );
sal_Bool bAllFiltersShouldExist = ((m_eFillState & E_CONTAINS_FILTERS ) == E_CONTAINS_FILTERS );
@@ -1074,7 +1074,7 @@ void FilterCache::impl_validateAndOptimize()
}
// Create a log for all detected problems, which
- // occur in the next feew lines.
+ // occur in the next few lines.
// If there are some real errors throw a RuntimException!
// If there are some warnings only, show an assertion.
sal_Int32 nErrors = 0;
@@ -1131,12 +1131,12 @@ void FilterCache::impl_validateAndOptimize()
#endif
// create an optimized registration for this type to
- // its set list of extensions/url pattern. If its a "normal" type
- // set it at the end of this optimized list. But if its
+ // its set list of extensions/url pattern. If it's a "normal" type
+ // set it at the end of this optimized list. But if it's
// a "Preferred" one - set it to the front of this list.
// 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
+ // preferred type is usable in the same manner then every
// other type!
sal_Bool bPreferred = sal_False;
aType[PROPNAME_PREFERRED] >>= bPreferred;
@@ -1173,7 +1173,7 @@ void FilterCache::impl_validateAndOptimize()
#if OSL_DEBUG_LEVEL > 0
- // Dont check cross references between types and filters, if
+ // Don't 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 shouldn't be set to E_CONTAINS_FILTERS!
@@ -1185,8 +1185,8 @@ void FilterCache::impl_validateAndOptimize()
if (!sPrefFilter.getLength())
{
// OK - there is no filter for this type. But thats not an error.
- // May be it can be handled by a ContentHandler ...
- // But at this time its not guaranteed that there is any ContentHandler
+ // Maybe it can be handled by a ContentHandler ...
+ // But at this time it's not guaranteed that there is any ContentHandler
// or FrameLoader inside this cache ... but on disk ...
sal_Bool bReferencedByLoader = sal_True;
sal_Bool bReferencedByHandler = sal_True;
@@ -1303,9 +1303,9 @@ void FilterCache::impl_validateAndOptimize()
++pIt )
{
// Note: of course the default loader must be ignored here.
- // Because we replace its registration later completly with all
+ // Because we replace its registration later completely with all
// types, which are not referenced by any other loader.
- // So we can avaoid our code against the complexity of a diff!
+ // So we can avoid our code against the complexity of a diff!
::rtl::OUString sLoader = pIt->first;
if (sLoader.equals(sDefaultFrameLoader))
continue;
@@ -1391,7 +1391,7 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
EItemFlushState eState( E_ITEM_UNCHANGED );
- // !? ... such situation can occur, if an item was added and(!) removed before it was flushed :-)
+ // !? ... such a situation can occur, if an item was added and(!) removed before it was flushed :-)
if (!bExistsInConfigLayer && !bExistsInMemory)
eState = E_ITEM_UNCHANGED;
else
@@ -1416,9 +1416,9 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList
throw(css::uno::Exception)
{
CacheItem& rItem = (*pList)[sItem];
- // 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!
+ // In case it's a new created entry (automatically done by the hash_map index operator!)
+ // we must be sure, that this entry has its own name as property available.
+ // It's needed later at our container interface!
rItem[PROPNAME_NAME] <<= sItem;
OUStringList lTypeRegs(rItem[PROPNAME_TYPES]);
@@ -1439,7 +1439,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
::osl::ResettableMutexGuard aLock(m_aLock);
// Attention: Detect services are part of the standard set!
- // So there is no need to handle it seperatly.
+ // So there is no need to handle it separately.
// ------------------------------------------
// a) The standard set of config value is needed.
@@ -1448,7 +1448,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
((m_eFillState & E_CONTAINS_STANDARD) != E_CONTAINS_STANDARD)
)
{
- // Attention! If config couldnt be opened successfully
+ // Attention! If config couldn't be opened successfully
// 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);
@@ -1465,7 +1465,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
((m_eFillState & E_CONTAINS_TYPES) != E_CONTAINS_TYPES)
)
{
- // Attention! If config couldnt be opened successfully
+ // Attention! If config couldn't be opened successfully
// 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);
@@ -1482,7 +1482,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
((m_eFillState & E_CONTAINS_FILTERS) != E_CONTAINS_FILTERS)
)
{
- // Attention! If config couldnt be opened successfully
+ // Attention! If config couldn't be opened successfully
// 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);
@@ -1499,7 +1499,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
((m_eFillState & E_CONTAINS_FRAMELOADERS) != E_CONTAINS_FRAMELOADERS)
)
{
- // Attention! If config couldnt be opened successfully
+ // Attention! If config couldn't be opened successfully
// 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);
@@ -1516,7 +1516,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
((m_eFillState & E_CONTAINS_CONTENTHANDLERS) != E_CONTAINS_CONTENTHANDLERS)
)
{
- // Attention! If config couldnt be opened successfully
+ // Attention! If config couldn't be opened successfully
// 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);
@@ -1526,10 +1526,10 @@ void FilterCache::impl_load(EFillState eRequiredState)
}
}
- // update fill state. Note: its a bit field, which combines different parts.
+ // update fill state. Note: it's a bit field, which combines different parts.
m_eFillState = (EFillState) ((sal_Int32)m_eFillState | (sal_Int32)eRequiredState);
- // any data readed?
+ // any data read?
// yes! => validate it and update optimized structures.
impl_validateAndOptimize();
@@ -1596,7 +1596,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
// get names of all existing sub items of this set
// step over it and fill internal cache structures.
- // But dont update optimized structures like e.g. hash
+ // But don't update optimized structures like e.g. hash
// for mapping extensions to its types!
const ::rtl::OUString* pItems = lItems.getConstArray();
@@ -1815,10 +1815,10 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
#endif
// The internal name of an item must(!) be part of the property
- // set too. Of course its already used as key into the e.g. outside
+ // set too. Of course it's already used as key into the e.g. outside
// used hash map ... but some of our API methods provide
// this property set as result only. But the user of this CacheItem
- // should know, which value the key names has :-) ITS IMPORTANT!
+ // should know, which value the key names has :-) IT'S IMPORTANT!
CacheItem aItem;
aItem[PROPNAME_NAME] = css::uno::makeAny(sItem);
switch(eType)
@@ -1874,7 +1874,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
aItem[PROPNAME_FLAGS] <<= FilterCache::impl_convertFlagNames2FlagField(lFlagNames);
}
// read optional properties of a filter
- // no else here! Is an additional switch ...
+ // no else here! It's an additional switch ...
if (
(eOption == E_READ_UPDATE) ||
(eOption == E_READ_ALL )
@@ -1951,7 +1951,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType
case E_DETECTSERVICE :
{
- OSL_ENSURE(sal_False, "Can't load detect services on demand. Who use this unsupported feature?");
+ OSL_ENSURE(sal_False, "Can't load detect services on demand. Who uses this unsupported feature?");
}
break;
}
@@ -1975,10 +1975,10 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType
{
if (pItemInCache != pList->end())
pList->erase(pItemInCache);
- // OK - this item does not exists inside configuration.
+ // OK - this item does not exist inside configuration.
// And we already updated our internal cache.
// But the outside code needs this NoSuchElementException
- // to know, that this item does notexists.
+ // to know, that this item does not exist.
// Nobody checks the iterator!
throw css::container::NoSuchElementException();
}
@@ -2056,7 +2056,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName
// special handling for flags! Convert it from an integer flag field back
// to a list of names ...
// But note: because we work directly on a reference to the cache item,
- // its not allowd to change the value here. We must work on a copy!
+ // it's not allowed to change the value here. We must work on a copy!
sal_Int32 nFlags = 0;
pIt = aItem.find(PROPNAME_FLAGS);
if (pIt != aItem.end())
@@ -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 shouldn't disturb our normal work!
+ // It's optional and shouldn't disturb our normal work!
// E.g. we must check, if the package exists ...
css::uno::Reference< css::container::XNameAccess > xCfg;
@@ -2357,13 +2357,13 @@ void FilterCache::impl_readOldFormat()
xCfg = css::uno::Reference< css::container::XNameAccess >(xInt, css::uno::UNO_QUERY_THROW);
}
/* corrupt filter addon ? because it's external (optional) code .. we can ignore it. Addon wont work then ...
- but that seams to be acceptable.
+ but that seems to be acceptable.
see #139088# for further informations
*/
catch(const css::uno::Exception&)
{ return; }
- // May be there is no type set ...
+ // Maybe there is no type set ...
if (xCfg->hasByName(TYPES_SET))
{
css::uno::Reference< css::container::XNameAccess > xSet;
@@ -2374,7 +2374,7 @@ void FilterCache::impl_readOldFormat()
m_lTypes[pItems[i]] = impl_readOldItem(xSet, E_TYPE, pItems[i]);
}
- // May be there is no filter set ...
+ // Maybe there is no filter set ...
if (xCfg->hasByName(FILTER_SET))
{
css::uno::Reference< css::container::XNameAccess > xSet;
commit a1564bc6ee5cecbf798f150563b52e15f98fc464
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue May 14 22:07:20 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Tue May 14 22:07:20 2019 +0000
Cleaned up, fixed typos
diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba
index 1087fd549e96..18748661b914 100644
--- a/wizards/source/euro/Common.xba
+++ b/wizards/source/euro/Common.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,18 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Common" script:language="StarBasic"> REM ***** BASIC *****
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Common" script:language="StarBasic"> REM ***** BASIC *****
Public DialogModel as Object
Public DialogConvert as Object
Public DialogPassword as Object
@@ -29,12 +29,12 @@ Public PasswordModel as Object
Sub RetrieveDocumentObjects()
CurMimeType = Tools.GetDocumentType(oDocument)
If Instr(1, CurMimeType, "calc") <> 0 Then
- oSheets = oDocument.Sheets
+ oSheets = oDocument.Sheets
oSheet = oDocument.Sheets.GetbyIndex(0)
oAddressRanges = oDocument.createInstance("com.sun.star.sheet.SheetCellRanges")
End If
- ' Retrieve the indices for the cellformatations
- oFormats = oDocument.NumberFormats
+ ' Retrieve the indices for the cellformatations
+ oFormats = oDocument.NumberFormats
End Sub
@@ -81,9 +81,9 @@ Function ConvertDocument()
bRangeListDefined = False
End If
Else
- DialogModel.ProgressBar.ProgressValue = 10 ' oStatusline.SetValue(10)
+ DialogModel.ProgressBar.ProgressValue = 10 ' oStatusline.SetValue(10)
ConvertTextFields()
- DialogModel.ProgressBar.ProgressValue = 80 ' oStatusline.SetValue(80)
+ DialogModel.ProgressBar.ProgressValue = 80 ' oStatusline.SetValue(80)
ConvertWriterTables()
End If
EndStatusLine()
@@ -132,7 +132,7 @@ End Sub
Function Numberformat( oFormats as Object, aFormatStr as String, oLocale as Object)
-Dim nRetkey
+Dim nRetkey
Dim l as String
Dim c as String
nRetKey = oFormats.queryKey( aFormatStr, oLocale, True )
@@ -157,13 +157,13 @@ Dim oFormatofObject() as Object
' Retrieve the Format of the Object
On Local Error GoTo NOKEY
oFormatofObject = oFormats.getByKey(FormatObject.NumberFormat)
- On Local Error GoTo 0
- If NOT INT(oFormatofObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY Then
+ On Local Error GoTo 0
+ If NOT INT(oFormatofObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY Then
CheckFormatType = False
Exit Function
End If
If FieldinArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then
- ' If the Currencysymbol of the object ist the one needed, then check the Currency extension
+ ' If the Currencysymbol of the object is the one needed, then check the Currency extension
sFormatCurrExt = oFormatofObject.CurrencyExtension
If FieldInList(CurExtension(),2,sFormatCurrExt) Then
diff --git a/wizards/source/euro/Protect.xba b/wizards/source/euro/Protect.xba
index 7775fab6c0c3..13ed30ef402e 100644
--- a/wizards/source/euro/Protect.xba
+++ b/wizards/source/euro/Protect.xba
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,18 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Protect" script:language="StarBasic">REM ***** BASIC *****
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Protect" script:language="StarBasic">REM ***** BASIC *****
Option Explicit
Public PWIndex as Integer
@@ -37,7 +37,7 @@ Dim iMsgResult as Integer
iMsgResult = Msgbox(sMsgUNPROTECT,36,sMsgDLGTITLE)
bDoUnProtect = iMsgResult = 6
End If
- If bDoUnProtect Then
+ If bDoUnProtect Then
MaxIndex = oSheets.Count-1
For i = 0 To MaxIndex
bDocHasProtectedSheets = Not UnprotectSheet(oSheets(i))
@@ -135,8 +135,8 @@ Sub RejectPassword()
End Sub
-' Reprotects the previousliy protected sheets
-' The passwordinformation is stored in the List 'UnProtectList()'
+' Reprotects the previously protected sheets
+' The password information is stored in the List 'UnProtectList()'
Sub ReprotectSheets()
Dim i as Integer
Dim oProtectSheet as Object
@@ -153,7 +153,7 @@ Dim SheetPassword as String
Else
SheetPassword = ""
End If
- oProtectSheet = oSheets.GetbyName(SheetName)
+ oProtectSheet = oSheets.GetbyName(SheetName)
If Not oProtectSheet.IsProtected Then
oProtectSheet.Protect(SheetPassWord)
End If
commit c05abd13ffc819b434d55def2659f6a6a3d0153e
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue May 14 11:02:05 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Tue May 14 11:02:05 2019 +0000
Updated rat excludes
See:
https://ci.apache.org/projects/openoffice/rat-output.html
diff --git a/rat-excludes b/rat-excludes
index 8715d462cb2c..c6b1e87d44b1 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -37,7 +37,6 @@ main/automation/source/miniapp/test.sid
main/testautomation/graphics/required/input/einfg.ini
main/sd/res/webview/edit.pl
main/sd/res/webview/index.pl
-main/qadevOOo/tests/java/mod/_javavm.uno/package.html
main/sal/qa/rtl/random/makefile.add
main/testautomation/writer/optional/input/export/filter/act_1.all
main/icc/source/create_sRGB_profile/Makefile.am
@@ -850,7 +849,9 @@ main/ooo_custom_images/industrial/duplicates
main/ooo_custom_images/industrial/missing
main/psprint_config/configuration/delzip
main/psprint_config/configuration/ppds/delzip
-main/qadevOOo/runner/manifest
+main/qadevOOo/java/OOoRunner/manifest
+main/qadevOOo/java/OOoRunner/src/main/java/mod/_javavm.uno/package.html
+main/qadevOOo/java/OOoRunnerLight/manifest
main/qadevOOo/testdocs/backend/org/openoffice/manifest
main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/manifest
main/qadevOOo/testdocs/qadevlibs/source/test/manifest
commit 90b0c9aaf85395bea90d22ba594015e3d01deeff
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue May 14 09:31:35 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Tue May 14 09:31:35 2019 +0000
Small change to Euro Converter dialog
diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl
index 61f397d3b2c9..a76919803bc3 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -44,7 +44,7 @@
</dlg:radio>
</dlg:radiogroup>
<dlg:text dlg:id="lblSelection" dlg:tab-index="7" dlg:left="170" dlg:top="84" dlg:width="73" dlg:height="8" dlg:page="1" dlg:value="lblSelection"/>
- <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="90" dlg:height="52" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_LISTBOX1" dlg:multiselection="true">
+ <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="93" dlg:height="52" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_LISTBOX1" dlg:multiselection="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.SelectListItem?language=Basic&location=application" script:language="Script"/>
</dlg:menulist>
<dlg:radiogroup>
commit bae8e88ffe35446567f86f637091571ac563b5f5
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Tue May 14 04:22:58 2019 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Tue May 14 04:22:58 2019 +0000
Port main/testgraphical to gbuild. Not that it does anything.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 271cf450925c..74a0c7f9c4dd 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
svtools \
svx \
sw \
+ testgraphical \
toolkit \
tools \
twain \
diff --git a/testgraphical/Ant_ConvwatchGUIProject.mk b/testgraphical/Ant_ConvwatchGUIProject.mk
new file mode 100644
index 000000000000..a92778eb6686
--- /dev/null
+++ b/testgraphical/Ant_ConvwatchGUIProject.mk
@@ -0,0 +1,28 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+# FIXME: move to correct location and get it to actually build:
+
+$(eval $(call gb_Ant_Ant,ConvwatchGUIProject,$(SRCDIR)/testgraphical/ui/java/ConvwatchGUIProject/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/testgraphical/Makefile b/testgraphical/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/testgraphical/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/testgraphical/Module_testgraphical.mk b/testgraphical/Module_testgraphical.mk
new file mode 100644
index 000000000000..f2206505fbd4
--- /dev/null
+++ b/testgraphical/Module_testgraphical.mk
@@ -0,0 +1,34 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,testgraphical))
+
+$(eval $(call gb_Module_add_targets,testgraphical,\
+))
+
+# Didn't build anything in dmake either:
+#
+# Ant_ConvwatchGUIProject \
+#
+
+# vim: set noet sw=4 ts=4:
diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst
index 8d617c0512af..d8080418151f 100644
--- a/testgraphical/prj/build.lst
+++ b/testgraphical/prj/build.lst
@@ -1,3 +1,2 @@
gfxcmp testgraphical : instsetoo_native qadevOOo NULL
-gfxcmp testgraphical usr1 - all gfxcmp_mkout NULL
-gfxcmp testgraphical\ui\java\ConvwatchGUIProject nmake - all gfxcmp_java_ui NULL
+gfxcmp testgraphical\prj nmake - all gfxcmp_prj NULL
diff --git a/testgraphical/prj/makefile.mk b/testgraphical/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/testgraphical/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
commit cd3fffb5c3473a532aed43135d4404f10e3e31de
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sun May 12 14:17:46 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sun May 12 14:17:46 2019 +0000
OpenOffice Calc offers functions for converting from old national currencies to EURO.
Additional countries joined the euro area: Estonia (2011), Latvia (2014) and Lithuania (2015), see:
https://www.ecb.europa.eu/euro/changeover/estonia/html/index.en.html
https://www.ecb.europa.eu/euro/changeover/latvia/html/index.en.html
https://www.ecb.europa.eu/euro/changeover/lithuania/html/index.en.html
This patch adds those currencies and conversion rates for CONVERT (Calc.xcu) and EUROCONVERT (interpr2.cxx).
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 0dfff1e2f224..a7c93a427917 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -175,7 +175,7 @@
<value>MTL</value>
</prop>
<prop oor:name="Factor">
- <value>.429300</value>
+ <value>.429300</value>
</prop>
</node>
<node oor:name="CR15" oor:op="replace">
@@ -186,7 +186,7 @@
<value>CYP</value>
</prop>
<prop oor:name="Factor">
- <value>.585274</value>
+ <value>.585274</value>
</prop>
</node>
<node oor:name="CR16" oor:op="replace">
@@ -200,6 +200,39 @@
<value>30.1260</value>
</prop>
</node>
+ <node oor:name="CR17" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>EEK</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>15.6466</value>
+ </prop>
+ </node>
+ <node oor:name="CR18" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>LVL</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>0.702804</value>
+ </prop>
+ </node>
+ <node oor:name="CR19" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>LTL</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>3.45280</value>
+ </prop>
+ </node>
</node>
<node oor:name="Calculate">
<node oor:name="Other">
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index d382f38d01fc..5a72927a57b2 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2668,7 +2668,10 @@ sal_Bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec
{ "SIT", 239.640, 2 },
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
- { "SKK", 30.1260, 2 }
+ { "SKK", 30.1260, 2 },
+ { "EEK", 15.6466, 2 },
+ { "LVL", 0.702804, 2 },
+ { "LTL", 3.45280, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );
More information about the Libreoffice-commits
mailing list