David Tardon
11 years ago
parent
b0266a90af
commit
60a544bd3c
@ -1,87 +0,0 @@
|
|||||||
From e42d03fa6ccd4b0d24e1560163326990ce2e560d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Mon, 13 Jan 2014 13:34:16 +0000
|
|
||||||
Subject: [PATCH] Related: rhbz#1047871 conditional formatting doesn't fit on
|
|
||||||
screen
|
|
||||||
|
|
||||||
Change-Id: I886030c056fe802279f9e16c6f85736b0c4587c6
|
|
||||||
---
|
|
||||||
sc/source/ui/src/condformatdlg.src | 18 +++++++++---------
|
|
||||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
|
|
||||||
index 0594c5b..4d476a0 100644
|
|
||||||
--- a/sc/source/ui/src/condformatdlg.src
|
|
||||||
+++ b/sc/source/ui/src/condformatdlg.src
|
|
||||||
@@ -14,32 +14,32 @@ ModalDialog RID_SCDLG_CONDFORMAT
|
|
||||||
HelpID = "sc:ModalDialog:RID_SCDLG_CONDFORMAT";
|
|
||||||
OutputSize = TRUE;
|
|
||||||
Hide = TRUE;
|
|
||||||
- Size = MAP_APPFONT ( 300, 300 );
|
|
||||||
+ Size = MAP_APPFONT ( 300, 265 );
|
|
||||||
Text [ en-US ] = "Conditional Formatting for";
|
|
||||||
Moveable = TRUE;
|
|
||||||
Closeable = TRUE;
|
|
||||||
OkButton BTN_OK
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT ( 190, 280 );
|
|
||||||
+ Pos = MAP_APPFONT ( 190, 245 );
|
|
||||||
Size = MAP_APPFONT ( 50, 14 );
|
|
||||||
TabStop = TRUE;
|
|
||||||
};
|
|
||||||
CancelButton BTN_CANCEL
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT ( 245, 280 );
|
|
||||||
+ Pos = MAP_APPFONT ( 245, 245 );
|
|
||||||
Size = MAP_APPFONT ( 50, 14 );
|
|
||||||
TabStop = TRUE;
|
|
||||||
};
|
|
||||||
PushButton BTN_ADD
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT( 5, 245 );
|
|
||||||
+ Pos = MAP_APPFONT( 5, 210 );
|
|
||||||
Size = MAP_APPFONT( 50, 14 );
|
|
||||||
Text [ en-US ] = "Add";
|
|
||||||
TabStop = TRUE;
|
|
||||||
};
|
|
||||||
PushButton BTN_REMOVE
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT( 60, 245 );
|
|
||||||
+ Pos = MAP_APPFONT( 60, 210 );
|
|
||||||
Size = MAP_APPFONT( 50, 14 );
|
|
||||||
Text [ en-US ] = "Remove";
|
|
||||||
TabStop = TRUE;
|
|
||||||
@@ -47,26 +47,26 @@ ModalDialog RID_SCDLG_CONDFORMAT
|
|
||||||
Control CTRL_LIST
|
|
||||||
{
|
|
||||||
Pos = MAP_APPFONT( 5, 20 );
|
|
||||||
- Size = MAP_APPFONT( 290, 220 );
|
|
||||||
+ Size = MAP_APPFONT( 290, 185 );
|
|
||||||
DialogControl = TRUE;
|
|
||||||
Border = TRUE;
|
|
||||||
};
|
|
||||||
FixedText FT_RANGE
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT( 5, 262 );
|
|
||||||
+ Pos = MAP_APPFONT( 5, 227 );
|
|
||||||
Size = MAP_APPFONT( 50, 16 );
|
|
||||||
Text [ en-US ] = "Range:";
|
|
||||||
};
|
|
||||||
Edit ED_RANGE
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT( 60, 262 );
|
|
||||||
+ Pos = MAP_APPFONT( 60, 227 );
|
|
||||||
Size = MAP_APPFONT( 182, 14 );
|
|
||||||
Border = TRUE;
|
|
||||||
TabStop = TRUE;
|
|
||||||
};
|
|
||||||
ImageButton RB_RANGE
|
|
||||||
{
|
|
||||||
- Pos = MAP_APPFONT( 245, 262 );
|
|
||||||
+ Pos = MAP_APPFONT( 245, 227 );
|
|
||||||
Size = MAP_APPFONT( 14, 14 );
|
|
||||||
Border = TRUE;
|
|
||||||
TabStop = TRUE;
|
|
||||||
--
|
|
||||||
1.8.4.2
|
|
||||||
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
From 6e489b4024f68fa7d07a1e41aca4ec119b43a3b7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Douglas Mencken <dougmencken@gmail.com>
|
|
||||||
Date: Mon, 16 Dec 2013 09:34:58 -0500
|
|
||||||
Subject: [PATCH] Use sal_Int32 to satisfy oox/helper/helper.hxx's
|
|
||||||
convertLittleEndian
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Fixes build error "no matching function for call to oox::ByteOrderConverter::convertLittleEndian(int&)"
|
|
||||||
|
|
||||||
workaround rather maddening endian-specific template bustage
|
|
||||||
|
|
||||||
together these two master patches hopefully fix the PPC build
|
|
||||||
|
|
||||||
(also includes: Change-Id: I69dc97c93ef5efe8d71074ac3eca06a3bbc45253)
|
|
||||||
|
|
||||||
Change-Id: I899f151ff99737247ce4090f59897eba842c40ba
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/7099
|
|
||||||
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
||||||
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/7607
|
|
||||||
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
||||||
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
||||||
---
|
|
||||||
oox/source/crypto/AgileEngine.cxx | 2 +-
|
|
||||||
oox/source/crypto/DocumentDecryption.cxx | 17 +++++++++++++++--
|
|
||||||
oox/source/crypto/Standard2007Engine.cxx | 2 +-
|
|
||||||
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
|
|
||||||
index f56e669..86d7025 100644
|
|
||||||
--- a/oox/source/crypto/AgileEngine.cxx
|
|
||||||
+++ b/oox/source/crypto/AgileEngine.cxx
|
|
||||||
@@ -106,7 +106,7 @@ bool AgileEngine::calculateHashFinal(const OUString& rPassword, vector<sal_uInt8
|
|
||||||
|
|
||||||
vector<sal_uInt8> data(mInfo.hashSize + 4, 0);
|
|
||||||
|
|
||||||
- for (int i = 0; i < mInfo.spinCount; i++)
|
|
||||||
+ for (sal_Int32 i = 0; i < mInfo.spinCount; i++)
|
|
||||||
{
|
|
||||||
ByteOrderConverter::writeLittleEndian( &data[0], i );
|
|
||||||
std::copy(hash.begin(), hash.end(), data.begin() + 4);
|
|
||||||
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
|
|
||||||
index 0d1c729..47fa006 100644
|
|
||||||
--- a/oox/source/crypto/DocumentDecryption.cxx
|
|
||||||
+++ b/oox/source/crypto/DocumentDecryption.cxx
|
|
||||||
@@ -289,9 +289,22 @@ bool DocumentDecryption::readStandard2007EncryptionInfo(BinaryInputStream& rStre
|
|
||||||
if( (nHeaderSize < actualHeaderSize) )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- rStream >> info.header;
|
|
||||||
+ rStream >> info.header.flags;
|
|
||||||
+ rStream >> info.header.sizeExtra;
|
|
||||||
+ rStream >> info.header.algId;
|
|
||||||
+ rStream >> info.header.algIdHash;
|
|
||||||
+ rStream >> info.header.keyBits;
|
|
||||||
+ rStream >> info.header.providedType;
|
|
||||||
+ rStream >> info.header.reserved1;
|
|
||||||
+ rStream >> info.header.reserved2;
|
|
||||||
+
|
|
||||||
rStream.skip( nHeaderSize - actualHeaderSize );
|
|
||||||
- rStream >> info.verifier;
|
|
||||||
+
|
|
||||||
+ rStream >> info.verifier.saltSize;
|
|
||||||
+ rStream.readArray(info.verifier.salt, SAL_N_ELEMENTS(info.verifier.salt));
|
|
||||||
+ rStream.readArray(info.verifier.encryptedVerifier, SAL_N_ELEMENTS(info.verifier.encryptedVerifier));
|
|
||||||
+ rStream >> info.verifier.encryptedVerifierHashSize;
|
|
||||||
+ rStream.readArray(info.verifier.encryptedVerifierHash, SAL_N_ELEMENTS(info.verifier.encryptedVerifierHash));
|
|
||||||
|
|
||||||
if( info.verifier.saltSize != 16 )
|
|
||||||
return false;
|
|
||||||
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
|
|
||||||
index b437846..13697d2 100644
|
|
||||||
--- a/oox/source/crypto/Standard2007Engine.cxx
|
|
||||||
+++ b/oox/source/crypto/Standard2007Engine.cxx
|
|
||||||
@@ -129,7 +129,7 @@ bool Standard2007Engine::calculateEncryptionKey(const OUString& rPassword)
|
|
||||||
// data = iterator (4bytes) + hash
|
|
||||||
vector<sal_uInt8> data(RTL_DIGEST_LENGTH_SHA1 + 4, 0);
|
|
||||||
|
|
||||||
- for (int i = 0; i < 50000; i++)
|
|
||||||
+ for (sal_Int32 i = 0; i < 50000; ++i)
|
|
||||||
{
|
|
||||||
ByteOrderConverter::writeLittleEndian( &data[0], i );
|
|
||||||
std::copy(hash.begin(), hash.end(), data.begin() + 4);
|
|
||||||
--
|
|
||||||
1.8.4.2
|
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From eba6a6789c8832f961ac7054588ed84d04b65480 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Thu, 6 Feb 2014 15:16:27 +0100
|
|
||||||
Subject: [PATCH] fdo#33852 do not remove too much from the path
|
|
||||||
|
|
||||||
Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017
|
|
||||||
---
|
|
||||||
sd/source/filter/ppt/pptinanimations.cxx | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
|
|
||||||
index b6c767f..d761e2b 100644
|
|
||||||
--- a/sd/source/filter/ppt/pptinanimations.cxx
|
|
||||||
+++ b/sd/source/filter/ppt/pptinanimations.cxx
|
|
||||||
@@ -2128,7 +2128,10 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
|
|
||||||
OUString aStr;
|
|
||||||
if ( aPath >>= aStr )
|
|
||||||
{
|
|
||||||
- aStr = aStr.replace( 'E', ' ' );
|
|
||||||
+ // E can appear inside a number, so we only check for its presence at the end
|
|
||||||
+ aStr = aStr.trim();
|
|
||||||
+ if (aStr.endsWith("E"))
|
|
||||||
+ aStr = aStr.copy(0, aStr.getLength() - 1);
|
|
||||||
aStr = aStr.trim();
|
|
||||||
aPath <<= aStr;
|
|
||||||
xMotion->setPath( aPath );
|
|
||||||
--
|
|
||||||
1.8.4.2
|
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 5b35f21f1c69239d0605b0751bed87a410fbffee Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Thu, 6 Feb 2014 13:49:05 +0100
|
|
||||||
Subject: [PATCH] rhbz#1017379 do not remove too much from the path
|
|
||||||
|
|
||||||
Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37
|
|
||||||
---
|
|
||||||
oox/source/ppt/timenodelistcontext.cxx | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
|
|
||||||
index 7a9c3c7..aaeacb8 100644
|
|
||||||
--- a/oox/source/ppt/timenodelistcontext.cxx
|
|
||||||
+++ b/oox/source/ppt/timenodelistcontext.cxx
|
|
||||||
@@ -785,7 +785,10 @@ namespace oox { namespace ppt {
|
|
||||||
}
|
|
||||||
|
|
||||||
OUString aStr = xAttribs->getOptionalValue( XML_path );
|
|
||||||
- aStr = aStr.replace( 'E', ' ' );
|
|
||||||
+ // E can appear inside a number, so we only check for its presence at the end
|
|
||||||
+ aStr = aStr.trim();
|
|
||||||
+ if (aStr.endsWith("E"))
|
|
||||||
+ aStr = aStr.copy(0, aStr.getLength() - 1);
|
|
||||||
aStr = aStr.trim();
|
|
||||||
pNode->getNodeProperties()[ NP_PATH ] = makeAny(aStr);
|
|
||||||
mnPathEditMode = xAttribs->getOptionalValueToken( XML_pathEditMode, 0 );
|
|
||||||
--
|
|
||||||
1.8.4.2
|
|
||||||
|
|
||||||
Loading…
Reference in new issue