replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that made more sense. Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 [API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist [API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice [API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
parent
005f5db47b
commit
493ae7a6bb
115 changed files with 375 additions and 375 deletions
|
@ -134,7 +134,7 @@ sub check_style($)
|
||||||
my ($h) = @_;
|
my ($h) = @_;
|
||||||
my $src = ClangFormat::get_extension_regex();
|
my $src = ClangFormat::get_extension_regex();
|
||||||
my @bad_names = ();
|
my @bad_names = ();
|
||||||
my $blacklist_names = ClangFormat::get_blacklist();
|
my $excluded_list_names = ClangFormat::get_excludelist();
|
||||||
my $clang_format = ClangFormat::find();
|
my $clang_format = ClangFormat::find();
|
||||||
|
|
||||||
# Get a list of non-deleted changed files.
|
# Get a list of non-deleted changed files.
|
||||||
|
@ -142,14 +142,14 @@ sub check_style($)
|
||||||
while (my $filename = <FILES>)
|
while (my $filename = <FILES>)
|
||||||
{
|
{
|
||||||
chomp $filename;
|
chomp $filename;
|
||||||
if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
|
if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
|
||||||
{
|
{
|
||||||
if (!defined($clang_format))
|
if (!defined($clang_format))
|
||||||
{
|
{
|
||||||
my $version = ClangFormat::get_wanted_version();
|
my $version = ClangFormat::get_wanted_version();
|
||||||
my $opt_lo = ClangFormat::get_own_directory();
|
my $opt_lo = ClangFormat::get_own_directory();
|
||||||
|
|
||||||
print("\nWARNING: Commit touches new (non-blacklisted) files, but no clang-format"
|
print("\nWARNING: Commit touches new (non-excluded) files, but no clang-format"
|
||||||
. " ${version}\n");
|
. " ${version}\n");
|
||||||
print(" found (via CLANG_FORMAT or PATH env vars, or in ${opt_lo}).\n\n");
|
print(" found (via CLANG_FORMAT or PATH env vars, or in ${opt_lo}).\n\n");
|
||||||
|
|
||||||
|
|
|
@ -942,11 +942,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
||||||
vcl_opengl_shader \
|
vcl_opengl_shader \
|
||||||
vcl_theme_definitions \
|
vcl_theme_definitions \
|
||||||
$(if $(filter WNT,$(OS)), \
|
$(if $(filter WNT,$(OS)), \
|
||||||
vcl_opengl_blacklist \
|
vcl_opengl_denylist \
|
||||||
) \
|
) \
|
||||||
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
|
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
|
||||||
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
||||||
vcl_skia_blacklist ) \
|
vcl_skia_denylist ) \
|
||||||
$(if $(DISABLE_PYTHON),,$(if $(filter-out AIX,$(OS)), \
|
$(if $(DISABLE_PYTHON),,$(if $(filter-out AIX,$(OS)), \
|
||||||
Pyuno/commonwizards \
|
Pyuno/commonwizards \
|
||||||
Pyuno/fax \
|
Pyuno/fax \
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
// struct below.
|
// struct below.
|
||||||
// note: the limitation of 63 args is only for RTL functions defined here and
|
// note: the limitation of 63 args is only for RTL functions defined here and
|
||||||
// does NOT impose a limit on User defined procedures ). This changes is to
|
// does NOT impose a limit on User defined procedures ). This changes is to
|
||||||
// allow us space for a flag to blacklist some functions in vba mode
|
// allow us space for a flag to denylist some functions in vba mode
|
||||||
|
|
||||||
#define ARGSMASK_ 0x003F // 63 Arguments
|
#define ARGSMASK_ 0x003F // 63 Arguments
|
||||||
#define COMPTMASK_ 0x00C0 // COMPATIBILITY mask
|
#define COMPTMASK_ 0x00C0 // COMPATIBILITY mask
|
||||||
|
|
|
@ -11,7 +11,7 @@ from difflib import unified_diff
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import PIPE, Popen
|
from subprocess import PIPE, Popen
|
||||||
|
|
||||||
BLACKLIST = Path("solenv/clang-format/blacklist")
|
EXCLUDELIST = Path("solenv/clang-format/excludelist")
|
||||||
THRESHOLD = os.getenv("CLANG_THRESHOLD", 5)
|
THRESHOLD = os.getenv("CLANG_THRESHOLD", 5)
|
||||||
CLANG_BINARY = Path(os.getenv("CLANG_FORMAT", "/opt/lo/bin/clang-format"))
|
CLANG_BINARY = Path(os.getenv("CLANG_FORMAT", "/opt/lo/bin/clang-format"))
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ def main(*args):
|
||||||
print("Couldn't find clang-format on {!s}".format(CLANG_BINARY))
|
print("Couldn't find clang-format on {!s}".format(CLANG_BINARY))
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
for path in BLACKLIST.read_text().splitlines():
|
for path in EXCLUDELIST.read_text().splitlines():
|
||||||
path = Path(path)
|
path = Path(path)
|
||||||
if not path.exists():
|
if not path.exists():
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -356,7 +356,7 @@ rss_bugzillas = (
|
||||||
# does not add it back immediately .-)
|
# does not add it back immediately .-)
|
||||||
# 'novell': 'https://bugzilla.novell.com/buglist.cgi',
|
# 'novell': 'https://bugzilla.novell.com/buglist.cgi',
|
||||||
# note: running this script against bz.apache.org apparently causes one's IP
|
# note: running this script against bz.apache.org apparently causes one's IP
|
||||||
# to be blacklisted or something; you won't get new files in any case...
|
# to be banned or something; you won't get new files in any case...
|
||||||
# ( 'ooo', 'https://bz.apache.org/ooo/buglist.cgi' ),
|
# ( 'ooo', 'https://bz.apache.org/ooo/buglist.cgi' ),
|
||||||
( 'tdf', 'http://bugs.documentfoundation.org/buglist.cgi' ),
|
( 'tdf', 'http://bugs.documentfoundation.org/buglist.cgi' ),
|
||||||
)
|
)
|
||||||
|
|
|
@ -7,7 +7,7 @@ fi
|
||||||
|
|
||||||
#shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
|
#shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
|
||||||
#the CXX as the linker and need to pass -stdlib=libc++ to build
|
#the CXX as the linker and need to pass -stdlib=libc++ to build
|
||||||
export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-blacklist.txt"
|
export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
|
||||||
#similarly force the -fsanitize etc args in as well as pthread to get
|
#similarly force the -fsanitize etc args in as well as pthread to get
|
||||||
#things to link successfully during the build
|
#things to link successfully during the build
|
||||||
export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
|
export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
|
||||||
|
|
|
@ -2,19 +2,19 @@
|
||||||
|
|
||||||
# Files listed here would not be store in the symbolestore-server.
|
# Files listed here would not be store in the symbolestore-server.
|
||||||
# The format is a string with files e.g.
|
# The format is a string with files e.g.
|
||||||
# BLACKLIST="python.exe
|
# EXCLUDE_LIST="python.exe
|
||||||
# file.dll
|
# file.dll
|
||||||
# next_file.exe"
|
# next_file.exe"
|
||||||
#
|
#
|
||||||
# It removes "python.exe", "file.dll", and "next_file.exe" from what's
|
# It removes "python.exe", "file.dll", and "next_file.exe" from what's
|
||||||
# added to the symstore. Separator is the newline
|
# added to the symstore. Separator is the newline
|
||||||
BLACK_LIST="python.exe"
|
EXCLUDE_LIST="python.exe"
|
||||||
|
|
||||||
# List files here where it's ok for this script to find more than one
|
# List files here where it's ok for this script to find more than one
|
||||||
# occurrence in the build tree. Files _not_ included here will generate
|
# occurrence in the build tree. Files _not_ included here will generate
|
||||||
# an error, if duplicates are found.
|
# an error, if duplicates are found.
|
||||||
#
|
#
|
||||||
# Same format as for BLACK_LIST above
|
# Same format as for EXCLUDE_LIST above
|
||||||
MOREPDBS_OKLIST="libcurl.dll
|
MOREPDBS_OKLIST="libcurl.dll
|
||||||
freebl3.dll
|
freebl3.dll
|
||||||
libeay32.dll
|
libeay32.dll
|
||||||
|
@ -46,7 +46,7 @@ add_pdb()
|
||||||
stats_morefound=0
|
stats_morefound=0
|
||||||
declare -a pdball
|
declare -a pdball
|
||||||
echo "Collect $extension"
|
echo "Collect $extension"
|
||||||
ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$BLACK_LIST")
|
ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$EXCLUDE_LIST")
|
||||||
while IFS= read -r file
|
while IFS= read -r file
|
||||||
do
|
do
|
||||||
${VERBOSE} -n "Found: $file"
|
${VERBOSE} -n "Found: $file"
|
||||||
|
|
|
@ -617,7 +617,7 @@ namespace dxcanvas
|
||||||
return false;
|
return false;
|
||||||
maPageSize = ::basegfx::B2IVector(aCaps.MaxTextureWidth,aCaps.MaxTextureHeight);
|
maPageSize = ::basegfx::B2IVector(aCaps.MaxTextureWidth,aCaps.MaxTextureHeight);
|
||||||
|
|
||||||
// check device against white & blacklist entries
|
// check device against white & denylist entries
|
||||||
D3DADAPTER_IDENTIFIER9 aIdent;
|
D3DADAPTER_IDENTIFIER9 aIdent;
|
||||||
if(FAILED(mpDirect3D9->GetAdapterIdentifier(nAdapter,0,&aIdent)))
|
if(FAILED(mpDirect3D9->GetAdapterIdentifier(nAdapter,0,&aIdent)))
|
||||||
return false;
|
return false;
|
||||||
|
@ -637,9 +637,9 @@ namespace dxcanvas
|
||||||
if( !aConfigItem.isDeviceUsable(aInfo) )
|
if( !aConfigItem.isDeviceUsable(aInfo) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if( aConfigItem.isBlacklistCurrentDevice() )
|
if( aConfigItem.isDenylistCurrentDevice() )
|
||||||
{
|
{
|
||||||
aConfigItem.blacklistDevice(aInfo);
|
aConfigItem.denylistDevice(aInfo);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,12 +40,12 @@ namespace dxcanvas
|
||||||
ConfigItemMode::NONE ),
|
ConfigItemMode::NONE ),
|
||||||
maValues(),
|
maValues(),
|
||||||
maMaxTextureSize(),
|
maMaxTextureSize(),
|
||||||
mbBlacklistCurrentDevice(false),
|
mbDenylistCurrentDevice(false),
|
||||||
mbValuesDirty(false)
|
mbValuesDirty(false)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
uno::Sequence< OUString > aName { "DeviceBlacklist" };
|
uno::Sequence< OUString > aName { "DeviceDenylist" };
|
||||||
|
|
||||||
uno::Sequence< uno::Any > aProps( GetProperties( aName ));
|
uno::Sequence< uno::Any > aProps( GetProperties( aName ));
|
||||||
uno::Sequence< sal_Int32 > aValues;
|
uno::Sequence< sal_Int32 > aValues;
|
||||||
|
@ -70,10 +70,10 @@ namespace dxcanvas
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
aName[0] = "BlacklistCurrentDevice";
|
aName[0] = "DenylistCurrentDevice";
|
||||||
aProps = GetProperties( aName );
|
aProps = GetProperties( aName );
|
||||||
if( aProps.getLength() > 0 )
|
if( aProps.getLength() > 0 )
|
||||||
aProps[0] >>= mbBlacklistCurrentDevice;
|
aProps[0] >>= mbDenylistCurrentDevice;
|
||||||
|
|
||||||
aName[0] = "MaxTextureSize";
|
aName[0] = "MaxTextureSize";
|
||||||
aProps = GetProperties( aName );
|
aProps = GetProperties( aName );
|
||||||
|
@ -111,7 +111,7 @@ namespace dxcanvas
|
||||||
*pValues++ = rInfo.nDriverBuildId;
|
*pValues++ = rInfo.nDriverBuildId;
|
||||||
}
|
}
|
||||||
|
|
||||||
PutProperties({"DeviceBlacklist"}, {css::uno::Any(aValues)});
|
PutProperties({"DeviceDenylist"}, {css::uno::Any(aValues)});
|
||||||
}
|
}
|
||||||
catch( const uno::Exception& )
|
catch( const uno::Exception& )
|
||||||
{
|
{
|
||||||
|
@ -127,12 +127,12 @@ namespace dxcanvas
|
||||||
return maValues.find(rDeviceInfo) == maValues.end();
|
return maValues.find(rDeviceInfo) == maValues.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DXCanvasItem::isBlacklistCurrentDevice() const
|
bool DXCanvasItem::isDenylistCurrentDevice() const
|
||||||
{
|
{
|
||||||
return mbBlacklistCurrentDevice;
|
return mbDenylistCurrentDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DXCanvasItem::blacklistDevice( const DeviceInfo& rDeviceInfo )
|
void DXCanvasItem::denylistDevice( const DeviceInfo& rDeviceInfo )
|
||||||
{
|
{
|
||||||
mbValuesDirty = true;
|
mbValuesDirty = true;
|
||||||
maValues.insert(rDeviceInfo);
|
maValues.insert(rDeviceInfo);
|
||||||
|
|
|
@ -63,8 +63,8 @@ namespace dxcanvas
|
||||||
~DXCanvasItem() override;
|
~DXCanvasItem() override;
|
||||||
|
|
||||||
bool isDeviceUsable( const DeviceInfo& rDeviceInfo ) const;
|
bool isDeviceUsable( const DeviceInfo& rDeviceInfo ) const;
|
||||||
bool isBlacklistCurrentDevice() const;
|
bool isDenylistCurrentDevice() const;
|
||||||
void blacklistDevice( const DeviceInfo& rDeviceInfo );
|
void denylistDevice( const DeviceInfo& rDeviceInfo );
|
||||||
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
|
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
|
||||||
virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
|
virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ namespace dxcanvas
|
||||||
typedef std::set< DeviceInfo > ValueSet;
|
typedef std::set< DeviceInfo > ValueSet;
|
||||||
ValueSet maValues;
|
ValueSet maValues;
|
||||||
std::optional<sal_Int32> maMaxTextureSize;
|
std::optional<sal_Int32> maMaxTextureSize;
|
||||||
bool mbBlacklistCurrentDevice;
|
bool mbDenylistCurrentDevice;
|
||||||
bool mbValuesDirty;
|
bool mbValuesDirty;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13304,7 +13304,7 @@ if test "$enable_mpl_subset" = "yes"; then
|
||||||
fi
|
fi
|
||||||
for theme in $WITH_THEMES; do
|
for theme in $WITH_THEMES; do
|
||||||
case $theme in
|
case $theme in
|
||||||
breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sukapura|sukapura_svg) #blacklist of icon themes under GPL or LGPL
|
breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sukapura|sukapura_svg) #denylist of icon themes under GPL or LGPL
|
||||||
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=colibre]) ;;
|
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=colibre]) ;;
|
||||||
*) : ;;
|
*) : ;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -54,7 +54,7 @@ namespace connectivity::evoab
|
||||||
static ColumnProperty **pFields=nullptr;
|
static ColumnProperty **pFields=nullptr;
|
||||||
static guint nFields = 0;
|
static guint nFields = 0;
|
||||||
|
|
||||||
static const char *pBlackList[] =
|
static const char *pDenyList[] =
|
||||||
{
|
{
|
||||||
"id",
|
"id",
|
||||||
"list-show-addresses",
|
"list-show-addresses",
|
||||||
|
@ -114,9 +114,9 @@ namespace connectivity::evoab
|
||||||
{
|
{
|
||||||
bool bAdd = true;
|
bool bAdd = true;
|
||||||
const char *pName = g_param_spec_get_name( pProps[i] );
|
const char *pName = g_param_spec_get_name( pProps[i] );
|
||||||
for (unsigned int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
|
for (unsigned int j = 0; j < G_N_ELEMENTS( pDenyList ); j++ )
|
||||||
{
|
{
|
||||||
if( !strcmp( pBlackList[j], pName ) )
|
if( !strcmp( pDenyList[j], pName ) )
|
||||||
{
|
{
|
||||||
bAdd = false;
|
bAdd = false;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -780,7 +780,7 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnForceSkiaToggled, weld::ToggleButton&, void)
|
||||||
{
|
{
|
||||||
if (m_xForceSkia->get_active())
|
if (m_xForceSkia->get_active())
|
||||||
{
|
{
|
||||||
// Ignoring the Skia blacklist implies that Skia is on.
|
// Ignoring the Skia denylist implies that Skia is on.
|
||||||
m_xUseSkia->set_active(true);
|
m_xUseSkia->set_active(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<property name="top_padding">6</property>
|
<property name="top_padding">6</property>
|
||||||
<property name="left_padding">12</property>
|
<property name="left_padding">12</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox" id="blacklistbox">
|
<object class="GtkBox" id="denylistbox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
|
|
|
@ -526,7 +526,7 @@
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkCheckButton" id="forceskia">
|
<object class="GtkCheckButton" id="forceskia">
|
||||||
<property name="label" translatable="yes" context="optviewpage|forceskia">Ignore Skia blacklist</property>
|
<property name="label" translatable="yes" context="optviewpage|forceskia">Ignore Skia denylist</property>
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">False</property>
|
<property name="receives_default">False</property>
|
||||||
|
|
|
@ -252,16 +252,16 @@ private:
|
||||||
SAL_DLLPRIVATE OUString
|
SAL_DLLPRIVATE OUString
|
||||||
getNodeValueFromExpression(OUString const & expression) const;
|
getNodeValueFromExpression(OUString const & expression) const;
|
||||||
|
|
||||||
/** Check the extensions blacklist if additional extension meta data (e.g. dependencies)
|
/** Check the extensions denylist if additional extension meta data (e.g. dependencies)
|
||||||
are defined for this extension and have to be taken into account.
|
are defined for this extension and have to be taken into account.
|
||||||
*/
|
*/
|
||||||
SAL_DLLPRIVATE void
|
SAL_DLLPRIVATE void
|
||||||
checkBlacklist() const;
|
checkDenylist() const;
|
||||||
|
|
||||||
/** Helper method to compare the versions with the current version
|
/** Helper method to compare the versions with the current version
|
||||||
*/
|
*/
|
||||||
SAL_DLLPRIVATE static bool
|
SAL_DLLPRIVATE static bool
|
||||||
checkBlacklistVersion(const OUString& currentversion,
|
checkDenylistVersion(const OUString& currentversion,
|
||||||
css::uno::Sequence< OUString > const & versions);
|
css::uno::Sequence< OUString > const & versions);
|
||||||
|
|
||||||
css::uno::Reference< css::uno::XComponentContext > m_context;
|
css::uno::Reference< css::uno::XComponentContext > m_context;
|
||||||
|
|
|
@ -342,7 +342,7 @@ OUString DescriptionInfoset::getNodeValueFromExpression(OUString const & express
|
||||||
return n.is() ? getNodeValue(n) : OUString();
|
return n.is() ? getNodeValue(n) : OUString();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DescriptionInfoset::checkBlacklist() const
|
void DescriptionInfoset::checkDenylist() const
|
||||||
{
|
{
|
||||||
if (!m_element.is())
|
if (!m_element.is())
|
||||||
return;
|
return;
|
||||||
|
@ -358,25 +358,25 @@ void DescriptionInfoset::checkBlacklist() const
|
||||||
{
|
{
|
||||||
{"nodepath", css::uno::Any(OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"))}
|
{"nodepath", css::uno::Any(OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"))}
|
||||||
}));
|
}));
|
||||||
css::uno::Reference< css::container::XNameAccess > blacklist(
|
css::uno::Reference< css::container::XNameAccess > denylist(
|
||||||
(css::configuration::theDefaultProvider::get(m_context)
|
(css::configuration::theDefaultProvider::get(m_context)
|
||||||
->createInstanceWithArguments(
|
->createInstanceWithArguments(
|
||||||
"com.sun.star.configuration.ConfigurationAccess", args)),
|
"com.sun.star.configuration.ConfigurationAccess", args)),
|
||||||
css::uno::UNO_QUERY_THROW);
|
css::uno::UNO_QUERY_THROW);
|
||||||
|
|
||||||
// check first if a blacklist entry is available
|
// check first if a denylist entry is available
|
||||||
if (!(blacklist.is() && blacklist->hasByName(*id))) return;
|
if (!(denylist.is() && denylist->hasByName(*id))) return;
|
||||||
|
|
||||||
css::uno::Reference< css::beans::XPropertySet > extProps(
|
css::uno::Reference< css::beans::XPropertySet > extProps(
|
||||||
blacklist->getByName(*id), css::uno::UNO_QUERY_THROW);
|
denylist->getByName(*id), css::uno::UNO_QUERY_THROW);
|
||||||
|
|
||||||
css::uno::Any anyValue = extProps->getPropertyValue("Versions");
|
css::uno::Any anyValue = extProps->getPropertyValue("Versions");
|
||||||
|
|
||||||
css::uno::Sequence< OUString > blversions;
|
css::uno::Sequence< OUString > blversions;
|
||||||
anyValue >>= blversions;
|
anyValue >>= blversions;
|
||||||
|
|
||||||
// check if the current version requires further dependency checks from the blacklist
|
// check if the current version requires further dependency checks from the denylist
|
||||||
if (!checkBlacklistVersion(currentversion, blversions)) return;
|
if (!checkDenylistVersion(currentversion, blversions)) return;
|
||||||
|
|
||||||
anyValue = extProps->getPropertyValue("Dependencies");
|
anyValue = extProps->getPropertyValue("Dependencies");
|
||||||
OUString udeps;
|
OUString udeps;
|
||||||
|
@ -404,7 +404,7 @@ void DescriptionInfoset::checkBlacklist() const
|
||||||
// get the parent xml document of current description info for the import
|
// get the parent xml document of current description info for the import
|
||||||
css::uno::Reference< css::xml::dom::XDocument > xCurrentDescInfo(m_element->getOwnerDocument());
|
css::uno::Reference< css::xml::dom::XDocument > xCurrentDescInfo(m_element->getOwnerDocument());
|
||||||
|
|
||||||
// get dependency node of current description info to merge the new dependencies from the blacklist
|
// get dependency node of current description info to merge the new dependencies from the denylist
|
||||||
css::uno::Reference< css::xml::dom::XNode > xCurrentDeps(
|
css::uno::Reference< css::xml::dom::XNode > xCurrentDeps(
|
||||||
m_xpath->selectSingleNode(m_element, "desc:dependencies"));
|
m_xpath->selectSingleNode(m_element, "desc:dependencies"));
|
||||||
|
|
||||||
|
@ -422,14 +422,14 @@ void DescriptionInfoset::checkBlacklist() const
|
||||||
css::uno::Reference< css::xml::dom::XNode > xNode(xDeps->item(i));
|
css::uno::Reference< css::xml::dom::XNode > xNode(xDeps->item(i));
|
||||||
css::uno::Reference< css::xml::dom::XElement > xDep(xNode, css::uno::UNO_QUERY);
|
css::uno::Reference< css::xml::dom::XElement > xDep(xNode, css::uno::UNO_QUERY);
|
||||||
if (xDep.is()) {
|
if (xDep.is()) {
|
||||||
// found valid blacklist dependency, import the node first and append it to the existing dependency node
|
// found valid denylist dependency, import the node first and append it to the existing dependency node
|
||||||
css::uno::Reference< css::xml::dom::XNode > importedNode = xCurrentDescInfo->importNode(xNode, true);
|
css::uno::Reference< css::xml::dom::XNode > importedNode = xCurrentDescInfo->importNode(xNode, true);
|
||||||
xCurrentDeps->appendChild(importedNode);
|
xCurrentDeps->appendChild(importedNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DescriptionInfoset::checkBlacklistVersion(
|
bool DescriptionInfoset::checkDenylistVersion(
|
||||||
const OUString& currentversion,
|
const OUString& currentversion,
|
||||||
css::uno::Sequence< OUString > const & versions)
|
css::uno::Sequence< OUString > const & versions)
|
||||||
{
|
{
|
||||||
|
@ -484,8 +484,8 @@ css::uno::Reference< css::xml::dom::XNodeList >
|
||||||
DescriptionInfoset::getDependencies() const {
|
DescriptionInfoset::getDependencies() const {
|
||||||
if (m_element.is()) {
|
if (m_element.is()) {
|
||||||
try {
|
try {
|
||||||
// check the extension blacklist first and expand the dependencies if applicable
|
// check the extension denylist first and expand the dependencies if applicable
|
||||||
checkBlacklist();
|
checkDenylist();
|
||||||
|
|
||||||
return m_xpath->selectNodeList(m_element, "desc:dependencies/*");
|
return m_xpath->selectNodeList(m_element, "desc:dependencies/*");
|
||||||
} catch (const css::xml::xpath::XPathException &) {
|
} catch (const css::xml::xpath::XPathException &) {
|
||||||
|
|
|
@ -774,13 +774,13 @@ void MigrationImpl::runServices()
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// set black list for extension migration
|
// set black list for extension migration
|
||||||
uno::Sequence< OUString > seqExtBlackList;
|
uno::Sequence< OUString > seqExtDenyList;
|
||||||
sal_uInt32 nSize = rMigration.excludeExtensions.size();
|
sal_uInt32 nSize = rMigration.excludeExtensions.size();
|
||||||
if ( nSize > 0 )
|
if ( nSize > 0 )
|
||||||
seqExtBlackList = comphelper::arrayToSequence< OUString >(
|
seqExtDenyList = comphelper::arrayToSequence< OUString >(
|
||||||
rMigration.excludeExtensions.data(), nSize );
|
rMigration.excludeExtensions.data(), nSize );
|
||||||
seqArguments[2] <<= NamedValue("ExtensionBlackList",
|
seqArguments[2] <<= NamedValue("ExtensionDenyList",
|
||||||
uno::makeAny( seqExtBlackList ));
|
uno::makeAny( seqExtDenyList ));
|
||||||
|
|
||||||
xMigrationJob.set(
|
xMigrationJob.set(
|
||||||
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(rMigration.service, seqArguments, xContext),
|
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(rMigration.service, seqArguments, xContext),
|
||||||
|
|
|
@ -192,7 +192,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
|
||||||
if ( !aExtIdentifier.isEmpty() )
|
if ( !aExtIdentifier.isEmpty() )
|
||||||
{
|
{
|
||||||
// scan extension identifier and try to match with our black list entries
|
// scan extension identifier and try to match with our black list entries
|
||||||
for (const OUString & i : m_aBlackList)
|
for (const OUString & i : m_aDenyList)
|
||||||
{
|
{
|
||||||
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
|
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
|
||||||
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
|
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
|
||||||
|
@ -217,7 +217,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
|
||||||
// Try to use the folder name to match our black list
|
// Try to use the folder name to match our black list
|
||||||
// as some extensions don't provide an identifier in the
|
// as some extensions don't provide an identifier in the
|
||||||
// description.xml!
|
// description.xml!
|
||||||
for (const OUString & i : m_aBlackList)
|
for (const OUString & i : m_aDenyList)
|
||||||
{
|
{
|
||||||
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
|
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
|
||||||
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
|
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
|
||||||
|
@ -297,13 +297,13 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments )
|
||||||
OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" );
|
OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( aValue.Name == "ExtensionBlackList" )
|
else if ( aValue.Name == "ExtensionDenyList" )
|
||||||
{
|
{
|
||||||
Sequence< OUString > aBlackList;
|
Sequence< OUString > aDenyList;
|
||||||
if ( (aValue.Value >>= aBlackList ) && aBlackList.hasElements())
|
if ( (aValue.Value >>= aDenyList ) && aDenyList.hasElements())
|
||||||
{
|
{
|
||||||
m_aBlackList.resize( aBlackList.getLength() );
|
m_aDenyList.resize( aDenyList.getLength() );
|
||||||
::comphelper::sequenceToArray< OUString >( m_aBlackList.data(), aBlackList );
|
::comphelper::sequenceToArray< OUString >( m_aDenyList.data(), aDenyList );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ namespace migration
|
||||||
::osl::Mutex m_aMutex;
|
::osl::Mutex m_aMutex;
|
||||||
OUString m_sSourceDir;
|
OUString m_sSourceDir;
|
||||||
OUString m_sTargetDir;
|
OUString m_sTargetDir;
|
||||||
TStringVector m_aBlackList;
|
TStringVector m_aDenyList;
|
||||||
|
|
||||||
enum ScanResult
|
enum ScanResult
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,7 +51,7 @@ module.exports = {
|
||||||
"global-require": "error",
|
"global-require": "error",
|
||||||
"guard-for-in": "off",
|
"guard-for-in": "off",
|
||||||
"handle-callback-err": "error",
|
"handle-callback-err": "error",
|
||||||
"id-blacklist": "error",
|
"id-denylist": "error",
|
||||||
"id-length": "off",
|
"id-length": "off",
|
||||||
"id-match": "error",
|
"id-match": "error",
|
||||||
"indent": "off",
|
"indent": "off",
|
||||||
|
|
|
@ -443,7 +443,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtFilePicker::implCreateDialog( weld::Windo
|
||||||
{
|
{
|
||||||
OUString sStandardDir = m_aStandardDir;
|
OUString sStandardDir = m_aStandardDir;
|
||||||
dialog->SetStandardDir( sStandardDir );
|
dialog->SetStandardDir( sStandardDir );
|
||||||
dialog->SetBlackList( m_aBlackList );
|
dialog->SetDenyList( m_aDenyList );
|
||||||
}
|
}
|
||||||
|
|
||||||
return dialog;
|
return dialog;
|
||||||
|
@ -983,9 +983,9 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
|
||||||
m_aStandardDir = sStandardDir;
|
m_aStandardDir = sStandardDir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( namedValue.Name == "BlackList" )
|
else if ( namedValue.Name == "DenyList" )
|
||||||
{
|
{
|
||||||
namedValue.Value >>= m_aBlackList;
|
namedValue.Value >>= m_aDenyList;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1010,9 +1010,9 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( _rName == "BlackList" )
|
if ( _rName == "DenyList" )
|
||||||
{
|
{
|
||||||
OSL_VERIFY( _rValue >>= m_aBlackList );
|
OSL_VERIFY( _rValue >>= m_aDenyList );
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1079,7 +1079,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog(weld::
|
||||||
{
|
{
|
||||||
OUString sStandardDir = m_aStandardDir;
|
OUString sStandardDir = m_aStandardDir;
|
||||||
dialog->SetStandardDir( sStandardDir );
|
dialog->SetStandardDir( sStandardDir );
|
||||||
dialog->SetBlackList( m_aBlackList );
|
dialog->SetDenyList( m_aDenyList );
|
||||||
}
|
}
|
||||||
|
|
||||||
return dialog;
|
return dialog;
|
||||||
|
|
|
@ -75,7 +75,7 @@ protected:
|
||||||
|
|
||||||
OUString m_aStandardDir;
|
OUString m_aStandardDir;
|
||||||
css::uno::Sequence< OUString >
|
css::uno::Sequence< OUString >
|
||||||
m_aBlackList;
|
m_aDenyList;
|
||||||
|
|
||||||
css::uno::Reference< css::ui::dialogs::XFilePickerListener >
|
css::uno::Reference< css::ui::dialogs::XFilePickerListener >
|
||||||
m_xListener;
|
m_xListener;
|
||||||
|
|
|
@ -362,7 +362,7 @@ void RemoteFilesDialog::OpenURL( OUString const & sURL )
|
||||||
m_pCurrentAsyncAction = new AsyncPickerAction( this, m_xFileView.get(), AsyncPickerAction::Action::eOpenURL );
|
m_pCurrentAsyncAction = new AsyncPickerAction( this, m_xFileView.get(), AsyncPickerAction::Action::eOpenURL );
|
||||||
|
|
||||||
// -1 timeout - sync
|
// -1 timeout - sync
|
||||||
m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetBlackList() );
|
m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetDenyList() );
|
||||||
|
|
||||||
if( m_eMode != REMOTEDLG_MODE_SAVE )
|
if( m_eMode != REMOTEDLG_MODE_SAVE )
|
||||||
m_xName_ed->set_text( "" );
|
m_xName_ed->set_text( "" );
|
||||||
|
@ -929,15 +929,15 @@ void RemoteFilesDialog::SetHasFilename( bool )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoteFilesDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
|
void RemoteFilesDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
m_aBlackList = rBlackList;
|
m_aDenyList = rDenyList;
|
||||||
m_xTreeView->SetBlackList( rBlackList );
|
m_xTreeView->SetDenyList( rDenyList );
|
||||||
}
|
}
|
||||||
|
|
||||||
const css::uno::Sequence< OUString >& RemoteFilesDialog::GetBlackList() const
|
const css::uno::Sequence< OUString >& RemoteFilesDialog::GetDenyList() const
|
||||||
{
|
{
|
||||||
return m_aBlackList;
|
return m_aDenyList;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoteFilesDialog::SetStandardDir( const OUString& rStdDir )
|
void RemoteFilesDialog::SetStandardDir( const OUString& rStdDir )
|
||||||
|
|
|
@ -61,8 +61,8 @@ public:
|
||||||
virtual SvtFileView* GetView() override;
|
virtual SvtFileView* GetView() override;
|
||||||
|
|
||||||
virtual void SetHasFilename( bool ) override;
|
virtual void SetHasFilename( bool ) override;
|
||||||
virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
|
virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override;
|
||||||
virtual const css::uno::Sequence< OUString >& GetBlackList() const override;
|
virtual const css::uno::Sequence< OUString >& GetDenyList() const override;
|
||||||
virtual void SetStandardDir( const OUString& rStdDir ) override;
|
virtual void SetStandardDir( const OUString& rStdDir ) override;
|
||||||
virtual const OUString& GetStandardDir() const override;
|
virtual const OUString& GetStandardDir() const override;
|
||||||
virtual void SetPath( const OUString& rNewURL ) override;
|
virtual void SetPath( const OUString& rNewURL ) override;
|
||||||
|
@ -121,7 +121,7 @@ private:
|
||||||
|
|
||||||
::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction;
|
::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction;
|
||||||
|
|
||||||
css::uno::Sequence< OUString > m_aBlackList;
|
css::uno::Sequence< OUString > m_aDenyList;
|
||||||
|
|
||||||
std::unique_ptr<weld::Button> m_xOk_btn;
|
std::unique_ptr<weld::Button> m_xOk_btn;
|
||||||
std::unique_ptr<weld::Button> m_xCancel_btn;
|
std::unique_ptr<weld::Button> m_xCancel_btn;
|
||||||
|
|
|
@ -61,7 +61,7 @@ namespace svt
|
||||||
const OUString& _rFilter,
|
const OUString& _rFilter,
|
||||||
sal_Int32 _nMinTimeout,
|
sal_Int32 _nMinTimeout,
|
||||||
sal_Int32 _nMaxTimeout,
|
sal_Int32 _nMaxTimeout,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
DBG_TESTSOLARMUTEX();
|
DBG_TESTSOLARMUTEX();
|
||||||
// if this asserts, we'd need to have an own mutex per instance
|
// if this asserts, we'd need to have an own mutex per instance
|
||||||
|
@ -95,7 +95,7 @@ namespace svt
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case eOpenURL:
|
case eOpenURL:
|
||||||
eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rBlackList );
|
eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rDenyList );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case eExecuteFilter:
|
case eExecuteFilter:
|
||||||
|
|
|
@ -72,7 +72,7 @@ namespace svt
|
||||||
const OUString& _rFilter,
|
const OUString& _rFilter,
|
||||||
sal_Int32 _nMinTimeout,
|
sal_Int32 _nMinTimeout,
|
||||||
sal_Int32 _nMaxTimeout,
|
sal_Int32 _nMaxTimeout,
|
||||||
const css::uno::Sequence< OUString >& rBlackList );
|
const css::uno::Sequence< OUString >& rDenyList );
|
||||||
|
|
||||||
/// cancels the running action
|
/// cancels the running action
|
||||||
void cancel();
|
void cancel();
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace svt
|
||||||
,m_xCommandEnv ( _rxCommandEnv )
|
,m_xCommandEnv ( _rxCommandEnv )
|
||||||
,m_pResultHandler ( nullptr )
|
,m_pResultHandler ( nullptr )
|
||||||
,m_bCancelled ( false )
|
,m_bCancelled ( false )
|
||||||
,m_rBlackList ( css::uno::Sequence< OUString >() )
|
,m_rDenyList ( css::uno::Sequence< OUString >() )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,13 +104,13 @@ namespace svt
|
||||||
|
|
||||||
EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
|
EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
|
||||||
const FolderDescriptor& _rFolder,
|
const FolderDescriptor& _rFolder,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
::osl::MutexGuard aGuard( m_aMutex );
|
::osl::MutexGuard aGuard( m_aMutex );
|
||||||
m_aFolder = _rFolder;
|
m_aFolder = _rFolder;
|
||||||
m_pResultHandler = nullptr;
|
m_pResultHandler = nullptr;
|
||||||
m_rBlackList = rBlackList;
|
m_rDenyList = rDenyList;
|
||||||
}
|
}
|
||||||
return enumerateFolderContent();
|
return enumerateFolderContent();
|
||||||
}
|
}
|
||||||
|
@ -220,7 +220,7 @@ namespace svt
|
||||||
// check for restrictions
|
// check for restrictions
|
||||||
{
|
{
|
||||||
::osl::MutexGuard aGuard( m_aMutex );
|
::osl::MutexGuard aGuard( m_aMutex );
|
||||||
if ( /* m_rBlackList.hasElements() && */ URLOnBlackList ( sRealURL ) )
|
if ( /* m_rDenyList.hasElements() && */ URLOnDenyList ( sRealURL ) )
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,11 +310,11 @@ namespace svt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL )
|
bool FileViewContentEnumerator::URLOnDenyList ( const OUString& sRealURL )
|
||||||
{
|
{
|
||||||
OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 );
|
OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 );
|
||||||
|
|
||||||
return comphelper::findValue(m_rBlackList, entryName) != -1;
|
return comphelper::findValue(m_rDenyList, entryName) != -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -167,9 +167,9 @@ namespace svt
|
||||||
IEnumerationResultHandler* m_pResultHandler;
|
IEnumerationResultHandler* m_pResultHandler;
|
||||||
bool m_bCancelled;
|
bool m_bCancelled;
|
||||||
|
|
||||||
css::uno::Sequence< OUString > m_rBlackList;
|
css::uno::Sequence< OUString > m_rDenyList;
|
||||||
|
|
||||||
bool URLOnBlackList ( const OUString& sRealURL );
|
bool URLOnDenyList ( const OUString& sRealURL );
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** constructs an enumerator instance
|
/** constructs an enumerator instance
|
||||||
|
@ -205,7 +205,7 @@ namespace svt
|
||||||
*/
|
*/
|
||||||
EnumerationResult enumerateFolderContentSync(
|
EnumerationResult enumerateFolderContentSync(
|
||||||
const FolderDescriptor& _rFolder,
|
const FolderDescriptor& _rFolder,
|
||||||
const css::uno::Sequence< OUString >& rBlackList
|
const css::uno::Sequence< OUString >& rDenyList
|
||||||
);
|
);
|
||||||
|
|
||||||
/** cancels the running operation.
|
/** cancels the running operation.
|
||||||
|
|
|
@ -288,12 +288,12 @@ public:
|
||||||
FileViewResult GetFolderContent_Impl(
|
FileViewResult GetFolderContent_Impl(
|
||||||
const OUString& rFolder,
|
const OUString& rFolder,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList );
|
const css::uno::Sequence< OUString >& rDenyList );
|
||||||
|
|
||||||
FileViewResult GetFolderContent_Impl(
|
FileViewResult GetFolderContent_Impl(
|
||||||
const FolderDescriptor& _rFolder,
|
const FolderDescriptor& _rFolder,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList );
|
const css::uno::Sequence< OUString >& rDenyList );
|
||||||
void FilterFolderContent_Impl( const OUString &rFilter );
|
void FilterFolderContent_Impl( const OUString &rFilter );
|
||||||
void CancelRunningAsyncAction();
|
void CancelRunningAsyncAction();
|
||||||
|
|
||||||
|
@ -879,7 +879,7 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc
|
||||||
|
|
||||||
OUString sParentURL;
|
OUString sParentURL;
|
||||||
if ( GetParentURL( sParentURL ) )
|
if ( GetParentURL( sParentURL ) )
|
||||||
eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maBlackList );
|
eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maDenyList );
|
||||||
|
|
||||||
return eResult;
|
return eResult;
|
||||||
}
|
}
|
||||||
|
@ -931,10 +931,10 @@ FileViewResult SvtFileView::Initialize(
|
||||||
const OUString& rURL,
|
const OUString& rURL,
|
||||||
const OUString& rFilter,
|
const OUString& rFilter,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
weld::WaitObject aWaitCursor(mpImpl->m_pTopLevel);
|
weld::WaitObject aWaitCursor(mpImpl->m_pTopLevel);
|
||||||
maBlackList = rBlackList;
|
maDenyList = rDenyList;
|
||||||
|
|
||||||
OUString sPushURL( mpImpl->maViewURL );
|
OUString sPushURL( mpImpl->maViewURL );
|
||||||
|
|
||||||
|
@ -963,7 +963,7 @@ FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileVi
|
||||||
mpImpl->maCurrentFilter = rFilter.toAsciiLowerCase();
|
mpImpl->maCurrentFilter = rFilter.toAsciiLowerCase();
|
||||||
|
|
||||||
mpImpl->Clear();
|
mpImpl->Clear();
|
||||||
FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maBlackList);
|
FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maDenyList);
|
||||||
OSL_ENSURE( ( eResult != eStillRunning ) || pAsyncDescriptor, "SvtFileView::ExecuteFilter: we told it to read synchronously!" );
|
OSL_ENSURE( ( eResult != eStillRunning ) || pAsyncDescriptor, "SvtFileView::ExecuteFilter: we told it to read synchronously!" );
|
||||||
return eResult;
|
return eResult;
|
||||||
}
|
}
|
||||||
|
@ -1167,7 +1167,7 @@ void SvtFileView_Impl::Clear()
|
||||||
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
||||||
const OUString& rFolder,
|
const OUString& rFolder,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
::osl::ClearableMutexGuard aGuard( maMutex );
|
::osl::ClearableMutexGuard aGuard( maMutex );
|
||||||
INetURLObject aFolderObj( rFolder );
|
INetURLObject aFolderObj( rFolder );
|
||||||
|
@ -1176,13 +1176,13 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
||||||
FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
|
FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
|
||||||
|
|
||||||
aGuard.clear();
|
aGuard.clear();
|
||||||
return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList );
|
return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rDenyList );
|
||||||
}
|
}
|
||||||
|
|
||||||
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
||||||
const FolderDescriptor& _rFolder,
|
const FolderDescriptor& _rFolder,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
DBG_TESTSOLARMUTEX();
|
DBG_TESTSOLARMUTEX();
|
||||||
::osl::ClearableMutexGuard aGuard( maMutex );
|
::osl::ClearableMutexGuard aGuard( maMutex );
|
||||||
|
@ -1194,7 +1194,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
|
||||||
|
|
||||||
if ( !pAsyncDescriptor )
|
if ( !pAsyncDescriptor )
|
||||||
{
|
{
|
||||||
::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList );
|
::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rDenyList );
|
||||||
if ( ::svt::EnumerationResult::SUCCESS == eResult )
|
if ( ::svt::EnumerationResult::SUCCESS == eResult )
|
||||||
{
|
{
|
||||||
implEnumerationSuccess();
|
implEnumerationSuccess();
|
||||||
|
|
|
@ -63,7 +63,7 @@ class SvtFileView
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<SvtFileView_Impl> mpImpl;
|
std::unique_ptr<SvtFileView_Impl> mpImpl;
|
||||||
css::uno::Sequence<OUString> maBlackList;
|
css::uno::Sequence<OUString> maDenyList;
|
||||||
|
|
||||||
DECL_LINK(HeaderSelect_Impl, int, void);
|
DECL_LINK(HeaderSelect_Impl, int, void);
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ public:
|
||||||
const OUString& rFolderURL,
|
const OUString& rFolderURL,
|
||||||
const OUString& rFilter,
|
const OUString& rFilter,
|
||||||
const FileViewAsyncAction* pAsyncDescriptor,
|
const FileViewAsyncAction* pAsyncDescriptor,
|
||||||
const css::uno::Sequence< OUString >& rBlackList
|
const css::uno::Sequence< OUString >& rDenyList
|
||||||
);
|
);
|
||||||
|
|
||||||
/** reads the current content of the current folder again, and applies the given filter to it
|
/** reads the current content of the current folder again, and applies the given filter to it
|
||||||
|
|
|
@ -74,7 +74,7 @@ void FolderTree::FillTreeEntry(const weld::TreeIter& rEntry)
|
||||||
FolderDescriptor aFolder(sURL);
|
FolderDescriptor aFolder(sURL);
|
||||||
|
|
||||||
EnumerationResult eResult =
|
EnumerationResult eResult =
|
||||||
xContentEnumerator->enumerateFolderContentSync( aFolder, m_aBlackList );
|
xContentEnumerator->enumerateFolderContentSync( aFolder, m_aDenyList );
|
||||||
|
|
||||||
if (EnumerationResult::SUCCESS == eResult)
|
if (EnumerationResult::SUCCESS == eResult)
|
||||||
{
|
{
|
||||||
|
@ -169,9 +169,9 @@ void FolderTree::SetTreePath( OUString const & sUrl )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FolderTree::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
|
void FolderTree::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
m_aBlackList = rBlackList;
|
m_aDenyList = rDenyList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
|
|
@ -27,7 +27,7 @@ private:
|
||||||
weld::Window* m_pTopLevel;
|
weld::Window* m_pTopLevel;
|
||||||
Reference< XCommandEnvironment > m_xEnv;
|
Reference< XCommandEnvironment > m_xEnv;
|
||||||
::osl::Mutex m_aMutex;
|
::osl::Mutex m_aMutex;
|
||||||
Sequence< OUString > m_aBlackList;
|
Sequence< OUString > m_aDenyList;
|
||||||
|
|
||||||
OUString m_sLastUpdatedDir;
|
OUString m_sLastUpdatedDir;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ public:
|
||||||
void FillTreeEntry(const weld::TreeIter& rEntry);
|
void FillTreeEntry(const weld::TreeIter& rEntry);
|
||||||
void FillTreeEntry(const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders);
|
void FillTreeEntry(const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders);
|
||||||
void SetTreePath(OUString const & sUrl);
|
void SetTreePath(OUString const & sUrl);
|
||||||
void SetBlackList(const css::uno::Sequence< OUString >& rBlackList);
|
void SetDenyList(const css::uno::Sequence< OUString >& rDenyList);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -70,8 +70,8 @@ public:
|
||||||
virtual SvtFileView* GetView() = 0;
|
virtual SvtFileView* GetView() = 0;
|
||||||
|
|
||||||
virtual void SetHasFilename( bool bHasFilename ) = 0;
|
virtual void SetHasFilename( bool bHasFilename ) = 0;
|
||||||
virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) = 0;
|
virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) = 0;
|
||||||
virtual const css::uno::Sequence< OUString >& GetBlackList() const = 0;
|
virtual const css::uno::Sequence< OUString >& GetDenyList() const = 0;
|
||||||
virtual void SetStandardDir( const OUString& rStdDir ) = 0;
|
virtual void SetStandardDir( const OUString& rStdDir ) = 0;
|
||||||
virtual const OUString& GetStandardDir() const = 0;
|
virtual const OUString& GetStandardDir() const = 0;
|
||||||
virtual void SetPath( const OUString& rNewURL ) = 0;
|
virtual void SetPath( const OUString& rNewURL ) = 0;
|
||||||
|
|
|
@ -1630,7 +1630,7 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action eAction,
|
||||||
m_aConfiguration.getNodeValue( OUString( "Timeout/Max" ) ) >>= nMaxTimeout;
|
m_aConfiguration.getNodeValue( OUString( "Timeout/Max" ) ) >>= nMaxTimeout;
|
||||||
|
|
||||||
m_bInExecuteAsync = true;
|
m_bInExecuteAsync = true;
|
||||||
m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetBlackList());
|
m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetDenyList());
|
||||||
m_bInExecuteAsync = false;
|
m_bInExecuteAsync = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1662,15 +1662,15 @@ void SvtFileDialog::SetStandardDir( const OUString& rStdDir )
|
||||||
m_xImpl->SetStandardDir( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
|
m_xImpl->SetStandardDir( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
|
void SvtFileDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
m_xImpl->SetBlackList( rBlackList );
|
m_xImpl->SetDenyList( rDenyList );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const
|
const css::uno::Sequence< OUString >& SvtFileDialog::GetDenyList() const
|
||||||
{
|
{
|
||||||
return m_xImpl->GetBlackList();
|
return m_xImpl->GetDenyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -160,8 +160,8 @@ public:
|
||||||
void FileSelect();
|
void FileSelect();
|
||||||
void FilterSelect() override;
|
void FilterSelect() override;
|
||||||
|
|
||||||
void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
|
void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override;
|
||||||
const css::uno::Sequence< OUString >& GetBlackList() const override;
|
const css::uno::Sequence< OUString >& GetDenyList() const override;
|
||||||
void SetStandardDir( const OUString& rStdDir ) override;
|
void SetStandardDir( const OUString& rStdDir ) override;
|
||||||
const OUString& GetStandardDir() const override;
|
const OUString& GetStandardDir() const override;
|
||||||
std::vector<OUString> GetPathList() const override; // for MultiSelection
|
std::vector<OUString> GetPathList() const override; // for MultiSelection
|
||||||
|
|
|
@ -107,7 +107,7 @@ private:
|
||||||
const SvtFileDialogFilter_Impl* m_pCurFilter;
|
const SvtFileDialogFilter_Impl* m_pCurFilter;
|
||||||
OUString m_sCurrentFilterDisplayName; // may differ from m_pCurFilter->GetName in case it is a cached entry
|
OUString m_sCurrentFilterDisplayName; // may differ from m_pCurFilter->GetName in case it is a cached entry
|
||||||
|
|
||||||
css::uno::Sequence< OUString > m_aBlackList;
|
css::uno::Sequence< OUString > m_aDenyList;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SvtFileDialogFilterList_Impl m_aFilter;
|
SvtFileDialogFilterList_Impl m_aFilter;
|
||||||
|
@ -156,8 +156,8 @@ public:
|
||||||
explicit SvtExpFileDlg_Impl();
|
explicit SvtExpFileDlg_Impl();
|
||||||
~SvtExpFileDlg_Impl();
|
~SvtExpFileDlg_Impl();
|
||||||
|
|
||||||
void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { m_aBlackList = rBlackList; }
|
void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { m_aDenyList = rDenyList; }
|
||||||
const css::uno::Sequence< OUString >& GetBlackList() const { return m_aBlackList; }
|
const css::uno::Sequence< OUString >& GetDenyList() const { return m_aDenyList; }
|
||||||
void SetStandardDir( const OUString& rDir );
|
void SetStandardDir( const OUString& rDir );
|
||||||
const OUString& GetStandardDir() const { return m_aStdDir; }
|
const OUString& GetStandardDir() const { return m_aStdDir; }
|
||||||
|
|
||||||
|
|
|
@ -245,42 +245,42 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MOZ_ASAN_BLACKLIST is a macro to tell AddressSanitizer (a compile-time
|
* MOZ_ASAN_DENYLIST is a macro to tell AddressSanitizer (a compile-time
|
||||||
* instrumentation shipped with Clang and GCC) to not instrument the annotated
|
* instrumentation shipped with Clang and GCC) to not instrument the annotated
|
||||||
* function. Furthermore, it will prevent the compiler from inlining the
|
* function. Furthermore, it will prevent the compiler from inlining the
|
||||||
* function because inlining currently breaks the blacklisting mechanism of
|
* function because inlining currently breaks the denylisting mechanism of
|
||||||
* AddressSanitizer.
|
* AddressSanitizer.
|
||||||
*/
|
*/
|
||||||
#if defined(__has_feature)
|
#if defined(__has_feature)
|
||||||
# if __has_feature(address_sanitizer)
|
# if __has_feature(address_sanitizer)
|
||||||
# define MOZ_HAVE_ASAN_BLACKLIST
|
# define MOZ_HAVE_ASAN_DENYLIST
|
||||||
# endif
|
# endif
|
||||||
#elif defined(__GNUC__)
|
#elif defined(__GNUC__)
|
||||||
# if defined(__SANITIZE_ADDRESS__)
|
# if defined(__SANITIZE_ADDRESS__)
|
||||||
# define MOZ_HAVE_ASAN_BLACKLIST
|
# define MOZ_HAVE_ASAN_DENYLIST
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MOZ_HAVE_ASAN_BLACKLIST)
|
#if defined(MOZ_HAVE_ASAN_DENYLIST)
|
||||||
# define MOZ_ASAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
|
# define MOZ_ASAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
|
||||||
#else
|
#else
|
||||||
# define MOZ_ASAN_BLACKLIST /* nothing */
|
# define MOZ_ASAN_DENYLIST /* nothing */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MOZ_TSAN_BLACKLIST is a macro to tell ThreadSanitizer (a compile-time
|
* MOZ_TSAN_DENYLIST is a macro to tell ThreadSanitizer (a compile-time
|
||||||
* instrumentation shipped with Clang) to not instrument the annotated function.
|
* instrumentation shipped with Clang) to not instrument the annotated function.
|
||||||
* Furthermore, it will prevent the compiler from inlining the function because
|
* Furthermore, it will prevent the compiler from inlining the function because
|
||||||
* inlining currently breaks the blacklisting mechanism of ThreadSanitizer.
|
* inlining currently breaks the denylisting mechanism of ThreadSanitizer.
|
||||||
*/
|
*/
|
||||||
#if defined(__has_feature)
|
#if defined(__has_feature)
|
||||||
# if __has_feature(thread_sanitizer)
|
# if __has_feature(thread_sanitizer)
|
||||||
# define MOZ_TSAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
|
# define MOZ_TSAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
|
||||||
# else
|
# else
|
||||||
# define MOZ_TSAN_BLACKLIST /* nothing */
|
# define MOZ_TSAN_DENYLIST /* nothing */
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# define MOZ_TSAN_BLACKLIST /* nothing */
|
# define MOZ_TSAN_DENYLIST /* nothing */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -76,7 +76,7 @@ struct OPENCL_DLLPUBLIC OpenCLConfig
|
||||||
|
|
||||||
typedef std::set<ImplMatcher> ImplMatcherSet;
|
typedef std::set<ImplMatcher> ImplMatcherSet;
|
||||||
|
|
||||||
ImplMatcherSet maBlackList;
|
ImplMatcherSet maDenyList;
|
||||||
ImplMatcherSet maWhiteList;
|
ImplMatcherSet maWhiteList;
|
||||||
|
|
||||||
OpenCLConfig();
|
OpenCLConfig();
|
||||||
|
|
|
@ -120,7 +120,7 @@ public:
|
||||||
SfxFilterFlags nMust,
|
SfxFilterFlags nMust,
|
||||||
SfxFilterFlags nDont,
|
SfxFilterFlags nDont,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList,
|
const css::uno::Sequence< OUString >& rDenyList,
|
||||||
weld::Window* pPreferredParent);
|
weld::Window* pPreferredParent);
|
||||||
|
|
||||||
FileDialogHelper(sal_Int16 nDialogType,
|
FileDialogHelper(sal_Int16 nDialogType,
|
||||||
|
@ -128,7 +128,7 @@ public:
|
||||||
const OUString& aFilterUIName,
|
const OUString& aFilterUIName,
|
||||||
const OUString& aExtName,
|
const OUString& aExtName,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList,
|
const css::uno::Sequence< OUString >& rDenyList,
|
||||||
weld::Window* pPreferredParent);
|
weld::Window* pPreferredParent);
|
||||||
|
|
||||||
virtual ~FileDialogHelper();
|
virtual ~FileDialogHelper();
|
||||||
|
@ -253,7 +253,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
|
||||||
const OUString* pPath,
|
const OUString* pPath,
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
|
const css::uno::Sequence< OUString >& rDenyList = css::uno::Sequence< OUString >());
|
||||||
|
|
||||||
|
|
||||||
ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, const css::uno::Reference<css::awt::XWindow>& rParent);
|
ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, const css::uno::Reference<css::awt::XWindow>& rParent);
|
||||||
|
|
|
@ -153,7 +153,7 @@ class SvxSearchItem;
|
||||||
#define SID_PATH (SID_SFX_START + 308)
|
#define SID_PATH (SID_SFX_START + 308)
|
||||||
#define SID_SAVEDOCS (SID_SFX_START + 309)
|
#define SID_SAVEDOCS (SID_SFX_START + 309)
|
||||||
#define SID_STANDARD_DIR (SID_SFX_START + 450)
|
#define SID_STANDARD_DIR (SID_SFX_START + 450)
|
||||||
#define SID_BLACK_LIST (SID_SFX_START + 451)
|
#define SID_DENY_LIST (SID_SFX_START + 451)
|
||||||
|
|
||||||
// browse-ids
|
// browse-ids
|
||||||
#define SID_BROWSE_FORWARD (SID_SFX_START + 1300)
|
#define SID_BROWSE_FORWARD (SID_SFX_START + 1300)
|
||||||
|
|
|
@ -100,9 +100,9 @@ public:
|
||||||
static void debugMsgStreamWarn(std::ostringstream const &pStream);
|
static void debugMsgStreamWarn(std::ostringstream const &pStream);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* checks if the device/driver pair is on our OpenGL blacklist
|
* checks if the device/driver pair is on our OpenGL denylist
|
||||||
*/
|
*/
|
||||||
static bool isDeviceBlacklisted();
|
static bool isDeviceDenylisted();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* checks if the system supports all features that are necessary for the OpenGL VCL support
|
* checks if the system supports all features that are necessary for the OpenGL VCL support
|
||||||
|
|
|
@ -18,7 +18,7 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface
|
||||||
* Returns true if calculation with OpenCL is enabled (at all).
|
* Returns true if calculation with OpenCL is enabled (at all).
|
||||||
* The actual use of OpenCL for a formula is also affected by the
|
* The actual use of OpenCL for a formula is also affected by the
|
||||||
* configuration settings specifying whether OpenCL is used for
|
* configuration settings specifying whether OpenCL is used for
|
||||||
* all opcodes or just for a subset, and the black- and whitelists
|
* all opcodes or just for a subset, and the deny- and allowlists
|
||||||
* of OpenCL implementations that are in use.
|
* of OpenCL implementations that are in use.
|
||||||
*/
|
*/
|
||||||
boolean isOpenCLEnabled();
|
boolean isOpenCLEnabled();
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
<!-- NVidia Quadro NVS 285 simply refuses rendering (failing silently) if we take the maximum texture size -->
|
<!-- NVidia Quadro NVS 285 simply refuses rendering (failing silently) if we take the maximum texture size -->
|
||||||
<value>2048</value>
|
<value>2048</value>
|
||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="BlacklistCurrentDevice" oor:type="xs:boolean">
|
<prop oor:name="DenylistCurrentDevice" oor:type="xs:boolean">
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="DeviceBlacklist" oor:type="oor:int-list">
|
<prop oor:name="DeviceDenylist" oor:type="oor:int-list">
|
||||||
<value><!-- Matrox G550 - blank display on 2nd head -->
|
<value><!-- Matrox G550 - blank display on 2nd head -->
|
||||||
4139 9511 260313131 1 5 13 1 1320
|
4139 9511 260313131 1 5 13 1 1320
|
||||||
<!-- Matrox G550 - blank display (single head?) -->
|
<!-- Matrox G550 - blank display (single head?) -->
|
||||||
|
|
|
@ -49,29 +49,29 @@
|
||||||
<info>
|
<info>
|
||||||
<desc>Contains config entries for the DirectX-based implementation of the XCanvas interface.</desc>
|
<desc>Contains config entries for the DirectX-based implementation of the XCanvas interface.</desc>
|
||||||
</info>
|
</info>
|
||||||
<prop oor:name="DeviceBlacklist" oor:type="oor:int-list" oor:nillable="false">
|
<prop oor:name="DeviceDenylist" oor:type="oor:int-list" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>Sequence of 8 integers per device/driver
|
<desc>Sequence of 8 integers per device/driver
|
||||||
combination, that uniquely mark them as not being compatible with the
|
combination, that uniquely mark them as not being compatible with the
|
||||||
DirectX9 canvas implementation. If you have
|
DirectX9 canvas implementation. If you have
|
||||||
trouble with your graphic adapter, and want to
|
trouble with your graphic adapter, and want to
|
||||||
add it to the blacklisting, set
|
add it to the denylisting, set
|
||||||
BlacklistCurrentDevice below to false. After
|
DenylistCurrentDevice below to false. After
|
||||||
running the Impress slideshow once, your card
|
running the Impress slideshow once, your card
|
||||||
identification has been added to the list.
|
identification has been added to the list.
|
||||||
</desc>
|
</desc>
|
||||||
<label>Sequence of blacklisted devices</label>
|
<label>Sequence of denylisted devices</label>
|
||||||
</info>
|
</info>
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="BlacklistCurrentDevice" oor:type="xs:boolean" oor:nillable="false">
|
<prop oor:name="DenylistCurrentDevice" oor:type="xs:boolean" oor:nillable="false">
|
||||||
<info>
|
<info>
|
||||||
<desc>Indicates whether the current DirectX device
|
<desc>Indicates whether the current DirectX device
|
||||||
ids should get blacklisted. When true, a
|
ids should get denylisted. When true, a
|
||||||
running DXCanvas will write a DeviceBlacklist entry, and refuse to run
|
running DXCanvas will write a DeviceDenylist entry, and refuse to run
|
||||||
on that device subsequently.
|
on that device subsequently.
|
||||||
</desc>
|
</desc>
|
||||||
<label>Blacklist current DirectX device</label>
|
<label>Denylist current DirectX device</label>
|
||||||
</info>
|
</info>
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
</prop>
|
</prop>
|
||||||
|
|
|
@ -861,7 +861,7 @@
|
||||||
<info>
|
<info>
|
||||||
<desc>Specifies if OpenGL rendering should be used in VCL backends
|
<desc>Specifies if OpenGL rendering should be used in VCL backends
|
||||||
supporting it. This one forces the use of OpenGL even if the
|
supporting it. This one forces the use of OpenGL even if the
|
||||||
blacklist would block the OpenGL driver.</desc>
|
denylist would block the OpenGL driver.</desc>
|
||||||
</info>
|
</info>
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
</prop>
|
</prop>
|
||||||
|
@ -876,7 +876,7 @@
|
||||||
<info>
|
<info>
|
||||||
<desc>Specifies if Skia rendering should be used in VCL backends
|
<desc>Specifies if Skia rendering should be used in VCL backends
|
||||||
supporting it. This one forces the use of Skia even if the
|
supporting it. This one forces the use of Skia even if the
|
||||||
blacklist would block the driver.</desc>
|
denylist would block the driver.</desc>
|
||||||
</info>
|
</info>
|
||||||
<value>false</value>
|
<value>false</value>
|
||||||
</prop>
|
</prop>
|
||||||
|
@ -5622,7 +5622,7 @@
|
||||||
</info>
|
</info>
|
||||||
<value>true</value>
|
<value>true</value>
|
||||||
</prop>
|
</prop>
|
||||||
<prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false">
|
<prop oor:name="OpenCLDenyList" oor:type="oor:string-list" oor:nillable="false">
|
||||||
<!-- UIHints: Tools - Options General OpenCL -->
|
<!-- UIHints: Tools - Options General OpenCL -->
|
||||||
<info>
|
<info>
|
||||||
<desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
|
<desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
|
||||||
|
@ -5632,7 +5632,7 @@
|
||||||
<prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
|
<prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
|
||||||
<!-- UIHints: Tools - Options General OpenCL -->
|
<!-- UIHints: Tools - Options General OpenCL -->
|
||||||
<info>
|
<info>
|
||||||
<desc>Like OpenCLBlackList, but for combinations known to be good.</desc>
|
<desc>Like OpenCLDenyList, but for combinations known to be good.</desc>
|
||||||
</info>
|
</info>
|
||||||
<value oor:separator=";">Linux//Advanced Micro Devices, Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) Corporation//;//NVIDIA Corporation//</value>
|
<value oor:separator=";">Linux//Advanced Micro Devices, Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) Corporation//;//NVIDIA Corporation//</value>
|
||||||
</prop>
|
</prop>
|
||||||
|
|
|
@ -157,7 +157,7 @@ http://www.microsoft.com/en-us/download/details.aspx?id=30425
|
||||||
== Export ==
|
== Export ==
|
||||||
Here is how LO's enhanced custom shapes are exported:
|
Here is how LO's enhanced custom shapes are exported:
|
||||||
* Shape name is ooxml-* - they are imported from ooxml, export as is.
|
* Shape name is ooxml-* - they are imported from ooxml, export as is.
|
||||||
* Blacklist - ODF presets that has OOXML equivalent.
|
* Denylist - ODF presets that has OOXML equivalent.
|
||||||
We convert adjustment values case by case. Microsoft Office
|
We convert adjustment values case by case. Microsoft Office
|
||||||
is rather strict about adjustment values, either none of them
|
is rather strict about adjustment values, either none of them
|
||||||
are provided so that default values are taken, or the exact set
|
are provided so that default values are taken, or the exact set
|
||||||
|
@ -165,7 +165,7 @@ Here is how LO's enhanced custom shapes are exported:
|
||||||
from the preset with less handles to the one with more handles
|
from the preset with less handles to the one with more handles
|
||||||
so that default values suitable for the odf one need to be
|
so that default values suitable for the odf one need to be
|
||||||
provided.
|
provided.
|
||||||
* Whitelist - ODF presets that has OOXML equivalent but looks a bit
|
* Allowlist - ODF presets that has OOXML equivalent but looks a bit
|
||||||
different, export them as PolyPolygon.
|
different, export them as PolyPolygon.
|
||||||
|
|
||||||
Check Andras Timar's presentation[1] and ShapeExport::WriteCustomShape()
|
Check Andras Timar's presentation[1] and ShapeExport::WriteCustomShape()
|
||||||
|
|
|
@ -518,9 +518,9 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool lcl_IsOnBlacklist(OUString const & rShapeType)
|
static bool lcl_IsOnDenylist(OUString const & rShapeType)
|
||||||
{
|
{
|
||||||
static const std::initializer_list<OUStringLiteral> vBlacklist = {
|
static const std::initializer_list<OUStringLiteral> vDenylist = {
|
||||||
"block-arc",
|
"block-arc",
|
||||||
"rectangle",
|
"rectangle",
|
||||||
"ellipse",
|
"ellipse",
|
||||||
|
@ -582,7 +582,7 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
|
||||||
"flowchart-display"
|
"flowchart-display"
|
||||||
};
|
};
|
||||||
|
|
||||||
return std::find(vBlacklist.begin(), vBlacklist.end(), rShapeType) != vBlacklist.end();
|
return std::find(vDenylist.begin(), vDenylist.end(), rShapeType) != vDenylist.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool lcl_IsOnWhitelist(OUString const & rShapeType)
|
static bool lcl_IsOnWhitelist(OUString const & rShapeType)
|
||||||
|
@ -812,20 +812,20 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
|
||||||
// we export non-primitive shapes to custom geometry
|
// we export non-primitive shapes to custom geometry
|
||||||
// we also export non-ooxml shapes which have handles/equations to custom geometry, because
|
// we also export non-ooxml shapes which have handles/equations to custom geometry, because
|
||||||
// we cannot convert ODF equations to DrawingML equations. TODO: see what binary DOC export filter does.
|
// we cannot convert ODF equations to DrawingML equations. TODO: see what binary DOC export filter does.
|
||||||
// but our WritePolyPolygon()/WriteCustomGeometry() functions are incomplete, therefore we use a blacklist
|
// but our WritePolyPolygon()/WriteCustomGeometry() functions are incomplete, therefore we use a denylist
|
||||||
// we use a whitelist for shapes where mapping to MSO preset shape is not optimal
|
// we use a whitelist for shapes where mapping to MSO preset shape is not optimal
|
||||||
bool bCustGeom = true;
|
bool bCustGeom = true;
|
||||||
bool bOnBlacklist = false;
|
bool bOnDenylist = false;
|
||||||
if( sShapeType == "ooxml-non-primitive" )
|
if( sShapeType == "ooxml-non-primitive" )
|
||||||
bCustGeom = true;
|
bCustGeom = true;
|
||||||
else if( sShapeType.startsWith("ooxml") )
|
else if( sShapeType.startsWith("ooxml") )
|
||||||
bCustGeom = false;
|
bCustGeom = false;
|
||||||
else if( lcl_IsOnWhitelist(sShapeType) )
|
else if( lcl_IsOnWhitelist(sShapeType) )
|
||||||
bCustGeom = true;
|
bCustGeom = true;
|
||||||
else if( lcl_IsOnBlacklist(sShapeType) )
|
else if( lcl_IsOnDenylist(sShapeType) )
|
||||||
{
|
{
|
||||||
bCustGeom = false;
|
bCustGeom = false;
|
||||||
bOnBlacklist = true;
|
bOnDenylist = true;
|
||||||
}
|
}
|
||||||
else if( bHasHandles )
|
else if( bHasHandles )
|
||||||
bCustGeom = true;
|
bCustGeom = true;
|
||||||
|
@ -853,7 +853,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
|
||||||
if (!bSuccess)
|
if (!bSuccess)
|
||||||
WritePresetShape( sPresetShape );
|
WritePresetShape( sPresetShape );
|
||||||
}
|
}
|
||||||
else if (bOnBlacklist && bHasHandles && nAdjustmentValuesIndex !=-1 && !sShapeType.startsWith("mso-spt"))
|
else if (bOnDenylist && bHasHandles && nAdjustmentValuesIndex !=-1 && !sShapeType.startsWith("mso-spt"))
|
||||||
{
|
{
|
||||||
WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
|
WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
|
||||||
Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
|
Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
|
||||||
|
|
|
@ -345,7 +345,7 @@ int pickBestDevice(std::unique_ptr<ds_profile> const & profile)
|
||||||
{
|
{
|
||||||
ds_device& device = profile->devices[d];
|
ds_device& device = profile->devices[d];
|
||||||
|
|
||||||
// Check blacklist and whitelist for actual devices
|
// Check denylist and whitelist for actual devices
|
||||||
if (device.eType == DeviceType::OpenCLDevice)
|
if (device.eType == DeviceType::OpenCLDevice)
|
||||||
{
|
{
|
||||||
// There is a silly impedance mismatch here. Why do we
|
// There is a silly impedance mismatch here. Why do we
|
||||||
|
@ -360,10 +360,10 @@ int pickBestDevice(std::unique_ptr<ds_profile> const & profile)
|
||||||
aDevice.maName = OStringToOUString(device.sDeviceName, RTL_TEXTENCODING_UTF8);
|
aDevice.maName = OStringToOUString(device.sDeviceName, RTL_TEXTENCODING_UTF8);
|
||||||
aDevice.maDriver = OStringToOUString(device.sDriverVersion, RTL_TEXTENCODING_UTF8);
|
aDevice.maDriver = OStringToOUString(device.sDriverVersion, RTL_TEXTENCODING_UTF8);
|
||||||
|
|
||||||
// If blacklisted or not whitelisted, ignore it
|
// If denylisted or not whitelisted, ignore it
|
||||||
if (OpenCLConfig::get().checkImplementation(aPlatform, aDevice))
|
if (OpenCLConfig::get().checkImplementation(aPlatform, aDevice))
|
||||||
{
|
{
|
||||||
SAL_INFO("opencl.device", "Device[" << d << "] " << device.sDeviceName << " is blacklisted or not whitelisted");
|
SAL_INFO("opencl.device", "Device[" << d << "] " << device.sDeviceName << " is denylisted or not whitelisted");
|
||||||
device.fTime = DBL_MAX;
|
device.fTime = DBL_MAX;
|
||||||
device.bErrors = false;
|
device.bErrors = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,10 +25,10 @@
|
||||||
OpenCLConfig::OpenCLConfig() :
|
OpenCLConfig::OpenCLConfig() :
|
||||||
mbUseOpenCL(true)
|
mbUseOpenCL(true)
|
||||||
{
|
{
|
||||||
// This entry we have had for some time (when blacklisting was
|
// This entry we have had for some time (when denylisting was
|
||||||
// done elsewhere in the code), so presumably there is a known
|
// done elsewhere in the code), so presumably there is a known
|
||||||
// good reason for it.
|
// good reason for it.
|
||||||
maBlackList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "9\\.17\\.10\\.2884"));
|
maDenyList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "9\\.17\\.10\\.2884"));
|
||||||
|
|
||||||
// This is what I have tested on Linux and it works for our unit tests.
|
// This is what I have tested on Linux and it works for our unit tests.
|
||||||
maWhiteList.insert(ImplMatcher("Linux", "", "Advanced Micro Devices, Inc\\.", "", "1445\\.5 \\(sse2,avx\\)"));
|
maWhiteList.insert(ImplMatcher("Linux", "", "Advanced Micro Devices, Inc\\.", "", "1445\\.5 \\(sse2,avx\\)"));
|
||||||
|
@ -42,7 +42,7 @@ OpenCLConfig::OpenCLConfig() :
|
||||||
bool OpenCLConfig::operator== (const OpenCLConfig& r) const
|
bool OpenCLConfig::operator== (const OpenCLConfig& r) const
|
||||||
{
|
{
|
||||||
return (mbUseOpenCL == r.mbUseOpenCL &&
|
return (mbUseOpenCL == r.mbUseOpenCL &&
|
||||||
maBlackList == r.maBlackList &&
|
maDenyList == r.maDenyList &&
|
||||||
maWhiteList == r.maWhiteList);
|
maWhiteList == r.maWhiteList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ OpenCLConfig OpenCLConfig::get()
|
||||||
|
|
||||||
result.mbUseOpenCL = officecfg::Office::Common::Misc::UseOpenCL::get();
|
result.mbUseOpenCL = officecfg::Office::Common::Misc::UseOpenCL::get();
|
||||||
|
|
||||||
result.maBlackList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLBlackList::get());
|
result.maDenyList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLDenyList::get());
|
||||||
result.maWhiteList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLWhiteList::get());
|
result.maWhiteList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLWhiteList::get());
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
@ -191,7 +191,7 @@ void OpenCLConfig::set()
|
||||||
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
|
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
|
||||||
|
|
||||||
officecfg::Office::Common::Misc::UseOpenCL::set(mbUseOpenCL, batch);
|
officecfg::Office::Common::Misc::UseOpenCL::set(mbUseOpenCL, batch);
|
||||||
officecfg::Office::Common::Misc::OpenCLBlackList::set(SetOfImplMatcherToStringSequence(maBlackList), batch);
|
officecfg::Office::Common::Misc::OpenCLDenyList::set(SetOfImplMatcherToStringSequence(maDenyList), batch);
|
||||||
officecfg::Office::Common::Misc::OpenCLWhiteList::set(SetOfImplMatcherToStringSequence(maWhiteList), batch);
|
officecfg::Office::Common::Misc::OpenCLWhiteList::set(SetOfImplMatcherToStringSequence(maWhiteList), batch);
|
||||||
|
|
||||||
batch->commit();
|
batch->commit();
|
||||||
|
@ -199,8 +199,8 @@ void OpenCLConfig::set()
|
||||||
|
|
||||||
bool OpenCLConfig::checkImplementation(const OpenCLPlatformInfo& rPlatform, const OpenCLDeviceInfo& rDevice) const
|
bool OpenCLConfig::checkImplementation(const OpenCLPlatformInfo& rPlatform, const OpenCLDeviceInfo& rDevice) const
|
||||||
{
|
{
|
||||||
// Check blacklist of known bad OpenCL implementations
|
// Check denylist of known bad OpenCL implementations
|
||||||
if (match(maBlackList, rPlatform, rDevice, "blacklist"))
|
if (match(maDenyList, rPlatform, rDevice, "denylist"))
|
||||||
{
|
{
|
||||||
SAL_INFO("opencl", "Rejecting");
|
SAL_INFO("opencl", "Rejecting");
|
||||||
return true;
|
return true;
|
||||||
|
@ -222,7 +222,7 @@ std::ostream& operator<<(std::ostream& rStream, const OpenCLConfig& rConfig)
|
||||||
{
|
{
|
||||||
rStream << "{"
|
rStream << "{"
|
||||||
"UseOpenCL=" << (rConfig.mbUseOpenCL ? "YES" : "NO") << ","
|
"UseOpenCL=" << (rConfig.mbUseOpenCL ? "YES" : "NO") << ","
|
||||||
"BlackList=" << rConfig.maBlackList << ","
|
"DenyList=" << rConfig.maDenyList << ","
|
||||||
"WhiteList=" << rConfig.maWhiteList <<
|
"WhiteList=" << rConfig.maWhiteList <<
|
||||||
"}";
|
"}";
|
||||||
return rStream;
|
return rStream;
|
||||||
|
|
|
@ -122,7 +122,7 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
void Test::test() {
|
void Test::test() {
|
||||||
// On Windows, blacklist the com.sun.star.comp.report.OReportDefinition
|
// On Windows, denylist the com.sun.star.comp.report.OReportDefinition
|
||||||
// implementation (reportdesign::OReportDefinition in
|
// implementation (reportdesign::OReportDefinition in
|
||||||
// reportdesign/source/core/api/ReportDefinition.cxx), as it spawns a thread
|
// reportdesign/source/core/api/ReportDefinition.cxx), as it spawns a thread
|
||||||
// that forever blocks in SendMessageW when no VCL event loop is running
|
// that forever blocks in SendMessageW when no VCL event loop is running
|
||||||
|
@ -136,12 +136,12 @@ void Test::test() {
|
||||||
// WorkWindow::ImplInit -> ImplBorderWindow::ImplBorderWindow ->
|
// WorkWindow::ImplInit -> ImplBorderWindow::ImplBorderWindow ->
|
||||||
// ImplBorderWindow::ImplInit -> Window::ImplInit ->
|
// ImplBorderWindow::ImplInit -> Window::ImplInit ->
|
||||||
// WinSalInstance::CreateFrame -> ImplSendMessage -> SendMessageW):
|
// WinSalInstance::CreateFrame -> ImplSendMessage -> SendMessageW):
|
||||||
std::vector<OUString> blacklist;
|
std::vector<OUString> denylist;
|
||||||
blacklist.emplace_back("com.sun.star.comp.report.OReportDefinition");
|
denylist.emplace_back("com.sun.star.comp.report.OReportDefinition");
|
||||||
|
|
||||||
// <https://bugs.documentfoundation.org/show_bug.cgi?id=89343>
|
// <https://bugs.documentfoundation.org/show_bug.cgi?id=89343>
|
||||||
// "~SwXMailMerge() goes into endless SwCache::Check()":
|
// "~SwXMailMerge() goes into endless SwCache::Check()":
|
||||||
blacklist.emplace_back("SwXMailMerge");
|
denylist.emplace_back("SwXMailMerge");
|
||||||
|
|
||||||
css::uno::Reference<css::container::XContentEnumerationAccess> enumAcc(
|
css::uno::Reference<css::container::XContentEnumerationAccess> enumAcc(
|
||||||
m_xContext->getServiceManager(), css::uno::UNO_QUERY_THROW);
|
m_xContext->getServiceManager(), css::uno::UNO_QUERY_THROW);
|
||||||
|
@ -263,8 +263,8 @@ void Test::test() {
|
||||||
}
|
}
|
||||||
std::vector<css::uno::Reference<css::lang::XComponent>> comps;
|
std::vector<css::uno::Reference<css::lang::XComponent>> comps;
|
||||||
for (auto const & i: impls) {
|
for (auto const & i: impls) {
|
||||||
if (std::find(blacklist.begin(), blacklist.end(), i.first)
|
if (std::find(denylist.begin(), denylist.end(), i.first)
|
||||||
== blacklist.end())
|
== denylist.end())
|
||||||
{
|
{
|
||||||
if (i.second.constructors.empty()) {
|
if (i.second.constructors.empty()) {
|
||||||
if (i.second.accumulationBased) {
|
if (i.second.accumulationBased) {
|
||||||
|
@ -458,7 +458,7 @@ void Test::createInstance(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!propsinfo->hasPropertyByName(prop->getName())) {
|
if (!propsinfo->hasPropertyByName(prop->getName())) {
|
||||||
static std::set<std::pair<OUString, OUString>> const blacklist{
|
static std::set<std::pair<OUString, OUString>> const denylist{
|
||||||
{"com.sun.star.comp.chart.DataSeries", "BorderDash"},
|
{"com.sun.star.comp.chart.DataSeries", "BorderDash"},
|
||||||
{"com.sun.star.comp.chart2.ChartDocumentWrapper", "UserDefinedAttributes"},
|
{"com.sun.star.comp.chart2.ChartDocumentWrapper", "UserDefinedAttributes"},
|
||||||
{"com.sun.star.comp.dbu.OColumnControlModel", "Tabstop"},
|
{"com.sun.star.comp.dbu.OColumnControlModel", "Tabstop"},
|
||||||
|
@ -485,7 +485,7 @@ void Test::createInstance(
|
||||||
{"com.sun.star.comp.report.OFormattedField", "TextLineColor"},
|
{"com.sun.star.comp.report.OFormattedField", "TextLineColor"},
|
||||||
{"com.sun.star.comp.report.OFormattedField", "TreatAsNumber"},
|
{"com.sun.star.comp.report.OFormattedField", "TreatAsNumber"},
|
||||||
{"stardiv.Toolkit.UnoControlRoadmapModel", "Interactive"}};
|
{"stardiv.Toolkit.UnoControlRoadmapModel", "Interactive"}};
|
||||||
if (blacklist.find({implementationName, prop->getName()}) != blacklist.end()) {
|
if (denylist.find({implementationName, prop->getName()}) != denylist.end()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
CPPUNIT_ASSERT_MESSAGE(
|
CPPUNIT_ASSERT_MESSAGE(
|
||||||
|
|
|
@ -187,7 +187,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& rCode, sc::FormulaLogge
|
||||||
// matrix operations and possibly incorrect results (=C:C/D:D). That is handled by
|
// matrix operations and possibly incorrect results (=C:C/D:D). That is handled by
|
||||||
// having ScCompiler check that there are no possible implicit intersections.
|
// having ScCompiler check that there are no possible implicit intersections.
|
||||||
// Additionally some functions such as INDEX() and OFFSET() require a reference,
|
// Additionally some functions such as INDEX() and OFFSET() require a reference,
|
||||||
// that is handled by blacklisting those opcodes in ScTokenArray::CheckToken().
|
// that is handled by denylisting those opcodes in ScTokenArray::CheckToken().
|
||||||
|
|
||||||
ScComplexRefData aRef = *p->GetDoubleRef();
|
ScComplexRefData aRef = *p->GetDoubleRef();
|
||||||
if( aRef.IsDeleted())
|
if( aRef.IsDeleted())
|
||||||
|
|
|
@ -1282,7 +1282,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
|
||||||
#if HAVE_CPP_CONSTINIT_SORTED_VECTOR
|
#if HAVE_CPP_CONSTINIT_SORTED_VECTOR
|
||||||
constinit
|
constinit
|
||||||
#endif
|
#endif
|
||||||
static const o3tl::sorted_vector<OpCode> aThreadedCalcBlackList({
|
static const o3tl::sorted_vector<OpCode> aThreadedCalcDenyList({
|
||||||
ocIndirect,
|
ocIndirect,
|
||||||
ocMacro,
|
ocMacro,
|
||||||
ocOffset,
|
ocOffset,
|
||||||
|
@ -1325,7 +1325,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
|
||||||
|
|
||||||
OpCode eOp = r.GetOpCode();
|
OpCode eOp = r.GetOpCode();
|
||||||
|
|
||||||
if (aThreadedCalcBlackList.find(eOp) != aThreadedCalcBlackList.end())
|
if (aThreadedCalcDenyList.find(eOp) != aThreadedCalcDenyList.end())
|
||||||
{
|
{
|
||||||
SAL_INFO("sc.core.formulagroup", "opcode " << formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp)
|
SAL_INFO("sc.core.formulagroup", "opcode " << formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp)
|
||||||
<< "(" << int(eOp) << ") disables threaded calculation of formula group");
|
<< "(" << int(eOp) << ") disables threaded calculation of formula group");
|
||||||
|
|
|
@ -342,7 +342,7 @@ MasterScriptProvider::providerCache()
|
||||||
::osl::MutexGuard aGuard( m_mutex );
|
::osl::MutexGuard aGuard( m_mutex );
|
||||||
if ( !m_pPCache )
|
if ( !m_pPCache )
|
||||||
{
|
{
|
||||||
Sequence<OUString> blacklist { "com.sun.star.script.provider.ScriptProviderForBasic" };
|
Sequence<OUString> denylist { "com.sun.star.script.provider.ScriptProviderForBasic" };
|
||||||
|
|
||||||
if ( !m_bIsPkgMSP )
|
if ( !m_bIsPkgMSP )
|
||||||
{
|
{
|
||||||
|
@ -350,7 +350,7 @@ MasterScriptProvider::providerCache()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_pPCache.reset( new ProviderCache( m_xContext, m_sAargs, blacklist ) );
|
m_pPCache.reset( new ProviderCache( m_xContext, m_sAargs, denylist ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext )
|
ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& denyList ) : m_sDenyList( denyList ), m_Sctx( scriptContext ), m_xContext( xContext )
|
||||||
|
|
||||||
{
|
{
|
||||||
// initialise m_hProviderDetailsCache with details of ScriptProviders
|
// initialise m_hProviderDetailsCache with details of ScriptProviders
|
||||||
|
@ -151,7 +151,7 @@ ProviderCache::populateCache()
|
||||||
auto pName = std::find_if(serviceNames.begin(), serviceNames.end(),
|
auto pName = std::find_if(serviceNames.begin(), serviceNames.end(),
|
||||||
[this](const OUString& rName) {
|
[this](const OUString& rName) {
|
||||||
return rName.startsWith("com.sun.star.script.provider.ScriptProviderFor")
|
return rName.startsWith("com.sun.star.script.provider.ScriptProviderFor")
|
||||||
&& !isInBlackList(rName);
|
&& !isInDenyList(rName);
|
||||||
});
|
});
|
||||||
if (pName != serviceNames.end())
|
if (pName != serviceNames.end())
|
||||||
{
|
{
|
||||||
|
@ -193,9 +193,9 @@ ProviderCache::createProvider( ProviderDetails& details )
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
ProviderCache::isInBlackList( const OUString& serviceName )
|
ProviderCache::isInDenyList( const OUString& serviceName )
|
||||||
{
|
{
|
||||||
return comphelper::findValue(m_sBlackList, serviceName) != -1;
|
return comphelper::findValue(m_sDenyList, serviceName) != -1;
|
||||||
}
|
}
|
||||||
} //end namespace
|
} //end namespace
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ public:
|
||||||
ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext );
|
ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext );
|
||||||
/// @throws css::uno::RuntimeException
|
/// @throws css::uno::RuntimeException
|
||||||
ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext,
|
ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext,
|
||||||
const css::uno::Sequence< OUString >& blackList );
|
const css::uno::Sequence< OUString >& denyList );
|
||||||
~ProviderCache();
|
~ProviderCache();
|
||||||
css::uno::Reference< css::script::provider::XScriptProvider >
|
css::uno::Reference< css::script::provider::XScriptProvider >
|
||||||
getProvider( const OUString& providerName );
|
getProvider( const OUString& providerName );
|
||||||
|
@ -66,8 +66,8 @@ private:
|
||||||
/// @throws css::uno::RuntimeException
|
/// @throws css::uno::RuntimeException
|
||||||
css::uno::Reference< css::script::provider::XScriptProvider >
|
css::uno::Reference< css::script::provider::XScriptProvider >
|
||||||
createProvider( ProviderDetails& details );
|
createProvider( ProviderDetails& details );
|
||||||
bool isInBlackList( const OUString& serviceName );
|
bool isInDenyList( const OUString& serviceName );
|
||||||
css::uno::Sequence< OUString > m_sBlackList;
|
css::uno::Sequence< OUString > m_sDenyList;
|
||||||
ProviderDetails_hash m_hProviderDetailsCache;
|
ProviderDetails_hash m_hProviderDetailsCache;
|
||||||
osl::Mutex m_mutex;
|
osl::Mutex m_mutex;
|
||||||
css::uno::Sequence< css::uno::Any > m_Sctx;
|
css::uno::Sequence< css::uno::Any > m_Sctx;
|
||||||
|
|
|
@ -637,17 +637,17 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
|
||||||
if ( pStandardDirItem )
|
if ( pStandardDirItem )
|
||||||
sStandardDir = pStandardDirItem->GetValue();
|
sStandardDir = pStandardDirItem->GetValue();
|
||||||
|
|
||||||
css::uno::Sequence< OUString > aBlackList;
|
css::uno::Sequence< OUString > aDenyList;
|
||||||
|
|
||||||
const SfxStringListItem* pBlackListItem = rReq.GetArg<SfxStringListItem>(SID_BLACK_LIST);
|
const SfxStringListItem* pDenyListItem = rReq.GetArg<SfxStringListItem>(SID_DENY_LIST);
|
||||||
if ( pBlackListItem )
|
if ( pDenyListItem )
|
||||||
pBlackListItem->GetStringList( aBlackList );
|
pDenyListItem->GetStringList( aDenyList );
|
||||||
|
|
||||||
vcl::Window* pTopWindow = GetTopWindow();
|
vcl::Window* pTopWindow = GetTopWindow();
|
||||||
ErrCode nErr = sfx2::FileOpenDialog_Impl(pTopWindow ? pTopWindow->GetFrameWeld() : nullptr,
|
ErrCode nErr = sfx2::FileOpenDialog_Impl(pTopWindow ? pTopWindow->GetFrameWeld() : nullptr,
|
||||||
nDialogType,
|
nDialogType,
|
||||||
eDialogFlags, aURLList,
|
eDialogFlags, aURLList,
|
||||||
aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList);
|
aFilter, pSet, &aPath, nDialog, sStandardDir, aDenyList);
|
||||||
|
|
||||||
if ( nErr == ERRCODE_ABORT )
|
if ( nErr == ERRCODE_ABORT )
|
||||||
{
|
{
|
||||||
|
|
|
@ -139,7 +139,7 @@ char const sNoAutoSave[] = "NoAutoSave";
|
||||||
char const sFolderName[] = "FolderName";
|
char const sFolderName[] = "FolderName";
|
||||||
char const sUseSystemDialog[] = "UseSystemDialog";
|
char const sUseSystemDialog[] = "UseSystemDialog";
|
||||||
char const sStandardDir[] = "StandardDir";
|
char const sStandardDir[] = "StandardDir";
|
||||||
char const sBlackList[] = "BlackList";
|
char const sDenyList[] = "DenyList";
|
||||||
char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
|
char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
|
||||||
char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
|
char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
|
||||||
char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
|
char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
|
||||||
|
@ -622,14 +622,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
|
||||||
if (bOK)
|
if (bOK)
|
||||||
rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
|
rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
|
||||||
}
|
}
|
||||||
else if ( aName == sBlackList )
|
else if ( aName == sDenyList )
|
||||||
{
|
{
|
||||||
uno::Sequence<OUString> xVal;
|
uno::Sequence<OUString> xVal;
|
||||||
bool bOK = (rProp.Value >>= xVal);
|
bool bOK = (rProp.Value >>= xVal);
|
||||||
DBG_ASSERT( bOK, "invalid type or value for BlackList" );
|
DBG_ASSERT( bOK, "invalid type or value for DenyList" );
|
||||||
if (bOK)
|
if (bOK)
|
||||||
{
|
{
|
||||||
SfxStringListItem stringList(SID_BLACK_LIST);
|
SfxStringListItem stringList(SID_DENY_LIST);
|
||||||
stringList.SetStringList( xVal );
|
stringList.SetStringList( xVal );
|
||||||
rSet.Put( stringList );
|
rSet.Put( stringList );
|
||||||
}
|
}
|
||||||
|
@ -994,7 +994,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
|
||||||
nAdditional++;
|
nAdditional++;
|
||||||
if ( rSet.GetItemState( SID_STANDARD_DIR ) == SfxItemState::SET )
|
if ( rSet.GetItemState( SID_STANDARD_DIR ) == SfxItemState::SET )
|
||||||
nAdditional++;
|
nAdditional++;
|
||||||
if ( rSet.GetItemState( SID_BLACK_LIST ) == SfxItemState::SET )
|
if ( rSet.GetItemState( SID_DENY_LIST ) == SfxItemState::SET )
|
||||||
nAdditional++;
|
nAdditional++;
|
||||||
if ( rSet.GetItemState( SID_CONTENT ) == SfxItemState::SET )
|
if ( rSet.GetItemState( SID_CONTENT ) == SfxItemState::SET )
|
||||||
nAdditional++;
|
nAdditional++;
|
||||||
|
@ -1207,7 +1207,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
|
||||||
continue;
|
continue;
|
||||||
if ( nId == SID_STANDARD_DIR )
|
if ( nId == SID_STANDARD_DIR )
|
||||||
continue;
|
continue;
|
||||||
if ( nId == SID_BLACK_LIST )
|
if ( nId == SID_DENY_LIST )
|
||||||
continue;
|
continue;
|
||||||
if ( nId == SID_CONTENTTYPE )
|
if ( nId == SID_CONTENTTYPE )
|
||||||
continue;
|
continue;
|
||||||
|
@ -1539,9 +1539,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
|
||||||
pValue[nActProp].Name = sStandardDir;
|
pValue[nActProp].Name = sStandardDir;
|
||||||
pValue[nActProp++].Value <<= static_cast<const SfxStringItem*>(pItem)->GetValue();
|
pValue[nActProp++].Value <<= static_cast<const SfxStringItem*>(pItem)->GetValue();
|
||||||
}
|
}
|
||||||
if ( rSet.GetItemState( SID_BLACK_LIST, false, &pItem ) == SfxItemState::SET )
|
if ( rSet.GetItemState( SID_DENY_LIST, false, &pItem ) == SfxItemState::SET )
|
||||||
{
|
{
|
||||||
pValue[nActProp].Name = sBlackList;
|
pValue[nActProp].Name = sDenyList;
|
||||||
|
|
||||||
css::uno::Sequence< OUString > aList;
|
css::uno::Sequence< OUString > aList;
|
||||||
static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList );
|
static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList );
|
||||||
|
|
|
@ -846,7 +846,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
weld::Window* pFrameWeld,
|
weld::Window* pFrameWeld,
|
||||||
const OUString& sStandardDir,
|
const OUString& sStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList
|
const css::uno::Sequence< OUString >& rDenyList
|
||||||
)
|
)
|
||||||
:m_nDialogType ( nDialogType )
|
:m_nDialogType ( nDialogType )
|
||||||
,meContext ( FileDialogHelper::UNKNOWN_CONTEXT )
|
,meContext ( FileDialogHelper::UNKNOWN_CONTEXT )
|
||||||
|
@ -1053,8 +1053,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
|
||||||
);
|
);
|
||||||
|
|
||||||
aInitArguments[2] <<= NamedValue(
|
aInitArguments[2] <<= NamedValue(
|
||||||
"BlackList",
|
"DenyList",
|
||||||
makeAny( rBlackList )
|
makeAny( rDenyList )
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
@ -2286,10 +2286,10 @@ FileDialogHelper::FileDialogHelper(
|
||||||
SfxFilterFlags nMust,
|
SfxFilterFlags nMust,
|
||||||
SfxFilterFlags nDont,
|
SfxFilterFlags nDont,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList,
|
const css::uno::Sequence< OUString >& rDenyList,
|
||||||
weld::Window* pPreferredParent)
|
weld::Window* pPreferredParent)
|
||||||
: m_nError(0),
|
: m_nError(0),
|
||||||
mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, pPreferredParent, rStandardDir, rBlackList ) )
|
mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, pPreferredParent, rStandardDir, rDenyList ) )
|
||||||
{
|
{
|
||||||
// create the list of filters
|
// create the list of filters
|
||||||
mpImpl->addFilters(
|
mpImpl->addFilters(
|
||||||
|
@ -2308,10 +2308,10 @@ FileDialogHelper::FileDialogHelper(
|
||||||
const OUString& aFilterUIName,
|
const OUString& aFilterUIName,
|
||||||
const OUString& aExtName,
|
const OUString& aExtName,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList,
|
const css::uno::Sequence< OUString >& rDenyList,
|
||||||
weld::Window* pPreferredParent )
|
weld::Window* pPreferredParent )
|
||||||
: m_nError(0),
|
: m_nError(0),
|
||||||
mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, pPreferredParent, rStandardDir, rBlackList ) )
|
mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, pPreferredParent, rStandardDir, rDenyList ) )
|
||||||
{
|
{
|
||||||
// the wildcard here is expected in form "*.extension"
|
// the wildcard here is expected in form "*.extension"
|
||||||
OUString aWildcard;
|
OUString aWildcard;
|
||||||
|
@ -2624,7 +2624,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
|
||||||
const OUString* pPath,
|
const OUString* pPath,
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList )
|
const css::uno::Sequence< OUString >& rDenyList )
|
||||||
{
|
{
|
||||||
ErrCode nRet;
|
ErrCode nRet;
|
||||||
std::unique_ptr<FileDialogHelper> pDialog;
|
std::unique_ptr<FileDialogHelper> pDialog;
|
||||||
|
@ -2632,9 +2632,9 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
|
||||||
// read-only to discourage editing (which would invalidate existing
|
// read-only to discourage editing (which would invalidate existing
|
||||||
// signatures).
|
// signatures).
|
||||||
if (nFlags & FileDialogFlags::SignPDF)
|
if (nFlags & FileDialogFlags::SignPDF)
|
||||||
pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList, pParent));
|
pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rDenyList, pParent));
|
||||||
else
|
else
|
||||||
pDialog.reset(new FileDialogHelper(nDialogType, nFlags, OUString(), nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList, pParent));
|
pDialog.reset(new FileDialogHelper(nDialogType, nFlags, OUString(), nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rDenyList, pParent));
|
||||||
|
|
||||||
OUString aPath;
|
OUString aPath;
|
||||||
if ( pPath )
|
if ( pPath )
|
||||||
|
|
|
@ -172,7 +172,7 @@ namespace sfx2
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
weld::Window* pFrameWeld,
|
weld::Window* pFrameWeld,
|
||||||
const OUString& sStandardDir = OUString(),
|
const OUString& sStandardDir = OUString(),
|
||||||
const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()
|
const css::uno::Sequence< OUString >& rDenyList = css::uno::Sequence< OUString >()
|
||||||
);
|
);
|
||||||
virtual ~FileDialogHelper_Impl() override;
|
virtual ~FileDialogHelper_Impl() override;
|
||||||
|
|
||||||
|
|
|
@ -314,7 +314,7 @@ public:
|
||||||
OUString& aSuggestedDir,
|
OUString& aSuggestedDir,
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList
|
const css::uno::Sequence< OUString >& rDenyList
|
||||||
);
|
);
|
||||||
|
|
||||||
bool ShowDocumentInfoDialog(const std::function< void () >&);
|
bool ShowDocumentInfoDialog(const std::function< void () >&);
|
||||||
|
@ -800,7 +800,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
|
||||||
OUString& aSuggestedDir,
|
OUString& aSuggestedDir,
|
||||||
sal_Int16 nDialog,
|
sal_Int16 nDialog,
|
||||||
const OUString& rStandardDir,
|
const OUString& rStandardDir,
|
||||||
const css::uno::Sequence< OUString >& rBlackList)
|
const css::uno::Sequence< OUString >& rDenyList)
|
||||||
{
|
{
|
||||||
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
|
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
|
||||||
nStoreMode = SAVEAS_REQUESTED;
|
nStoreMode = SAVEAS_REQUESTED;
|
||||||
|
@ -865,20 +865,20 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
|
||||||
// this is a PDF export
|
// this is a PDF export
|
||||||
// the filter options has been shown already
|
// the filter options has been shown already
|
||||||
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
|
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
|
||||||
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rBlackList, pFrameWin ));
|
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rDenyList, pFrameWin ));
|
||||||
pFileDlg->SetCurrentFilter( aFilterUIName );
|
pFileDlg->SetCurrentFilter( aFilterUIName );
|
||||||
}
|
}
|
||||||
else if ((nStoreMode & EPUBEXPORT_REQUESTED) && !aPreselectedFilterPropsHM.empty())
|
else if ((nStoreMode & EPUBEXPORT_REQUESTED) && !aPreselectedFilterPropsHM.empty())
|
||||||
{
|
{
|
||||||
// This is an EPUB export, the filter options has been shown already.
|
// This is an EPUB export, the filter options has been shown already.
|
||||||
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
|
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
|
||||||
pFileDlg.reset(new sfx2::FileDialogHelper(aDialogMode, aDialogFlags, aFilterUIName, "epub", rStandardDir, rBlackList, pFrameWin));
|
pFileDlg.reset(new sfx2::FileDialogHelper(aDialogMode, aDialogFlags, aFilterUIName, "epub", rStandardDir, rDenyList, pFrameWin));
|
||||||
pFileDlg->SetCurrentFilter(aFilterUIName);
|
pFileDlg->SetCurrentFilter(aFilterUIName);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// This is the normal dialog
|
// This is the normal dialog
|
||||||
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog, nMust, nDont, rStandardDir, rBlackList, pFrameWin ));
|
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog, nMust, nDont, rStandardDir, rDenyList, pFrameWin ));
|
||||||
}
|
}
|
||||||
|
|
||||||
sfx2::FileDialogHelper::Context eCtxt = sfx2::FileDialogHelper::UNKNOWN_CONTEXT;
|
sfx2::FileDialogHelper::Context eCtxt = sfx2::FileDialogHelper::UNKNOWN_CONTEXT;
|
||||||
|
@ -907,7 +907,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
|
||||||
{
|
{
|
||||||
// This is the normal dialog
|
// This is the normal dialog
|
||||||
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog,
|
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog,
|
||||||
nMust, nDont, rStandardDir, rBlackList, pFrameWin ));
|
nMust, nDont, rStandardDir, rDenyList, pFrameWin ));
|
||||||
pFileDlg->CreateMatcher( aDocServiceName );
|
pFileDlg->CreateMatcher( aDocServiceName );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1518,17 +1518,17 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
|
||||||
if ( aStdDirIter != aModelData.GetMediaDescr().end() )
|
if ( aStdDirIter != aModelData.GetMediaDescr().end() )
|
||||||
aStdDirIter->second >>= sStandardDir;
|
aStdDirIter->second >>= sStandardDir;
|
||||||
|
|
||||||
css::uno::Sequence< OUString > aBlackList;
|
css::uno::Sequence< OUString > aDenyList;
|
||||||
|
|
||||||
::comphelper::SequenceAsHashMap::const_iterator aBlackListIter =
|
::comphelper::SequenceAsHashMap::const_iterator aDenyListIter =
|
||||||
aModelData.GetMediaDescr().find( OUString("BlackList") );
|
aModelData.GetMediaDescr().find( OUString("DenyList") );
|
||||||
if ( aBlackListIter != aModelData.GetMediaDescr().end() )
|
if ( aDenyListIter != aModelData.GetMediaDescr().end() )
|
||||||
aBlackListIter->second >>= aBlackList;
|
aDenyListIter->second >>= aDenyList;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
// in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters
|
// in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters
|
||||||
bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList );
|
bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aDenyList );
|
||||||
if ( nStoreMode == SAVEAS_REQUESTED )
|
if ( nStoreMode == SAVEAS_REQUESTED )
|
||||||
{
|
{
|
||||||
// in case of saving check filter for possible alien warning
|
// in case of saving check filter for possible alien warning
|
||||||
|
|
|
@ -166,10 +166,10 @@ CSysShExec::~CSysShExec()
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
bool checkExtension(OUString const & extension, OUString const & blacklist) {
|
bool checkExtension(OUString const & extension, OUString const & denylist) {
|
||||||
assert(!extension.isEmpty());
|
assert(!extension.isEmpty());
|
||||||
for (sal_Int32 i = 0; i != -1;) {
|
for (sal_Int32 i = 0; i != -1;) {
|
||||||
OUString tok = blacklist.getToken(0, ';', i);
|
OUString tok = denylist.getToken(0, ';', i);
|
||||||
tok.startsWith(".", &tok);
|
tok.startsWith(".", &tok);
|
||||||
if (extension.equalsIgnoreAsciiCase(tok)) {
|
if (extension.equalsIgnoreAsciiCase(tok)) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -9,33 +9,33 @@ package ClangFormat;
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
our @EXPORT_OK = qw(get_blacklist set_blacklist get_wanted_version get_own_directory get_extension_regex find check_style);
|
our @EXPORT_OK = qw(get_excludelist set_excludelist get_wanted_version get_own_directory get_extension_regex find check_style);
|
||||||
|
|
||||||
# Reads the blacklist.
|
# Reads the excludelist.
|
||||||
sub get_blacklist()
|
sub get_excludelist()
|
||||||
{
|
{
|
||||||
my $src = "c|cpp|cxx|h|hxx|inl";
|
my $src = "c|cpp|cxx|h|hxx|inl";
|
||||||
my %blacklist_names = ();
|
my %excludelist_names = ();
|
||||||
|
|
||||||
# Read the blacklist.
|
# Read the excludelist.
|
||||||
if (open(LINES, "solenv/clang-format/blacklist"))
|
if (open(LINES, "solenv/clang-format/excludelist"))
|
||||||
{
|
{
|
||||||
while (my $line = <LINES>)
|
while (my $line = <LINES>)
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
$blacklist_names{$line} = 1;
|
$excludelist_names{$line} = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return \%blacklist_names;
|
return \%excludelist_names;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Writes the blacklist.
|
# Writes the excludelist.
|
||||||
# The single argument is a reference to an array.
|
# The single argument is a reference to an array.
|
||||||
sub set_blacklist
|
sub set_excludelist
|
||||||
{
|
{
|
||||||
my @filenames = @{$_[0]};
|
my @filenames = @{$_[0]};
|
||||||
open my $fh, ">", "solenv/clang-format/blacklist" or die $!;
|
open my $fh, ">", "solenv/clang-format/excludelist" or die $!;
|
||||||
print $fh "$_\n" for @filenames;
|
print $fh "$_\n" for @filenames;
|
||||||
close $fh;
|
close $fh;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ Style enforcing code.
|
||||||
|
|
||||||
== Directory contents ==
|
== Directory contents ==
|
||||||
|
|
||||||
- blacklist: list of existing files not to be formatted:
|
- excludelist: list of existing files not to be formatted:
|
||||||
|
|
||||||
- if you rename a file mentioned in this list, please update the entry (and
|
- if you rename a file mentioned in this list, please update the entry (and
|
||||||
keep the file sorted)
|
keep the file sorted)
|
||||||
|
@ -29,7 +29,7 @@ Style enforcing code.
|
||||||
|
|
||||||
- ClangFormat.pm: shared code between the git hook and these scripts
|
- ClangFormat.pm: shared code between the git hook and these scripts
|
||||||
|
|
||||||
- generate-style-blacklist: was used to generate `blacklist`
|
- generate-style-excludelist: was used to generate `excludelist`
|
||||||
|
|
||||||
- reformat-formatted-files: run this script in case the style config changes or
|
- reformat-formatted-files: run this script in case the style config changes or
|
||||||
clang-format version is updated
|
clang-format version is updated
|
||||||
|
|
|
@ -26,7 +26,7 @@ sub check_style()
|
||||||
my $src = ClangFormat::get_extension_regex();
|
my $src = ClangFormat::get_extension_regex();
|
||||||
my @good_names = ();
|
my @good_names = ();
|
||||||
my @bad_names = ();
|
my @bad_names = ();
|
||||||
my $blacklist_names = ClangFormat::get_blacklist();
|
my $excluded_list_names = ClangFormat::get_excludelist();
|
||||||
my $clang_format = ClangFormat::find();
|
my $clang_format = ClangFormat::find();
|
||||||
my $parent = $commit + 1;
|
my $parent = $commit + 1;
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ sub check_style()
|
||||||
while (my $filename = <FILES>)
|
while (my $filename = <FILES>)
|
||||||
{
|
{
|
||||||
chomp $filename;
|
chomp $filename;
|
||||||
if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
|
if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
|
||||||
{
|
{
|
||||||
if (! -x $clang_format)
|
if (! -x $clang_format)
|
||||||
{
|
{
|
||||||
|
@ -67,7 +67,7 @@ sub check_style()
|
||||||
print("and the clang-format rules. Tips:\n");
|
print("and the clang-format rules. Tips:\n");
|
||||||
print("\n- You may run '/opt/lo/bin/clang-format -i <problematic file>' to fix up style automatically.\n");
|
print("\n- You may run '/opt/lo/bin/clang-format -i <problematic file>' to fix up style automatically.\n");
|
||||||
print("- See solenv/clang-format/README on where to get the required version of clang-format binaries.\n");
|
print("- See solenv/clang-format/README on where to get the required version of clang-format binaries.\n");
|
||||||
print("- If you renamed a blacklisted file, update solenv/clang-format/blacklist accordingly to keep it blacklisted.\n");
|
print("- If you renamed an excluded file, update solenv/clang-format/excludelist accordingly to keep it excluded.\n");
|
||||||
print("\nsolenv/clang-format/check-last-commit: KO\n");
|
print("\nsolenv/clang-format/check-last-commit: KO\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
# Generates a blacklist containing all existing cxx/hxx files.
|
# Generates an excludelist containing all existing cxx/hxx files.
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
@ -26,6 +26,6 @@ while (my $filename = <FILES>)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ClangFormat::set_blacklist(\@filenames);
|
ClangFormat::set_excludelist(\@filenames);
|
||||||
|
|
||||||
# vim: set shiftwidth=4 softtabstop=4 expandtab:
|
# vim: set shiftwidth=4 softtabstop=4 expandtab:
|
|
@ -5,7 +5,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
# Reformat files which are not blacklisted. This is interesting if the
|
# Reformat files which are not excluded. This is interesting if the
|
||||||
# clang-format version or config changes.
|
# clang-format version or config changes.
|
||||||
# -n allows just listing the formatted files.
|
# -n allows just listing the formatted files.
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ use ClangFormat;
|
||||||
|
|
||||||
my $clang_format = ClangFormat::find();
|
my $clang_format = ClangFormat::find();
|
||||||
my $src = ClangFormat::get_extension_regex();
|
my $src = ClangFormat::get_extension_regex();
|
||||||
my $blacklist_names = ClangFormat::get_blacklist();
|
my $excluded_list_names = ClangFormat::get_excludelist();
|
||||||
my @filenames = ();
|
my @filenames = ();
|
||||||
my $dry_run = 0;
|
my $dry_run = 0;
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ open (FILES, "git ls-files |") || die "Cannot run git ls-files.";
|
||||||
while (my $filename = <FILES>)
|
while (my $filename = <FILES>)
|
||||||
{
|
{
|
||||||
chomp $filename;
|
chomp $filename;
|
||||||
if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
|
if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
|
||||||
{
|
{
|
||||||
push @filenames, $filename;
|
push @filenames, $filename;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,9 +18,9 @@
|
||||||
# --JAVAOBJECTS
|
# --JAVAOBJECTS
|
||||||
# --PYTHONOBJECTS
|
# --PYTHONOBJECTS
|
||||||
#
|
#
|
||||||
# Add black listed modules a json files (--BLACKLIST)
|
# Add black listed modules a json files (--DENYLIST)
|
||||||
#
|
#
|
||||||
# Reduce number of blacklisted modules
|
# Reduce number of denylisted modules
|
||||||
|
|
||||||
ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
|
ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ endef
|
||||||
|
|
||||||
gb_Module_add_l10n_target =
|
gb_Module_add_l10n_target =
|
||||||
|
|
||||||
gb_GbuildToJson_BLACKLISTEDMODULES := cli_ure jurt external
|
gb_GbuildToJson_DENYLISTEDMODULES := cli_ure jurt external
|
||||||
|
|
||||||
define gb_Module__add_moduledir_impl
|
define gb_Module__add_moduledir_impl
|
||||||
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(notdir $(2)).mk
|
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(notdir $(2)).mk
|
||||||
|
@ -196,7 +196,7 @@ gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define gb_Module_add_moduledir
|
define gb_Module_add_moduledir
|
||||||
$(if $(filter $(gb_GbuildToJson_BLACKLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2)))
|
$(if $(filter $(gb_GbuildToJson_DENYLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2)))
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override
|
bool mustTestImportOf(const char* filename) const override
|
||||||
{
|
{
|
||||||
|
|
|
@ -50,7 +50,7 @@ public:
|
||||||
Test() : SwModelTestBase("/sw/qa/extras/odfexport/data/", "writer8") {}
|
Test() : SwModelTestBase("/sw/qa/extras/odfexport/data/", "writer8") {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// Only test import of .odt document
|
// Only test import of .odt document
|
||||||
|
|
|
@ -29,17 +29,17 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-escape.docx",
|
"math-escape.docx",
|
||||||
"math-mso2k7.docx",
|
"math-mso2k7.docx",
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -74,7 +74,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -28,7 +28,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -27,7 +27,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override
|
bool mustTestImportOf(const char* filename) const override
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,7 +32,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -36,7 +36,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -20,7 +20,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -37,17 +37,17 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-escape.docx",
|
"math-escape.docx",
|
||||||
"math-mso2k7.docx",
|
"math-mso2k7.docx",
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -31,17 +31,17 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-escape.docx",
|
"math-escape.docx",
|
||||||
"math-mso2k7.docx"
|
"math-mso2k7.docx"
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,17 +34,17 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-escape.docx",
|
"math-escape.docx",
|
||||||
"math-mso2k7.docx",
|
"math-mso2k7.docx",
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
void verifyComboBoxExport(bool aComboBoxAsDropDown);
|
void verifyComboBoxExport(bool aComboBoxAsDropDown);
|
||||||
|
|
|
@ -31,17 +31,17 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-escape.docx",
|
"math-escape.docx",
|
||||||
"math-mso2k7.docx",
|
"math-mso2k7.docx",
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -26,7 +26,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -71,7 +71,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -45,7 +45,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -118,7 +118,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override
|
bool mustTestImportOf(const char* filename) const override
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* Blacklist handling
|
* Denylist handling
|
||||||
*/
|
*/
|
||||||
bool mustTestImportOf(const char* filename) const override {
|
bool mustTestImportOf(const char* filename) const override {
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
|
|
|
@ -43,16 +43,16 @@ public:
|
||||||
bool mustTestImportOf(const char* filename) const override
|
bool mustTestImportOf(const char* filename) const override
|
||||||
{
|
{
|
||||||
// Don't test the first import of these, for some reason those tests fail
|
// Don't test the first import of these, for some reason those tests fail
|
||||||
const char* aBlacklist[] = {
|
const char* aDenylist[] = {
|
||||||
"math-eqarray.rtf", "math-escaping.rtf", "math-lim.rtf",
|
"math-eqarray.rtf", "math-escaping.rtf", "math-lim.rtf",
|
||||||
"math-mso2007.rtf", "math-nary.rtf", "math-rad.rtf",
|
"math-mso2007.rtf", "math-nary.rtf", "math-rad.rtf",
|
||||||
"math-vertical-stacks.rtf", "math-runs.rtf",
|
"math-vertical-stacks.rtf", "math-runs.rtf",
|
||||||
};
|
};
|
||||||
std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
|
||||||
|
|
||||||
// If the testcase is stored in some other format, it's pointless to test.
|
// If the testcase is stored in some other format, it's pointless to test.
|
||||||
return (OString(filename).endsWith(".rtf")
|
return (OString(filename).endsWith(".rtf")
|
||||||
&& std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
&& std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void postLoad(const char* pFilename) override
|
virtual void postLoad(const char* pFilename) override
|
||||||
|
|
|
@ -61,7 +61,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Blacklist handling.
|
/// Denylist handling.
|
||||||
bool mustTestImportOf(const char* filename) const override
|
bool mustTestImportOf(const char* filename) const override
|
||||||
{
|
{
|
||||||
// If the testcase is stored in some other format, it's pointless to
|
// If the testcase is stored in some other format, it's pointless to
|
||||||
|
|
|
@ -67,7 +67,7 @@ public:
|
||||||
*/
|
*/
|
||||||
bool mustValidate(const char* filename) const override
|
bool mustValidate(const char* filename) const override
|
||||||
{
|
{
|
||||||
const std::vector<const char*> aBlacklist =
|
const std::vector<const char*> aDenylist =
|
||||||
{
|
{
|
||||||
// the following doc exports currently don't pass binary validation
|
// the following doc exports currently don't pass binary validation
|
||||||
"tdf56321_flipImage_both.doc",
|
"tdf56321_flipImage_both.doc",
|
||||||
|
@ -91,8 +91,8 @@ public:
|
||||||
"first-header-footer.doc"
|
"first-header-footer.doc"
|
||||||
};
|
};
|
||||||
|
|
||||||
// Don't bother with non-.doc files; weed out blacklisted .doc files
|
// Don't bother with non-.doc files; weed out denylisted .doc files
|
||||||
return (OString(filename).endsWith(".doc") && std::find(aBlacklist.begin(), aBlacklist.end(), filename) == aBlacklist.end());
|
return (OString(filename).endsWith(".doc") && std::find(aDenylist.begin(), aDenylist.end(), filename) == aDenylist.end());
|
||||||
}
|
}
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -610,7 +610,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
|
||||||
# runtime dependency
|
# runtime dependency
|
||||||
$(eval $(call gb_Library_use_package,vcl,vcl_opengl_shader))
|
$(eval $(call gb_Library_use_package,vcl,vcl_opengl_shader))
|
||||||
ifeq ($(OS),WNT)
|
ifeq ($(OS),WNT)
|
||||||
$(eval $(call gb_Library_use_package,vcl,vcl_opengl_blacklist))
|
$(eval $(call gb_Library_use_package,vcl,vcl_opengl_denylist))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
|
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
|
||||||
|
|
|
@ -26,9 +26,9 @@ $(eval $(call gb_Module_add_targets,vcl,\
|
||||||
Package_tipoftheday \
|
Package_tipoftheday \
|
||||||
UIConfig_vcl \
|
UIConfig_vcl \
|
||||||
$(if $(filter WNT,$(OS)), \
|
$(if $(filter WNT,$(OS)), \
|
||||||
Package_opengl_blacklist ) \
|
Package_opengl_denylist ) \
|
||||||
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
||||||
Package_skia_blacklist ) \
|
Package_skia_denylist ) \
|
||||||
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
|
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
|
||||||
StaticLibrary_vclmain \
|
StaticLibrary_vclmain \
|
||||||
$(if $(ENABLE_MACOSX_SANDBOX),, \
|
$(if $(ENABLE_MACOSX_SANDBOX),, \
|
||||||
|
|
|
@ -7,10 +7,10 @@
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
#
|
#
|
||||||
|
|
||||||
$(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl))
|
$(eval $(call gb_Package_Package,vcl_opengl_denylist,$(SRCDIR)/vcl/opengl))
|
||||||
|
|
||||||
$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_FOLDER)/opengl,\
|
$(eval $(call gb_Package_add_files,vcl_opengl_denylist,$(LIBO_SHARE_FOLDER)/opengl,\
|
||||||
opengl_blacklist_windows.xml \
|
opengl_denylist_windows.xml \
|
||||||
))
|
))
|
||||||
|
|
||||||
# vim: set noet sw=4 ts=4:
|
# vim: set noet sw=4 ts=4:
|
|
@ -7,10 +7,10 @@
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
#
|
#
|
||||||
|
|
||||||
$(eval $(call gb_Package_Package,vcl_skia_blacklist,$(SRCDIR)/vcl/skia))
|
$(eval $(call gb_Package_Package,vcl_skia_denylist,$(SRCDIR)/vcl/skia))
|
||||||
|
|
||||||
$(eval $(call gb_Package_add_files,vcl_skia_blacklist,$(LIBO_SHARE_FOLDER)/skia,\
|
$(eval $(call gb_Package_add_files,vcl_skia_denylist,$(LIBO_SHARE_FOLDER)/skia,\
|
||||||
skia_blacklist_vulkan.xml \
|
skia_denylist_vulkan.xml \
|
||||||
))
|
))
|
||||||
|
|
||||||
# vim: set noet sw=4 ts=4:
|
# vim: set noet sw=4 ts=4:
|
|
@ -42,8 +42,8 @@ SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures or Skia
|
||||||
Skia
|
Skia
|
||||||
----
|
----
|
||||||
SAL_DISABLESKIA=1 - force disabled Skia
|
SAL_DISABLESKIA=1 - force disabled Skia
|
||||||
SAL_ENABLESKIA=1 - enable Skia, unless blacklisted (and if the VCL backend supports Skia)
|
SAL_ENABLESKIA=1 - enable Skia, unless denylisted (and if the VCL backend supports Skia)
|
||||||
SAL_FORCESKIA=1 - force using Skia, even if blacklisted
|
SAL_FORCESKIA=1 - force using Skia, even if denylisted
|
||||||
SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is used
|
SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is used
|
||||||
SAL_DISABLE_SKIA_CACHE=1 - disable caching of complex images
|
SAL_DISABLE_SKIA_CACHE=1 - disable caching of complex images
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,7 @@ private:
|
||||||
enum class BlockType
|
enum class BlockType
|
||||||
{
|
{
|
||||||
WHITELIST,
|
WHITELIST,
|
||||||
BLACKLIST,
|
DENYLIST,
|
||||||
UNKNOWN
|
UNKNOWN
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue