[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 6 commits - basic/source configure.ac instsetoo_native/util sc/source setup_native/source solenv/bin svx/source sw/source
Andras Timar
andras.timar at collabora.com
Mon May 26 03:02:03 PDT 2014
basic/source/sbx/sbxdec.cxx | 6 +
configure.ac | 2
instsetoo_native/util/openoffice.lst.in | 2
sc/source/core/tool/scmatrix.cxx | 2
setup_native/source/packinfo/finals_instsetoo.txt | 2
solenv/bin/modules/installer/globals.pm | 2
svx/source/tbxctrls/tbcontrl.cxx | 12 +++
sw/source/core/fields/reffld.cxx | 73 ++++++++++------------
8 files changed, 56 insertions(+), 45 deletions(-)
New commits:
commit b41c569ab782041b81032de85b0617df881d8ae3
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu May 22 07:38:50 2014 -0700
enable MSP creation
Change-Id: Ifb90fd638a2316ed1726a64fd70de09727f25219
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 8083d56..58ea4fc 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ Globals
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
- CREATE_MSP_INSTALLSET 0
+ CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt
index d1d9241..28ed774 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,4 +30,4 @@
# OpenOffice pro de \\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
# OpenOfficeLanguagePack pro es \\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
# URE pro en-US \\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-# LibreOffice pro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-XV,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-3\LibreOffice_4.1-3_Win_x86.msi
+LibreOffice pro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-XV,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-7\LibreOffice_4.1-7_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index b3088c8..94e6912 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -222,7 +222,7 @@ BEGIN
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
- $include_cab_in_msi = 1;
+ $include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
commit a85641c044a9f5c1104cef07059f56b45518d968
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu May 22 07:37:27 2014 -0700
Bump version to 4.1-8
Change-Id: I6344fc11cd5a470c2d91a3e87ea4a3d4e60559be
diff --git a/configure.ac b/configure.ac
index dc75154..7edae19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[4.1.10.7],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.8],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
commit 2de5019ef3e6f63b91a44d5a26b28c66c2be634b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 13 05:22:47 2014 +0200
i#64348 basic: fix CDec() crash if string is empty
Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98
Reviewed-on: https://gerrit.libreoffice.org/9337
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 276b788..25d7936 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val )
bool SbxDecimal::setString( OUString* pOUString )
{
+ assert(pOUString);
+
static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
// Convert delimiter
@@ -472,7 +474,9 @@ start:
case SbxLPSTR:
case SbxSTRING:
case SbxBYREF | SbxSTRING:
- pnDecRes->setString( p->pOUString ); break;
+ if( p->pOUString )
+ pnDecRes->setString( p->pOUString );
+ break;
case SbxOBJECT:
{
SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
commit 8dec013c56b1204dea3ccfe537ac71b3a056e46c
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon Apr 28 11:55:23 2014 -0400
fdo#75397: Return an empty string for empty element.
This is the behavior as of 3.6. It had changed in 4.0 and onward by
accident, and caused the bug as reported in fdo#75397.
(cherry picked from commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f)
Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
Reviewed-on: https://gerrit.libreoffice.org/9188
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index eea3a71..4b382a0 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -677,7 +677,7 @@ OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSI
{
if (!maMatFlag.get<bool>(nR, nC))
// not an empty path.
- break;
+ return EMPTY_OUSTRING;
// result of empty FALSE jump path
sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL,
commit 417d730e1a890e2349bf99778b48dd46e0ac5ef5
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date: Sat Apr 19 16:52:44 2014 +0900
fdo#73891 Fix "UI color panel does not show the actual color in Writer"
1.The Font/Background/Highlight Color panels identify the actual color
by a small frame.
(Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f
See also fdo#32376 - Set default color to the current one in toolbar
popups)
2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too.
Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c
Reviewed-on: https://gerrit.libreoffice.org/9103
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
(cherry picked from commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed)
Signed-off-by: Kohei Yoshida <kohei.yoshida at collabora.com>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0b7324f..1754b51 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1134,6 +1134,17 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd));
aColorSet.Clear();
aColorSet.addEntriesForXColorList(*pColorList);
+
+ short i = 0;
+ long nCount = pColorList->Count();
+ XColorEntry* pEntry = NULL;
+
+ for ( i = 0; i < nCount; i++ )
+ {
+ pEntry = pColorList->GetColor(i);
+ if( pEntry->GetColor() == mLastColor )
+ aColorSet.SelectItem( i+1 );
+ }
}
aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
@@ -1206,6 +1217,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ),
maCommand,
aArgs );
+ aColorSet.SelectItem( nItemId );
}
return 0;
commit a9eec33cbc4ddf79ab4ff480959f46cb3d80613c
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Apr 17 15:25:23 2014 +0200
fdo#77342: sw: fix copy/paste of footnote cross references
The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.
Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.
(regression from bb665affbd8870652ade3951d626d76e99143f67)
(cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f)
Conflicts:
sw/source/core/fields/reffld.cxx
Change-Id: If1be1e1d9742182a4085bbbff53e26a8fa8665b8
Reviewed-on: https://gerrit.libreoffice.org/9084
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ba0e4bb..fee6d0e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1014,6 +1014,17 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
{
GetNoteIdsFromDoc( rDestDoc, aIds );
GetNoteIdsFromDoc( rDoc, aDstIds );
+
+ for (std::set<sal_uInt16>::iterator pIt = aDstIds.begin(); pIt != aDstIds.end(); ++pIt)
+ AddId( GetFirstUnusedId(aIds), *pIt );
+
+ // Change the footnotes/endnotes in the source doc to the new ID
+ for (sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < nCnt; ++i)
+ {
+ SwTxtFtn *const pFtnIdx = rDoc.GetFtnIdxs()[i];
+ sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
+ pFtnIdx->SetSeqNo(sequencedIds[n]);
+ }
}
bInit = true;
}
@@ -1051,54 +1062,38 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
{
Init( rDoc, rDestDoc, bField);
- sal_uInt16 nSeqNo = rFld.GetSeqNo();
+ sal_uInt16 const nSeqNo = rFld.GetSeqNo();
- // Check if the number is used in both documents
- // Note: For fields, aIds contains both the ids of SetExp from rDestDoc
- // and the targets of the already remapped ones from rDoc.
- // It is possible that aDstIds contains numbers that aIds does not contain!
- // For example, copying a selection to clipboard that does not contain
- // the first SwSetExpField will result in id 0 missing, then pasting that
- // into empty document gives a mapping 1->0 ... N->N-1 (fdo#63553).
- if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
+ // check if it needs to be remapped
+ // if sequencedIds doesn't contain the number, it means there is no
+ // SetExp field / footnote in the source document: do not modify
+ // the number, which works well for copy from/paste to same document
+ // (and if it is not the same document, there's no "correct" result anyway)
+ if (sequencedIds.count(nSeqNo))
{
- // Number already taken, so need a new one.
- if( sequencedIds.count(nSeqNo) )
- rFld.SetSeqNo( sequencedIds[nSeqNo] );
- else
- {
- assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
-
- sal_uInt16 n = GetFirstUnusedId( aIds );
-
- // die neue SeqNo eintragen, damit die "belegt" ist
- AddId( n, nSeqNo );
- rFld.SetSeqNo( n );
-
- // und noch die Fuss-/EndNote auf die neue Id umsetzen
- if( !bField )
- {
- SwTxtFtn* pFtnIdx;
- for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < nCnt; ++i )
- if( nSeqNo == (pFtnIdx = rDoc.GetFtnIdxs()[ i ])->GetSeqRefNo() )
- {
- pFtnIdx->SetSeqNo( n );
- break;
- }
- }
- }
- }
- else
- {
- AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in both!
+ rFld.SetSeqNo( sequencedIds[nSeqNo] );
}
}
-
+/// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied,
+/// enusure that both get a new unused matching number
+/// 2. if only SetExp / Footnote is copied, it gets a new unused number
+/// 3. if only GetExp field is copied, for the case of copy from / paste to
+/// same document it's desirable to keep the same number;
+/// for other cases of copy/paste or master documents it's not obvious
+/// what is most desirable since it's going to be wrong anyway
void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
{
if( &rDestDoc != pDoc )
{
+ if (rDestDoc.IsClipBoard())
+ {
+ // when copying _to_ clipboard, expectation is that no fields exist
+ // so no re-mapping is required to avoid collisions
+ assert(!rDestDoc.GetSysFldType(RES_GETREFFLD)->GetDepends());
+ return; // don't modify the fields in the source doc
+ }
+
// dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
// alle RefFelder auf einduetige Ids in beiden Docs umgestellt
// werden.
More information about the Libreoffice-commits
mailing list