David Tardon
12 years ago
parent
80b9700c91
commit
b155180706
@ -1,48 +0,0 @@
|
||||
From 517fc70fb19dd2afb72890aaf7ccee5d422b7aa4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Sun, 23 Jun 2013 20:46:07 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#976304 gallery elements may not support
|
||||
document.Settings
|
||||
|
||||
so the createInstance throws, so the element doesn't get inserted into
|
||||
the documents.
|
||||
|
||||
regression since f0cd6fe9075cd0aa00162474784ad804a07ed138
|
||||
|
||||
Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
|
||||
---
|
||||
xmloff/source/draw/sdxmlexp.cxx | 17 +++++++++--------
|
||||
1 file changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
|
||||
index 6e86da3..c9149b9 100644
|
||||
--- a/xmloff/source/draw/sdxmlexp.cxx
|
||||
+++ b/xmloff/source/draw/sdxmlexp.cxx
|
||||
@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
|
||||
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
|
||||
if( xFac.is() )
|
||||
{
|
||||
- Reference<beans::XPropertySet> const xProps( xFac->createInstance(
|
||||
- "com.sun.star.document.Settings"), UNO_QUERY );
|
||||
- if (xProps.is())
|
||||
+ try
|
||||
{
|
||||
- try // clipboard document doesn't have shell so throws here
|
||||
- {
|
||||
- xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
|
||||
- }
|
||||
- catch (uno::Exception const&) { }
|
||||
+ Reference<beans::XPropertySet> const xProps( xFac->createInstance(
|
||||
+ "com.sun.star.document.Settings"), UNO_QUERY_THROW );
|
||||
+ xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
|
||||
+ }
|
||||
+ catch (...)
|
||||
+ {
|
||||
+ // clipboard document doesn't have shell so throws from getPropertyValue
|
||||
+ // gallery elements may not support com.sun.star.document.Settings so throws from createInstance
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 3090cfc972287da3fbdc567387527b65b3bfd128 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Mon, 1 Jul 2013 12:56:17 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#979758 crash on 'Diagrammen in LibreOffice'
|
||||
help page
|
||||
|
||||
Change-Id: I269846840b8e2f67838da525c020a305901cf903
|
||||
---
|
||||
sw/source/core/unocore/unocrsrhelper.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
|
||||
index deeb5ba..66202c0 100644
|
||||
--- a/sw/source/core/unocore/unocrsrhelper.cxx
|
||||
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
|
||||
@@ -176,7 +176,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
|
||||
if (pRanges)
|
||||
{
|
||||
SwUnoCrsr const* pUnoCrsr = pRanges->GetCursor();
|
||||
- if (pUnoCrsr->GetDoc() == &rTargetDoc)
|
||||
+ if (pUnoCrsr && pUnoCrsr->GetDoc() == &rTargetDoc)
|
||||
{
|
||||
o_rpPaM = lcl_createPamCopy(*pUnoCrsr);
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 46c683c740acf324164f188a97abea28fe3c1bf9 Mon Sep 17 00:00:00 2001
|
||||
From: Andras Timar <atimar@suse.com>
|
||||
Date: Tue, 18 Jun 2013 16:54:58 +0200
|
||||
Subject: [PATCH] buildfix
|
||||
|
||||
Change-Id: I3816b95baba54568d00f7afca8eff0a1882f8886
|
||||
---
|
||||
source/kk/dbaccess/source/ui/misc.po | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/kk/dbaccess/source/ui/misc.po b/source/kk/dbaccess/source/ui/misc.po
|
||||
index c5d8118..a42baf0 100644
|
||||
--- a/translations/source/kk/dbaccess/source/ui/misc.po
|
||||
+++ b/translations/source/kk/dbaccess/source/ui/misc.po
|
||||
@@ -417,4 +417,4 @@ msgctxt ""
|
||||
"RID_STR_EXTENSION_NOT_PRESENT\n"
|
||||
"string.text"
|
||||
msgid "The report, \"$file$\", requires the Oracle Report Builder feature."
|
||||
-msgstr "\\\"$file$\\\" есептемесі Oracle Report Builder мүмкіндігін талап етеді."
|
||||
+msgstr "\"$file$\" есептемесі Oracle Report Builder мүмкіндігін талап етеді."
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Mon, 24 Jun 2013 13:31:27 +0200
|
||||
Subject: [PATCH] convert the right number of elements
|
||||
|
||||
Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
|
||||
---
|
||||
include/oox/helper/binaryoutputstream.hxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
|
||||
index 0882821..56d8065 100644
|
||||
--- a/include/oox/helper/binaryoutputstream.hxx
|
||||
+++ b/include/oox/helper/binaryoutputstream.hxx
|
||||
@@ -84,7 +84,7 @@ template< typename Type >
|
||||
void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
|
||||
{
|
||||
sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
|
||||
- ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nWriteSize ) );
|
||||
+ ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nElemCount ) );
|
||||
writeMemory( opnArray, nWriteSize, sizeof( Type ) );
|
||||
}
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1,114 +0,0 @@
|
||||
From d2dff59c034a65421dee67c86c1b1585d56f29d1 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Wed, 19 Jun 2013 12:38:43 +0200
|
||||
Subject: [PATCH] fix rtf import on big endian
|
||||
|
||||
(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6)
|
||||
|
||||
Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
|
||||
Signed-off-by: David Tardon <dtardon@redhat.com>
|
||||
---
|
||||
writerfilter/source/rtftok/rtffly.hxx | 42 +++++++++++++----------------------
|
||||
1 file changed, 15 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
|
||||
index ab68cfc..d07a8ac 100644
|
||||
--- a/writerfilter/source/rtftok/rtffly.hxx
|
||||
+++ b/writerfilter/source/rtftok/rtffly.hxx
|
||||
@@ -17,18 +17,18 @@ namespace writerfilter {
|
||||
{
|
||||
public:
|
||||
RTFVertOrient(sal_uInt16 nValue)
|
||||
+ : nVal(nValue)
|
||||
{
|
||||
- Value.nVal = nValue;
|
||||
}
|
||||
|
||||
sal_uInt16 GetOrient() const
|
||||
{
|
||||
- return Value.Flags.nOrient;
|
||||
+ return OSL_LONIBBLE(OSL_LOBYTE(nVal));
|
||||
}
|
||||
|
||||
sal_uInt16 GetRelation() const
|
||||
{
|
||||
- return Value.Flags.nRelOrient;
|
||||
+ return OSL_HINIBBLE(OSL_LOBYTE(nVal));
|
||||
}
|
||||
|
||||
sal_Int32 GetAlign() const
|
||||
@@ -71,19 +71,11 @@ namespace writerfilter {
|
||||
|
||||
sal_uInt16 GetValue() const
|
||||
{
|
||||
- return Value.nVal;
|
||||
+ return nVal;
|
||||
}
|
||||
|
||||
private:
|
||||
- union
|
||||
- {
|
||||
- struct
|
||||
- {
|
||||
- sal_uInt16 nOrient : 4;
|
||||
- sal_uInt16 nRelOrient : 4;
|
||||
- } Flags;
|
||||
- sal_uInt16 nVal;
|
||||
- } Value;
|
||||
+ sal_uInt16 nVal;
|
||||
};
|
||||
|
||||
/// Stores the horizontal orientation properties of an RTF fly frame.
|
||||
@@ -91,18 +83,23 @@ namespace writerfilter {
|
||||
{
|
||||
public:
|
||||
RTFHoriOrient(sal_uInt16 nValue)
|
||||
+ : nVal(nValue)
|
||||
{
|
||||
- Value.nVal = nValue;
|
||||
}
|
||||
|
||||
sal_uInt16 GetOrient() const
|
||||
{
|
||||
- return Value.Flags.nOrient;
|
||||
+ return OSL_LONIBBLE(OSL_LOBYTE(nVal));
|
||||
}
|
||||
|
||||
sal_uInt16 GetRelation() const
|
||||
{
|
||||
- return Value.Flags.nRelOrient;
|
||||
+ return OSL_LONIBBLE(OSL_HIBYTE(nVal));
|
||||
+ }
|
||||
+
|
||||
+ sal_uInt16 GetRelAnchor() const
|
||||
+ {
|
||||
+ return OSL_HINIBBLE(OSL_LOBYTE(nVal));
|
||||
}
|
||||
|
||||
sal_Int32 GetAlign() const
|
||||
@@ -151,20 +148,11 @@ namespace writerfilter {
|
||||
|
||||
sal_uInt16 GetValue() const
|
||||
{
|
||||
- return Value.nVal;
|
||||
+ return nVal;
|
||||
}
|
||||
|
||||
private:
|
||||
- union
|
||||
- {
|
||||
- struct
|
||||
- {
|
||||
- sal_uInt16 nOrient : 4;
|
||||
- sal_uInt16 nRelAnchor : 4;
|
||||
- sal_uInt16 nRelOrient : 4;
|
||||
- } Flags;
|
||||
- sal_uInt16 nVal;
|
||||
- } Value;
|
||||
+ sal_uInt16 nVal;
|
||||
};
|
||||
} // namespace rtftok
|
||||
} // namespace writerfilter
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
Loading…
Reference in new issue