connectivity/source/parse/sqlbison.y | 6 +++++
dtrans/source/win32/ftransl/ftransl.cxx | 2 -
external/gpgmepp/ExternalProject_gpgmepp.mk | 2 -
external/libassuan/ExternalProject_libassuan.mk | 3 +-
external/libgpg-error/ExternalProject_libgpg-error.mk | 2 -
include/vcl/transfer.hxx | 2 -
sc/source/ui/app/transobj.cxx | 2 -
sd/source/ui/app/sdxfer.cxx | 2 -
sot/source/base/exchange.cxx | 4 +--
svtools/source/misc/stringtransfer.cxx | 2 -
svx/source/fmcomp/dbaexchange.cxx | 4 +--
svx/source/fmcomp/xmlexchg.cxx | 2 -
svx/source/gallery2/galmisc.cxx | 2 -
vcl/source/treelist/transfer.cxx | 19 +-----------------
14 files changed, 23 insertions(+), 31 deletions(-)
New commits:
commit 3b0933520c6b0bc59ae2ab540222b3f772265726
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Dec 1 12:29:37 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 6 16:03:21 2022 +0300
tdf#145964 related: also drop special-casing in
TransferableHelper::SetString
Follow-up to commit 5fb9f4ffa9284c7248e2e82210506babaad4044d
Change-Id: I46d5ea404f77ac5ff67b6ee6a42afee13274a481
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126174
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126181
Tested-by: Jenkins
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 2ec7c340b69f..90ab70c21a1e 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -230,7 +230,7 @@ protected:
void ClearFormats();
bool SetAny( const css::uno::Any& rAny );
- bool SetString( const OUString& rString, const
css::datatransfer::DataFlavor& rFlavor );
+ bool SetString( const OUString& rString );
bool SetBitmapEx( const BitmapEx& rBitmap, const
css::datatransfer::DataFlavor& rFlavor );
bool SetGDIMetaFile( const GDIMetaFile& rMtf );
bool SetGraphic( const Graphic& rGraphic );
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 5a81a24a1fa4..616d37aed594 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -377,7 +377,7 @@ bool ScTransferObj::GetData( const
datatransfer::DataFlavor& rFlavor, const OUSt
{
OUString aString;
if ( aObj.ExportString( aString, nFormat ) )
- bOK = SetString( aString, rFlavor );
+ bOK = SetString( aString );
}
else if ( rFlavor.DataType.equals( cppu::UnoType<uno::Sequence<
sal_Int8 >>::get() ) )
{
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 9ce97f817e73..e501d750c008 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -520,7 +520,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
}
else if( ( nFormat == SotClipboardFormatId::STRING ) && mpBookmark )
{
- bOK = SetString( mpBookmark->GetURL(), rFlavor );
+ bOK = SetString( mpBookmark->GetURL() );
}
else if( ( nFormat == SotClipboardFormatId::SVXB ) && mpGraphic )
{
diff --git a/svtools/source/misc/stringtransfer.cxx
b/svtools/source/misc/stringtransfer.cxx
index 14e805fc60c9..d56f2a52b720 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -52,7 +52,7 @@ namespace svt
{
SotClipboardFormatId nFormat = SotExchange::GetFormat( _rFlavor );
if (SotClipboardFormatId::STRING == nFormat)
- return SetString( m_sContent, _rFlavor );
+ return SetString( m_sContent );
return false;
}
diff --git a/svx/source/fmcomp/dbaexchange.cxx
b/svx/source/fmcomp/dbaexchange.cxx
index b11e9770b040..46b878146984 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -218,7 +218,7 @@ namespace svx
{
case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE:
case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE:
- return SetString(m_sCompatibleFormat, _rFlavor);
+ return SetString(m_sCompatibleFormat);
default: break;
}
if (nFormatId == getDescriptorFormatId())
@@ -431,7 +431,7 @@ namespace svx
return SetAny(
makeAny(m_aDescriptor.createPropertyValueSequence()) );
case SotClipboardFormatId::SBA_DATAEXCHANGE:
- return SetString(m_sCompatibleObjectDescription, rFlavor);
+ return SetString(m_sCompatibleObjectDescription);
default: break;
}
return false;
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index 7fe8e4b88bd7..1f8d44ee7d3a 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -42,7 +42,7 @@ namespace svx
const SotClipboardFormatId nFormatId = SotExchange::GetFormat(
_rFlavor );
if ( SotClipboardFormatId::XFORMS == nFormatId )
{
- return SetString("XForms-Transferable", _rFlavor);
+ return SetString("XForms-Transferable");
}
return false;
}
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b51cdb1af2b2..011a6bd69728 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -484,7 +484,7 @@ bool GalleryTransferable::GetData( const
datatransfer::DataFlavor& rFlavor, cons
}
else if( ( SotClipboardFormatId::SIMPLE_FILE == nFormat ) && mpURL )
{
- bRet = SetString( mpURL->GetMainURL(
INetURLObject::DecodeMechanism::NONE ), rFlavor );
+ bRet = SetString( mpURL->GetMainURL(
INetURLObject::DecodeMechanism::NONE ) );
}
else if( ( SotClipboardFormatId::SVXB == nFormat ) && mpGraphicObject )
{
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index eefc22e8ba6c..9294bedbdb3d 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -649,24 +649,9 @@ bool TransferableHelper::SetAny( const Any& rAny )
}
-bool TransferableHelper::SetString( const OUString& rString, const DataFlavor&
rFlavor )
+bool TransferableHelper::SetString( const OUString& rString )
{
- DataFlavor aFileFlavor;
-
- if( !rString.isEmpty() &&
- SotExchange::GetFormatDataFlavor( SotClipboardFormatId::SIMPLE_FILE,
aFileFlavor ) &&
- TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
- {
- const OString aByteStr(OUStringToOString(rString,
osl_getThreadTextEncoding()));
- Sequence< sal_Int8 > aSeq( aByteStr.getLength() + 1 );
-
- memcpy( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() );
- aSeq[ aByteStr.getLength() ] = 0;
- maAny <<= aSeq;
- }
- else
- maAny <<= rString;
-
+ maAny <<= rString;
return maAny.hasValue();
}
commit 2e7b87ec9dccb285c744a4fd6d7ed288e852ff81
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Nov 30 23:11:50 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 6 15:57:43 2022 +0300
tdf#145964: Windows format name is FileNameW for Unicode strings
Otherwise SIMPLE_FILE clipboard format arrives encoded in ACP,
and fails for any characters not representable in ACP.
Change-Id: Ice8cfd98955e3ef49682aa21b41a313786b291f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126131
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx
b/dtrans/source/win32/ftransl/ftransl.cxx
index bd189b890f99..3d53ca92ccc5 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -127,7 +127,7 @@ static const std::vector< FormatEntry > g_TranslTable {
// SotClipboardFormatId::PRIVATE
FormatEntry("application/x-openoffice-private;windows_formatname=\"Private\"",
"Private", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::SIMPLE_FILE
-
FormatEntry("application/x-openoffice-file;windows_formatname=\"FileName\"",
"FileName", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
+
FormatEntry("application/x-openoffice-file;windows_formatname=\"FileNameW\"",
"FileName", nullptr, CF_INVALID, CppuType_String),
// SotClipboardFormatId::RTF
FormatEntry("text/rtf", "Rich Text Format", nullptr, CF_INVALID,
CPPUTYPE_DEFAULT),
// SotClipboardFormatId::DRAWING
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 4888a366ec71..7a7349e63954 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -60,7 +60,7 @@ struct DataFlavorRepresentation
/* 2 SotClipboardFormatId::BITMAP*/ {
"application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 3 SotClipboardFormatId::GDIMETAFILE*/ {
"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"",
"GDIMetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 4 SotClipboardFormatId::PRIVATE*/ {
"application/x-openoffice-private;windows_formatname=\"Private\"", "Private",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
- /* 5 SotClipboardFormatId::SIMPLE_FILE*/
{ "application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
+ /* 5 SotClipboardFormatId::SIMPLE_FILE*/
{ "application/x-openoffice-file;windows_formatname=\"FileNameW\"", "FileName",
&cppu::UnoType<OUString>::get() },
/* 6 SotClipboardFormatId::FILE_LIST*/ {
"application/x-openoffice-filelist;windows_formatname=\"FileList\"",
"FileList", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 7 EMPTY*/ { "", "",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 8 EMPTY*/ { "", "",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
@@ -145,7 +145,7 @@ struct DataFlavorRepresentation
/* 87 SotClipboardFormatId::EMBEDDED_OBJ*/ {
"application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded
Object (XML)\"", "Star Embedded Object (XML)",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 88 SotClipboardFormatId::FILECONTENT*/ {
"application/x-openoffice-filecontent;windows_formatname=\"FileContents\"",
"FileContents", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 89 SotClipboardFormatId::FILEGRPDESCRIPTOR*/ {
"application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptor\"",
"FileGroupDescriptor", &cppu::UnoType<Sequence<sal_Int8>>::get() },
- /* 90 SotClipboardFormatId::FILENAME*/ {
"application/x-openoffice-filename;windows_formatname=\"FileName\"",
"FileName", &cppu::UnoType<Sequence<sal_Int8>>::get() },
+ /* 90 SotClipboardFormatId::FILENAME*/ {
"application/x-openoffice-filename;windows_formatname=\"FileNameW\"",
"FileName", &cppu::UnoType<OUString>::get() },
/* 91 SotClipboardFormatId::SD_OLE*/ {
"application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 92 SotClipboardFormatId::EMBEDDED_OBJ_OLE*/ {
"application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded
Object\"", "Embedded Object", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 93 SotClipboardFormatId::EMBED_SOURCE_OLE*/ {
"application/x-openoffice-embed-source-ole;windows_formatname=\"Embed
Source\"", "Embed Source", &cppu::UnoType<Sequence<sal_Int8>>::get() },
commit 50852900e66f6597bfbaf9127806f0ac630abd3a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 6 15:32:27 2022 +0300
Adapt to Bison 3.8 internal yyn -> yyrule rename
see
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
"glr2.cc: log the execution of deferred actions" including "Rename argument
yyn
as yyrule for clarity."
YYBISON was defined as 1 rather than as a representation of the Bison
version
prior to
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
"yacc.c: provide the Bison version as an integral macro", which shouldn't
be a
problem here. And YYBISON is apparently completely undefined with
/usr/bin/bison on macOS.
(The preceding comment always mentioned "yyi" and "yyrmap" in apparent
mismatch
with the actually used "yyn" and "yyr1" ever since
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
untouched.)
Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index d14f36e7794f..c4be0bc00bd0 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const
OUString& _newValue,
// yyi is the internal number of the rule that is currently being reduced
// This can be mapped to external rule number via the yyrmap.
+#if defined YYBISON && YYBISON >= 30800
+#define SQL_NEW_RULE newNode("", SQLNodeType::Rule,
yyr1[yyrule])
+#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule,
yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule,
yyr1[yyrule])
+#else
#define SQL_NEW_RULE newNode("", SQLNodeType::Rule,
yyr1[yyn])
#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule,
yyr1[yyn])
#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule,
yyr1[yyn])
+#endif
extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
commit e0bf187a247b52cf755de2b5112b7ffb870e6410
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Dec 28 17:22:29 2021 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 6 15:20:00 2022 +0300
Fix autoconf>=2.70 gcc-wrapper breakage
Re-generated configure file gets confused & claims not finding C89-
compatible compiler for gcc-wrapper-building libassuan with msvc
underneath.
Work-around the problem by telling toolchain right off that this
_is_ a std c compliant compiler.
Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/external/libassuan/ExternalProject_libassuan.mk
b/external/libassuan/ExternalProject_libassuan.mk
index 137f1a229539..5c53a876530c 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -31,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_Executabl
--disable-shared \
--disable-doc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+ CFLAGS="$(CFLAGS) -D__STDC__=1" \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
commit 049e4d71c8a557ef6f68512fe23a79d4f825f508
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat May 1 10:40:58 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 6 15:01:58 2022 +0300
avoid windres preprocessor quoting-messups with current cygwin
apparently fresh installs of cygwin behave differently with the windres
command's quoting and treats --preprocessor='cpp foo bar' as a single file
"cpp foo bar" to run instead of running "cpp" with the arguments "foo"
and "bar".
(-D and -I options are passed to the preprocessor automatically, so no
need to prefix those with --preprocessor-arg)
Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965
Tested-by: Jenkins
Reviewed-by: Georgy Litvinov <g...@litvinovg.pro>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 989844465f1f..4cf9c217700e 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(call gb_Executable_
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(call
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
--host=$(gb_ExternalProject_gpgmepp_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
MAKE=$(MAKE) \
&& $(MAKE) \
)
diff --git a/external/libassuan/ExternalProject_libassuan.mk
b/external/libassuan/ExternalProject_libassuan.mk
index 565d38ff9a1c..137f1a229539 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_Executabl
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
--host=$(gb_ExternalProject_libassuan_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
MAKE=$(MAKE) \
&& $(MAKE) \
)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index cf0b594dca24..814876cc0810 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -29,7 +29,7 @@ $(call
gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
--disable-doc \
--disable-tests \
--host=$(gb_ExternalProject_libgpg-error_host) \
- RC='windres -O COFF
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+ RC='windres -O COFF
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call
gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED
-DWINAPI_FAMILY=0 $(SOLARINC)' \
&& $(MAKE) \
)
$(call gb_Trace_EndRange,libgpg-error,EXTERNAL)
