[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdetc.hxx |4 +---
include/svx/svdglob.hxx |2 +-
svx/source/svdraw/svdetc.cxx | 12 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 6c657296f109ce4c0c74ab6b7c13f2c1c31fec64
Author: Caolán McNamara
Date: Fri Jul 26 20:41:48 2013 +0100
more valient efforts to remove UniString from ResID ctor
Change-Id: I1227d42f5d24d1743212125ffbeb07513b7d092b
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 22a91d3..b179275 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -248,9 +248,7 @@ inline SdrGlobalData& GetSdrGlobalData()
namespace sdr
{
-
-SVX_DLLPUBLIC String GetResourceString(sal_uInt16 nResID);
-
+SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID);
}
/
diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx
index dbec676..655fd60 100644
--- a/include/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
@@ -39,7 +39,7 @@ ResMgr* ImpGetResMgr();
// SDR_StringCacheBegin (256) to SDR_StringCacheEnd
// are cached.
// See also SvdStr.Hrc
-SVX_DLLPUBLIC String ImpGetResStr(sal_uInt16 nResID);
+SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index f133ca8..4caca94 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -442,19 +442,19 @@ ResMgr* ImpGetResMgr()
-String ImpGetResStr(sal_uInt16 nResID)
+OUString ImpGetResStr(sal_uInt16 nResID)
{
-return String(ResId(nResID, *ImpGetResMgr()));
+return ResId(nResID, *ImpGetResMgr()).toString();
}
namespace sdr
{
-String GetResourceString(sal_uInt16 nResID)
-{
-return ImpGetResStr( nResID );
-}
+OUString GetResourceString(sal_uInt16 nResID)
+{
+return ImpGetResStr(nResID);
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] Merging Calc's label range functionality with named range.
Hello > Message du 26/07/13 16:44 > De : "Kohei Yoshida" > > I found that the "automatic find label" option *is* used. > which really bothers me. We should at the very least turn this off by > default, and work toward deprecating this in the future (as Eike also > pointed out). > > Any objection to that? Anyone? Ok, no objection > the expansion of a range sounds more fit for a > database range than a named range. I'm now more leaning toward database > range as a possible replacement for the labeled range feature. This would not be only a "derivative" benefit, it would be a big improvement in itself for database ranges, highly anticipated. Best regards Pierre-Yves Une messagerie gratuite, garantie à vie et des services en plus, ça vous tente ? Je crée ma boîte mail www.laposte.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/table2.cxx |5 --
sc/source/core/data/table3.cxx | 12 ++---
sc/source/core/tool/token.cxx |6 +-
sc/source/filter/excel/excform.cxx | 14 ++---
sc/source/filter/excel/excform8.cxx | 14 ++---
sc/source/filter/excel/frmbase.cxx | 85 +---
sc/source/filter/inc/formel.hxx |4 -
7 files changed, 67 insertions(+), 73 deletions(-)
New commits:
commit 311d4726572ce9c439288f198cb7373576fac2a1
Author: Kohei Yoshida
Date: Fri Jul 26 23:06:06 2013 -0400
More of the same. Will this ever end, I'm starting to wonder...
Change-Id: I36bc90e8477cba306e107fb6d6e47f5732161df8
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5bbb6d3..ebbd7fb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -971,10 +971,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
ScAddress aDestPos( static_cast(nRow-nRow1),
static_cast(nCol-nCol1), pTransClip->nTab );
ScSingleRefData aRef;
-aRef.nCol = nCol;
-aRef.nRow = nRow;
-aRef.nTab = nTab;
-aRef.InitFlags(); // -> all absolute
+aRef.InitAddress(ScAddress(nCol,nRow,nTab));
aRef.SetFlag3D(true);
ScTokenArray aArr;
aArr.AddSingleReference( aRef );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9971816..60df260 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1107,8 +1107,8 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
// now insert the formulas
ScComplexRefData aRef;
aRef.InitFlags();
-aRef.Ref1.nTab = nTab;
-aRef.Ref2.nTab = nTab;
+aRef.Ref1.SetAbsTab(nTab);
+aRef.Ref2.SetAbsTab(nTab);
for ( ::std::vector< RowEntry >::const_iterator iEntry(
aRowVector.begin());
iEntry != aRowVector.end(); ++iEntry)
{
@@ -1117,10 +1117,10 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
ScSubTotalFunc* eResFunc = rParam.pFunctions[iEntry->nGroupNo];
for ( SCCOL nResult=0; nResult < nResCount; ++nResult )
{
-aRef.Ref1.nCol = nResCols[nResult];
-aRef.Ref1.nRow = iEntry->nFuncStart;
-aRef.Ref2.nCol = nResCols[nResult];
-aRef.Ref2.nRow = iEntry->nFuncEnd;
+aRef.Ref1.SetAbsCol(nResCols[nResult]);
+aRef.Ref1.SetAbsRow(iEntry->nFuncStart);
+aRef.Ref2.SetAbsCol(nResCols[nResult]);
+aRef.Ref2.SetAbsRow(iEntry->nFuncEnd);
ScTokenArray aArr;
aArr.AddOpCode( ocSubTotal );
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index a46d33e..df54e8f 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2070,13 +2070,13 @@ void AdjustSingleRefData( ScSingleRefData& rRef, const
ScAddress& rOldPos, const
SCsTAB nTabs = rNewPos.Tab() - rOldPos.Tab();
if (!rRef.IsColRel())
-rRef.nCol += nCols;
+rRef.IncCol(nCols);
if (!rRef.IsRowRel())
-rRef.nRow += nRows;
+rRef.IncRow(nRows);
if (!rRef.IsTabRel())
-rRef.nTab += nTabs;
+rRef.IncTab(nTabs);
}
}
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index ec9817d..7918bad 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1037,7 +1037,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList,
XclImpStream& aIn, sal
ExcRelToScRel( nUINT16, nByte, aSRD, bRangeName );
-rRangeList.Append( aSRD, nTab );
+rRangeList.Append(aSRD.toAbs(aEingPos), nTab);
break;
case 0x45:
case 0x65:
@@ -1063,7 +1063,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList,
XclImpStream& aIn, sal
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
-rRangeList.Append( aCRD, nTab );
+rRangeList.Append(aCRD.toAbs(aEingPos), nTab);
}
break;
case 0x46:
@@ -1099,7 +1099,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList,
XclImpStream& aIn, sal
ExcRelToScRel( nUINT16, nByte, aSRD, bRNorSF );
-rRangeList.Append( aSRD, nTab );
+rRangeList.Append(aSRD.toAbs(aEingPos), nTab);
}
break;
case 0x4D:
@@ -1124,7 +1124,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList,
XclImpStream& aIn, sal
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
-rRangeList.Append( aCRD, nTab );
+rRangeList.Append
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 89ca030c439be0f93e662c3f13b009d42dbec68a
Author: Norbert Thiebaud
Date: Fri Jul 26 21:37:29 2013 -0500
tb: fix upload nightlies
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 4d00445..ccbd43f 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -403,10 +403,10 @@ prepare_upload_manifest()
echo "tinderbox: administrator: ${TB_OWNER?}" >> $manifest_file
echo "tinderbox: buildname: ${TB_NAME?}" >> $manifest_file
-echo "tinderbox: tree: ${tb_TINDERBOX_BRANCH?}" >> $manifest_file
+echo "tinderbox: tree: ${TB_TINDERBOX_BRANCH?}" >> $manifest_file
echo "tinderbox: pull time $(cat
"${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log")" >> $manifest_file
echo "tinderbox: git sha1s" >> $manifest_file
-echo "core:$(cat ${TB_METADATA_DIR?}/{P?}_current-git-head.log)" >>
$manifest_file
+echo "core:$(cat ${TB_METADATA_DIR?}/${P?}_current-git-head.log)" >>
$manifest_file
echo "" >> $manifest_file
echo "tinderbox: autogen log" >> $manifest_file
cat tb_${P?}_autogen.log >> $manifest_file
@@ -525,7 +525,7 @@ push_nightly()
[ $V ] && echo "Push Nightly builds"
prepare_upload_manifest
-upload_time="$(cat "${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log")"
+upload_time="$(cat "${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log" |
sed -e "s/ /_/g" | sed -e "s/:/./g")"
ssh upl...@gimli.documentfoundation.org "mkdir -p
\"/srv/www/dev-builds.libreoffice.org/daily/${TB_BRANCH?}/${TB_NAME?}/${upload_time?}\""
|| return 1
if [ -f config_host.mk ] ; then
@@ -537,7 +537,8 @@ push_nightly()
pack_loc="workdir"
fi
pushd "${pack_loc?}" > /dev/null
-mkdir push 2>/dev/null || return 1
+rm -fr push
+mkdir push 2>/dev/null
stage="./push"
tag="${P?}~${upload_time?}"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source extensions/source forms/source framework/source
editeng/source/items/borderline.cxx |4 -
editeng/source/items/itemtype.cxx |2
editeng/source/uno/unofield.cxx | 33 +---
extensions/source/bibliography/bibload.cxx |2
extensions/source/propctrlr/formcomponenthandler.cxx|4 -
forms/source/misc/limitedformats.cxx|4 -
framework/source/fwe/classes/imagewrapper.cxx |4 -
framework/source/fwe/classes/rootactiontriggercontainer.cxx |4 -
8 files changed, 26 insertions(+), 31 deletions(-)
New commits:
commit 826be413d6f3242ee5c5672ca0f1f2f8ac6b417a
Author: Takeshi Abe
Date: Sat Jul 27 10:05:44 2013 +0900
Mark as const/static
Change-Id: I9000ea607e1df140ac18d59f7c4d4abd999c71d1
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 70ff353..47bb613 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -426,7 +426,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
if ( nStyle == DOUBLE )
{
-static SvxBorderStyle aDoubleStyles[] =
+static const SvxBorderStyle aDoubleStyles[] =
{
DOUBLE,
THINTHICK_SMALLGAP,
@@ -437,7 +437,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
THICKTHIN_LARGEGAP
};
-size_t const len = SAL_N_ELEMENTS(aDoubleStyles);
+static size_t const len = SAL_N_ELEMENTS(aDoubleStyles);
long nWidth = 0;
SvxBorderStyle nTestStyle(NONE);
for (size_t i = 0; i < len && nWidth == 0; ++i)
diff --git a/editeng/source/items/itemtype.cxx
b/editeng/source/items/itemtype.cxx
index 58506af..519471c 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -143,7 +143,7 @@ XubString GetColorString( const Color& rCol )
RGB_COLORDATA( rCol.GetRed(), rCol.GetGreen(), rCol.GetBlue() );
sal_uInt16 nColor = 0;
-static ColorData aColAry[] = {
+static const ColorData aColAry[] = {
COL_BLACK, COL_BLUE, COL_GREEN, COL_CYAN,
COL_RED, COL_MAGENTA, COL_BROWN, COL_GRAY,
COL_LIGHTGRAY, COL_LIGHTBLUE, COL_LIGHTGREEN, COL_LIGHTCYAN,
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index e2c87be..aef8c65 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -69,7 +69,7 @@ public:
const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
{
-static SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
+static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
{
{ MAP_CHAR_LEN(UNO_TC_PROP_DATE_TIME), WID_DATE,
&::getCppuType((const util::DateTime*)0), 0, 0 },
{ MAP_CHAR_LEN(UNO_TC_PROP_IS_FIXED), WID_BOOL1,
&::getBooleanCppuType(), 0, 0 },
@@ -77,16 +77,16 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet(
sal_Int32 mnId )
{ MAP_CHAR_LEN(UNO_TC_PROP_NUMFORMAT), WID_INT32,
&::getCppuType((const sal_Int32*)0), 0, 0 },
{0,0,0,0,0,0}
};
-static SfxItemPropertySet
aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
+static const SfxItemPropertySet
aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
-static SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
+static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
{
{ MAP_CHAR_LEN(UNO_TC_PROP_IS_DATE), WID_BOOL2,
&::getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
-static SfxItemPropertySet
aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
+static const SfxItemPropertySet
aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
-static SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
+static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
{
{ MAP_CHAR_LEN(UNO_TC_PROP_URL_FORMAT), WID_INT16,
&::getCppuType((const sal_Int16*)0), 0, 0 },
@@ -95,24 +95,24 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet(
sal_Int32 mnId )
{ MAP_CHAR_LEN(UNO_TC_PROP_URL),WID_STRING3,
&::getCppuType((const OUString*)0), 0, 0 },
{0,0,0,0,0,0}
};
-static SfxItemPropertySet
aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
+static const SfxItemPropertySet
aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
-static SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
+static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
{
{0,0,0,0,0,0}
};
-static SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
+static const SfxItemPropertySet
aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
-static SfxItemPropertyMapEntry
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 4 commits - sc/inc sc/qa sc/source
sc/inc/refdata.hxx |4 +-
sc/qa/unit/helper/qahelper.cxx | 43 +
sc/qa/unit/helper/qahelper.hxx | 11 ++
sc/qa/unit/subsequent_export-test.cxx | 42
sc/qa/unit/ucalc_formula.cxx | 42
sc/source/core/data/formulaiter.cxx|4 +-
sc/source/core/tool/compiler.cxx |2 -
sc/source/core/tool/interpr1.cxx |5 +-
sc/source/core/tool/interpr4.cxx | 26 ++-
sc/source/core/tool/refdata.cxx| 56 ++---
sc/source/core/tool/reftokenhelper.cxx | 16 +
sc/source/core/tool/token.cxx |4 +-
sc/source/filter/excel/excform8.cxx|9 +
sc/source/filter/inc/namebuff.hxx | 25 ++
sc/source/filter/lotus/lotform.cxx |5 +-
sc/source/ui/unoobj/funcuno.cxx|8
16 files changed, 146 insertions(+), 156 deletions(-)
New commits:
commit 5a027080eadd3bf141a62649b53c910bfa7f05e1
Author: Kohei Yoshida
Date: Fri Jul 26 20:53:54 2013 -0400
More on the ref object.
Change-Id: Id75bf12a04a1756aed4178df397c5a28787307a8
diff --git a/sc/source/core/data/formulaiter.cxx
b/sc/source/core/data/formulaiter.cxx
index f14817d..d055ecb 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -55,8 +55,8 @@ bool ScDetectiveRefIter::GetNextRef( ScRange& rRange )
if( p )
{
SingleDoubleRefProvider aProv( *p );
-rRange.aStart.Set( aProv.Ref1.nCol, aProv.Ref1.nRow, aProv.Ref1.nTab );
-rRange.aEnd.Set( aProv.Ref2.nCol, aProv.Ref2.nRow, aProv.Ref2.nTab );
+rRange.aStart = aProv.Ref1.toAbs(aPos);
+rRange.aEnd = aProv.Ref2.toAbs(aPos);
bRet = true;
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a18a42d..f9c3a4c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3989,8 +3989,9 @@ void ScInterpreter::ScColumns()
String aTabName;
ScComplexRefData aRef;
PopExternalDoubleRef( nFileId, aTabName, aRef);
-nVal += static_cast(aRef.Ref2.nTab - aRef.Ref1.nTab
+ 1) *
-static_cast(aRef.Ref2.nCol - aRef.Ref1.nCol +
1);
+ScRange aAbs = aRef.toAbs(aPos);
+nVal += static_cast(aAbs.aEnd.Tab() -
aAbs.aStart.Tab() + 1) *
+static_cast(aAbs.aEnd.Col() - aAbs.aStart.Col()
+ 1);
}
break;
default:
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c3a47a4..12f49b6 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1872,10 +1872,7 @@ void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW
nRow, SCTAB nTab)
if (!IfErrorPushError())
{
ScSingleRefData aRef;
-aRef.InitFlags();
-aRef.nCol = nCol;
-aRef.nRow = nRow;
-aRef.nTab = nTab;
+aRef.InitAddress(ScAddress(nCol,nRow,nTab));
PushTempTokenWithoutError( new ScSingleRefToken( aRef ) );
}
}
@@ -1887,13 +1884,7 @@ void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW
nRow1, SCTAB nTab1,
if (!IfErrorPushError())
{
ScComplexRefData aRef;
-aRef.InitFlags();
-aRef.Ref1.nCol = nCol1;
-aRef.Ref1.nRow = nRow1;
-aRef.Ref1.nTab = nTab1;
-aRef.Ref2.nCol = nCol2;
-aRef.Ref2.nRow = nRow2;
-aRef.Ref2.nTab = nTab2;
+aRef.InitRange(ScRange(nCol1,nRow1,nTab1,nCol2,nRow2,nTab2));
PushTempTokenWithoutError( new ScDoubleRefToken( aRef ) );
}
}
@@ -1905,10 +1896,7 @@ void ScInterpreter::PushExternalSingleRef(
if (!IfErrorPushError())
{
ScSingleRefData aRef;
-aRef.InitFlags();
-aRef.nCol = nCol;
-aRef.nRow = nRow;
-aRef.nTab = nTab;
+aRef.InitAddress(ScAddress(nCol,nRow,nTab));
PushTempTokenWithoutError( new ScExternalSingleRefToken(nFileId,
rTabName, aRef)) ;
}
}
@@ -1921,13 +1909,7 @@ void ScInterpreter::PushExternalDoubleRef(
if (!IfErrorPushError())
{
ScComplexRefData aRef;
-aRef.InitFlags();
-aRef.Ref1.nCol = nCol1;
-aRef.Ref1.nRow = nRow1;
-aRef.Ref1.nTab = nTab1;
-aRef.Ref2.nCol = nCol2;
-aRef.Ref2.nRow = nRow2;
-aRef.Ref2.nTab = nTab2;
+aRef.InitRange(ScRange(nCol1,nRow1,nTab1,nCol2,nRow2,nTab2));
PushTempTokenWithoutError( new ScExternalDoubleRefToken(nFileId,
rTabName, aRef) );
}
}
diff --git a/sc/source/core/tool/reftokenhelper.cxx
b/sc/source/core/tool/reftokenhelper.cxx
index 0dcda68..6b8d288 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -171,24 +171,12 @@ void ScRefTokenHelper::getRangeListFromTokens(
void ScRefTokenHe
[Libreoffice-commits] core.git: 4 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo67365.rtf | 35 +
sw/qa/extras/rtfimport/rtfimport.cxx | 17
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 -
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit 83e0489217fd4b0fcf3ab62d002257b47e7a6459
Author: Miklos Vajna
Date: Sat Jul 27 01:03:06 2013 +0200
fdo#67365 testcase
Change-Id: I921eda30f60e5466e381922193c2a46be10ad65c
diff --git a/sw/qa/extras/rtfimport/data/fdo67365.rtf
b/sw/qa/extras/rtfimport/data/fdo67365.rtf
new file mode 100755
index 000..07755cc
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo67365.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+\paperw11906\paperh16838\margl1134\margr567\margt851\margb567
\widowctrl\ftnbj\aenddoc\hyphcaps0\formshade\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot
\fet0
+\sectd \linex0\headery397\footery397\colsx709\endnhere\sectdefaultcl
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr \brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A1\cell }
+\pard \qc\widctlpar\intbl\adjustright
+{\fs22
+\cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{
+\fs22 A2\cell }
+\pard \qc\widctlpar\intbl\adjustright
+{\fs22 \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A3\cell }
+\pard
+\qc\widctlpar\intbl\adjustright
+{\fs22 \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv
\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A4\cell \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\pard \qj\sb120\widctlpar\adjustright
+foo
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index eabdd69..c676d08 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -157,6 +157,7 @@ public:
void testFdo54900();
void testFdo64637();
void testN820504();
+void testFdo67365();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -299,6 +300,7 @@ void Test::run()
{"fdo54900.rtf", &Test::testFdo54900},
{"fdo64637.rtf", &Test::testFdo64637},
{"n820504.rtf", &Test::testN820504},
+{"fdo67365.rtf", &Test::testFdo67365},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1453,6 +1455,21 @@ void Test::testN820504()
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
getProperty(xDraws->getByIndex(0), "AnchorType"));
}
+void Test::testFdo67365()
+{
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xRows = xTable->getRows();
+// The table only had 3 rows.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xRows->getCount());
+// This was 4999, i.e. the two cells of the row had equal widths instead
of a larger and a smaller cell.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(5290), getProperty<
uno::Sequence >(xRows->getByIndex(2),
"TableColumnSeparators")[0].Position);
+uno::Reference xCell(xTable->getCellByName("A2"),
uno::UNO_QUERY);
+// Paragraph was aligned to center, should be left.
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_LEFT,
static_cast(getProperty(getParagraphOfText(1,
xCell->getText()), "ParaAdjust")));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 165cd8332a0844314e698cf59936799676257ea1
Author: Miklos Vajna
Date: Sat Jul 27 00:34:04 2013 +0200
fdo#67365 fix RTF import of RTF_QC in table cells wrt unusual group stack
Change-Id: I487e1a941f499ab3d0a820c790af051a9b972376
di
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws changed: What|Removed |Added Depends on||67246 --- Comment #55 from Cor Nouws --- add 67246 - FILEOPEN General input/output error for particular xls file -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/textapi.hxx |2 +-
sd/source/core/text/textapi.cxx|8
sd/source/ui/annotations/annotationmanager.cxx |6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 2f9d2489791ee97a169df0cea932ed7f9ba1e66c
Author: MÃTÃ Gergely
Date: Thu Jul 25 22:56:53 2013 +0200
OUString conversion in sd in textapi.hxx and related files
Change-Id: Id080ae9aaf08de1b0903ee12dc1082c7e531af0b
Reviewed-on: https://gerrit.libreoffice.org/5114
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 12a67be..ceb27cf 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -46,7 +46,7 @@ public:
OutlinerParaObject* CreateText();
voidSetText( OutlinerParaObject& rText );
-String GetText();
+OUStringGetText();
static TextApiObject* getImplementation( const
::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& );
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index afe6e80..acd3e86 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -108,7 +108,7 @@ public:
voidDispose();
voidSetText( OutlinerParaObject& rText );
OutlinerParaObject* CreateText();
-String GetText();
+OUStringGetText();
SdDrawDocument* GetDoc() { return pImpl->mpDoc; }
};
@@ -174,7 +174,7 @@ void TextApiObject::SetText( OutlinerParaObject& rText )
maSelection.nStartPara = EE_PARA_MAX_COUNT;
}
-String TextApiObject::GetText()
+OUString TextApiObject::GetText()
{
return mpSource->GetText();
}
@@ -273,12 +273,12 @@ OutlinerParaObject* TextAPIEditSource::CreateText()
return 0;
}
-String TextAPIEditSource::GetText()
+OUString TextAPIEditSource::GetText()
{
if ( pImpl->mpDoc && pImpl->mpOutliner )
return pImpl->mpOutliner->GetEditEngine().GetText();
else
-return String();
+return OUString();
}
} // namespace sd
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index 5d95892..5baa4ba 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -469,10 +469,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation(
SfxRequest& rReq )
aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) );
aStr.Append( OUString("): \"") );
-String sQuote( pTextApi->GetText() );
+OUString sQuote( pTextApi->GetText() );
-if( sQuote.Len() == 0 )
-sQuote = OUString( "..." );
+if( sQuote.isEmpty() )
+sQuote = "...";
aStr.Append( sQuote );
aStr.Append( OUString("\"\n") );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 36 ++
cui/source/options/optaboutconfig.hxx |2 +
2 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 6a2c82bba50a338dce72ffaae0b2b8c9252aeaea
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 01:17:54 2013 +0300
Header bar sorting implemented.
Change-Id: I2c80b6f7973053c78af430b458ae2f9e5532532e
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 56c0d0a..c36a195 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -47,10 +47,10 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent, const SfxItemSet&
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
HeaderBar &rBar = pPrefBox->GetTheHeaderBar();
-rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_STATUS, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
+rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW);
+rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_STATUS, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
long aTabs[] = {4,0,12,12,12};
@@ -235,4 +235,32 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess( OUString sNodeP
return xNameAccess;
}
+
+IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
+{
+if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE )
+return 0;
+
+HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
+sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+SvSortMode eMode = SortAscending;
+
+if ( bUp )
+{
+nBits &= ~HIB_UPARROW;
+nBits |= HIB_DOWNARROW;
+eMode = SortDescending;
+}
+else
+{
+nBits &= ~HIB_DOWNARROW;
+nBits |= HIB_UPARROW;
+}
+pBar->SetItemBits( ITEMID_TYPE, nBits );
+SvTreeList* pModel = pPrefBox->GetModel();
+pModel->SetSortMode( eMode );
+pModel->Resort();
+return 1;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 9421328..22661d7 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -31,6 +31,8 @@ private:
::svx::OptHeaderTabListBox* pPrefBox;
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
~CuiAboutConfigTabPage();
+
+DECL_LINK( HeaderSelect_Impl, HeaderBar * );
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: 7 commits - tb3/dist-packages tb3/tb3 tb3/tests
tb3/dist-packages/tb3/repostate.py |2 -
tb3/dist-packages/tb3/scheduler.py | 19 ++
tb3/tb3|7 ++-
tb3/tests/tb3/repostate.py | 14 +++
tb3/tests/tb3/scheduler.py | 68 +++--
5 files changed, 88 insertions(+), 22 deletions(-)
New commits:
commit 0aea4f950ef89ee77c47fb17ac3c9d026daefdc3
Author: Bjoern Michaelsen
Date: Fri Jul 26 23:44:34 2013 +0200
tweaking the scoring
diff --git a/tb3/dist-packages/tb3/scheduler.py
b/tb3/dist-packages/tb3/scheduler.py
index 474eecd..c2164ba 100644
--- a/tb3/dist-packages/tb3/scheduler.py
+++ b/tb3/dist-packages/tb3/scheduler.py
@@ -39,21 +39,25 @@ class Scheduler:
if len(commit) == 40:
commits.append( (len(commits), commit,
self.repohistory.get_commit_state(commit)) )
return commits
-def norm_results(self, proposals):
+def norm_results(self, proposals, offset):
maxscore = 0
#maxscore = functools.reduce( lambda x,y: max(x.score, y.score),
proposals)
for proposal in proposals:
maxscore = max(maxscore, proposal.score)
+multiplier = (len(proposals) + offset) / maxscore
if maxscore > 0:
for proposal in proposals:
-proposal.score = proposal.score / maxscore * len(proposals)
+proposal.score = proposal.score * multiplier
def dampen_running_commits(self, commits, proposals, time):
+reduce_all = 0
for commit in commits:
if commit[2].state == 'RUNNING':
running_time = max(datetime.timedelta(), time -
commit[2].started)
timedistance = running_time.total_seconds() /
commit[2].estimated_duration.total_seconds()
for idx in range(len(proposals)):
-proposals[idx].score *=
1-1/((commit[0]-idx+timedistance)**2+1)
+proposals[idx].score *=
1-1/((abs(commit[0]-idx)+timedistance)**2+1)
+reduce_all -= math.exp(-(timedistance**2))
+return reduce_all
def get_proposals(self, time):
return [(0, None, self.__class__.__name__)]
@@ -62,14 +66,15 @@ class HeadScheduler(Scheduler):
head = self.repostate.get_head()
last_build = self.repostate.get_last_build()
proposals = []
+reduce_all = 0
if not last_build is None:
commits = self.get_commits(last_build, head)
for commit in commits:
proposals.append(self.make_proposal(1-1/((len(commits)-float(commit[0]))**2+1),
commit[1]))
-self.dampen_running_commits(commits, proposals, time)
+reduce_all = self.dampen_running_commits(commits, proposals, time)
else:
proposals.append(self.make_proposal(float(1), head))
-self.norm_results(proposals)
+self.norm_results(proposals, reduce_all)
return proposals
class BisectScheduler(Scheduler):
@@ -86,8 +91,8 @@ class BisectScheduler(Scheduler):
proposals.append(self.make_proposal(1.0, commit[1]))
for idx in range(len(proposals)):
proposals[idx].score *= (1-1/(float(idx)**2+1)) *
(1-1/((float(idx-len(proposals)))**2+1))
-self.dampen_running_commits(commits, proposals, time)
-self.norm_results(proposals)
+reduce_all = self.dampen_running_commits(commits, proposals, time)
+self.norm_results(proposals, reduce_all)
return proposals
class MergeScheduler(Scheduler):
diff --git a/tb3/tests/tb3/scheduler.py b/tb3/tests/tb3/scheduler.py
index 17870c6..bf0e328 100755
--- a/tb3/tests/tb3/scheduler.py
+++ b/tb3/tests/tb3/scheduler.py
@@ -21,6 +21,14 @@ import tb3.repostate
class TestScheduler(unittest.TestCase):
def __resolve_ref(self, refname):
return self.git('show-ref', refname).split(' ')[0]
+def _show_log(self, commit):
+for line in self.git("log", "--pretty=oneline", commit):
+sys.stdout.write(line)
+print
+def _show_proposals(self, proposals):
+for proposal in proposals:
+sys.stdout.write("%f %s" %(proposal.score, self.git("log", "-1",
"--pretty=oneline", proposal.commit)))
+print
def setUp(self):
(self.testdir, self.git) = helpers.createTestRepo()
self.state = tb3.repostate.RepoState('linux', 'master', self.testdir)
@@ -36,30 +44,70 @@ class TestScheduler(unittest.TestCase):
sh.rm('-r', self.testdir)
class TestHeadScheduler(TestScheduler):
-def test_get_proposals(self):
+def test_with_running(self):
+#self._show_log(self.head)
self.scheduler = tb3.scheduler.HeadScheduler('linux', 'master',
self.testdir)
self.state.set_last_good(self.preb1)
proposals = self.scheduler.get_proposals(datetime.datetime.now())
self.assertEqual(len(proposals), 9)
+proposals = sorted(proposals, key = lambda proposal:
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 33 +
1 file changed, 33 insertions(+)
New commits:
commit 409e9267f26d0c2a6b6099acb2ed5c3d2276f66c
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 01:00:19 2013 +0300
string and long sequence's added.
Change-Id: I46b6eed7a509ba6793f8e2b2a148acae3f4d06cc
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 7b2fbad..56c0d0a 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -167,6 +167,39 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
break;
+case ::com::sun::star::uno::TypeClass_SEQUENCE :
+//case ::com::sun::star::uno::TypeClass_ARRAY :
+{
+test = OUString("");
+if(
OUString("[]long").equals(aProp.getValueTypeName()) )
+{
+uno::Sequence seqLong;
+if( aProp >>= seqLong )
+{
+//test = OUString("Congrats bro!");
+for(sal_Int16 nInd=0; nInd <
seqLong.getLength(); ++nInd)
+{
+OUString sNumber(
OUString::valueOf(seqLong[nInd]) );
+test += sNumber;
+test += OUString(",");
+}
+}
+}
+
+if( OUString("[]string") == aProp.getValueTypeName() )
+{
+uno::Sequence< OUString > seqOUString;
+if( aProp >>= seqOUString )
+{
+for( sal_Int16 nInd=0; nInd <
seqOUString.getLength(); ++nInd )
+{
+test += seqOUString[nInd] + OUString(",");
+}
+}
+}
+}
+break;
+
default:
{
test = OUString("test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 0d49b2f86b155a95967657533050ab028d14d824
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 00:02:10 2013 +0300
Boolean and string types added for representation.
Change-Id: I5e325ec36ee6977cd8916ea1edc552db7a35af52
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index ea66de6..7b2fbad 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -145,6 +145,28 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
break;
+case ::com::sun::star::uno::TypeClass_BOOLEAN :
+{
+sal_Bool bVal = sal_False;
+if(aProp >>= bVal )
+{
+OUString sBoolean( OUString::valueOf( bVal ) );
+test = sBoolean;
+}
+}
+break;
+
+case ::com::sun::star::uno::TypeClass_STRING :
+{
+OUString sString;
+if(aProp >>= sString)
+{
+test = sString;
+}
+
+}
+break;
+
default:
{
test = OUString("test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: fdo 37341 MAXRECURSION reached in ScFormulaCell::Interpret
Hi Winfried,
On Wednesday, 2013-07-24 11:34:27 +0200, Winfried Donkers wrote:
> I set MAXRECURSION to 4, made a simple spreadsheet (A2:=A1+1, A3:=A2=1, etc.)
> and started 'Goal Seeking'.
> With the target at A5 and the variable cell at A1, the recursion count
> reached 4 every time Interpret() was called from BackSolver(); BackSolver()
> was called once and a valid solution was found (as expected).
> With the target at A6 and the variable cell at A1, the recursion count
> reached 5 every time Interpret() was called from BackSolver(); Interpret()
> was called a zillion times and I aborted the application (more or less as
> expected).
> I changed a littel bit in the code of ScFormulaCell::Interpret():
> if (rRecursionHelper.GetRecursionCount() > MAXRECURSION)
> {
> bRunning = true;
> rRecursionHelper.SetInRecursionReturn( true);
> return; //line added for testing
> }
> I changed this so that Interpret does not continue its recursive work, as it
> seems to do.
> With the target at A6 and the variable cell at A1, the recursion count
> reached 5, Interpret() was called once from BackSolver(); BackSolver() was
> called twice; Goal Seek reported a failure (circular reference), but (better
> than expected).
Inserting a return at that place of course eliminates the entire
recursion/circular handling.
> To me, it _seems_ as if reaching the maximum recusrion count is not handled
> correctly in ScFormulaCell::Interpret().
> Before I start digging in the wrong direction and messing up things that I
> shouldn't touch I would very much like your expert opinion ;-)
The recursion itself is handled correctly, the added problem here is
1) we also have a circular dependency (which standalone combined with
recursion should be handled gracefully)
2) the goal seek is triggered by ScDocument::Solver() creating an
ScFormulaCell and start Interpret() on it, in
ScInterpreter::ScBackSolver() the goal seek's defined formula cell is
set dirty over and over again until the confifuration's limit is
reached
The "zillion times" Interpret() was called probably were from
ScBackSolver() and if each results in a recursion with circular
references the calls to Interpret() multiply.
I'd investigate first why the loop in ScInterpreter::ScBackSolver()
isn't terminated, i.e. why changing the start value does not alter the
result. If it is correct that it doesn't change anymore than
ScBackSolver() will have to detect that.
If the culprit seems to be within ScFormulaCell::Interpret() then, well,
... I can't say much else would help than stepping through these calls
and keeping track of what called which in what state. The old code had
some debugging/tracing facilities that generated a .dot file from within
ScFormulaCell::Interpret() but unfortunately got completely removed with
5ff49e8ce958deb8217880b2aaf2bd41a567e8a1 (these are the cases where
I don't understand blind removal of #ifdef'ed code) so for testing
purposes you might want to revive the part of
sc/source/core/data/cell.cxx of that change into
sc/source/core/data/formulacell.cxx
Note that that debug code was unmaintained for a long while even before
its removal and needs (probably heavy) adaption to the current code, but
it may be a starting point for how to generate a track of the call
chain.
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
pgp_CNXJbeXTk.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa
sc/qa/unit/data/xls/formula-reference.xls |binary 1 file changed New commits: commit b68c5a6fdbc51c3e390c2b1a8cc4742d7b938b5f Author: Kohei Yoshida Date: Fri Jul 26 16:26:20 2013 -0400 New xls file to write import/export test on. Test not written yet. Change-Id: Icdb3a0f6b9bfcf327598f52620a35ab423f9be14 diff --git a/sc/qa/unit/data/xls/formula-reference.xls b/sc/qa/unit/data/xls/formula-reference.xls new file mode 100644 index 000..736f980 Binary files /dev/null and b/sc/qa/unit/data/xls/formula-reference.xls differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/docfile.cxx | 47 +-
sfx2/source/doc/guisaveas.cxx | 51 --
sfx2/source/doc/objmisc.cxx |1
sfx2/source/doc/objstor.cxx |1
4 files changed, 17 insertions(+), 83 deletions(-)
New commits:
commit c02b3f8517e159c462a288d82e3b62cc4b2ab682
Author: Julien Nabet
Date: Fri Jul 26 22:10:15 2013 +0200
fdo#46037: less occurrences of comphelper/configurationhelper in sfx2/doc
Change-Id: Id1416ae6c1efaa251a979ac67e90b5261f64bd9a
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ef2f85e..8a93ef2 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -88,7 +88,6 @@
#include
#include
-#include
#include
#include
#include
@@ -141,55 +140,13 @@ static const sal_Int8 LOCK_UI_TRY = 2;
bool IsSystemFileLockingUsed()
{
-// check whether system file locking has been used, the default value is
false
-bool bUseSystemLock = false;
-try
-{
-
-uno::Reference< uno::XInterface > xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString( "/org.openoffice.Office.Common" ),
-::comphelper::ConfigurationHelper::E_STANDARD );
-if ( !xCommonConfig.is() )
-throw uno::RuntimeException();
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCommonConfig,
-OUString( "Misc/" ),
-OUString( "UseDocumentSystemFileLocking" ) ) >>=
bUseSystemLock;
-}
-catch( const uno::Exception& )
-{
-}
-
-return bUseSystemLock;
+return
officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get();
}
//
bool IsOOoLockFileUsed()
{
-// check whether system file locking has been used, the default value is
false
-bool bOOoLockFileUsed = false;
-try
-{
-
-uno::Reference< uno::XInterface > xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString( "/org.openoffice.Office.Common" ),
-::comphelper::ConfigurationHelper::E_STANDARD );
-if ( !xCommonConfig.is() )
-throw uno::RuntimeException();
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCommonConfig,
-OUString( "Misc/" ),
-OUString( "UseDocumentOOoLockFile" ) ) >>= bOOoLockFileUsed;
-}
-catch( const uno::Exception& )
-{
-}
-
-return bOOoLockFileUsed;
+return officecfg::Office::Common::Misc::UseDocumentOOoLockFile::get();
}
bool IsLockingUsed()
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index dcb233a..5afd2c1 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -61,7 +61,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -91,6 +90,8 @@
#include
+#include
+
// flags that specify requested operation
#define EXPORT_REQUESTED1
#define PDFEXPORT_REQUESTED 2
@@ -646,42 +647,20 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8
nCurStatus )
if ( nResult != STATUS_NO_ACTION && GetStorable()->hasLocation() )
{
-// check whether save is acceptable by the configuration
-// it is done only for documents that have persistence already
-uno::Reference< uno::XInterface > xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
-comphelper::getProcessComponentContext(),
-OUString( "/org.openoffice.Office.Common" ),
-::comphelper::ConfigurationHelper::E_STANDARD );
-if ( !xCommonConfig.is() )
-throw uno::RuntimeException(); // should the saving proceed as
usual instead?
-
-try
-{
-sal_Bool bAlwaysSaveAs = sal_False;
-
-// the saving is acceptable
-// in case the configuration entry is not set or set to false
-// or in case of version creation
-OUString aVersionCommentString = OUString("VersionComment");
-if ( ( ::comphelper::ConfigurationHelper::readRelativeKey(
-xCommonConfig,
-OUString( "Save/Document/" ),
-OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs )
- && bAlwaysSaveAs
-&& GetMediaDescr().find( aVersionCommentString ) ==
GetMediaDescr().end() )
-{
-// notify the user that SaveAs is going to be done
-Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel );
-QueryBox aMessageBox( pWin, WB_OK_CANCEL | WB_
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/filter/excel/xetable.cxx |2 +-
sc/source/filter/excel/xlformula.cxx | 17 +
sc/source/filter/inc/xlformula.hxx |2 +-
sc/source/filter/lotus/tool.cxx | 15 ---
4 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit a03cf8933c7a1060bc43acaa5cc1c1a434916dca
Author: Kohei Yoshida
Date: Fri Jul 26 16:12:07 2013 -0400
More of the same.
Change-Id: I29c60f2f7a31b69b224d4c910392c88990b48572
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 9ef8202..99313ea 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -399,7 +399,7 @@ XclExpTableopRef XclExpTableopBuffer::CreateOrExtendTableop(
// try to extract cell references of a multiple operations formula
XclMultipleOpRefs aRefs;
-if( XclTokenArrayHelper::GetMultipleOpRefs( aRefs, rScTokArr ) )
+if (XclTokenArrayHelper::GetMultipleOpRefs(aRefs, rScTokArr, rScPos))
{
// try to find an existing TABLEOP record for this cell position
for( size_t nPos = 0, nSize = maTableopList.GetSize(); !xRec && (nPos
< nSize); ++nPos )
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 337b971..94d9594 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -780,14 +780,14 @@ const ScTokenArray*
XclTokenArrayHelper::GetSharedFormula( const XclRoot& rRoot,
namespace {
-inline bool lclGetAddress( ScAddress& rAddress, const FormulaToken& rToken )
+inline bool lclGetAddress( ScAddress& rAddress, const FormulaToken& rToken,
const ScAddress& rPos )
{
OpCode eOpCode = rToken.GetOpCode();
bool bIsSingleRef = (eOpCode == ocPush) && (rToken.GetType() ==
svSingleRef);
if( bIsSingleRef )
{
const ScSingleRefData& rRef = static_cast(rToken).GetSingleRef();
-rAddress.Set( rRef.nCol, rRef.nRow, rRef.nTab );
+rAddress = rRef.toAbs(rPos);
bIsSingleRef = !rRef.IsDeleted();
}
return bIsSingleRef;
@@ -795,7 +795,8 @@ inline bool lclGetAddress( ScAddress& rAddress, const
FormulaToken& rToken )
} // namespace
-bool XclTokenArrayHelper::GetMultipleOpRefs( XclMultipleOpRefs& rRefs, const
ScTokenArray& rScTokArr )
+bool XclTokenArrayHelper::GetMultipleOpRefs(
+XclMultipleOpRefs& rRefs, const ScTokenArray& rScTokArr, const ScAddress&
rScPos )
{
rRefs.mbDblRefMode = false;
enum
@@ -817,32 +818,32 @@ bool XclTokenArrayHelper::GetMultipleOpRefs(
XclMultipleOpRefs& rRefs, const ScT
eState = (eOpCode == ocOpen) ? stOpen : stError;
break;
case stOpen:
-eState = lclGetAddress( rRefs.maFmlaScPos, *aIt ) ? stFormula
: stError;
+eState = lclGetAddress(rRefs.maFmlaScPos, *aIt, rScPos) ?
stFormula : stError;
break;
case stFormula:
eState = bIsSep ? stFormulaSep : stError;
break;
case stFormulaSep:
-eState = lclGetAddress( rRefs.maColFirstScPos, *aIt ) ?
stColFirst : stError;
+eState = lclGetAddress(rRefs.maColFirstScPos, *aIt, rScPos) ?
stColFirst : stError;
break;
case stColFirst:
eState = bIsSep ? stColFirstSep : stError;
break;
case stColFirstSep:
-eState = lclGetAddress( rRefs.maColRelScPos, *aIt ) ? stColRel
: stError;
+eState = lclGetAddress(rRefs.maColRelScPos, *aIt, rScPos) ?
stColRel : stError;
break;
case stColRel:
eState = bIsSep ? stColRelSep : ((eOpCode == ocClose) ?
stClose : stError);
break;
case stColRelSep:
-eState = lclGetAddress( rRefs.maRowFirstScPos, *aIt ) ?
stRowFirst : stError;
+eState = lclGetAddress(rRefs.maRowFirstScPos, *aIt, rScPos) ?
stRowFirst : stError;
rRefs.mbDblRefMode = true;
break;
case stRowFirst:
eState = bIsSep ? stRowFirstSep : stError;
break;
case stRowFirstSep:
-eState = lclGetAddress( rRefs.maRowRelScPos, *aIt ) ? stRowRel
: stError;
+eState = lclGetAddress(rRefs.maRowRelScPos, *aIt, rScPos) ?
stRowRel : stError;
break;
case stRowRel:
eState = (eOpCode == ocClose) ? stClose : stError;
diff --git a/sc/source/filter/inc/xlformula.hxx
b/sc/source/filter/inc/xlformula.hxx
index 7768769..fdf395e 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -537,7 +537,7 @@ public:
@descr Requires that the formula contains a single MULTIPLE.OPERATION
function call.
Spaces in the formula are silently ignored.
@return true = Multiple operation found, and all references
successfully extracted. */
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/filter/excel/xechart.cxx | 20 ++--
sc/source/filter/excel/xeformula.cxx |8
sc/source/filter/excel/xelink.cxx| 32
sc/source/filter/excel/xichart.cxx | 10 +-
sc/source/filter/inc/xelink.hxx |4 ++--
5 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 8dff0bd635701e2c7d0600778b4dc72782dcb353
Author: Kohei Yoshida
Date: Fri Jul 26 15:52:53 2013 -0400
More on removing direct access to reference data members.
Change-Id: I9bb682da0408df76794a1bbf9d48995cd1633d99
diff --git a/sc/source/filter/excel/xechart.cxx
b/sc/source/filter/excel/xechart.cxx
index 92bb939..64e3f0d 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -941,20 +941,20 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence(
Reference< XDataSequence > x
{
// split 3-dimensional ranges into single sheets
const ScComplexRefData& rComplexRef = static_cast< const
ScToken* >( pToken )->GetDoubleRef();
-const ScSingleRefData& rRef1 = rComplexRef.Ref1;
-const ScSingleRefData& rRef2 = rComplexRef.Ref2;
-for( SCsTAB nScTab = rRef1.nTab; nScTab <= rRef2.nTab;
++nScTab )
+ScAddress aAbs1 = rComplexRef.Ref1.toAbs(ScAddress());
+ScAddress aAbs2 = rComplexRef.Ref2.toAbs(ScAddress());
+for (SCsTAB nScTab = aAbs1.Tab(); nScTab <= aAbs2.Tab();
++nScTab)
{
// split 2-dimensional ranges into single columns
-if( bSplitToColumns && (rRef1.nCol < rRef2.nCol) &&
(rRef1.nRow < rRef2.nRow) )
-for( SCsCOL nScCol = rRef1.nCol; nScCol <= rRef2.nCol;
++nScCol )
-lclAddDoubleRefData( aArray, *pToken, nScTab,
nScCol, rRef1.nRow, nScTab, nScCol, rRef2.nRow );
+if (bSplitToColumns && (aAbs1.Col() < aAbs2.Col()) &&
(aAbs1.Row() < aAbs2.Row()))
+for (SCCOL nScCol = aAbs1.Col(); nScCol <=
aAbs2.Col(); ++nScCol)
+lclAddDoubleRefData(aArray, *pToken, nScTab,
nScCol, aAbs1.Row(), nScTab, nScCol, aAbs2.Row());
else
-lclAddDoubleRefData( aArray, *pToken, nScTab,
rRef1.nCol, rRef1.nRow, nScTab, rRef2.nCol, rRef2.nRow );
+lclAddDoubleRefData(aArray, *pToken, nScTab,
aAbs1.Col(), aAbs1.Row(), nScTab, aAbs2.Col(), aAbs2.Row());
}
-sal_uInt32 nTabs = static_cast< sal_uInt32 >( rRef2.nTab -
rRef1.nTab + 1 );
-sal_uInt32 nCols = static_cast< sal_uInt32 >( rRef2.nCol -
rRef1.nCol + 1 );
-sal_uInt32 nRows = static_cast< sal_uInt32 >( rRef2.nRow -
rRef1.nRow + 1 );
+sal_uInt32 nTabs = static_cast(aAbs2.Tab() -
aAbs1.Tab() + 1);
+sal_uInt32 nCols = static_cast(aAbs2.Col() -
aAbs1.Col() + 1);
+sal_uInt32 nRows = static_cast(aAbs2.Row() -
aAbs1.Row() + 1);
nValueCount += nCols * nRows * nTabs;
}
break;
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index 32d3d75..a803002 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1879,8 +1879,8 @@ void XclExpFmlaCompImpl::ConvertRefData(
{
// convert start and end of the range
ConvertRefData( rRefData.Ref1, rXclRange.maFirst, bNatLangRef, false,
false );
-bool bTruncMaxCol = !rRefData.Ref1.IsColDeleted() && (rRefData.Ref1.nCol
== 0);
-bool bTruncMaxRow = !rRefData.Ref1.IsRowDeleted() && (rRefData.Ref1.nRow
== 0);
+bool bTruncMaxCol = !rRefData.Ref1.IsColDeleted() &&
(rXclRange.maFirst.mnCol == 0);
+bool bTruncMaxRow = !rRefData.Ref1.IsRowDeleted() &&
(rXclRange.maFirst.mnRow == 0);
ConvertRefData( rRefData.Ref2, rXclRange.maLast, bNatLangRef,
bTruncMaxCol, bTruncMaxRow );
}
@@ -1916,7 +1916,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const
XclExpScToken& rTokData )
{
// store external cell contents in CRN records
if( mxData->mrCfg.mbFromCell && mxData->mpLinkMgr &&
mxData->mpScBasePos )
-mxData->mpLinkMgr->StoreCell( aRefData );
+mxData->mpLinkMgr->StoreCell(aRefData, *mxData->mpScBasePos);
// create the tRef, tRefErr, tRefN, tRef3d, or tRefErr3d token
if( !mxData->mrCfg.mb3DRefOnly && IsRef2D( aRefData ) )
@@ -1961,7 +1961,7 @@ void XclExpFmlaCompImpl::ProcessRangeRef( const
XclExpScToken& rTokData )
// store external cell contents in CRN records
if( mxData->mrCfg.mbFromCell && mxData->mpLinkMgr && mxData->mpScBasePos )
-mxData->mpLinkMgr->StoreCellRange( aRefData );
+mxData->mpLinkMgr->StoreCellRange(aRefData, *mxData->mpScBasePos);
// create the tArea, tAreaErr, tAreaN, tArea3d, or tAr
Re: [Libreoffice-ux-advise] Merging Calc's label range functionality with named range.
Hi Kohei, On Tuesday, 2013-07-23 13:47:08 -0400, Kohei Yoshida wrote: > >Of course it doesn't matter where we actually > >stick the "defined label" in, having them as part of the database range > >probably is best because we usually can derive it from the top-row of > >the database range (don't know currently if Excel allows more than one > >row for those Table labels, they did a very awkward thing with their > >labels back then). > Noted. Perhaps it was that awkward-ness that prompted them to drop > this feature in 2007? I'm just guessing. Might be one of the reasons (that awkward feature btw was called Stacked Column Labels, we never implemented that in its implications though). I guess another reason is the introduction of the XML based file format, they probably encountered similar problems we do. The automatic lookup depends on the actual current content of the document, one can quite easily generate a document using automatic label lookup that when saved and reloaded again the new lookup actually matches a different cell due to a nearer cell having the matching content. That was no problem in binary formats where formulas didn't have to be recompiled. Of course issues with editing such a formula were also present back then. Sad that MS introduced it and we had to follow :-/ Having had to implement the space operator for intersection in this specific case didn't make things better and already drove me nuts by itself ;-) Really, space operator, wtf?!? (yes Excel intersections always work that way) Remember how the whole story was advertised? Natural Language Formulas ... Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpPvOx4VjI8B.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source extensions/source include/svtools include/vcl sd/source sfx2/source starmath/source sw/source vcl/source
cui/source/options/fontsubs.cxx |2 +-
cui/source/tabpages/chardlg.cxx |8
extensions/source/dbpilots/commonpagesdbp.cxx |2 +-
include/svtools/ctrlbox.hxx |2 --
include/vcl/lstbox.hxx|6 +++---
sd/source/ui/dlg/animobjs.cxx |2 +-
sfx2/source/doc/new.cxx |2 +-
starmath/source/dialog.cxx|2 +-
sw/source/ui/fldui/fldvar.cxx |2 +-
sw/source/ui/index/cnttab.cxx |2 +-
sw/source/ui/index/swuiidxmrk.cxx |2 +-
vcl/source/control/lstbox.cxx |2 +-
12 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 225d50da607a8a4115f45b2c433cb280fac70361
Author: Caolán McNamara
Date: Fri Jul 26 17:21:28 2013 +0100
convert GetSelectEntry family to OUString
Change-Id: Id3282e2efd6573bed7fd172021dae9aee9342fae
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 86e26ae..230ab85 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -175,7 +175,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
comphelper::ConfigurationChanges::create());
if(m_pFontHeightLB->GetSavedValue() !=
m_pFontHeightLB->GetSelectEntryPos())
officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
-static_cast< sal_Int16
>(m_pFontHeightLB->GetSelectEntry().ToInt32()),
+static_cast< sal_Int16
>(m_pFontHeightLB->GetSelectEntry().toInt32()),
batch);
if(m_pNonPropFontsOnlyCB->GetSavedValue() !=
m_pNonPropFontsOnlyCB->IsChecked())
officecfg::Office::Common::Font::SourceViewFont::
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ce57a4d..2a106a7 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3473,9 +3473,9 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet&
rSet )
const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES );
sal_Bool bOn = m_pTwoLinesBtn->IsChecked();
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
-? m_pStartBracketLB->GetSelectEntry().GetChar(0) : 0;
+? m_pStartBracketLB->GetSelectEntry()[0] : 0;
sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
-? m_pEndBracketLB->GetSelectEntry().GetChar(0) : 0;
+? m_pEndBracketLB->GetSelectEntry()[0] : 0;
if ( pOld )
{
@@ -3499,9 +3499,9 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet&
rSet )
voidSvxCharTwoLinesPage::UpdatePreview_Impl()
{
sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0
-? m_pStartBracketLB->GetSelectEntry().GetChar(0) : 0;
+? m_pStartBracketLB->GetSelectEntry()[0] : 0;
sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0
-? m_pEndBracketLB->GetSelectEntry().GetChar(0) : 0;
+? m_pEndBracketLB->GetSelectEntry()[0] : 0;
m_pPreviewWin->SetBrackets(cStart, cEnd);
m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
m_pPreviewWin->Invalidate();
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx
b/extensions/source/dbpilots/commonpagesdbp.cxx
index 77e019c..fea3a5c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -430,7 +430,7 @@ namespace dbp
//-
void OMaybeListSelectionPage::implCommit(String& _rSelection)
{
-_rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() :
String();
+_rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() :
OUString();
}
//-
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 79c976b..621d8f8 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -196,8 +196,6 @@ public:
voidSelectEntry( const XubString& rStr, sal_Bool bSelect =
sal_True )
{ ListBox::SelectEntry( rStr, bSelect ); }
voidSelectEntry( const Color& rColor, sal_Bool bSelect =
sal_True );
-XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const
-{ return ListBox::GetSelectEntry( nSelIndex ); }
Color GetSelectEntryColor( sal_uInt16 nSelIndex = 0 ) const;
boolIsEntrySelected(const OUString& rStr ) const
{
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index a691629..9cd5459 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -131,9 +131,9 @@ public:
virtual voidSelectEntry( const XubString& rStr, sal_Bool bSelect =
sal_True );
virtual voidSelectEntryPos( sal_uInt16 nPos, sa
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/CppunitTest_sc_subsequent_export_test.mk sc/Library_scqahelper.mk sc/qa sc/source
sc/CppunitTest_sc_subsequent_export_test.mk |3
sc/Library_scqahelper.mk|2
sc/qa/unit/data/xls/embedded-chart.xls |binary
sc/qa/unit/data/xls/inline-array.xls|binary
sc/qa/unit/helper/qahelper.cxx | 128
sc/qa/unit/helper/qahelper.hxx |9 +
sc/qa/unit/subsequent_export-test.cxx | 33 +++
sc/qa/unit/subsequent_filters-test.cxx | 50 +-
sc/source/filter/excel/xechart.cxx |8 -
9 files changed, 180 insertions(+), 53 deletions(-)
New commits:
commit 368bea65c9db604d481b1146f96ea1683957f461
Author: Kohei Yoshida
Date: Fri Jul 26 14:55:47 2013 -0400
Add test for exporting of chart to xls format.
Change-Id: I49adfcabec4b8bafa8f1b25e7771acca9ccf0ead
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk
b/sc/CppunitTest_sc_subsequent_export_test.mk
index 12565a5..1896bbd 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -83,6 +83,7 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
framework/util/fwk \
i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
@@ -103,9 +104,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+xmloff/util/xo \
xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
-xmloff/util/xo \
))
ifeq ($(OS),WNT)
diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index c978c95..fd1d4a1 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
sot \
svl \
svt \
+ svx \
+svxcore \
test \
tl \
unotest \
diff --git a/sc/qa/unit/data/xls/embedded-chart.xls
b/sc/qa/unit/data/xls/embedded-chart.xls
new file mode 100644
index 000..ca5a2a4
Binary files /dev/null and b/sc/qa/unit/data/xls/embedded-chart.xls differ
diff --git a/sc/qa/unit/data/xls/inline-array.xls
b/sc/qa/unit/data/xls/inline-array.xls
index 64574f8..151fb38 100644
Binary files a/sc/qa/unit/data/xls/inline-array.xls and
b/sc/qa/unit/data/xls/inline-array.xls differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 9583f04..e145f58 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -9,6 +9,9 @@
#include "qahelper.hxx"
#include "csv_handler.hxx"
+#include "drwlayer.hxx"
+#include "svx/svdpage.hxx"
+#include "svx/svdoole2.hxx"
#if defined WNT
#define __ORCUS_STATIC_LIB
@@ -17,6 +20,14 @@
#include
+#include
+#include
+#include
+#include
+
+using namespace com::sun::star;
+using namespace ::com::sun::star::uno;
+
FileFormat aFileFormats[] = {
{ "ods" , "calc8", "", ODS_FORMAT_TYPE },
{ "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE },
@@ -107,6 +118,123 @@ void testCondFile(OUString& aFileName, ScDocument* pDoc,
SCTAB nTab)
}
}
+const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage)
+{
+// Retrieve the chart object instance from the 2nd page (for the 2nd
sheet).
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+if (!pDrawLayer)
+{
+cout << "Failed to retrieve the drawing layer object." << endl;
+return NULL;
+}
+
+const SdrPage* pPage = pDrawLayer->GetPage(nPage);
+if (!pPage)
+{
+cout << "Failed to retrieve the page object." << endl;
+return NULL;
+}
+
+if (pPage->GetObjCount() != 1)
+{
+cout << "This page should contain one drawing object." << endl;
+return NULL;
+}
+
+const SdrObject* pObj = pPage->GetObj(0);
+if (!pObj)
+{
+cout << "Failed to retrieve the drawing object." << endl;
+return NULL;
+}
+
+if (pObj->GetObjIdentifier() != OBJ_OLE2)
+{
+cout << "This is not an OLE2 object." << endl;
+return NULL;
+}
+
+const SdrOle2Obj& rOleObj = static_cast(*pObj);
+if (!rOleObj.IsChart())
+{
+cout << "This should be a chart object." << endl;
+return NULL;
+}
+
+return &rOleObj;
+}
+
+std::vector getChartRangeRepresentations(const SdrOle2Obj& rChartObj)
+{
+std::vector aRangeReps;
+
+// Make sure the chart object has correct range references.
+Reference xModel = rChartObj.getXModel();
+if (!xModel.is())
+{
+cout << "Failed to get the embedded object interface." << endl;
+return aRangeReps;
+}
+
+Reference xChartDoc(xModel, UNO_QUERY);
+if (!xChartDoc.is())
+{
+cout << "Failed to get the chart document interface." << endl;
+return aRangeReps;
+}
+
+Reference xDataSource(x
[Libreoffice-commits] core.git: framework/source
framework/source/helper/statusindicatorfactory.cxx | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit e8be58a10bce944525b4186db64629f526cf20ce
Author: Julien Nabet
Date: Fri Jul 26 20:50:55 2013 +0200
fdo#46037: 1 less occurrence comphelper/configurationhelper in fmwk/helper
Change-Id: I504789fb6b1e5332b0c131313ea9b9c538227d46
diff --git a/framework/source/helper/statusindicatorfactory.cxx
b/framework/source/helper/statusindicatorfactory.cxx
index e544213..739a7d9 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -42,10 +42,10 @@
#include
#include
-#include
#include
#include
+#include
namespace framework{
@@ -413,14 +413,7 @@ void
StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
if ( pWindow )
{
-bool bForceFrontAndFocus(false);
-::comphelper::ConfigurationHelper::readDirectKey(
-xContext,
-OUString("org.openoffice.Office.Common/View"),
-OUString("NewDocumentHandling"),
-OUString("ForceFocusAndToFront"),
-::comphelper::ConfigurationHelper::E_READONLY) >>=
bForceFrontAndFocus;
-
+bool
bForceFrontAndFocus(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext));
pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/accelerators/globalacceleratorconfiguration.cxx |1 -
framework/source/accelerators/moduleacceleratorconfiguration.cxx |2 --
2 files changed, 3 deletions(-)
New commits:
commit 39b1fb894fb3cd5ae2db65ddf9a2db761604f5e5
Author: Julien Nabet
Date: Fri Jul 26 20:44:14 2013 +0200
fdo#46037: comphelper/configurationhelper partly not used in
fmwk/accelerators
Change-Id: I710b9155b6ce8f42f46d87c80cebf37414e91c70
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index baabc9f..6d55b06 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -34,7 +34,6 @@
#include
#include
-#include
#define IMPLEMENTATIONNAME_GLOBALACCELERATORCONFIGURATION
DECLARE_ASCII("com.sun.star.comp.framework.GlobalAcceleratorConfiguration")
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index c20ee83..186ed0e 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -33,8 +33,6 @@
#include
#include
-#include
-
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - tools/qa tools/source
tools/qa/cppunit/test_urlobj.cxx | 22 ++
tools/source/fsys/urlobj.cxx |4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit ffcc71001927a862be0fdd9f27099b5468c7b37b
Author: Stephan Bergmann
Date: Fri Jul 26 17:41:08 2013 +0200
fdo#33605: Handle http etc. URLs with no path but fragment
Change-Id: I8c47cc55e7ad53e514c0bd46130cbbe6a1bb0357
(cherry picked from commit 44ddacb232c4fd5cbb28867aa28d7d855788a511)
Reviewed-on: https://gerrit.libreoffice.org/5130
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 38120aa..07714ee 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -268,6 +268,27 @@ namespace tools_urlobj
}
}
+void urlobjTest_emptyPath() {
+{
+INetURLObject url(OUString("http://example.com";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+}
+{
+// This is an invalid http URL per RFC 2616:
+INetURLObject url(OUString("http://example.com?query";));
+CPPUNIT_ASSERT(url.HasError());
+}
+{
+INetURLObject url(OUString("http://example.com#fragment";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+CPPUNIT_ASSERT_EQUAL(OUString("fragment"), url.GetMark());
+}
+}
+
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
@@ -280,6 +301,7 @@ namespace tools_urlobj
CPPUNIT_TEST( urlobjTest_005 );
CPPUNIT_TEST( urlobjTest_006 );
CPPUNIT_TEST( urlobjCmisTest );
+CPPUNIT_TEST( urlobjTest_emptyPath );
CPPUNIT_TEST_SUITE_END( );
}; // class createPool
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index f6e9db4..eecc4b4 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2942,7 +2942,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_FTP:
case INET_PROT_IMAP:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nFragmentDelimiter)
{
@@ -2962,7 +2962,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_HTTPS:
case INET_PROT_SMB:
case INET_PROT_CMIS:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nQueryDelimiter
&& *pPos != nFragmentDelimiter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - tools/qa tools/source
tools/qa/cppunit/test_urlobj.cxx | 22 ++
tools/source/fsys/urlobj.cxx |4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit b407b33e3e00a54796abc3307dc7f123ce958e75
Author: Stephan Bergmann
Date: Fri Jul 26 17:41:08 2013 +0200
fdo#33605: Handle http etc. URLs with no path but fragment
Change-Id: I8c47cc55e7ad53e514c0bd46130cbbe6a1bb0357
(cherry picked from commit 44ddacb232c4fd5cbb28867aa28d7d855788a511)
Reviewed-on: https://gerrit.libreoffice.org/5129
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 6719fc8..6b0b313 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -240,6 +240,27 @@ namespace tools_urlobj
}
}
+void urlobjTest_emptyPath() {
+{
+INetURLObject url(OUString("http://example.com";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+}
+{
+// This is an invalid http URL per RFC 2616:
+INetURLObject url(OUString("http://example.com?query";));
+CPPUNIT_ASSERT(url.HasError());
+}
+{
+INetURLObject url(OUString("http://example.com#fragment";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+CPPUNIT_ASSERT_EQUAL(OUString("fragment"), url.GetMark());
+}
+}
+
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
@@ -252,6 +273,7 @@ namespace tools_urlobj
CPPUNIT_TEST( urlobjTest_005 );
CPPUNIT_TEST( urlobjTest_006 );
CPPUNIT_TEST( urlobjCmisTest );
+CPPUNIT_TEST( urlobjTest_emptyPath );
CPPUNIT_TEST_SUITE_END( );
}; // class createPool
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 071ca7a..377d2eb 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2933,7 +2933,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_FTP:
case INET_PROT_IMAP:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nFragmentDelimiter)
{
@@ -2953,7 +2953,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_HTTPS:
case INET_PROT_SMB:
case INET_PROT_CMIS:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nQueryDelimiter
&& *pPos != nFragmentDelimiter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7087de13aba5fb7303a532e198a43fd1d13435b0
Author: Michael Meeks
Date: Fri Jul 26 19:15:41 2013 +0100
avoid strncpy for windows.
Change-Id: I7949697bb245e08355a061b4548c4078bbe9a091
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d753f9a..696e413 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include "liblibreoffice.hxx"
@@ -141,7 +142,9 @@ bool LibLODocument_Impl::saveAs (const char *url)
char *LibLibreOffice_Impl::getError()
{
OString aStr = rtl::OUStringToOString( maLastExceptionMsg,
RTL_TEXTENCODING_UTF8 );
-return strndup( aStr.getStr(), aStr.getLength() );
+char *pMem = (char *) malloc (aStr.getLength() + 1);
+strcpy( pMem, aStr.getStr() );
+return pMem;
}
static void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Avoid confusing wording in mails requesting a review
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4828 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved Eike Rathke: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4828 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37cc7801716b43693a2f14d28fc5c410b01d95d9 Gerrit-PatchSet: 2 Gerrit-Project: gerrit-etc Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks changed: What|Removed |Added Depends on||67313 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/inc desktop/source embedserv/source smoketest/libtest.cxx
desktop/inc/liblibreoffice.hxx | 17 -
desktop/inc/liblibreoffice_impl.hxx | 27
desktop/source/lib/init.cxx | 109 +++
embedserv/source/embed/docholder.cxx |3
smoketest/libtest.cxx| 23 +++
5 files changed, 133 insertions(+), 46 deletions(-)
New commits:
commit d32b179c3f2b16bb96679816db485d62ce8fe87f
Author: Michael Meeks
Date: Fri Jul 26 18:21:45 2013 +0100
more liblibreoffice pieces.
Change-Id: I21d67de281847321d784cddc652d4a51a437fadf
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 48c0a24..eb7715b 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -10,17 +10,26 @@
#ifndef _LIBLIBREOFFICE_HXX
#define _LIBLIBREOFFICE_HXX
-typedef struct _LODocument LODocument;
+class LODocument
+{
+public:
+virtual ~LODocument() {}
+
+virtual bool saveAs (const char *url) = 0;
+};
class LibLibreOffice
{
public:
-virtual bool initialize (const char *installPath) = 0;
+virtual ~LibLibreOffice () {};
+
+virtual boolinitialize (const char *installPath) = 0;
virtual LODocument *documentLoad (const char *url) = 0;
-virtual bool documentSave (const char *url) = 0;
-virtual ~LibLibreOffice () {};
+// return the last error as a string, free me.
+virtual char *getError() = 0;
+
};
LibLibreOffice *lo_init (const char *install_path);
diff --git a/desktop/inc/liblibreoffice_impl.hxx
b/desktop/inc/liblibreoffice_impl.hxx
deleted file mode 100644
index 3f7783e..000
--- a/desktop/inc/liblibreoffice_impl.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * 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/.
- */
-
-#ifndef _LIBLIBREOFFICE_IMPL_HXX
-#define _LIBLIBREOFFICE_IMPL_HXX
-
-#include "liblibreoffice.hxx"
-
-class LibLibreOffice_Impl : public LibLibreOffice
-{
-public:
-virtual boolinitialize (const char *installPath);
-
-virtual LODocument *documentLoad (const char *url);
-virtual booldocumentSave (const char *url);
-
-virtual ~LibLibreOffice_Impl ();
-};
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d564c8c..d753f9a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7,9 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
-
#include
+#include
+
+#include "liblibreoffice.hxx"
#include
#include
@@ -20,7 +21,9 @@
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -34,34 +37,111 @@
using namespace ::com::sun::star;
+class LibLODocument_Impl;
+class LibLibreOffice_Impl;
+
+static LibLibreOffice_Impl *gImpl = NULL;
+
+class LibLODocument_Impl : public LODocument
+{
+uno::Reference < css::lang::XComponent > mxComponent;
+public:
+LibLODocument_Impl( const uno::Reference < css::lang::XComponent >
&xComponent )
+: mxComponent( xComponent )
+{ }
+virtual bool saveAs (const char *url);
+};
+
+class LibLibreOffice_Impl : public LibLibreOffice
+{
+public:
+rtl::OUString maLastExceptionMsg;
+
+virtual boolinitialize (const char *installPath);
+
+virtual LODocument *documentLoad (const char *url);
+
+virtual char *getError();
+
+virtual ~LibLibreOffice_Impl ();
+};
+
// Wonder global state ...
static uno::Reference xContext;
static uno::Reference xSFactory;
static uno::Reference xFactory;
+static OUString getUString( const char *str )
+{
+if( !str )
+return OUString( "" );
+return OStringToOUString( OString( str, strlen (str) ),
+ RTL_TEXTENCODING_UTF8 );
+}
+
LODocument *
LibLibreOffice_Impl::documentLoad( const char *docUrl )
{
-OUString sUrl = OUString::createFromAscii (docUrl);
+OUString sUrl = getUString( docUrl );
OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
uno::Reference < css::frame::XDesktop2 > xComponentLoader =
css::frame::Desktop::create(xContext);
osl_getProcessWorkingDir(&sWorkingDir.pData);
-osl::FileBase::getFileURLFromSystemPath(sUrl, sDocPathUrl);
+osl::FileBase::getFileURLFromSystemPath( sUrl, sDocPathUrl );
osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl,
sAbsoluteDocUrl);
-uno::Reference < css::lang::XComponent > xComponent =
xComponentLoader->loadComponentFromURL(
-sAbsoluteDocUrl, OUString("_blank"), 0,
-uno::Sequence < css::beans::PropertyValue >());
+maLastExceptionMsg = "";
+try {
+uno::Reference < css::lang
[Libreoffice-commits] core.git: framework/source
framework/source/classes/taskcreator.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 04646443b3ee3baef0c3bdbaefad0eb66b71d33a
Author: Julien Nabet
Date: Fri Jul 26 19:12:11 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in framework/classes
Thank you Stephan!
Change-Id: I70a7f3dbbbe71c165f823ecc207bb5995a8e1376
diff --git a/framework/source/classes/taskcreator.cxx
b/framework/source/classes/taskcreator.cxx
index bff649c..49aebce 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -28,9 +28,10 @@
#include
#include
-#include
#include
+#include
+
namespace framework{
/*-//**
@@ -78,12 +79,9 @@ css::uno::Reference< css::frame::XFrame >
TaskCreator::createTask( const OUStrin
( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_DEFAULT)
)
)
{
-::comphelper::ConfigurationHelper::readDirectKey(
-xContext,
-"org.openoffice.Office.TabBrowse",
-"TaskCreatorService",
-"ImplementationName",
-::comphelper::ConfigurationHelper::E_READONLY) >>= sCreator;
+
+boost::optional
x(officecfg::Office::TabBrowse::TaskCreatorService::ImplementationName::get(xContext));
+if (x) sCreator = x.get();
}
xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - 2 commits - sw/inc sw/source
sw/inc/swtblfmt.hxx |6 +--
sw/source/core/doc/swtblfmt.cxx | 61 ++-
sw/source/core/doc/tblafmt.cxx |6 +--
sw/source/core/docnode/ndtbl.cxx |2 -
sw/source/core/undo/untbl.cxx|4 +-
5 files changed, 31 insertions(+), 48 deletions(-)
New commits:
commit 5d8b4793247eedb5d02c52356d0dcc37d45290a1
Author: Alex Ivan
Date: Fri Jul 26 19:51:15 2013 +0300
Further changes on separating hard formatting from style
Changes have been made to better distinguish table style from the
table's hard format. These concern setting the table style on
a certain table and the associated Undo/Redo operation.
Some errors still need to be sorted out.
Change-Id: Id7593616b89234301fb33352d46a83aca7c3ac90
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index d49396a..0443cbd 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -121,10 +121,8 @@ public:
sal_Bool GetRowSplit() const;
sal_uInt16 GetRepeatHeading() const;
-void RestoreTableProperties( SwTable &table ) const;
-void StoreTableProperties( const SwTable &table );
-
-void CopyTableFormatInfo( const SwTableFmt* pTableFormat );
+static void RestoreTableProperties( SwTableFmt* pSrcFmt, SwTable &table );
+static SwTableFmt* StoreTableProperties( const SwTable &table );
sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions, SwDoc*
pDoc, sal_uInt16 nVal );
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index e4a3a89..15c63c7 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -241,57 +241,42 @@ sal_uInt16 SwTableFmt::GetRepeatHeading() const
return (static_cast( GetFmtAttr(
FN_PARAM_TABLE_HEADLINE ) )).GetValue();
}
-void SwTableFmt::RestoreTableProperties(SwTable &table) const
+void SwTableFmt::RestoreTableProperties( SwTableFmt* pSrcFmt, SwTable &table )
{
-SwTableFmt *pFormat = (SwTableFmt*)table.GetTableFmt()->GetRegisteredIn();
-if (!pFormat)
+SwTableFmt *pHardFmt = table.GetTableFmt();
+if( !pHardFmt )
return;
-SwDoc *pDoc = pFormat->GetDoc();
-if (!pDoc)
+SwDoc *pDoc = pHardFmt->GetDoc();
+if( !pDoc )
return;
-pFormat->CopyTableFormatInfo( this );
+SwTableFmt *pTableStyle = (SwTableFmt*)pHardFmt->GetRegisteredIn();
+sal_Bool bRowSplit = sal_True;
+sal_uInt16 nRepeatHeading = 0;
-SwEditShell *pShell = pDoc->GetEditShell();
-pDoc->SetRowSplit( *pShell->getShellCrsr( false ), SwFmtRowSplit(
GetRowSplit() ) );
-
-table.SetRowsToRepeat( GetRepeatHeading() );
-}
-
-void SwTableFmt::StoreTableProperties(const SwTable &table)
-{
-SwTableFmt *pFormat = (SwTableFmt*)table.GetTableFmt()->GetRegisteredIn();
-if (!pFormat)
-return;
-
-SwDoc *pDoc = pFormat->GetDoc();
-if (!pDoc)
-return;
+if( pSrcFmt )
+{
+pHardFmt->RegisterToFormat( *pSrcFmt );
+bRowSplit = pSrcFmt->GetRowSplit();
+nRepeatHeading = pSrcFmt->GetRepeatHeading();
+}
+else
+pTableStyle->Remove( pHardFmt );
SwEditShell *pShell = pDoc->GetEditShell();
-SwFmtRowSplit *pRowSplit = 0;
-pDoc->GetRowSplit( *pShell->getShellCrsr( false ), pRowSplit );
-SetRowSplit( pRowSplit ? pRowSplit->GetValue() : sal_False );
-delete pRowSplit;
-pRowSplit = 0;
+pDoc->SetRowSplit( *pShell->getShellCrsr( false ), SwFmtRowSplit(
bRowSplit ) );
-CopyTableFormatInfo( pFormat );
+table.SetRowsToRepeat( nRepeatHeading );
}
-void SwTableFmt::CopyTableFormatInfo( const SwTableFmt* pTableFormat )
+SwTableFmt* SwTableFmt::StoreTableProperties( const SwTable &table )
{
-SetFmtAttr( pTableFormat->GetAttrSet() );
-
-m_pFstLineFmt.reset( new SwTableLineFmt ( *pTableFormat->GetFirstLineFmt()
) );
-m_pLstLineFmt.reset( new SwTableLineFmt ( *pTableFormat->GetLastLineFmt()
) );
-m_pOddLineFmt.reset( new SwTableLineFmt ( *pTableFormat->GetOddLineFmt() )
);
-m_pEvnLineFmt.reset( new SwTableLineFmt ( *pTableFormat->GetEvenLineFmt()
) );
+SwTableFmt *pHardFmt = table.GetTableFmt();
+if( !pHardFmt )
+return NULL;
-m_pFstColFmt.reset( new SwTableLineFmt ( *pTableFormat->GetFirstColFmt() )
);
-m_pLstColFmt.reset( new SwTableLineFmt ( *pTableFormat->GetLastColFmt() )
);
-m_pOddColFmt.reset( new SwTableLineFmt ( *pTableFormat->GetOddColFmt() ) );
-m_pEvnColFmt.reset( new SwTableLineFmt ( *pTableFormat->GetEvenColFmt() )
);
+return (SwTableFmt*)pHardFmt->GetRegisteredIn();
}
SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index ef80167..8881553 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -751,12 +751,12 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos,
SfxItemSet& rSet,
void SwTableAutoFmt::Re
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/qa sc/source
sc/qa/unit/data/ods/fdo62729.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 30 ++
sc/source/filter/xml/xmlexprt.cxx |1 +
3 files changed, 31 insertions(+)
New commits:
commit cb626d01772985bd0eed0f5963475d0e801379c8
Author: Noel Power
Date: Fri Jul 26 11:25:51 2013 +0100
fix for fdo#62729 reference pos can point to non existing table
there is an existing function ( called at least from uno names api also )
that updates the tab pos, calling that seems to fix this problem
(cherry picked from commit b5fffdb8d0438a2fe933a5742d41fe50a14b71f3)
with squash of
unit test for fdo#62729
(cherry picked from commit 7b3d8e0a7dcf6ae05e1de5c33ed382822cf52cce)
Change-Id: I6f6f31895eda9c338eeabd3f3285bf2c9eb23b7e
b9be75459aa49b8bab968dedae9e0760ccef9a26
Reviewed-on: https://gerrit.libreoffice.org/5124
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/qa/unit/data/ods/fdo62729.ods b/sc/qa/unit/data/ods/fdo62729.ods
new file mode 100644
index 000..00b5079
Binary files /dev/null and b/sc/qa/unit/data/ods/fdo62729.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 5dbadba..ed23eee 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -52,6 +52,7 @@ public:
void testDataBarExportODS();
void testDataBarExportXLSX();
void testMiscRowHeightExport();
+void testNamedRangeBugfdo62729();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -63,6 +64,7 @@ public:
CPPUNIT_TEST(testColorScaleExportODS);
CPPUNIT_TEST(testColorScaleExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
+CPPUNIT_TEST(testNamedRangeBugfdo62729);
CPPUNIT_TEST_SUITE_END();
private:
@@ -292,6 +294,34 @@ void ScExportTest::testMiscRowHeightExport()
miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
}
+
+void ScExportTest::testNamedRangeBugfdo62729()
+{
+ScDocShellRef xShell = loadDoc("fdo62729.", ODS);
+CPPUNIT_ASSERT(xShell.Is());
+ScDocument* pDoc = xShell->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+ScRangeName* pNames = pDoc->GetRangeName();
+//should be just a single named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+pDoc->DeleteTab(0);
+//should be still a single named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+xShell->DoClose();
+
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+pNames = pDoc->GetRangeName();
+//after reload should still have a named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+
+xDocSh->DoClose();
+}
+
ScExportTest::ScExportTest()
: ScBootstrapFixture("/sc/qa/unit/data")
{
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 2a543cd..73b3aec 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3738,6 +3738,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
AddAttribute(sAttrName, it->second->GetName());
OUString sBaseCellAddress;
+it->second->ValidateTabRefs();
ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress,
it->second->GetPos(), pDoc,
FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D);
AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,
sBaseCellAddress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/module.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit a9c9353b4b1628fdffc5f8c4db34c88186a244c7
Author: Jelle van der Waa
Date: Fri Jul 26 11:32:23 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: Ic762d02458265fe1ef2f4ba0b286438b6082e805
Reviewed-on: https://gerrit.libreoffice.org/5120
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 0081a0e..4c384d7 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -48,8 +48,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName,
sal_Int32 /*nRtldM
oslModule ret = 0;
oslFileErrornError;
-RTL_LOGFILE_TRACE1( "{ osl_loadModule start: %S",
(LPTSTR)&strModuleName->buffer );
-
+SAL_INFO( "sal.osl", "{ osl_loadModule start: " <<
(LPTSTR)&strModuleName->buffer );
OSL_ASSERT(strModuleName);
nError = osl_getSystemPathFromFileURL(strModuleName, &Module);
@@ -93,8 +92,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName,
sal_Int32 /*nRtldM
SetErrorMode(errorMode);
#endif
-RTL_LOGFILE_TRACE1( "} osl_loadModule end: %S",
(LPTSTR)&strModuleName->buffer );
-
+SAL_INFO( "sal.osl", "} osl_loadModule end: " <<
(LPTSTR)&strModuleName->buffer );
return ret;
}
@@ -109,8 +107,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX |
SEM_FAILCRITICALERRORS);
oslModule ret = 0;
-RTL_LOGFILE_TRACE1( "{ osl_loadModule start: %s", pModuleName );
-
+SAL_INFO( "sal.osl", "{ osl_loadModule start: " << pModuleName );
OSL_ASSERT(pModuleName);
hInstance = LoadLibrary(pModuleName);
@@ -124,8 +121,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
ret = (oslModule) hInstance;
SetErrorMode(errorMode);
-RTL_LOGFILE_TRACE1( "} osl_loadModule end: %s", pModuleName );
-
+SAL_INFO( "sal.osl", "} osl_loadModule end: " << pModuleName );
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal reportdesign/source
include/sal/log-areas.dox|1 + reportdesign/source/filter/xml/xmlfilter.cxx |9 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) New commits: commit 48c662e1a8ac6da61b6b586d268db5bb4f1e3669 Author: Jelle van der Waa Date: Fri Jul 26 11:51:00 2013 +0200 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO Change-Id: I00cfd958c2e7d430d9bcb03a609bbead812de3f3 Reviewed-on: https://gerrit.libreoffice.org/5122 Reviewed-by: LuboÅ¡ LuÅák Tested-by: LuboÅ¡ LuÅák diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 6471349..4ae7105 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -414,6 +414,7 @@ certain functionality. @li @c vbahelper @li @c xmlhelp @li @c xmlreader +@li @c reportdesign */ /* vim:set ft=cpp shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 1a1e17d..fd9723d 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -133,16 +132,13 @@ sal_Int32 ReadThroughComponent( OSL_ENSURE(xModelComponent.is(), "document missing"); OSL_ENSURE(rContext.is(), "factory missing"); -RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "rptxml", "oj", "ReadThroughComponent" ); - // prepare ParserInputSrouce InputSource aParserInput; aParserInput.aInputStream = xInputStream; // get parser uno::Reference< XParser > xParser = xml::sax::Parser::create(rContext); -RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); - +SAL_INFO( "reportdesign", "parser created" ); // get filter OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." ); if( !_xFilter.is() ) @@ -158,8 +154,7 @@ sal_Int32 ReadThroughComponent( #ifdef TIMELOG // if we do profiling, we want to know the stream -RTL_LOGFILE_TRACE_AUTHOR1( "rptxml", "oj", - "ReadThroughComponent : parsing \"%s\"", pStreamName ); +SAL_INFO( "reportdesign", "rptxml ReadThroughComponent : parsing \"" << pStreamName << "\"" ); #endif // finally, parser the stream ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/sidebar/tools/Popup.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70f9d122ecfc24aed528881c9ec734f9d3bcbfb3
Author: Caolán McNamara
Date: Fri Jul 26 14:52:49 2013 +0100
Resolves: fdo#67344 wrong relative menu position
Change-Id: I4a0cc610cc3c6a9c4164a69d40a9b0230aa702a4
(cherry picked from commit b11d022aeba5f981a9a3e4d8322ca5797f16944a)
Reviewed-on: https://gerrit.libreoffice.org/5123
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 8678eb6..36efa1b 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -67,7 +67,7 @@ void Popup::Show (ToolBox& rToolBox)
{
mpContainer->SetSizePixel(mpControl->GetOutputSizePixel());
-const Point aPos
(mpParent->OutputToScreenPixel(rToolBox.GetPosPixel()));
+const Point aPos
(rToolBox.GetParent()->OutputToScreenPixel(rToolBox.GetPosPixel()));
const Size aSize (rToolBox.GetSizePixel());
const Rectangle aRect (aPos, aSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: autogen.sh
autogen.sh |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 92e484c4b5baffbcc3a24af0d104adde351f77c0
Author: Isamu Mogi
Date: Sat Jul 20 09:45:36 2013 +0900
Ignore empty line in autogen.input
Change-Id: I5a640c996779ba548c1b4772820eaa799537c1af
Reviewed-on: https://gerrit.libreoffice.org/4991
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/autogen.sh b/autogen.sh
index 7b1b726..dc3a58d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -76,6 +76,8 @@ sub read_args($)
}
} elsif ( substr($_, 0, 1) eq "#" ) {
# comment
+} elsif ( length == 0 ) {
+# empty line
} else {
push @lst, $_;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 35/b5e2906b1966a43604f1addeaea56d785861a6
35/b5e2906b1966a43604f1addeaea56d785861a6 |1 + 1 file changed, 1 insertion(+) New commits: commit fa192db612a199c605693a074d66fc119527a5e0 Author: Caolán McNamara Date: Fri Jul 26 17:12:50 2013 +0100 Notes added by 'git notes add' diff --git a/35/b5e2906b1966a43604f1addeaea56d785861a6 b/35/b5e2906b1966a43604f1addeaea56d785861a6 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/35/b5e2906b1966a43604f1addeaea56d785861a6 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fd/014c0ea04602f43d5f59d16112c3c351871b8b
fd/014c0ea04602f43d5f59d16112c3c351871b8b |1 + 1 file changed, 1 insertion(+) New commits: commit 8ebe72f4df88c7e4123ce04f1e8a84547c19a428 Author: Caolán McNamara Date: Fri Jul 26 17:12:39 2013 +0100 Notes added by 'git notes add' diff --git a/fd/014c0ea04602f43d5f59d16112c3c351871b8b b/fd/014c0ea04602f43d5f59d16112c3c351871b8b new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/fd/014c0ea04602f43d5f59d16112c3c351871b8b @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 include/svx sfx2/source svx/source
cui/source/tabpages/backgrnd.cxx|5 +++-- cui/source/tabpages/tpgradnt.cxx|4 ++-- cui/source/tabpages/tphatch.cxx |8 cui/uiconfig/ui/shadowtabpage.ui| 24 +--- include/sfx2/dialoghelper.hxx |4 include/svx/dlgctrl.hxx |1 + sfx2/source/dialog/dialoghelper.cxx | 10 ++ svx/source/dialog/dlgctrl.cxx |4 8 files changed, 37 insertions(+), 23 deletions(-) New commits: commit 902276557566bbcbcef7e8de4d119196fdcfa345 Author: Caolán McNamara Date: Fri Jul 26 17:09:20 2013 +0100 stash rather arbitrary widget sizes in one place Change-Id: I26cc3185d6abbce516f7c7d9243962b873587859 diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index ea37ea5..2b80d10 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -370,11 +371,11 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC // Initialize gradient controls get(m_pBackGroundGradientFrame, "backgroundgradientframe"); get(m_pLbGradients, "gradientslb"); -Size aSize = LogicToPixel(Size(88, 110), MAP_APPFONT); +Size aSize = getDrawListBoxOptimalSize(this); m_pLbGradients->set_width_request(aSize.Width()); m_pLbGradients->set_height_request(aSize.Height()); get(m_pCtlPreview, "previewctl"); -aSize = LogicToPixel(Size(88, 42), MAP_APPFONT); +aSize = getDrawPreviewOptimalSize(this); m_pCtlPreview->set_width_request(aSize.Width()); m_pCtlPreview->set_height_request(aSize.Height()); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index fc3e04b..31bb345 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -78,11 +78,11 @@ SvxGradientTabPage::SvxGradientTabPage get(m_pLbColorTo, "colortolb"); get(m_pMtrColorTo, "colortomtr"); get(m_pLbGradients,"gradientslb"); -Size aSize = LogicToPixel(Size(88, 110), MAP_APPFONT); +Size aSize = getDrawListBoxOptimalSize(this); m_pLbGradients->set_width_request(aSize.Width()); m_pLbGradients->set_height_request(aSize.Height()); get(m_pCtlPreview, "previewctl"); -aSize = LogicToPixel(Size(88, 42), MAP_APPFONT); +aSize = getDrawPreviewOptimalSize(this); m_pCtlPreview->set_width_request(aSize.Width()); m_pCtlPreview->set_height_request(aSize.Height()); get(m_pBtnAdd, "add"); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 2305c65..b429820 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -72,16 +72,16 @@ SvxHatchTabPage::SvxHatchTabPage get(m_pMtrAngle, "anglemtr"); get(m_pCtlAngle, "anglectl"); m_pCtlAngle->SetCS(CS_ANGLE); -Size aSize = LogicToPixel(Size(39, 39), MAP_APPFONT); -m_pCtlAngle->set_width_request(aSize.Width()); -m_pCtlAngle->set_height_request(aSize.Height()); get(m_pLbLineType, "linetypelb"); get(m_pLbLineColor, "linecolorlb"); get(m_pLbHatchings, "hatchingslb"); -aSize = LogicToPixel(Size(88, 110), MAP_APPFONT); +Size aSize = getDrawListBoxOptimalSize(this); m_pLbHatchings->set_width_request(aSize.Width()); m_pLbHatchings->set_height_request(aSize.Height()); get(m_pCtlPreview, "previewctl"); +aSize = getDrawPreviewOptimalSize(this); +m_pCtlPreview->set_width_request(aSize.Width()); +m_pCtlPreview->set_height_request(aSize.Height()); get(m_pBtnAdd, "add"); get(m_pBtnModify, "modify"); get(m_pBtnDelete, "delete"); diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui index 421e4fb..4110a8c 100644 --- a/cui/uiconfig/ui/shadowtabpage.ui +++ b/cui/uiconfig/ui/shadowtabpage.ui @@ -2,11 +2,6 @@ - -999 -1 -10 - 100 5 @@ -33,9 +28,10 @@ 12 True - + True False +True vertical 6 @@ -59,6 +55,7 @@ True False +True 6 12 @@ -93,8 +90,6 @@ True False -True -True 1 @@ -146,13 +141,7 @@ start 12 - -True -False -_Position -True -CTL_POSITION -
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/svx svx/source
cui/UIConfig_cui.mk|1
cui/source/inc/cuitabarea.hxx | 18 -
cui/source/inc/helpid.hrc |1
cui/source/tabpages/tabarea.hrc| 10
cui/source/tabpages/tabarea.src| 106 -
cui/source/tabpages/tpshadow.cxx | 181 ++-
cui/uiconfig/ui/shadowtabpage.ui | 288 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/dlgctrl.hxx|9
svx/source/dialog/dlgctrl.cxx | 27 +-
10 files changed, 402 insertions(+), 242 deletions(-)
New commits:
commit 6d21d95f2d24a4f1fd0be5e754953f6cf718e56a
Author: Olivier Hallot
Date: Thu Jul 25 22:53:02 2013 -0300
Convert shadow tab page to widget UI
Change-Id: I8828100136f73e4f80cb11c2b5003fa7de6b575f
Reviewed-on: https://gerrit.libreoffice.org/5116
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 9ac79ba..0db14ff 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
+ cui/uiconfig/ui/shadowtabpage \
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/spellingdialog \
cui/uiconfig/ui/splitcellsdialog \
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 9fa007d..402ddb0 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -303,17 +303,13 @@ class SvxShadowTabPage : public SvxTabPage
using TabPage::DeactivatePage;
private:
-FixedLine aFlProp;
-TriStateBox aTsbShowShadow;
-FixedText aFtPosition;
-SvxRectCtl aCtlPosition;
-FixedText aFtDistance;
-MetricField aMtrDistance;
-FixedText aFtShadowColor;
-ColorLB aLbShadowColor;
-FixedText aFtTransparent;
-MetricField aMtrTransparent;
-SvxXShadowPreview aCtlXRectPreview;
+TriStateBox*m_pTsbShowShadow;
+VclGrid*m_pGridShadow;
+SvxRectCtl* m_pCtlPosition;
+MetricField*m_pMtrDistance;
+ColorLB*m_pLbShadowColor;
+MetricField*m_pMtrTransparent;
+SvxXShadowPreview* m_pCtlXRectPreview;
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index eebecc8..e6e3b5a 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -246,7 +246,6 @@
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
-#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 79b816d..f508b0f 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -22,11 +22,8 @@
#define BTN_EMBED 7
#define CTL_PREVIEW 1
#define CTL_POSITION 2
-#define CTL_COLOR_PREVIEW 5
#define CTL_BITMAP_PREVIEW 6
-#define MTR_FLD_DISTANCE 1
#define TSB_INVISIBLE 1
-#define TSB_SHOW_SHADOW 2
#define LB_COLOR 1
#define LB_GRADIENT 2
@@ -41,16 +38,12 @@
#define BTN_DELETE 4
#define FT_COLOR 1
#define FT_BACKGROUND_COLOR 2
-#define FT_POSITION 2
-#define FT_DISTANCE 1
#define MTR_FLD_ANGLE 3
#define CTL_ANGLE 2
#define NUM_FLD_STEPCOUNT 1
#define FT_PIXEL_EDIT 4
#define CTL_PIXEL 2
#define FT_TYPE 7
-#define FT_SHADOW_COLOR 10
-#define LB_SHADOW_COLOR 10
#define FL_PROP 2
#define FL_SIZE 3
@@ -71,9 +64,6 @@
#define MTR_FLD_4 4
#define FT_TABLE_NAME 7
-#define FT_TRANSPARENT 9
#define FT_BITMAPS_HIDDEN 12
-#define MTR_SHADOW_TRANSPARENT 11
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 3728d98..f789b47 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -29,112 +29,6 @@
#define TRANS_GRAD_OFFSET_Y 64
// --
-TabPage RID_SVXPAGE_SHADOW
-{
-HelpID = HID_AREA_SHADOW ;
-Hide = TRUE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Text [ en-US ] = "Shadow" ;
-FixedLine FL_PROP
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248, 8 ) ;
-Text [ en-US ] = "Properties";
-};
-TriStateBox TSB_SHOW_SHADOW
-{
-HelpID = "cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW";
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 110 , 10 ) ;
-T
[ABANDONED] solve fdo#54819
Luboš Luňák has abandoned this change. Change subject: solve fdo#54819 .. Patch Set 2: Abandoned I'm abandoning this change based on the comments, so that it doesn't linger around. When you have the time to submit an updated version, please a new one. -- To view, visit https://gerrit.libreoffice.org/3583 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I989d3f9e56503ddc6280d134ed433b8af94ed052 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Maxime de Roucy Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - icon-themes/tango solenv/bin vcl/inc vcl/source
icon-themes/tango/links.txt | 786 solenv/bin/packimages.pl| 36 + vcl/inc/impimagetree.hxx|4 vcl/source/gdi/impimagetree.cxx | 10 4 files changed, 436 insertions(+), 400 deletions(-) New commits: commit 055edb382a400a90a12bac36c4009372fb96888e Author: Michael Meeks Date: Fri Jul 26 16:59:32 2013 +0100 cleanup link file syntax. Change-Id: Ic2bfbce05e1d291af0ce8ba551b8c1e6227039d4 diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index ab522f6..97662eeb 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -1,393 +1,393 @@ -./res/sx03129.png ./dbaccess/res/db.png -./dbaccess/res/sc09.png ./dbaccess/res/docopen_sc.png -./dbaccess/res/sc021.png ./dbaccess/res/queryeditdesign_sc.png -./dbaccess/res/sc023.png ./dbaccess/res/queryeditsql_sc.png -./sd/imglst/sc27058.png ./sd/imglst/sc27028.png -./sd/imglst/lc27175.png ./sd/imglst/lc27177.png -./sd/imglst/sc27173.png ./sd/imglst/sc27171.png -./sd/imglst/sc27296.png ./sd/imglst/sc27295.png -./sd/imglst/lc27058.png ./sd/imglst/lc27028.png -./sd/imglst/sc27063.png ./sd/imglst/sc27054.png -./sd/imglst/sc27057.png ./sd/imglst/sc27054.png -./sd/imglst/sc27056.png ./sd/imglst/sc27054.png -./sd/imglst/sc27060.png ./sd/imglst/sc27054.png -./sd/imglst/sc27055.png ./sd/imglst/sc27054.png -./sd/imglst/lc27318.png ./cmd/lc_drawchart.png -./sch/res/lc30514.png ./cmd/lc_viewdatasourcebrowser.png -./cmd/lc_gotoendofdoc.png ./cmd/lc_lastpage.png -./cmd/sc_draw.png ./cmd/sc_reload.png -./cmd/sc_refresh.png ./cmd/sc_reload.png -./res/reload.png ./cmd/sc_reload.png -./res/sc05508.png ./cmd/sc_reload.png -./sw/imglst/sr20016.png ./cmd/sc_searchdialog.png -./cmd/sc_insertcurrencyfield.png ./cmd/sc_currencyfield.png -./cmd/sc_numberformatcurrency.png ./cmd/sc_currencyfield.png -./sd/imglst/sc27064.png ./cmd/sc_duplicatepage.png -./res/sc05710.png ./cmd/sc_cut.png -./sd/imglst/lc27015.png ./cmd/lc_importfromfile.png -./sfx2/res/favourite_big.png ./cmd/lc_insertbookmark.png -./cmd/lc_recundo.png ./cmd/lc_undo.png -./res/lc05701.png ./cmd/lc_undo.png -./cmd/sc_browsebackward.png ./cmd/sc_pageup.png -./cmd/previouspage.png ./cmd/sc_pageup.png -./cmd/sc_navigateback.png ./cmd/sc_pageup.png -./res/sc06301.png ./cmd/sc_pageup.png -./svtools/res/back_small.png ./cmd/sc_pageup.png -./cmd/lc_closewin.png ./cmd/lc_closedoc.png -./res/lc10853.png ./cmd/lc_recsearch.png -./res/lc05961.png ./cmd/lc_recsearch.png -./cmd/sc_browseforward.png ./cmd/sc_pagedown.png -./cmd/sc_nextpage.png ./cmd/sc_pagedown.png -./cmd/sc_navigateforward.png ./cmd/sc_pagedown.png -./res/sc06300.png ./cmd/sc_pagedown.png -./cmd/lc_gotostartofdoc.png ./cmd/lc_firstpage.png -./cmd/lc_advancedmode.png ./cmd/lc_toggleobjectrotatemode.png -./res/lc05539.png ./cmd/lc_designerdialog.png -./cmd/sc_savebasicas.png ./cmd/sc_saveas.png -./res/lc05711.png ./cmd/lc_copy.png -./cmd/lc_browsebackward.png ./cmd/lc_pageup.png -./cmd/lc_previouspage.png ./cmd/lc_pageup.png -./cmd/lc_navigateback.png ./cmd/lc_pageup.png -./res/lc06301.png ./cmd/lc_pageup.png -./svtools/res/back_large.png ./cmd/lc_pageup.png -./sc/imglst/lc26050.png ./cmd/lc_cancel.png -./sw/imglst/lc20557.png ./cmd/lc_cancel.png -./cmd/lc_exitsearch.png ./cmd/lc_cancel.png -./res/sc10853.png ./cmd/sc_recsearch.png -./res/sc05961.png ./cmd/sc_recsearch.png -./cmd/sc_leftpara.png ./cmd/sc_alignleft.png -./cmd/sc_justifypara.png ./cmd/sc_alignblock.png -./cmd/sc_sortdown.png ./cmd/sc_sortdescending.png -./sd/imglst/lc27017.png ./cmd/lc_zoompanning.png -./res/lc05700.png ./cmd/lc_redo.png -./cmd/sc_insertsymbol.png ./cmd/sc_symbolcatalogue.png -./sd/imglst/lc27059.png ./cmd/lc_animationmode.png -./cmd/lc_printdefault.png ./cmd/lc_print.png -./cmd/lc_printpagepreview.png ./cmd/lc_print.png -./res/lc05509.png ./cmd/lc_print.png -./res/lc05504.png ./cmd/lc_print.png -./cmd/lc_sortdown.png ./cmd/lc_sortdescending.png -./cmd/sc_zoomtoolbox.png ./cmd/sc_zoom.png -./cmd/sc_spellingandgrammardialog.png ./cmd/sc_spelling.png -./cmd/sc_spelldialog.png ./cmd/sc_spelling.png -./res/sc05711.png ./cmd/sc_copy.png -./sd/imglst/sc27015.png ./cmd/sc_importfromfile.png -./sch/res/sc30528.png ./cmd/sc_diagramtype.png -./sd/res/ole.png ./cmd/sc_diagramtype.png -./cmd/lc_draw.png ./cmd/lc_reload.png -./cmd/lc_refresh.png ./cmd/lc_reload.png -./sc/res/dropurl.png ./cmd/sc_inserthyperlink.png -./cmd/lc_insertcurrencyfield.png ./cmd/lc_currencyfield.png -./cmd/lc_numberformatcurrency.png ./cmd/lc_currencyfield.png -./cmd/sc_gotostartofdoc.png ./cmd/sc_firstpage.png -./cmd/sc_recundo.png ./cmd/sc_undo.png -./svx/res/id020.png ./cmd/sc_undo.png -./svx/res/cd020.png ./cmd/sc_undo.png -./cmd/sc_insertobjctrl.png ./cmd/sc_insertobject.png -./cmd/sc_togglemergecells.png ./cmd/sc_mergecells.png -./cmd/lc_commontaskbarvisible.png ./cmd/lc_autoformat.png -./sd/imglst/lc05928.png ./cmd/lc_autoformat.png -./cmd/sc_fillstyle.png ./cmd/sc_linewidth.png -./cmd/sc_xlinecolor.png ./c
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx |2
sc/qa/unit/data/ods/fdo62729.ods |binary
sc/qa/unit/data/xls/inline-array.xls |binary
sc/qa/unit/subsequent_export-test.cxx | 83 ++
sc/source/filter/xml/xmlexprt.cxx |1
5 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit 5300d19c19e3ee5cb8f55cf3f104d4b046041c1c
Author: Kohei Yoshida
Date: Fri Jul 26 11:50:30 2013 -0400
Add export test for exporting inline arrays to xls format.
Change-Id: I8f6e32adcbd33362f20eca3ce329633bf9fbf039
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 09f0874..39334ee 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -566,7 +566,7 @@ public:
SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark ) const;
-boolGetMatrixFormulaRange( const ScAddress& rCellPos, ScRange&
rMatrix );
+SC_DLLPUBLIC bool GetMatrixFormulaRange( const ScAddress& rCellPos,
ScRange& rMatrix );
boolIsEmbedded() const;
voidGetEmbedded( ScRange& rRange ) const;
diff --git a/sc/qa/unit/data/xls/inline-array.xls
b/sc/qa/unit/data/xls/inline-array.xls
new file mode 100644
index 000..64574f8
Binary files /dev/null and b/sc/qa/unit/data/xls/inline-array.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 600bc5a..ad7a514 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -26,6 +26,7 @@
#include "scitems.hxx"
#include "document.hxx"
#include "cellform.hxx"
+#include "formulacell.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -51,6 +52,8 @@ public:
void testMiscRowHeightExport();
void testNamedRangeBugfdo62729();
+void testInlineArrayXLS();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
#if !defined(MACOSX) && !defined(DRAGONFLY)
@@ -62,6 +65,7 @@ public:
CPPUNIT_TEST(testColorScaleExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729);
+CPPUNIT_TEST(testInlineArrayXLS);
CPPUNIT_TEST_SUITE_END();
private:
@@ -319,6 +323,55 @@ void ScExportTest::testNamedRangeBugfdo62729()
xDocSh->DoClose();
}
+namespace {
+
+void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange)
+{
+ScRange aMatRange;
+ScAddress aMatOrigin;
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+{
+for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row();
++nRow)
+{
+ScAddress aPos(nCol, nRow, rRange.aStart.Tab());
+bool bIsMatrix = rDoc.GetMatrixFormulaRange(aPos, aMatRange);
+CPPUNIT_ASSERT_MESSAGE("Matrix expected, but not found.",
bIsMatrix);
+CPPUNIT_ASSERT_MESSAGE("Wrong matrix range.", rRange == aMatRange);
+const ScFormulaCell* pCell = rDoc.GetFormulaCell(aPos);
+CPPUNIT_ASSERT_MESSAGE("This must be a formula cell.", pCell);
+
+bIsMatrix = pCell->GetMatrixOrigin(aMatOrigin);
+CPPUNIT_ASSERT_MESSAGE("Not a part of matrix formula.", bIsMatrix);
+CPPUNIT_ASSERT_MESSAGE("Wrong matrix origin.", aMatOrigin ==
aMatRange.aStart);
+}
+}
+}
+
+}
+
+void ScExportTest::testInlineArrayXLS()
+{
+ScDocShellRef xShell = loadDoc("inline-array.", XLS);
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument* pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+// B2:C3 contains a matrix.
+checkMatrixRange(*pDoc, ScRange(1,1,0,2,2,0));
+
+// B5:D6 contains a matrix.
+checkMatrixRange(*pDoc, ScRange(1,4,0,3,5,0));
+
+// B8:C10 as well.
+checkMatrixRange(*pDoc, ScRange(1,7,0,2,9,0));
+
+xDocSh->DoClose();
+}
+
ScExportTest::ScExportTest()
: ScBootstrapFixture("/sc/qa/unit/data")
{
commit b7df19862d6fbf4d05950540bd49885813312ec7
Author: Noel Power
Date: Fri Jul 26 13:13:37 2013 +0100
unit test for fdo#62729
Change-Id: Ib9be75459aa49b8bab968dedae9e0760ccef9a26
diff --git a/sc/qa/unit/data/ods/fdo62729.ods b/sc/qa/unit/data/ods/fdo62729.ods
new file mode 100644
index 000..00b5079
Binary files /dev/null and b/sc/qa/unit/data/ods/fdo62729.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 05b0c35..600bc5a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -49,6 +49,7 @@ public:
void testDataBarExportODS();
void testDataBarExportXLSX();
void testMiscRowHeightExport();
+void testNamedRangeBugfdo62729();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -60,6 +61,7 @@ public:
CPPUNIT_TEST(testColorScaleExportODS);
CPPUNIT_T
[Libreoffice-commits] core.git: tools/qa tools/source
tools/qa/cppunit/test_urlobj.cxx | 22 ++
tools/source/fsys/urlobj.cxx |4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 44ddacb232c4fd5cbb28867aa28d7d855788a511
Author: Stephan Bergmann
Date: Fri Jul 26 17:41:08 2013 +0200
fdo#33605: Handle http etc. URLs with no path but fragment
Change-Id: I8c47cc55e7ad53e514c0bd46130cbbe6a1bb0357
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 6719fc8..6b0b313 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -240,6 +240,27 @@ namespace tools_urlobj
}
}
+void urlobjTest_emptyPath() {
+{
+INetURLObject url(OUString("http://example.com";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+}
+{
+// This is an invalid http URL per RFC 2616:
+INetURLObject url(OUString("http://example.com?query";));
+CPPUNIT_ASSERT(url.HasError());
+}
+{
+INetURLObject url(OUString("http://example.com#fragment";));
+CPPUNIT_ASSERT_EQUAL(INET_PROT_HTTP, url.GetProtocol());
+CPPUNIT_ASSERT_EQUAL(OUString("example.com"), url.GetHost());
+CPPUNIT_ASSERT_EQUAL(OUString("/"), url.GetURLPath());
+CPPUNIT_ASSERT_EQUAL(OUString("fragment"), url.GetMark());
+}
+}
+
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
@@ -252,6 +273,7 @@ namespace tools_urlobj
CPPUNIT_TEST( urlobjTest_005 );
CPPUNIT_TEST( urlobjTest_006 );
CPPUNIT_TEST( urlobjCmisTest );
+CPPUNIT_TEST( urlobjTest_emptyPath );
CPPUNIT_TEST_SUITE_END( );
}; // class createPool
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 77128d7..fe719f568 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2933,7 +2933,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_FTP:
case INET_PROT_IMAP:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nFragmentDelimiter)
{
@@ -2953,7 +2953,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_HTTPS:
case INET_PROT_SMB:
case INET_PROT_CMIS:
-if (pPos < pEnd && *pPos != '/')
+if (pPos < pEnd && *pPos != '/' && *pPos != nFragmentDelimiter)
return false;
while (pPos < pEnd && *pPos != nQueryDelimiter
&& *pPos != nFragmentDelimiter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2b.cxx | 115 +---
1 file changed, 70 insertions(+), 45 deletions(-)
New commits:
commit 6037bf8a26b028542d82deb58e5de4988f346bcc
Author: Gergo Mocsi
Date: Fri Jul 26 17:28:54 2013 +0200
GSOC work, extend reflection+crash fix
Fixed creash error on accessing elements of an empty vector.
Reflection is now extract fields also.
Change-Id: Ic41353cbe9fc404115eb0d2b2f9d5706fc044dab
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 0cb09c0..5ff3e3d 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -54,6 +54,7 @@
#include
#include "com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp"
#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XIdlField.hpp"
namespace basctl
{
@@ -499,6 +500,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
// see if there is an accelerator to be processed first
bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+
if( rKEvt.GetCharCode() == '"' &&
CodeCompleteOptions::IsAutoCloseQuotesOn() )
{//autoclose double quotes
TextSelection aSel = GetEditView()->GetSelection();
@@ -507,12 +509,15 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-if( aLine.getLength() > 0 && aLine[aLine.getLength()-1] != '"' &&
(aPortions[aPortions.size()-1].tokenType != 4) )
+if( aPortions.size() != 0 )
{
-GetEditView()->InsertText(OUString("\""));
-//leave the cursor on it's place: inside the two double quotes
-TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
-GetEditView()->SetSelection( TextSelection( aEnd, aEnd ) );
+if( aLine.getLength() > 0 && aLine[aLine.getLength()-1] != '"' &&
(aPortions[aPortions.size()-1].tokenType != 4) )
+{
+GetEditView()->InsertText(OUString("\""));
+//leave the cursor on it's place: inside the two double quotes
+TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
+GetEditView()->SetSelection( TextSelection( aEnd, aEnd ) );
+}
}
}
@@ -565,58 +570,78 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-for ( size_t i = 0; i < aPortions.size(); i++ )
+if( aPortions.size() != 0 )
{
-HighlightPortion& r = aPortions[i];
-if( r.tokenType == 1 ) // extract the identifers(methods, base
variable)
-aVect.push_back( aLine.copy(r.nBegin, r.nEnd - r.nBegin) );
-}
-OUString sBaseName = aVect[0];//variable name
-OUString sVarType = aCodeCompleteCache.GetVarType( sBaseName );
+for ( size_t i = 0; i < aPortions.size(); i++ )
+{
+HighlightPortion& r = aPortions[i];
+if( r.tokenType == 1 ) // extract the identifers(methods, base
variable)
+aVect.push_back( aLine.copy(r.nBegin, r.nEnd - r.nBegin) );
+}
-Reference< lang::XMultiServiceFactory > xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
-Reference< reflection::XIdlReflection > xRefl(
xFactory->createInstance("com.sun.star.reflection.CoreReflection"),
UNO_QUERY_THROW );
+OUString sBaseName = aVect[0];//variable name
+OUString sVarType = aCodeCompleteCache.GetVarType( sBaseName );
-if( xRefl.is() )
-{
-Reference< reflection::XIdlClass > xClass =
xRefl->forName(sVarType);//get the base class for reflection
-if( xClass != NULL )
+Reference< lang::XMultiServiceFactory > xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
+Reference< reflection::XIdlReflection > xRefl(
xFactory->createInstance("com.sun.star.reflection.CoreReflection"),
UNO_QUERY_THROW );
+
+if( xRefl.is() )
{
-unsigned int j = 1;
-OUString sMethName;
-while( j != aVect.size() )
+Reference< reflection::XIdlClass > xClass =
xRefl->forName(sVarType);//get the base class for reflection
+if( xClass != NULL )
{
-sMethName = aVect[j];
-Reference< reflection::XIdlMethod> xMethod =
xClass->getMethod( sMethName );
-if( xMethod != NULL ) //method OK
+unsigned int j = 1;
+OUString sMethName;
+while( j != aVect.size() )
{
-xClass = xMethod->getReturnType();
-if( xClass == NULL )
+
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo66474.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15 +++
3 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 67163f5531c29ff1983661ba832bd205944b33f3
Author: Miklos Vajna
Date: Fri Jul 26 16:50:07 2013 +0200
fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widths
Instead of checking if any cells have fixed width, check if all calls
have fixed with. Regression from
74c5ed19f430327988194cdcd6bdff09591a93fa.
Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
diff --git a/sw/qa/extras/ooxmlimport/data/fdo66474.docx
b/sw/qa/extras/ooxmlimport/data/fdo66474.docx
new file mode 100755
index 000..0252746
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo66474.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 34e41b5..0d10002 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -125,6 +125,7 @@ public:
void testTableAutoColumnFixedSize();
void testFdo46361();
void testFdo65632();
+void testFdo66474();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -215,6 +216,7 @@ void Test::run()
{"table-auto-column-fixed-size.docx",
&Test::testTableAutoColumnFixedSize},
{"fdo46361.docx", &Test::testFdo46361},
{"fdo65632.docx", &Test::testFdo65632},
+{"fdo66474.docx", &Test::testFdo66474},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1516,6 +1518,15 @@ void Test::testFdo65632()
CPPUNIT_ASSERT_EQUAL(OUString("Text"),
getProperty(getRun(getParagraphOfText(1, xText), 1),
"TextPortionType"));
}
+void Test::testFdo66474()
+{
+// The table wasn't relative (relative with was 0), so the table didn't
+// take the full available width, like it would have to.
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(100),
getProperty(xTables->getByIndex(0), "RelativeWidth"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 739d3e7..c5c9ce0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -140,20 +140,24 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
the final sizing of the table, but then must use
the contents of each cell to determine final column widths.
(See 17.18.87 of the ISO/IEC 29500-1:2011.)
*/
-bool bFixed = false;
+bool bFixed = true;
sal_Int32 nRowFixedWidth = 0;
if (!m_aCellWidths.empty())
{
-// Step 1. Check whether any cell has fixed
width in the given row of table.
+// Step 1. Check whether all cells have fixed
widths in the given row of table.
::std::vector< IntVectorPtr >::iterator itr;
for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); itr ++)
{
IntVectorPtr itrVal = (*itr);
for
(std::vector::const_iterator aValIter = itrVal->begin(); aValIter !=
itrVal->end(); ++aValIter)
{
+if (*aValIter == -1)
+{
+bFixed = false;
+break;
+}
// Sum the width of cells to find the
total width of given row
nRowFixedWidth += (*aValIter);
-bFixed = true;
}
}
}
@@ -368,7 +372,10 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
MeasureHandlerPtr pMeasureHandler(new
MeasureHandler());
pProperties->resolve(*pMeasureHandler);
-
getCurrentCellWidths()->push_back(pMeasureHandler->getMeasureValue());
+if
(sal::static_int_cast(pMeasureHandler->getUnit()) ==
NS_ooxml::LN_Value_ST_TblWidth_auto)
+
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2be3dcd9cc0f66aec026538baa7299663d9986b0 Author: Tor Lillqvist Date: Fri Jul 26 18:35:36 2013 +0300 Use BUILDDIR, not SRC_ROOT Change-Id: I497238fbc8344a1bb8703dfd8090bd4e5c420ff1 diff --git a/Makefile.in b/Makefile.in index 04add49..79974d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -259,7 +259,7 @@ install-strip: echo "$(INSTALLDIR)/program/soffice" ifeq ($(ENABLE_MACOSX_SANDBOX),YES) -entitlements:=--entitlements $(SRC_ROOT)/lo.xcent +entitlements:=--entitlements $(BUILDDIR)/lo.xcent endif dev-install: build ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Module.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b472b4c70ce7668d3637d4fd8ecf789eb1e56a0f Author: Bjoern Michaelsen Date: Fri Jul 26 17:27:49 2013 +0200 'almost finished' doesnt sound like a clean target Change-Id: I0455dce3c41a859a6d3f7c2cc62ba5002559bd29 diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index e5dcc3d..7b3aad94 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -54,7 +54,7 @@ gb_Module_CLEANTARGETSTACK := gb_Module_CURRENTMAKEFILE := $(call gb_Module_get_almost_target,%) : - $(call gb_Output_announce,$*,$(false),ALM,5) + $(call gb_Output_announce,$*,$(true),ALM,5) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ touch $@) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Wed, Jul 24, 2013 at 12:40:03PM +0200, Miklos Vajna wrote: > On Thu, Jul 18, 2013 at 04:34:02PM +0100, Michael Meeks > wrote: > > AI: + write a trivial example for paragraph properties (Miklos) > > Done: As Michael Stahl mentioned on IRC, it turns out we already have something similar for ODF: RES_UNKNOWNATR_CONTAINER in sw, its uno api is xml::ParaUserDefinedAttributesSupplier. Given that it serves a different purpose (we don't want to write back those OOXML properties to ODF, nor the other way around), having different UNO properties make sense, but it would be wise to check if the underlying SfxPoolItem (SvXMLAttrContainerItem) could be reused, instead of the newly introduced SfxGrabBagItem. SfxGrabBagItem is a string-any map, while SvXMLAttrContainerItem is a string-string map (with some additional namespace support, but you can ignore that). If it's confirmed that such a grab bag container doesn't have to support nesting, then reusing is possible, I think. But I'm not sure that's the case, seeing that in case of normal UNO properties, both structures and simple values are used as a property value. Opinions? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/ui/dochdl/gloshdl.cxx | 10 ++--
sw/source/ui/inc/gloslst.hxx | 27 ++-
sw/source/ui/inc/workctrl.hxx|4 -
sw/source/ui/ribbar/workctrl.cxx | 39 +++-
sw/source/ui/shells/textglos.cxx | 12 ++---
sw/source/ui/utlui/gloslst.cxx | 93 ++-
6 files changed, 99 insertions(+), 86 deletions(-)
New commits:
commit 4a1c808b95c9a62f6ecf8ae3c20218ef85a9261e
Author: Ivan Timofeev
Date: Fri Jul 26 18:59:27 2013 +0400
String -> OUString
Change-Id: I244de2137f6a7b26f21de24ff9273c5c3672d12e
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 1c7b231..be38a29 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -151,7 +151,7 @@ class SwScrollNaviPopup : public SfxPopupWindow
FixedInfo aInfoField;
ImageList aIList;
-String sQuickHelp[2 * NID_COUNT];
+OUStringsQuickHelp[2 * NID_COUNT];
voidApplyImageList();
@@ -179,7 +179,7 @@ class SwNaviImageButton : public ImageButton
{
SwScrollNaviPopup* pPopup;
Image aImage;
-String sQuickText;
+OUStringsQuickText;
SfxPopupWindow* pPopupWindow;
SfxPopupWindow* pFloatingWindow;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
m_xFrame;
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index c925aed..69cded2 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -467,13 +467,13 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId,
const Reference< XFrame >&
for( i = 0; i < NID_COUNT; i++)
{
sal_uInt16 nNaviId = aNavigationInsertIds[i];
-String sText;
+OUString sText;
ToolBoxItemBits nTbxBits = 0;
if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
{
// -2, there's no string for Next/Prev
sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START;
-sText = String(SW_RES(nResStr));
+sText = SW_RESSTR(nResStr);
nTbxBits = TIB_CHECKABLE;
}
aToolBox.InsertItem(nNaviId, sText, nTbxBits);
@@ -487,7 +487,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const
Reference< XFrame >&
// these are global strings
for( i = 0; i < 2 * NID_COUNT; i++)
{
-sQuickHelp[i] = String(SW_RES(STR_IMGBTN_START + i));
+sQuickHelp[i] = SW_RESSTR(STR_IMGBTN_START + i);
}
Size aImgSize = aIList.GetImageSize();
@@ -595,7 +595,7 @@ String SwScrollNaviPopup::GetQuickHelpText(sal_Bool bNext)
nResId += SwView::GetMoveType() - NID_START;
if(!bNext)
nResId += NID_COUNT;
-return String(SW_RES(nResId));
+return SW_RESSTR(nResId);
}
void SwNaviImageButton::Click()
@@ -660,7 +660,7 @@ SwNaviImageButton::SwNaviImageButton(
ImageButton(pParent, SW_RES(BTN_NAVI)),
pPopup(0),
aImage(SW_RES(IMG_BTN)),
-sQuickText(SW_RES(ST_QUICK)),
+sQuickText(SW_RESSTR(ST_QUICK)),
pPopupWindow(0),
pFloatingWindow(0),
m_xFrame( rFrame )
@@ -715,8 +715,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
{ 25, 50, 75, 100, 150, 200 };
for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
{
-String sEntry = OUString::number(aZoomValues[i]);
-sEntry += '%';
+OUString sEntry = OUString::number(aZoomValues[i]) + "%";
InsertEntry(sEntry);
}
}
@@ -728,8 +727,8 @@ voidSwZoomBox_Impl::Select()
{
if ( !IsTravelSelect() )
{
-String sEntry(comphelper::string::remove(GetText(), '%'));
-sal_uInt16 nZoom = (sal_uInt16)sEntry.ToInt32();
+OUString sEntry(comphelper::string::remove(GetText(), '%'));
+sal_uInt16 nZoom = (sal_uInt16)sEntry.toInt32();
if(nZoom < MINZOOM)
nZoom = MINZOOM;
if(nZoom > MAXZOOM)
@@ -831,8 +830,8 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16
/*nSID*/,
SwZoomBox_Impl* pBox = (SwZoomBox_Impl*)GetToolBox().GetItemWindow(
GetId() );
if(SFX_ITEM_AVAILABLE <= eState)
{
-String sZoom(OUString::number(((const
SfxUInt16Item*)pState)->GetValue()));
-sZoom += '%';
+OUString sZoom(OUString::number(((const
SfxUInt16Item*)pState)->GetValue()));
+sZoom += "%";
pBox->SetText(sZoom);
pBox->SaveValue();
}
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index b1dbb1c..89d02ed 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -63,11 +63,11 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
case FN_NEW_GLOSSARY:
if(pItem && pArgs->Count() == 3 )
{
-String aGroup = (( const SfxStringItem *)pItem)->GetValue();
-
[Libreoffice-commits] core.git: liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch liblangtag/UnpackedTarball_langtag.mk
liblangtag/UnpackedTarball_langtag.mk |1 liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch | 18 - 2 files changed, 19 deletions(-) New commits: commit e7c06d3081e68d49d1c2cca32a01ac3e081d4c3b Author: Eike Rathke Date: Fri Jul 26 16:39:48 2013 +0200 patching out doc->encoding is not needed anymore Upstream 71e2b41a366ecd150700025058364c7dbf3576a7 fixed that. Change-Id: I6f91170be9888c1fca19839d3ec6bb745dcff329 diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index 32f993a..8594707 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.5.1-msvc-warning.patch \ - liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch \ liblangtag/liblangtag-0.5.1-vsnprintf.patch \ liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \ liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \ diff --git a/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch b/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch deleted file mode 100644 index d63a571..000 --- a/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch +++ /dev/null @@ -1,18 +0,0 @@ -# libxml2 has a problem when a document encoding is specified, even though -# documentation says that all internal representation would be in UTF-8 and -# language-subtag-registry data already is passed in UTF-8, when specifying the -# document encoding to be UTF-8 the output to language-subtag-registry.xml is -# conversion garbage, '?' on Linux UTF-8 locale, ISO-8859-1 on Windows. If no -# document encoding is specified at all no conversion happens and non-ASCII -# values are correctly written as entities. - misc/liblangtag-0.4.0/data/reg2xml.c 2012-01-30 13:20:57.0 +0100 -+++ misc/build/liblangtag-0.4.0/data/reg2xml.c 2012-08-11 02:30:39.147779753 +0200 -@@ -134,7 +134,6 @@ - lt_bool_t retval; - - doc = xmlNewDoc((const xmlChar *)"1.0"); -- doc->encoding = xmlStrdup((const xmlChar *)"UTF-8"); - root = xmlNewDocNode(doc, NULL, -(const xmlChar *)"registry", -NULL); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67086, which changed state. Bug 67086 Summary: embedded Fonts renders strangely on first load https://bugs.freedesktop.org/show_bug.cgi?id=67086 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/filter/excel/xetable.cxx | 31 ---
sc/source/filter/inc/xetable.hxx |2 +-
2 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 02b610b53d697a2d5e15674fc79ceee5b7c75207
Author: Kohei Yoshida
Date: Fri Jul 26 10:31:50 2013 -0400
Fix exporting of array formulas to xls.
Change-Id: I366f5ef21353d64561d82b025c7919a1dbdb3422
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 8694a49..9ef8202 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -148,23 +148,24 @@ XclExpArrayRef XclExpArrayBuffer::CreateArray( const
ScTokenArray& rScTokArr, co
return rxRec;
}
-XclExpArrayRef XclExpArrayBuffer::FindArray( const ScTokenArray& rScTokArr )
const
+XclExpArrayRef XclExpArrayBuffer::FindArray( const ScTokenArray& rScTokArr,
const ScAddress& rBasePos ) const
{
XclExpArrayRef xRec;
// try to extract a matrix reference token
-if( rScTokArr.GetLen() == 1 )
-{
-const formula::FormulaToken* pToken = rScTokArr.GetArray()[ 0 ];
-if( pToken && (pToken->GetOpCode() == ocMatRef) )
-{
-const ScSingleRefData& rRef = static_cast(pToken)->GetSingleRef();
-ScAddress aBasePos( rRef.nCol, rRef.nRow, GetCurrScTab() );
-XclExpArrayMap::const_iterator aIt = maRecMap.find( aBasePos );
-if( aIt != maRecMap.end() )
-xRec = aIt->second;
-}
-}
-return xRec;
+if (rScTokArr.GetLen() != 1)
+// Must consist of a single reference token.
+return xRec;
+
+const formula::FormulaToken* pToken = rScTokArr.GetArray()[0];
+if (!pToken || pToken->GetOpCode() != ocMatRef)
+// not a matrix reference token.
+return xRec;
+
+const ScSingleRefData& rRef = static_cast(pToken)->GetSingleRef();
+ScAddress aAbsPos = rRef.toAbs(rBasePos);
+XclExpArrayMap::const_iterator it = maRecMap.find(aAbsPos);
+
+return (it == maRecMap.end()) ? xRec : xRec = it->second;
}
// Shared formulas
@@ -840,7 +841,7 @@ XclExpFormulaCell::XclExpFormulaCell(
case MM_REFERENCE:
{
// other formula cell covered by a matrix - find the ARRAY record
-mxAddRec = rArrayBfr.FindArray( rScTokArr );
+mxAddRec = rArrayBfr.FindArray(rScTokArr, aScPos);
// should always be found, if Calc document is not broken
OSL_ENSURE( mxAddRec, "XclExpFormulaCell::XclExpFormulaCell - no
matrix found" );
}
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 655d6ea..533d2ec 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -135,7 +135,7 @@ public:
/** Inserts a new ARRAY record into the buffer and returns it. */
XclExpArrayRef CreateArray( const ScTokenArray& rScTokArr, const
ScRange& rScRange );
/** Tries to find an ARRAY record that corresponds to an ocMatRef token. */
-XclExpArrayRef FindArray( const ScTokenArray& rScTokArr ) const;
+XclExpArrayRef FindArray( const ScTokenArray& rScTokArr, const ScAddress&
rBasePos ) const;
private:
typedef ::std::map< ScAddress, XclExpArrayRef > XclExpArrayMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - autodoc/source stlport/systemstl
autodoc/source/inc/estack.hxx |1 -
autodoc/source/parser/cpp/sownstck.hxx | 28 ++--
stlport/systemstl/slist|3 +++
3 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit 35b5e2906b1966a43604f1addeaea56d785861a6
Author: Herbert Dürr
Date: Fri Jul 26 13:26:18 2013 +
#i122853# prevent use of slist::size() for all platforms
even for the once that emulate slist using std::list
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index 260983d..295651f 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -64,6 +64,9 @@ public:
typedef typename _super::const_iterator slist_cit;
#ifndef STLP4_SLIST_WITH_LIST
slist_mit insert( slist_cit aI, const T& rT) { return
_super::insert_after( aI, rT); }
+#else
+private:
+ size_t size() const; // prevent use of slist::size() as forward_list
doesn't have a size() method
#endif
};
commit fd014c0ea04602f43d5f59d16112c3c351871b8b
Author: Herbert Dürr
Date: Fri Jul 26 13:04:33 2013 +
#i122853# replace use of size() method for single linked lists
diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx
index 29ec063..351560e 100644
--- a/autodoc/source/inc/estack.hxx
+++ b/autodoc/source/inc/estack.hxx
@@ -74,7 +74,6 @@ class EStack : private std::slist
// INQUIRY
const value_type & top() const { return base::front(); }
-size_type size() const{ return base::size(); }
boolempty() const { return base::empty(); }
// ACCESS
diff --git a/autodoc/source/parser/cpp/sownstck.hxx
b/autodoc/source/parser/cpp/sownstck.hxx
index a3ec524..ca3a1fa 100644
--- a/autodoc/source/parser/cpp/sownstck.hxx
+++ b/autodoc/source/parser/cpp/sownstck.hxx
@@ -121,7 +121,7 @@ inline ary::cpp::Class *
ContextForAry::
S_OwnerStack::CurClass() const
{
-return aStack_Classes.size() > 0
+return !aStack_Classes.empty()
? aStack_Classes.top().first
: (ary::cpp::Class *) 0;
}
@@ -130,7 +130,7 @@ inline void
ContextForAry::
S_OwnerStack::SetOwner_2CurNamespace()
{
-csv_assert( aStack_Namespaces.size() > 0 );
+csv_assert( !aStack_Namespaces.empty() );
pOwner_Cur = pOwner_Namespace.MutablePtr();
pOwner_Namespace->SetAnotherNamespace( CurNamespace() );
}
@@ -139,7 +139,7 @@ inline void
ContextForAry::
S_OwnerStack::SetOwner_2CurClass()
{
-csv_assert( aStack_Classes.size() > 0 );
+csv_assert( !aStack_Classes.empty() );
pOwner_Cur = pOwner_Class.MutablePtr();
pOwner_Class->SetAnotherClass( *CurClass() );
}
@@ -173,7 +173,7 @@ inline void
ContextForAry::
S_OwnerStack::SetGlobalNamespace( ary::cpp::Namespace & io_rGlobalNamespace )
{
-csv_assert( aStack_Namespaces.size() == 0 );
+csv_assert( aStack_Namespaces.empty() );
aStack_Namespaces.push(&io_rGlobalNamespace);
SetOwner_2CurNamespace();
}
@@ -187,7 +187,7 @@ inline void
ContextForAry::
S_OwnerStack::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
{
-csv_assert( aStack_Namespaces.size() > 0 OR io_rOpenedNamespace.Parent()
== 0 );
+csv_assert( !aStack_Namespaces.empty() OR io_rOpenedNamespace.Parent() ==
0 );
aStack_Namespaces.push(&io_rOpenedNamespace);
SetOwner_2CurNamespace();
}
@@ -228,7 +228,7 @@ inline E_Protection
ContextForAry::
S_OwnerStack::CurProtection() const
{
-return aStack_Classes.size() > 0
+return !aStack_Classes.empty()
? aStack_Classes.top().second
: ary::cpp::PROTECT_global;
}
@@ -271,15 +271,15 @@ S_OwnerStack::CloseBlock()
}
else
{
-// csv_assert( aStack_Classes.size() == 0 );
-if ( aStack_Classes.size() > 0 )
+// csv_assert( aStack_Classes.empty() );
+if ( !aStack_Classes.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "",
String::Null_(), 0);
csv_assert( pCurEnum == 0 );
aStack_Namespaces.pop();
-// csv_assert( aStack_Namespaces.size() > 0 );
-if( aStack_Namespaces.size() == 0 )
+// csv_assert( !aStack_Namespaces.empty() );
+if( aStack_Namespaces.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "",
String::Null_(), 0);
}
@@ -290,12 +290,12 @@ void
ContextForAry::
S_OwnerStack::CloseClass()
{
-// csv_assert( aStack_Classes.size() > 0 );
-if ( aStack_Classes.size() == 0 )
+// csv_assert( !aStack_Classes.empty() );
+if ( aStack_Classes.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "",
String::Null_(), 0);
aStack_Classes.pop();
-if ( aStack_Classes.size() > 0 )
+if ( !aStack_Classes.empty() )
SetOwner_2CurClass();
else
SetOwner_2CurNamespace();
@@ -307,7 +307,7 @@ S_OwnerStack::CloseEnum()
{
csv_assert( pCurEnum != 0 );
pCurEn
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/tools/Popup.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b11d022aeba5f981a9a3e4d8322ca5797f16944a
Author: Caolán McNamara
Date: Fri Jul 26 14:52:49 2013 +0100
Resolves: fdo#67344 wrong relative menu position
Change-Id: I4a0cc610cc3c6a9c4164a69d40a9b0230aa702a4
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 8678eb6..36efa1b 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -67,7 +67,7 @@ void Popup::Show (ToolBox& rToolBox)
{
mpContainer->SetSizePixel(mpControl->GetOutputSizePixel());
-const Point aPos
(mpParent->OutputToScreenPixel(rToolBox.GetPosPixel()));
+const Point aPos
(rToolBox.GetParent()->OutputToScreenPixel(rToolBox.GetPosPixel()));
const Size aSize (rToolBox.GetSizePixel());
const Rectangle aRect (aPos, aSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/gdi/outdev3.cxx | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit ea82c62a396818150758172445d33c216e0d
Author: Michael Meeks
Date: Wed Jul 24 19:48:43 2013 +0100
fdo#67086 - clear device font list before re-fetching it.
Seemingly if this is done in the other order, then ImplUpdateFontData
reads the old font list into mpGraphics leaving pointers around that
are then freed by ClearDevFontCache -> GlyphCache::ClearFontCache
Change-Id: I06fdc428c782820dd9f98cf77dc0eef486a096ee
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8304746..6548d0c 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -237,6 +237,24 @@ void OutputDevice::ImplUpdateAllFontData( bool
bNewFontLists )
{
ImplSVData* pSVData = ImplGetSVData();
+// clear global font lists to have them updated
+pSVData->maGDIData.mpScreenFontCache->Invalidate();
+if ( bNewFontLists )
+{
+pSVData->maGDIData.mpScreenFontList->Clear();
+Window * pFrame = pSVData->maWinData.mpFirstFrame;
+if ( pFrame )
+{
+if ( pFrame->ImplGetGraphics() )
+{
+// Stupid typecast here and somewhere
((OutputDevice*)&aVDev)->, because bug in .NET2002 compiler
+OutputDevice *pDevice = (OutputDevice*)pFrame;
+pDevice->mpGraphics->ClearDevFontCache();
+
pDevice->mpGraphics->GetDevFontList(pFrame->mpWindowImpl->mpFrameData->mpFontList);
+}
+}
+}
+
// update all windows
Window* pFrame = pSVData->maWinData.mpFirstFrame;
while ( pFrame )
@@ -268,24 +286,6 @@ void OutputDevice::ImplUpdateAllFontData( bool
bNewFontLists )
pPrinter->ImplUpdateFontData( bNewFontLists );
pPrinter = pPrinter->mpNext;
}
-
-// clear global font lists to have them updated
-pSVData->maGDIData.mpScreenFontCache->Invalidate();
-if ( bNewFontLists )
-{
-pSVData->maGDIData.mpScreenFontList->Clear();
-pFrame = pSVData->maWinData.mpFirstFrame;
-if ( pFrame )
-{
-if ( pFrame->ImplGetGraphics() )
-{
-// Stupid typecast here and somewhere
((OutputDevice*)&aVDev)->, because bug in .NET2002 compiler
-OutputDevice *pDevice = (OutputDevice*)pFrame;
-pDevice->mpGraphics->ClearDevFontCache();
-
pDevice->mpGraphics->GetDevFontList(pFrame->mpWindowImpl->mpFrameData->mpFontList);
-}
-}
-}
}
// TODO: remove this method when the CWS-gfbfcfg dust has settled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 10 -- source/text/scalc/01/1201.xhp | 18 +- source/text/scalc/01/12010100.xhp | 16 source/text/shared/00/0001.xhp |9 ++--- 4 files changed, 19 insertions(+), 34 deletions(-) New commits: commit 9d984456abaefb364a6b5f77928dfc14e2c571c1 Author: Caolán McNamara Date: Fri Jul 26 14:20:13 2013 +0100 update help ids for databaserange define dialog .ui conversion Change-Id: I3a7453866fa4478d3102067f2b1f3e1d47ff241b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6757143..81b7dc0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6266,10 +6266,6 @@ sc_CheckBox_RID_SCDLG_COL_OPT_BTN_DEFVAL,1494926337, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725, -sc_CheckBox_RID_SCDLG_DBNAMES_BTN_FORMAT,2567324695, -sc_CheckBox_RID_SCDLG_DBNAMES_BTN_HEADER,2567324693, -sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694, -sc_CheckBox_RID_SCDLG_DBNAMES_BTN_STRIPDATA,2567324696, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475, sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085, @@ -6319,7 +6315,6 @@ sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227, sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228, sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203, sc_ComboBox_RID_SCDLG_DAPIDATA_CB_OBJECT,1495355413, -sc_ComboBox_RID_SCDLG_DBNAMES_ED_NAME,2567327755, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792, @@ -6338,7 +6333,6 @@ sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973, sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977, sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971, sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975, -sc_Edit_RID_SCDLG_DBNAMES_ED_DBAREA,2567325709, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882, sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881, @@ -6367,7 +6361,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_1,2568531471, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_2,2568531474, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_1,2568531481, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484, -sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438, sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672, @@ -6433,7 +6426,6 @@ sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136, sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, -sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676, @@ -6457,8 +6449,6 @@ sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284, -sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259, -sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260, sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197, sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486, sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485, diff --git a/source/text/scalc/01/1201.xhp b/source/text/scalc/01/1201.xhp index aece565..806c226 100644 --- a/source/text/scalc/01/1201.xhp +++ b/source/text/scalc/01/1201.xhp @@ -28,7 +28,7 @@ - + Define Database Range Defines a database range based on the selected cells in your sheet. @@ -36,19 +36,19 @@ - + Name -Enter a name for the database range that you want to define, or select an existing name from the list. - +Enter a name for the database range that you want to define, or select an existing name from the list. + Range -Displays the selected cell range. +Displays the selected cell range. - + Add/Modify -Adds the selected cell range to the database range list, or modifies an existing database range. +Adds the selected cell range to the database range list, or modifies an existing database range. - + More >> -Shows additional options. +Shows additional options. diff --git a/source/text/scalc/01/12010100.xhp b/source/text/scalc/01/12010100.xhp index 7169c64..9e52d03 100644 --- a/source/text/scalc/01/12010100.xhp +++ b/source/text/scalc/01/12010100.xhp @@ -34,14 +34,14 @@ Options - Contains column labels - Selected cell ranges contains labels. -
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d7/c2bf91978289b5cdb4705da30c3f81ae94b685
d7/c2bf91978289b5cdb4705da30c3f81ae94b685 |1 + 1 file changed, 1 insertion(+) New commits: commit ef887206ea8f8a172ba32ff40f397d122d82b32e Author: Caolán McNamara Date: Fri Jul 26 14:14:43 2013 +0100 Notes added by 'git notes add' diff --git a/d7/c2bf91978289b5cdb4705da30c3f81ae94b685 b/d7/c2bf91978289b5cdb4705da30c3f81ae94b685 new file mode 100644 index 000..29ceeea --- /dev/null +++ b/d7/c2bf91978289b5cdb4705da30c3f81ae94b685 @@ -0,0 +1 @@ +prefer: a1c02181319d32cab7fdb4f1086221056a34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/definedatabaserangedialog.ui | 469 ++ 1 file changed, 469 insertions(+) New commits: commit c11b6db4a08cab2ba48a733bc565f26e33492061 Author: Reem.ALotaibi Date: Fri Jul 26 00:29:47 2013 +0300 definedatabaserangedialog.ui widget Change-Id: I68a72b62b55d8964c147265495a39e0c07bf6ee4 Reviewed-on: https://gerrit.libreoffice.org/5115 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui new file mode 100644 index 000..a8ee84f --- /dev/null +++ b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui @@ -0,0 +1,469 @@ + + + + +False +5 +Define Database Range +dialog + + +False +start +2 + + +False +vertical +start + + +True +False +vertical + + +gtk-ok +True +True +True +True +True +True + + +False +True +0 + + + + +gtk-cancel +True +True +True +True + + +False +True +1 + + + + +gtk-help +True +True +True +59 +True + + +False +True +2 + + + + +False +True +0 + + + + +True +False +vertical + + +gtk-add +True +True +True +True + + +False +True +0 + + + + +gtk-delete +True +True +True +True + + +False +True +1 + + + + +False +True +1 + + + + +More +True +True +True +49 + + +False +True +2 + + + + +False +True +end +0 + + + + +True +False +vertical +6 + + +True +False +0 +none + + +True +False +6 +12 + + +True +False +vertical +6 + + +True +False +12 +⢠+True + + +False +True +0 + + + + +325 +155 +True +False +12 + + +False +True +1 + + + + + + + + +True +
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/data/ods/fdo62729.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 30 ++
sc/source/filter/xml/xmlexprt.cxx |1 +
3 files changed, 31 insertions(+)
New commits:
commit 7b3d8e0a7dcf6ae05e1de5c33ed382822cf52cce
Author: Noel Power
Date: Fri Jul 26 13:13:37 2013 +0100
unit test for fdo#62729
Change-Id: Ib9be75459aa49b8bab968dedae9e0760ccef9a26
diff --git a/sc/qa/unit/data/ods/fdo62729.ods b/sc/qa/unit/data/ods/fdo62729.ods
new file mode 100644
index 000..00b5079
Binary files /dev/null and b/sc/qa/unit/data/ods/fdo62729.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 05b0c35..600bc5a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -49,6 +49,7 @@ public:
void testDataBarExportODS();
void testDataBarExportXLSX();
void testMiscRowHeightExport();
+void testNamedRangeBugfdo62729();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -60,6 +61,7 @@ public:
CPPUNIT_TEST(testColorScaleExportODS);
CPPUNIT_TEST(testColorScaleExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
+CPPUNIT_TEST(testNamedRangeBugfdo62729);
CPPUNIT_TEST_SUITE_END();
private:
@@ -289,6 +291,34 @@ void ScExportTest::testMiscRowHeightExport()
miscRowHeightsTest( aTestValues, SAL_N_ELEMENTS(aTestValues) );
}
+
+void ScExportTest::testNamedRangeBugfdo62729()
+{
+ScDocShellRef xShell = loadDoc("fdo62729.", ODS);
+CPPUNIT_ASSERT(xShell.Is());
+ScDocument* pDoc = xShell->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+ScRangeName* pNames = pDoc->GetRangeName();
+//should be just a single named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+pDoc->DeleteTab(0);
+//should be still a single named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+xShell->DoClose();
+
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+pNames = pDoc->GetRangeName();
+//after reload should still have a named range
+CPPUNIT_ASSERT(pNames->size() == 1 );
+
+xDocSh->DoClose();
+}
+
ScExportTest::ScExportTest()
: ScBootstrapFixture("/sc/qa/unit/data")
{
commit b5fffdb8d0438a2fe933a5742d41fe50a14b71f3
Author: Noel Power
Date: Fri Jul 26 11:25:51 2013 +0100
fix for fdo#62729 reference pos can point to non existing table
there is an existing function ( called at least from uno names api also )
that updates the tab pos, calling that seems to fix this problem
Change-Id: I6f6f31895eda9c338eeabd3f3285bf2c9eb23b7e
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 1943238..23fd580 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3727,6 +3727,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
AddAttribute(sAttrName, it->second->GetName());
OUString sBaseCellAddress;
+it->second->ValidateTabRefs();
ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress,
it->second->GetPos(), pDoc,
FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D);
AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,
sBaseCellAddress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basctl/uiconfig basic/source include/basic
basctl/source/basicide/baside2b.cxx | 15 +++
basctl/source/basicide/codecompleteoptionsdlg.cxx |6 +++---
basctl/source/basicide/codecompleteoptionsdlg.hxx |2 +-
basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui |4 ++--
basic/source/classes/codecompletecache.cxx| 13 -
include/basic/codecompletecache.hxx |4
6 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit 59418489effa864fddba8ba5432e066e1c089976
Author: Gergo Mocsi
Date: Fri Jul 26 13:57:29 2013 +0200
GSOC work, implement "Autoclose parenthesis" function
Autoclosing parenthesis function is working. Implementation is similar to
autoclosing double quotes, except that this one does not need the
HighlighPortion struct to use.
Renamed the checkbox title to "Autoclose parenthesis".
Change-Id: I4311cd8020f0dc0b62a2d8707e0eccbf57e0d2c2
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index c533ebc..0cb09c0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -516,6 +516,21 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
}
}
+if( rKEvt.GetCharCode() == '(' &&
CodeCompleteOptions::IsAutoCloseParenthesisOn() )
+{//autoclose parenthesis
+TextSelection aSel = GetEditView()->GetSelection();
+sal_uLong nLine = aSel.GetStart().GetPara();
+OUString aLine( pEditEngine->GetText( nLine ) ); // the line being
modified
+
+if( aLine.getLength() > 0 && aLine[aSel.GetEnd().GetIndex()-1] != '(' )
+{
+GetEditView()->InsertText(OUString(")"));
+//leave the cursor on it's place: inside the parenthesis
+TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
+GetEditView()->SetSelection( TextSelection( aEnd, aEnd ) );
+}
+}
+
if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN &&
CodeCompleteOptions::IsProcedureAutoCompleteOn() )
{//autoclose implementation
TextSelection aSel = GetEditView()->GetSelection();
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index ac2793f..ff4398b 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -34,7 +34,7 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window*
pWindow )
get(pCodeCompleteChk, "codecomplete_enable");
get(pAutocloseProcChk, "autoclose_proc");
-get(pAutocloseBracesChk, "autoclose_braces");
+get(pAutocloseParenChk, "autoclose_paren");
get(pAutocloseQuotesChk, "autoclose_quotes");
pOkBtn->SetClickHdl( LINK( this, CodeCompleteOptionsDlg, OkHdl ) );
@@ -43,8 +43,7 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window*
pWindow )
pCodeCompleteChk->Check( CodeCompleteOptions::IsCodeCompleteOn() );
pAutocloseProcChk->Check( CodeCompleteOptions::IsProcedureAutoCompleteOn()
);
pAutocloseQuotesChk->Check( CodeCompleteOptions::IsAutoCloseQuotesOn() );
-
-pAutocloseBracesChk->Enable( false );
+pAutocloseParenChk->Check( CodeCompleteOptions::IsAutoCloseParenthesisOn()
);
}
CodeCompleteOptionsDlg::~CodeCompleteOptionsDlg()
@@ -56,6 +55,7 @@ IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() );
CodeCompleteOptions::SetProcedureAutoCompleteOn(
pAutocloseProcChk->IsChecked() );
CodeCompleteOptions::SetAutoCloseQuotesOn(
pAutocloseQuotesChk->IsChecked() );
+CodeCompleteOptions::SetAutoCloseParenthesisOn(
pAutocloseParenChk->IsChecked() );
Close();
return 0;
}
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.hxx
b/basctl/source/basicide/codecompleteoptionsdlg.hxx
index 9549b99..2154c8a 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.hxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.hxx
@@ -34,7 +34,7 @@ private:
CheckBox* pCodeCompleteChk;
CheckBox* pAutocloseProcChk;
-CheckBox* pAutocloseBracesChk;
+CheckBox* pAutocloseParenChk;
CheckBox* pAutocloseQuotesChk;
DECL_LINK(OkHdl, void*);
diff --git a/basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui
b/basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui
index 83256b5..1c0d86c 100644
--- a/basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui
+++ b/basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui
@@ -145,8 +145,8 @@
-
-Autoclose Braces
+
+Autoclose Parenthesis
True
True
False
diff --git a/basic/source/classes/codecompletecache.cxx
b/basic/source/classes/codecompletecache.cxx
index 3e327c
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 35785, which changed state. Bug 35785 Summary: LibreOffice's support of the "recent documents" feature of the Windows 7 Start menu broken https://bugs.freedesktop.org/show_bug.cgi?id=35785 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source
sd/Library_sd.mk |8
sd/source/ui/remotecontrol/AvahiNetworkService.cxx |2
sd/source/ui/remotecontrol/avahi-common/thread-watch.c | 191 -
sd/source/ui/remotecontrol/avahi-common/thread-watch.h | 82 ---
4 files changed, 1 insertion(+), 282 deletions(-)
New commits:
commit 76aad98dcbe03ceb17fdf975eb4a1281f9814844
Author: Siqi
Date: Fri Jul 26 13:30:26 2013 +0200
Revert "add threaded pool support for avahi backward compatibility"
This reverts commit af1ce3de97a6c1d583f82558ee18054b7917b03d.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8484423..807926f 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -553,14 +553,6 @@ ifeq ($(ENABLE_AVAHI),TRUE)
$(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/AvahiNetworkService \
))
-
-$(eval $(call gb_Library_add_cobjects,sd,\
- sd/source/ui/remotecontrol/avahi-common/thread-watch \
-))
-
-$(eval $(call gb_Library_add_libs,sd,\
- -lpthread \
-))
endif
$(eval $(call gb_Library_add_exception_objects,sd,\
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 6043d49..5cb52de 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -10,7 +10,7 @@
#include
#include
#include
-#include "avahi-common/thread-watch.h"
+#include
#include "AvahiNetworkService.hxx"
#include "ZeroconfService.hxx"
diff --git a/sd/source/ui/remotecontrol/avahi-common/thread-watch.c
b/sd/source/ui/remotecontrol/avahi-common/thread-watch.c
deleted file mode 100644
index 4bb277f..000
--- a/sd/source/ui/remotecontrol/avahi-common/thread-watch.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* $Id$ */
-
-/***
- This file is part of avahi.
-
- avahi is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- avahi is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
- Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with avahi; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-// Only introduced in 0.6.13. Place it here as advised by avahi maintainer
-#include "thread-watch.h"
-
-struct AvahiThreadedPoll {
-AvahiSimplePoll *simple_poll;
-pthread_t thread_id;
-pthread_mutex_t mutex;
-int thread_running;
-int retval;
-};
-
-static int poll_func(struct pollfd *ufds, unsigned int nfds, int timeout, void
*userdata) {
-pthread_mutex_t *mutex = userdata;
-int r;
-
-/* Before entering poll() we unlock the mutex, so that
- * avahi_simple_poll_quit() can succeed from another thread. */
-
-pthread_mutex_unlock(mutex);
-r = poll(ufds, nfds, timeout);
-pthread_mutex_lock(mutex);
-
-return r;
-}
-
-static void* thread(void *userdata){
-AvahiThreadedPoll *p = userdata;
-sigset_t mask;
-
-/* Make sure that signals are delivered to the main thread */
-sigfillset(&mask);
-pthread_sigmask(SIG_BLOCK, &mask, NULL);
-
-pthread_mutex_lock(&p->mutex);
-p->retval = avahi_simple_poll_loop(p->simple_poll);
-pthread_mutex_unlock(&p->mutex);
-
-return NULL;
-}
-
-AvahiThreadedPoll *avahi_threaded_poll_new(void) {
-AvahiThreadedPoll *p;
-
-if (!(p = avahi_new(AvahiThreadedPoll, 1)))
-goto fail; /* OOM */
-
-if (!(p->simple_poll = avahi_simple_poll_new()))
-goto fail;
-
-pthread_mutex_init(&p->mutex, NULL);
-
-avahi_simple_poll_set_func(p->simple_poll, poll_func, &p->mutex);
-
-p->thread_running = 0;
-
-return p;
-
-fail:
-if (p) {
-if (p->simple_poll) {
-avahi_simple_poll_free(p->simple_poll);
-pthread_mutex_destroy(&p->mutex);
-}
-
-avahi_free(p);
-}
-
-return NULL;
-}
-
-void avahi_threaded_poll_free(AvahiThreadedPoll *p) {
-assert(p);
-
-/* Make sure that this function is not called from the helper thread */
-assert(!p->thread_running || !pthread_equal(pthread_self(), p->thread_id));
-
-if (p->thread_running)
-avahi_threaded_poll_stop(p);
-
-if (p->simple_poll)
-avahi_simple_poll_free(p->simple_poll);
-
-pthread_mutex_destroy(&p->mutex);
-avahi_free(p);
-}
-
-const AvahiPoll* avahi_threaded_poll_get(AvahiThreadedPoll *p) {
-a
[Libreoffice-commits] core.git: bin/distro-install-sdk
bin/distro-install-sdk | 36 +---
1 file changed, 17 insertions(+), 19 deletions(-)
New commits:
commit db0b333ea6cb04241a78f55b39884eeb87ee6215
Author: Bjoern Michaelsen
Date: Fri Jul 26 13:19:50 2013 +0200
setsdkenv_unix.csh is no more
Change-Id: I1f20dbc690be23c013c26c0a37b8d6eceef0f51d
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 36b0e23..33554e8 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -65,24 +65,22 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
echo "$DOCDIR/sdk/examples"
>>$DESTDIR/gid_Module_Root_SDK
# generate default profiles
-for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
-sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
- -e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \
- -e "s,@OFFICE_HOME@,$INSTALLDIR," \
- -e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
- -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
- -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_SED_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CAT_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
- -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
- -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
- -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
-$DESTDIR$INSTALLDIR/sdk/$file.in \
- > $DESTDIR$INSTALLDIR/sdk/$file
- chmod 755 $DESTDIR$INSTALLDIR/sdk/$file
- echo $INSTALLDIR/sdk/$file >>$DESTDIR/gid_Module_Root_SDK
-done
+sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
+-e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \
+-e "s,@OFFICE_HOME@,$INSTALLDIR," \
+-e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
+-e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
+-e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
+-e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+-e "s,@OO_SDK_SED_HOME@,/usr/bin," \
+-e "s,@OO_SDK_CAT_HOME@,/usr/bin," \
+-e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+-e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
+-e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+-e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
+$DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh.in \
+> $DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh
+chmod 755 $DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh
+echo $INSTALLDIR/sdk/setsdkenv_unix.sh >>$DESTDIR/gid_Module_Root_SDK
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - config_host/config_features.h.in config_host.mk.in configure.ac desktop/source solenv/gbuild
config_host.mk.in|1 -
config_host/config_features.h.in | 18 ++
configure.ac |4 ++--
desktop/source/app/app.cxx |4 ++--
solenv/gbuild/gbuild.mk |2 --
5 files changed, 22 insertions(+), 7 deletions(-)
New commits:
commit 8f315d9ece9dc8bfc093e4707d761e7120092618
Author: Tor Lillqvist
Date: Fri Jul 26 14:06:23 2013 +0300
Move the (unimplemented) READONLY_INSTALLSET flag into config_features.h
Change-Id: Icce89cc2a3c8089aa248a176ab92b545c36b1091
diff --git a/config_host.mk.in b/config_host.mk.in
index a96bfba..88f3e34 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -149,7 +149,6 @@ export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
export ENABLE_PCH=@ENABLE_PCH@
export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_RANDR=@ENABLE_RANDR@
-export ENABLE_READONLY_INSTALLSET=@ENABLE_READONLY_INSTALLSET@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 29da64c..3b92e87 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -88,4 +88,14 @@
#define HAVE_FEATURE_MACOSX_SANDBOX 0
+/* READONLY_INSTALLSET - whether to treat the installation as read-only
+ *
+ * Prevents attempts by LibreOffice to write into its installation. That means
+ * at least that no "system-wide" extensions can be added, if the location for
+ * them is the traditional one. Experimental work in progress, not actually
implemented.
+ */
+
+#define HAVE_FEATURE_READONLY_INSTALLSET 0
+
+
#endif
diff --git a/configure.ac b/configure.ac
index ade9c26..ee8a35d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2819,11 +2819,10 @@ if test \( -z "$enable_readonly_installset" -a
"$ENABLE_MACOSX_SANDBOX" = YES \)
fi
if test "$enable_readonly_installset" = yes; then
AC_MSG_RESULT([yes])
-ENABLE_READONLY_INSTALLSET=YES
+AC_DEFINE(HAVE_FEATURE_READONLY_INSTALLSET)
else
AC_MSG_RESULT([no])
fi
-AC_SUBST(ENABLE_READONLY_INSTALLSET)
dnl ===
dnl Windows specific tests and stuff
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c489ee4..9681dd2 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -261,7 +261,6 @@ gb_GLOBALDEFS += \
DISABLE_DYNLOADING \
DISABLE_EXPORT \
DISABLE_SCRIPTING \
- ENABLE_READONLY_INSTALLSET \
)
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
commit cca02d9e984d1937f6d8597de0267ebf22ae6916
Author: Tor Lillqvist
Date: Fri Jul 26 13:41:10 2013 +0300
Move OS X sandbox flag to config_features.h
Change-Id: I189fa06d13a78bcaa8e17b32756076473ced3641
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3437e13..29da64c 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -80,4 +80,12 @@
#define HAVE_FEATURE_AVAHI 0
+/* MACOSX_SANDBOX - whether LibreOffice runs in an OS X sandbox
+ *
+ * When building LibreOffice for distribution through the Mac App Store,
+ * it must be sandboxed.
+ */
+
+#define HAVE_FEATURE_MACOSX_SANDBOX 0
+
#endif
diff --git a/configure.ac b/configure.ac
index 9eb04ea..ade9c26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2742,6 +2742,7 @@ if test $_os = Darwin; then
AC_MSG_ERROR([OS X sandboxing requires code signing])
elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" =
yes; then
ENABLE_MACOSX_SANDBOX=YES
+AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX)
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a6888b5..137dbac 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -598,7 +598,7 @@ void Desktop::Init()
OfficeIPCThread::Status aStatus =
OfficeIPCThread::EnableOfficeIPCThread();
if ( aStatus == OfficeIPCThread::IPC_STATUS_PIPE_ERROR )
{
-#ifdef MACOSX
+#if HAVE_FEATURE_MACOSX_SANDBOX
// In a sandboxed LO, on 10.8.2 at least, creating the
// Unix domain socket fails. Ignore that as hopefully
// people running a sandboxed LO won't attempt starting it
@@ -1159,7 +1159,7 @@ namespace {
void restartOnMac(bool passArguments) {
#if defined MACOSX
OfficeIPCThread::DisableOfficeIPCThread();
-#ifdef ENABLE_MACOSX_SANDBOX
+#if HAVE_FEATURE_MACOSX_SANDBOX
(void) passArguments; // avoid warnings
ResMgr *resMgr = Desktop::GetDesktopResManager();
OUString aMessage = OUString( String( ResId( STR_LO_MUST_BE_RESTARTED,
*resMgr )));
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 47d6e6e..c489ee4 100644
--- a/solenv/gbuild/gbuild.mk
+++
[Libreoffice-commits] core.git: 2 commits - sd/Library_sd.mk sd/source sw/qa writerfilter/source
sd/Library_sd.mk |8
sd/source/ui/remotecontrol/AvahiNetworkService.cxx |2
sd/source/ui/remotecontrol/avahi-common/thread-watch.c | 191 +
sd/source/ui/remotecontrol/avahi-common/thread-watch.h | 82 +++
sw/qa/extras/rtfimport/data/groupshape-notext.rtf | 71 ++
sw/qa/extras/rtfimport/rtfimport.cxx |1
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
8 files changed, 359 insertions(+), 2 deletions(-)
New commits:
commit e849f5d84a4bc35a241c2d1231b48c57c43ecce4
Author: Miklos Vajna
Date: Fri Jul 26 11:57:34 2013 +0200
RTF import: fix groupshape import when shapes don't contain text
Without this, the groupshape itself was created, not it had no child
shapes.
Change-Id: I5d3276498eb3ffe840f3d42dad16661849596da4
diff --git a/sw/qa/extras/rtfimport/data/groupshape-notext.rtf
b/sw/qa/extras/rtfimport/data/groupshape-notext.rtf
new file mode 100644
index 000..98d3c8b
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/groupshape-notext.rtf
@@ -0,0 +1,71 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
+{\shpgrp
+{\*\shpinst\shpleft1058\shptop353\shpright3443\shpbottom1148\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1026
+{\sp
+{\sn groupLeft}
+{\sv 2475}
+}
+{\sp
+{\sn groupTop}
+{\sv 1770}
+}
+{\sp
+{\sn groupRight}
+{\sv 4860}
+}
+{\sp
+{\sn groupBottom}
+{\sv 2565}
+}
+{\shp
+{\*\shpinst\shplid1027
+{\sp
+{\sn relLeft}
+{\sv 2475}
+}
+{\sp
+{\sn relTop}
+{\sv 1770}
+}
+{\sp
+{\sn relRight}
+{\sv 3285}
+}
+{\sp
+{\sn relBottom}
+{\sv 2565}
+}
+{\sp
+{\sn shapeType}
+{\sv 2}
+}
+}
+}
+{\shp
+{\*\shpinst\shplid1028
+{\sp
+{\sn relLeft}
+{\sv 3900}
+}
+{\sp
+{\sn relTop}
+{\sv 1770}
+}
+{\sp
+{\sn relRight}
+{\sv 4860}
+}
+{\sp
+{\sn relBottom}
+{\sv 2565}
+}
+{\sp
+{\sn shapeType}
+{\sv 5}
+}
+}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index a25564d..eabdd69 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -294,6 +294,7 @@ void Test::run()
{"fdo47802.rtf", &Test::testFdo47802},
{"fdo39001.rtf", &Test::testFdo39001},
{"groupshape.rtf", &Test::testGroupshape},
+{"groupshape-notext.rtf", &Test::testGroupshape},
{"fdo66565.rtf", &Test::testFdo66565},
{"fdo54900.rtf", &Test::testFdo54900},
{"fdo64637.rtf", &Test::testFdo64637},
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 840c2c2..56e1759 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1327,6 +1327,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_SHP:
m_bNeedCrOrig = m_bNeedCr;
m_aStates.top().nDestinationState = DESTINATION_SHAPE;
+m_aStates.top().bInShape = true;
break;
case RTF_SHPINST:
m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION;
@@ -3930,7 +3931,8 @@ int RTFDocumentImpl::popState()
break;
case DESTINATION_PICPROP:
case DESTINATION_SHAPEINSTRUCTION:
-if (!m_bObject && !aState.bInListpicture &&
!m_aStates.top().bHadShapeText && !m_aStates.top().bInShapeGroup)
+// Don't trigger a shape import in case we're only leaving the
\shpinst of the groupshape itself.
+if (!m_bObject && !aState.bInListpicture && !aState.bHadShapeText
&& !(aState.bInShapeGroup && !aState.bInShape))
m_pSdrImport->resolve(m_aStates.top().aShape, true);
break;
case DESTINATION_BOOKMARKSTART:
@@ -4808,6 +4810,7 @@ RTFParserState::RTFParserState(RTFDocumentImpl
*pDocumentImpl)
bInBackground(false),
bHadShapeText(false),
bInShapeGroup(false),
+bInShape(false),
bCreatedShapeGroup(false),
bStartedTrackchange(false)
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d55572e..86b6912 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -263,6 +263,7 @@ namespace writerfilter {
bool bHadShapeText;
bool bInShapeGroup; ///< If we're inside a \shpgrp group.
+bool bInShape; ///< If we're inside a \shp group.
bool bCreatedShapeGroup; ///< A GroupShape was created and
pushed to the parent stack.
bool bStartedTrackchange; ///< Track change is started, need
to end it before popping.
};
commit af1ce3de97a6c1d583f82558
[Libreoffice-commits] core.git: framework/source
framework/source/helper/titlebarupdate.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 02931dc8c7ca01c536a12e213b3d728632d5d4c0
Author: Fridrich Å trba
Date: Fri Jul 26 12:51:27 2013 +0200
ouch
Change-Id: I927a688c28121d084bf3fd9a57dd1a9c2501a407
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index cac2298..c62d48b 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -186,6 +186,7 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference< css::fr
sApplicationID += OUString(sal_Unicode('-'));
sApplicationID += sDesktopName.toAsciiLowerCase();
#endif
+#endif
}
catch(const css::uno::Exception&)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp |4
src/lib/PolygonUtils.cpp |5 -
src/lib/TableInfo.h|3 ---
3 files changed, 12 deletions(-)
New commits:
commit 938e918d3a02dd2b1f741ca65c70c61e9e8bf7bb
Author: David Tardon
Date: Fri Jul 26 12:49:11 2013 +0200
drop pragmas disabling warnings
If there is (still) a problem, I would rather fix it than hide it.
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 6cad408..8836376 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -39,10 +39,6 @@
#include "PolygonUtils.h"
#include "Coordinate.h"
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-
WPXBinaryData &libmspub::MSPUBCollector::addEOTFont(const WPXString &name)
{
m_embeddedFonts.push_back(EmbeddedFontInfo(name));
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index 29baf5a..bd79064 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -42,11 +42,6 @@
#define M_PI 3.14159265358979323846
#endif
-// FIXME: Do something better than the following workaround
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-
using namespace libmspub;
const Vertex LINE_VERTICES[] =
diff --git a/src/lib/TableInfo.h b/src/lib/TableInfo.h
index 2dc1d16..2a1c65f 100644
--- a/src/lib/TableInfo.h
+++ b/src/lib/TableInfo.h
@@ -28,9 +28,6 @@
#ifndef __TABLEINFO_H__
#define __TABLEINFO_H__
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
namespace libmspub
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/helper/titlebarupdate.cxx | 34 +
1 file changed, 6 insertions(+), 28 deletions(-)
New commits:
commit f277d2a8caee4b15a518a26a3d1c064a9a3a1a62
Author: Fridrich Å trba
Date: Fri Jul 26 12:43:29 2013 +0200
Don't dupplicate logic so that one can fix possible bugs only once
Change-Id: I58744a93d3edb3002e9a71c22e0d492cb9277e73
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index a3e929a..cac2298 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -154,33 +154,7 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference< css::fr
OUString aModuleId = xModuleManager->identify(xFrame);
OUString sDesktopName;
-#if defined(UNX) && !defined(MACOSX)
-if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument"))
)
-sDesktopName = OUString("writer");
-else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
-sDesktopName = OUString("calc");
-else if ( aModuleId ==
"com.sun.star.presentation.PresentationDocument" )
-sDesktopName = OUString("impress");
-else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
-sDesktopName = OUString("draw");
-else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
-sDesktopName = OUString("math");
-else if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser"))
)
-sDesktopName = OUString("base");
-else
-sDesktopName = OUString("startcenter");
-sApplicationID =
utl::ConfigManager::getProductName().toAsciiLowerCase();
-sApplicationID += OUString(sal_Unicode('-'));
-sApplicationID += sDesktopName;
-#elif defined(WNT)
+#if !defined(MACOSX)
if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument"))
||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument"))
||
@@ -203,10 +177,14 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference< css::fr
sDesktopName = OUString("Base");
else
sDesktopName = OUString("Startcenter");
-
+#if defined(WNT)
// We use a hardcoded product name matching the registry keys so
applications can be associated with file types
sApplicationID = "TheDocumentFoundation.LibreOffice.";
sApplicationID += sDesktopName;
+#else
+sApplicationID =
utl::ConfigManager::getProductName().toAsciiLowerCase();
+sApplicationID += OUString(sal_Unicode('-'));
+sApplicationID += sDesktopName.toAsciiLowerCase();
#endif
}
catch(const css::uno::Exception&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 61544, which changed state. Bug 61544 Summary: UI: Some fields don't fit into Options dialog https://bugs.freedesktop.org/show_bug.cgi?id=61544 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/ui/sidebar/PagePropertyPanel.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d7c2bf91978289b5cdb4705da30c3f81ae94b685
Author: Armin Le Grand
Date: Fri Jul 26 08:28:40 2013 +
Correction of scope for if
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx
b/sw/source/ui/sidebar/PagePropertyPanel.cxx
index 4cbe7f2..e73e6dd 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx
@@ -832,7 +832,7 @@ void PagePropertyPanel::ChangeColumnImage( const sal_uInt16
nColumnType )
void PagePropertyPanel::StartUndo()
{
-if ( mxUndoManager.is() );
+if ( mxUndoManager.is() )
{
mxUndoManager->enterUndoContext( A2S("") );
}
@@ -841,7 +841,7 @@ void PagePropertyPanel::StartUndo()
void PagePropertyPanel::EndUndo()
{
-if ( mxUndoManager.is() );
+if ( mxUndoManager.is() )
{
mxUndoManager->leaveUndoContext();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 49 --- 1 file changed, 27 insertions(+), 22 deletions(-) New commits: commit 324fff97a1713625e2def0f973462fb0a11290fb Author: Caolán McNamara Date: Fri Jul 26 11:01:34 2013 +0100 Related: fdo#61544 lessen height of impress options Change-Id: Ic74657943cfcb2e71944d0749de94868e24b1446 diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index ea00ade..71ca5d9 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -1,6 +1,13 @@ + +5 +200 +5 +1 +1 + True False @@ -365,9 +372,11 @@ False True 6 +12 +True - -Always with current page + +Enable remote control True True False @@ -383,8 +392,8 @@ - -Enable remote control + +Enable Presenter Console True True False @@ -393,15 +402,15 @@ True -0 -1 +1 +0 1 1 - -Enable Presenter Console + +Always with current page True True False @@ -411,11 +420,14 @@ 0 -2 +1 1 1 + + + @@ -595,12 +607,6 @@ - - - - - - True False @@ -627,6 +633,12 @@ 1 + + + + + + @@ -723,11 +735,4 @@ - -5 -200 -5 -1 -1 - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source solenv/bin
scp2/source/base/folderitem_base.scp |2 +- scp2/source/calc/folderitem_calc.scp |2 +- scp2/source/draw/folderitem_draw.scp |2 +- scp2/source/impress/folderitem_impress.scp|2 +- scp2/source/math/folderitem_math.scp |2 +- scp2/source/ooo/folderitem_ooo.scp|4 ++-- scp2/source/writer/folderitem_writer.scp |2 +- solenv/bin/modules/installer/windows/idtglobal.pm |2 +- 8 files changed, 9 insertions(+), 9 deletions(-) New commits: commit fc999e60af23817e3689bfd423146915a7c2c7f4 Author: Fridrich Å trba Date: Fri Jul 26 11:32:58 2013 +0200 Miscellaneous belts and braces around MsiShortcutProperty table These two strings are non-nullable so fail if they are null Change-Id: I7ea1a8faff96aca54f6bad5e811841f58aadd382 (cherry picked from commit 60c19683b5897beefa0e799b7efdc3e2b4da528e) Shorten the idetifiers a bit not to be more the 32 chars Change-Id: I5ee50ae740aa113670dad97067e78e063cca1a61 (cherry picked from commit 4155bc56ad2910d8acc5d6468eb1ee2a3cffcd20) Reviewed-on: https://gerrit.libreoffice.org/5121 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 7c5420b..2da4321 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sbase ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End -FolderItemProperty git_Folderitemproperty_Sbase_AppID +FolderItemProperty gid_Fip_Sbase_AppID ShortcutID = gid_Folderitem_Sbase; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Base"; diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index a5de033..83dd82b 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Scalc ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End -FolderItemProperty git_Folderitemproperty_Scalc_AppID +FolderItemProperty gid_Fip_Scalc_AppID ShortcutID = gid_Folderitem_Scalc; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Calc"; diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 16b19b0..ba59ea7 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sdraw ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End -FolderItemProperty git_Folderitemproperty_Sdraw_AppID +FolderItemProperty gid_Fip_Sdraw_AppID ShortcutID = gid_Folderitem_Sdraw; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Draw"; diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 5419044..fb5c136 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Simpress ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End -FolderItemProperty git_Folderitemproperty_Simpress_AppID +FolderItemProperty gid_Fip_Simpress_AppID ShortcutID = gid_Folderitem_Simpress; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Impress"; diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 5ba71cc..127773f 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Smath ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH); End -FolderItemProperty git_Folderitemproperty_Smath_AppID +FolderItemProperty gid_Fip_Smath_AppID ShortcutID = gid_Folderitem_Smath; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Math"; diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index 1a1b52a..de77ba1 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -35,7 +35,7 @@ FolderItem gid_Folderitem_LibreOffice Parameter = ""; End -FolderItemProperty git_Folderitemproperty_LibreOffice_AppID +FolderItemProperty gid_Fip_LibreOffice_AppID ShortcutID = gid_Folderitem_LibreOffice; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Startcenter"; @@ -59,7 +59,7 @@ FolderItem gid_Folderitem_Soffice_Desktop ComponentCondition = "CREATEDESKTOPLINK=1"; End -FolderItemProperty git_Folderitemproperty_Soffice_Desktop_AppID +FolderItemProperty gid_Fip_Soffice_Desktop_AppID ShortcutID = gid_Folderitem_Soffice_Desktop; Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Startcenter"; diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index b4aaee2.
[Libreoffice-commits] core.git: 2 commits - scp2/source solenv/bin
scp2/source/base/folderitem_base.scp |2 +-
scp2/source/calc/folderitem_calc.scp |2 +-
scp2/source/draw/folderitem_draw.scp |2 +-
scp2/source/impress/folderitem_impress.scp|2 +-
scp2/source/math/folderitem_math.scp |2 +-
scp2/source/ooo/folderitem_ooo.scp|4 ++--
scp2/source/writer/folderitem_writer.scp |2 +-
solenv/bin/modules/installer/windows/idtglobal.pm |2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 60c19683b5897beefa0e799b7efdc3e2b4da528e
Author: Fridrich Å trba
Date: Fri Jul 26 11:32:58 2013 +0200
These two strings are non-nullable so fail if they are null
Change-Id: I7ea1a8faff96aca54f6bad5e811841f58aadd382
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index d3495c9..8cbfcb2 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -479,7 +479,7 @@ sub write_idt_header
{
$oneline =
"MsiShortcutProperty\tShortcut_\tPropertyKey\tPropVariantValue\n";
push(@{$idtref}, $oneline);
-$oneline = "s72\ts72\tS255\tS255\n";
+$oneline = "s72\ts72\ts255\ts255\n";
push(@{$idtref}, $oneline);
$oneline = "MsiShortcutProperty\tMsiShortcutProperty\n";
push(@{$idtref}, $oneline);
commit 4155bc56ad2910d8acc5d6468eb1ee2a3cffcd20
Author: Fridrich Å trba
Date: Fri Jul 26 11:29:41 2013 +0200
Shorten the idetifiers a bit not to be more the 32 chars
Change-Id: I5ee50ae740aa113670dad97067e78e063cca1a61
diff --git a/scp2/source/base/folderitem_base.scp
b/scp2/source/base/folderitem_base.scp
index 7c5420b..2da4321 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sbase
ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
End
-FolderItemProperty git_Folderitemproperty_Sbase_AppID
+FolderItemProperty gid_Fip_Sbase_AppID
ShortcutID = gid_Folderitem_Sbase;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Base";
diff --git a/scp2/source/calc/folderitem_calc.scp
b/scp2/source/calc/folderitem_calc.scp
index a5de033..83dd82b 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Scalc
ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
End
-FolderItemProperty git_Folderitemproperty_Scalc_AppID
+FolderItemProperty gid_Fip_Scalc_AppID
ShortcutID = gid_Folderitem_Scalc;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
diff --git a/scp2/source/draw/folderitem_draw.scp
b/scp2/source/draw/folderitem_draw.scp
index 16b19b0..ba59ea7 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sdraw
ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
End
-FolderItemProperty git_Folderitemproperty_Sdraw_AppID
+FolderItemProperty gid_Fip_Sdraw_AppID
ShortcutID = gid_Folderitem_Sdraw;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
diff --git a/scp2/source/impress/folderitem_impress.scp
b/scp2/source/impress/folderitem_impress.scp
index 5419044..fb5c136 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Simpress
ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
End
-FolderItemProperty git_Folderitemproperty_Simpress_AppID
+FolderItemProperty gid_Fip_Simpress_AppID
ShortcutID = gid_Folderitem_Simpress;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
diff --git a/scp2/source/math/folderitem_math.scp
b/scp2/source/math/folderitem_math.scp
index 5ba71cc..127773f 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Smath
ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
End
-FolderItemProperty git_Folderitemproperty_Smath_AppID
+FolderItemProperty gid_Fip_Smath_AppID
ShortcutID = gid_Folderitem_Smath;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Math";
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index 1a1b52a..de77ba1 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -35,7 +35,7 @@ FolderItem gid_Folderitem_LibreOffice
Parameter = "";
End
-FolderItemProperty git_Folderitemproperty_LibreOffice_AppID
+FolderItemProperty gid_Fip_LibreOffice_AppID
ShortcutID = gid_Folderitem_LibreOffice;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Startcenter";
@@ -59,7 +59,7 @@ FolderItem gid_Folderitem_Soffice_De
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/n820504.rtf | 37
sw/qa/extras/rtfimport/rtfimport.cxx| 10 +++
writerfilter/source/rtftok/rtfsdrimport.cxx |2 +
3 files changed, 49 insertions(+)
New commits:
commit 50a76af9d1b6cc1b02c856c2e06bc18d849ec2d3
Author: Miklos Vajna
Date: Thu Jul 25 18:12:51 2013 +0200
Related: bnc#820504 RTF import: don't anchor shapes TO_PAGE
This is the RTF equivalent of f5b7acac624f07fa95835b6054b8d295901bb1dd,
which avoided TO_PAGE-anchored shapes in the VML importer.
Change-Id: I58a5cdb311ac43ddba00bc441005fb37a4899cee
diff --git a/sw/qa/extras/rtfimport/data/n820504.rtf
b/sw/qa/extras/rtfimport/data/n820504.rtf
new file mode 100644
index 000..6d2d88e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n820504.rtf
@@ -0,0 +1,37 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
+{\shp
+{\*\shpinst\shpleft1295\shptop-212\shpright2090\shpbottom598\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1027
+{\sp
+{\sn shapeType}
+{\sv 2}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn rotation}
+{\sv 2949120}
+}
+{\sp
+{\sn fRecolorFillAsPicture}
+{\sv 0}
+}
+{\sp
+{\sn fUseShapeAnchor}
+{\sv 0}
+}
+{\sp
+{\sn lidRegroup}
+{\sv 1}
+}
+}
+{\shprslt
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 93489d7..a25564d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -156,6 +156,7 @@ public:
void testFdo66565();
void testFdo54900();
void testFdo64637();
+void testN820504();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -296,6 +297,7 @@ void Test::run()
{"fdo66565.rtf", &Test::testFdo66565},
{"fdo54900.rtf", &Test::testFdo54900},
{"fdo64637.rtf", &Test::testFdo64637},
+{"n820504.rtf", &Test::testN820504},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1442,6 +1444,14 @@ void Test::testFdo64637()
CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getProperty(xPropertySet,
"Company"));
}
+void Test::testN820504()
+{
+// The shape was anchored at-page instead of at-character (that's
incorrect as Word only supports at-character and as-character).
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
getProperty(xDraws->getByIndex(0), "AnchorType"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 78c34d9..3286c9d 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include // NS_ooxml namespace
#include
@@ -650,6 +651,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose)
// Sets the ShadowFormat UNO property.
oox::PropertySet(xShape).setProperties(aPropMap);
}
+xPropertySet->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
}
if (m_rImport.isInBackground())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 56960, which changed state. Bug 56960 Summary: FILEOPEN particular .xlsx shows cell border lines with wrong FORMATTING (too thick) https://bugs.freedesktop.org/show_bug.cgi?id=56960 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/docrecovery.cxx |2 +-
svx/source/unodraw/recoveryui.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6b0f903464d5f1c9483a1aac242f77b059bd3716
Author: Stephan Bergmann
Date: Fri Jul 26 11:11:14 2013 +0200
More "Keep passing XComponentContext into officecfg:: wrapper fns"
Change-Id: Ie891f1afe8db2f3ac2f01e287e1caae4de3c3246
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index e3c57b4..316a2b0 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -971,7 +971,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
FreeResource();
-bool
bCrashRepEnabled(officecfg::Office::Recovery::CrashReporter::Enabled::get());
+bool
bCrashRepEnabled(officecfg::Office::Recovery::CrashReporter::Enabled::get(pCore->getComponentContext()));
m_bRecoveryOnly = !bCrashRepEnabled;
PluginProgress* pProgress = new PluginProgress( &m_aProgrParent,
pCore->getComponentContext() );
diff --git a/svx/source/unodraw/recoveryui.cxx
b/svx/source/unodraw/recoveryui.cxx
index e6d4c33..21c1ac4 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -276,7 +276,7 @@ void RecoveryUI::impl_doRecovery()
{
bool bRecoveryOnly( false );
-bool
bCrashRepEnabled(officecfg::Office::Recovery::CrashReporter::Enabled::get());
+bool
bCrashRepEnabled(officecfg::Office::Recovery::CrashReporter::Enabled::get(m_xContext));
bRecoveryOnly = !bCrashRepEnabled;
// create core service, which implements the real "emergency save"
algorithm.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sddll.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit aa03340dcb5f832afe760e0d498238c3643f52c6 Author: Tor Lillqvist Date: Fri Jul 26 11:54:00 2013 +0300 Don't bother with remote control support when headless (like in unit tests) We got mysterious dbus and/or Avahi -related crashes in sd unit tests otherwise. Change-Id: Ia8beb5ca942f757eb423cb30b9000d3b52f5e920 diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index d76fedf..a55ea93 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include "sddll.hxx" #include "DrawDocShell.hxx" @@ -116,7 +117,8 @@ void SdDLL::Init() // register your exotic remote controlls here #ifdef ENABLE_SDREMOTE -RegisterRemotes(); +if ( !Application::IsHeadlessModeRequested() ) +RegisterRemotes(); #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote/Communication/CommandTransmitter.h |5 +
ios/iosremote/iosremote/Communication/CommandTransmitter.m |9 +
ios/iosremote/iosremote/slideShow_vc.m |6 ++
3 files changed, 20 insertions(+)
New commits:
commit 666fe3e96c6715e455c6ab3e509e5e1c271cf9d9
Author: Siqi LIU
Date: Fri Jul 26 10:52:41 2013 +0200
send proper pointer visibility command when touch begins/ ends
Change-Id: I2427f1857ca8189db39c20009103d93b935dd5bb
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
index f0243b3..b93cf7b 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
@@ -27,6 +27,11 @@
- (void) startPresentation;
- (void) stopPresentation;
+// Update pointer position
- (void) pointerCoordination:(CGPoint) aPoint;
+// Set pointer to the proper position and set it to visible on screen.
+- (void) setPointerVisibleAt: (CGPoint)aPoint;
+// Dismiss the pointer when touch ended.
+- (void) setPointerDismissed;
@end
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
index 07cdc9a..111c1ec 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
@@ -48,6 +48,15 @@
[self.client sendCommand:[NSString
stringWithFormat:@"pointer_coordination\n%f\n%f\n\n", aPoint.x, aPoint.y]];
}
+- (void) setPointerVisibleAt: (CGPoint)aPoint
+{
+[self.client sendCommand:[NSString
stringWithFormat:@"pointer_started\n%f\n%f\n\n", aPoint.x, aPoint.y]];
+}
+
+- (void) setPointerDismissed
+{
+[self.client sendCommand:@"pointer_dismissed\n\n"];
+}
/**
* Blank the screen to the default colour (set server-side), which is
diff --git a/ios/iosremote/iosremote/slideShow_vc.m
b/ios/iosremote/iosremote/slideShow_vc.m
index f66e279..5fb3350 100644
--- a/ios/iosremote/iosremote/slideShow_vc.m
+++ b/ios/iosremote/iosremote/slideShow_vc.m
@@ -191,6 +191,11 @@
CGPoint loc = [touch locationInView:self.touchPointerImage];
if (loc.x >= 0 && loc.x <= self.touchPointerImage.frame.size.width
&& loc.y >= 0 && loc.y <=
self.touchPointerImage.frame.size.height){
+CGPoint pointerInPercentage;
+pointerInPercentage.x = loc.x /
self.touchPointerImage.frame.size.width;
+pointerInPercentage.y = loc.y /
self.touchPointerImage.frame.size.height;
+[self.comManager.transmitter
setPointerVisibleAt:pointerInPercentage];
+
CGPoint p;
p.x = loc.x + self.touchPointerImage.frame.origin.x;
p.y = loc.y + self.touchPointerImage.frame.origin.y;
@@ -230,6 +235,7 @@
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
{
[self.movingPointer setHidden:YES];
+[self.comManager.transmitter setPointerDismissed];
}
#pragma mark - System defaults
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo65718.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 25 +
sw/source/filter/ww8/docxattributeoutput.cxx | 20 +---
3 files changed, 38 insertions(+), 7 deletions(-)
New commits:
commit 6be2b0fbf9da9963ac18d33f145e06d684136a26
Author: Adam Co
Date: Thu Jul 25 18:45:20 2013 +0300
fdo#65718 : fix for exporting of image distance from text
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Id33a9d491b2d89b05189b566641dadcef3176dc3
diff --git a/sw/qa/extras/ooxmlexport/data/fdo65718.docx
b/sw/qa/extras/ooxmlexport/data/fdo65718.docx
new file mode 100644
index 000..0af4f90
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo65718.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6fb397f..97015da 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -41,6 +41,8 @@
#include
#include
+#define EMU_TO_MM100(EMU) (EMU / 360)
+
class Test : public SwModelTestBase
{
public:
@@ -101,6 +103,7 @@ public:
void testGrabBag();
void testFdo66781();
void testFdo60990();
+void testFdo65718();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -180,6 +183,7 @@ void Test::run()
{"grabbag.docx", &Test::testGrabBag},
{"fdo66781.docx", &Test::testFdo66781},
{"fdo60990.odt", &Test::testFdo60990},
+{"fdo65718.docx", &Test::testFdo65718},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1063,6 +1067,27 @@ void Test::testFdo60990()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00FF00),
getProperty(getRun(xParagraph, 1), "CharColor"));
}
+void Test::testFdo65718()
+{
+// The problem was that the exporter always exported values of "0" for an
images distance from text.
+// the actual attributes where 'distT', 'distB', 'distL', 'distR'
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference xPropertySet(xDraws->getByIndex(0),
uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(0) ),
getProperty(xPropertySet, "TopMargin") );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(0) ),
getProperty(xPropertySet, "BottomMargin") );
+
+// Going to do '+1' because the 'getProperty' return 318 (instead of 317.5)
+// I think this is because it returns an integer, instead of a float.
+// The actual exporting to DOCX exports the correct value (114300 = 317.5
* 360)
+// The exporting to DOCX uses the 'SvxLRSpacing' that stores the value in
TWIPS (180 TWIPS)
+// However, the 'LeftMargin' property is an integer property that holds
that value in 'MM100' (should hold 317.5, but it is 318)
+// So I had to add the hack of the '+1' to make the test-case pass
+CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(114300) + 1 ),
getProperty(xPropertySet, "LeftMargin") );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(114300) + 1),
getProperty(xPropertySet, "RightMargin") );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d79897d..16fc3b0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2295,17 +2295,20 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
if ( aRelId.isEmpty() )
return;
-m_pSerializer->startElementNS( XML_w, XML_drawing,
-FSEND );
+m_pSerializer->startElementNS( XML_w, XML_drawing, FSEND );
+
+const SvxLRSpaceItem pLRSpaceItem = pFrmFmt->GetLRSpace(false);
+const SvxULSpaceItem pULSpaceItem = pFrmFmt->GetULSpace(false);
+
bool isAnchor = pFrmFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
if( isAnchor )
{
::sax_fastparser::FastAttributeList* attrList =
m_pSerializer->createAttrList();
attrList->add( XML_behindDoc, pFrmFmt->GetOpaque().GetValue() ? "0" :
"1" );
-attrList->add( XML_distT, "0" );
-attrList->add( XML_distB, "0" );
-attrList->add( XML_distL, "0" );
-attrList->add( XML_distR, "0" );
+attrList->add( XML_distT, OString::valueOf( TwipsToEMU(
pULSpaceItem.GetUpper() ) ).getStr( ) );
+attrList->add( XML_distB, OString::valueOf( TwipsToEMU(
pULSpaceItem.GetLower() ) ).getStr( ) );
+attrList->add( XML_distL, OString::valueOf( TwipsToEMU(
pLRSpaceItem.GetLeft() ) ).getStr( ) );
+attrList->add( XML_distR, OString::valueOf( TwipsToEMU(
pLRSpaceItem.GetRight() ) ).getStr( ) );
attrList->add( XML_simplePos, "0" );
attrList->add( XML_locked, "0" );
attrList->add( X
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2b.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e9d2993bd7a5e5dd354b2d6e8f1ac7d5fc9c7a33
Author: Gergo Mocsi
Date: Fri Jul 26 10:29:00 2013 +0200
GSOC work, fix runtime crash
Fixes runtime crash by not checking the string length in "Autoclose Quotes"
funtion.
Change-Id: I15e58a0fd487ce86b832452a562406b8155b2641
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index d75aae9..c533ebc 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -507,7 +507,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-if( aLine[aLine.getLength()-1] != '"' &&
(aPortions[aPortions.size()-1].tokenType != 4) )
+if( aLine.getLength() > 0 && aLine[aLine.getLength()-1] != '"' &&
(aPortions[aPortions.size()-1].tokenType != 4) )
{
GetEditView()->InsertText(OUString("\""));
//leave the cursor on it's place: inside the two double quotes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/vcl vcl/source
include/vcl/layout.hxx |1
vcl/source/window/layout.cxx | 58 ++-
2 files changed, 47 insertions(+), 12 deletions(-)
New commits:
commit a0fbb8b460114838a1c3fabb57274b04a78d3182
Author: Caolán McNamara
Date: Thu Jul 25 16:58:36 2013 +0100
Resolves: fdo#61544 improve handling of grid's not enough layout space
(cherry picked from commit b64adf65afb1cfe1bd48fed0d71ac333ad962776)
Conflicts:
vcl/source/window/layout.cxx
Change-Id: I9a73e90f639bb853b67daa98d5daac155dab5900
Reviewed-on: https://gerrit.libreoffice.org/5119
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 5237c72..dd2c0bc 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -388,6 +388,7 @@ public:
private:
void calcMaxs(const array_type &A, std::vector &rWidths,
std::vector &rHeights) const;
+Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32
nColSpacing) const;
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size &rAllocation);
public:
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index bc92d8c..ae79e8f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -984,6 +984,11 @@ VclGrid::Value accumulateValues(const VclGrid::Value &i,
const VclGrid::Value &j
Size VclGrid::calculateRequisition() const
{
+return calculateRequisitionForSpacings(get_row_spacing(),
get_column_spacing());
+}
+
+Size VclGrid::calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32
nColSpacing) const
+{
array_type A = assembleGrid();
if (isNullGrid(A))
@@ -1004,7 +1009,7 @@ Size VclGrid::calculateRequisition() const
nTotalWidth = std::accumulate(aWidths.begin(), aWidths.end(), Value(),
accumulateValues).m_nValue;
}
-nTotalWidth += get_column_spacing() * (aWidths.size()-1);
+nTotalWidth += nColSpacing * (aWidths.size()-1);
long nTotalHeight = 0;
if (get_row_homogeneous())
@@ -1017,7 +1022,7 @@ Size VclGrid::calculateRequisition() const
nTotalHeight = std::accumulate(aHeights.begin(), aHeights.end(),
Value(), accumulateValues).m_nValue;
}
-nTotalHeight += get_row_spacing() * (aHeights.size()-1);
+nTotalHeight += nRowSpacing * (aHeights.size()-1);
return Size(nTotalWidth, nTotalHeight);
}
@@ -1041,7 +1046,12 @@ void VclGrid::setAllocation(const Size& rAllocation)
calcMaxs(A, aWidths, aHeights);
}
-long nAvailableWidth = rAllocation.Width() - (get_column_spacing() *
nMaxX);
+sal_Int32 nColSpacing(get_column_spacing());
+sal_Int32 nRowSpacing(get_row_spacing());
+
+long nAvailableWidth = rAllocation.Width();
+if (nMaxX)
+nAvailableWidth -= nColSpacing * (nMaxX - 1);
if (get_column_homogeneous())
{
for (sal_Int32 x = 0; x < nMaxX; ++x)
@@ -1055,9 +1065,20 @@ void VclGrid::setAllocation(const Size& rAllocation)
++nExpandables;
long nExtraWidthForExpanders = nExpandables ? (rAllocation.Width() -
aRequisition.Width()) / nExpandables : 0;
-if (rAllocation.Width() < aRequisition.Width())
+//We don't fit and there is no volunteer to be shrunk
+if (!nExpandables && rAllocation.Width() < aRequisition.Width())
{
-long nExtraWidth = (rAllocation.Width() - aRequisition.Width() -
nExtraWidthForExpanders * nExpandables) / nMaxX;
+//first reduce spacing, to a min of 3
+while (nColSpacing >= 6)
+{
+nColSpacing /= 2;
+aRequisition = calculateRequisitionForSpacings(nRowSpacing,
nColSpacing);
+if (aRequisition.Width() >= rAllocation.Width())
+break;
+}
+
+//share out the remaining pain to everyone
+long nExtraWidth = (rAllocation.Width() - aRequisition.Width()) /
nMaxX;
for (sal_Int32 x = 0; x < nMaxX; ++x)
aWidths[x].m_nValue += nExtraWidth;
@@ -1071,7 +1092,9 @@ void VclGrid::setAllocation(const Size& rAllocation)
}
}
-long nAvailableHeight = rAllocation.Height() - (get_row_spacing() * nMaxY);
+long nAvailableHeight = rAllocation.Height();
+if (nMaxY)
+nAvailableHeight -= nRowSpacing * (nMaxY - 1);
if (get_row_homogeneous())
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
@@ -1085,9 +1108,20 @@ void VclGrid::setAllocation(const Size& rAllocation)
++nExpandables;
long nExtraHeightForExpanders = nExpandables ? (rAllocation.Height() -
aRequisition.Height()) / nExpandables : 0;
-if (rAllocation.Height() < aRequisition.Height())
+//We don't fit and there is no volunteer to be shrunk
+if (!nExpandables && rAllocation.Height() < aRequisition.Height())
{
-long nEx
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/window/salframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0154460b49d4c46cfca52e2c78dec134c7948b5a
Author: Fridrich Å trba
Date: Fri Jul 26 10:23:47 2013 +0200
Fix MINGW64 build
Change-Id: Ie933fd3853f0c195faaee15620b970e6cb5259d1
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 111bfea..dca67c9 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1925,7 +1925,7 @@ void WinSalFrame::SetApplicationID( const OUString
&rApplicationID )
PROPVARIANT pv;
if ( !rApplicationID.isEmpty() )
{
-hr = InitPropVariantFromString( rApplicationID.getStr(),
&pv );
+hr = InitPropVariantFromString( ( PCWSTR
)rApplicationID.getStr(), &pv );
mbPropertiesStored = TRUE;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-writer-char-borders' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/cube3d.hxx |2 -
include/svx/extrud3d.hxx |2 -
include/svx/lathe3d.hxx |2 -
include/svx/obj3d.hxx|2 -
include/svx/scene3d.hxx |2 -
include/svx/sphere3d.hxx |2 -
include/svx/svdoashp.hxx |2 -
include/svx/svdobj.hxx |2 -
include/svx/svdocapt.hxx |2 -
include/svx/svdocirc.hxx |2 -
include/svx/svdoedge.hxx |2 -
include/svx/svdograf.hxx |2 -
include/svx/svdogrp.hxx |2 -
include/svx/svdomeas.hxx |2 -
include/svx/svdomedia.hxx|2 -
include/svx/svdoole2.hxx |2 -
include/svx/svdopage.hxx |2 -
include/svx/svdopath.hxx |2 -
include/svx/svdorect.hxx |2 -
include/svx/svdotable.hxx|2 -
include/svx/svdotext.hxx |2 -
include/svx/svdouno.hxx |2 -
include/svx/svdovirt.hxx |2 -
svx/source/engine3d/cube3d.cxx |4 +-
svx/source/engine3d/extrud3d.cxx |4 +-
svx/source/engine3d/lathe3d.cxx |4 +-
svx/source/engine3d/obj3d.cxx|4 +-
svx/source/engine3d/scene3d.cxx |4 +-
svx/source/engine3d/sphere3d.cxx |4 +-
svx/source/svdraw/svdedtv2.cxx |9 ++--
svx/source/svdraw/svdmark.cxx| 14 +++
svx/source/svdraw/svdoashp.cxx |4 +-
svx/source/svdraw/svdobj.cxx |4 +-
svx/source/svdraw/svdocapt.cxx |4 +-
svx/source/svdraw/svdocirc.cxx |4 +-
svx/source/svdraw/svdoedge.cxx |4 +-
svx/source/svdraw/svdograf.cxx | 74 ---
svx/source/svdraw/svdogrp.cxx| 10 ++---
svx/source/svdraw/svdomeas.cxx |4 +-
svx/source/svdraw/svdomedia.cxx |4 +-
svx/source/svdraw/svdoole2.cxx |4 +-
svx/source/svdraw/svdopage.cxx |4 +-
svx/source/svdraw/svdopath.cxx | 22 ++-
svx/source/svdraw/svdorect.cxx | 32 +++-
svx/source/svdraw/svdotext.cxx | 12 +++---
svx/source/svdraw/svdouno.cxx|4 +-
svx/source/svdraw/svdovirt.cxx |9 ++--
svx/source/table/svdotable.cxx |4 +-
svx/source/unodraw/unoshape.cxx |4 --
49 files changed, 156 insertions(+), 144 deletions(-)
New commits:
commit a307e03946cca3a8e93b37eb9113721bc4e512bb
Author: Caolán McNamara
Date: Thu Jul 25 20:35:59 2013 +0100
convert TakeObjNamePlural family to OUString
Change-Id: I947e47934677a4f9ced0bfc0db3932bcbbb25f36
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index fc25aae..942f96c 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -80,7 +80,7 @@ public:
// TakeObjName...() is for the display in the UI, for example "3 frames
selected".
virtual OUString TakeObjNameSingul() const;
-virtual void TakeObjNamePlural(String& rName) const;
+virtual OUString TakeObjNamePlural() const;
};
#endif // _E3D_CUBE3D_HXX
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index d24857b..fc94e8c 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -87,7 +87,7 @@ public:
// TakeObjName...() is for the display in the UI (for example "3 frames
selected")
virtual OUString TakeObjNameSingul() const;
-virtual void TakeObjNamePlural(String& rName) const;
+virtual OUString TakeObjNamePlural() const;
// set/get local parameters with geometry regeneration
void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index fe9c607..e765a2d 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -98,7 +98,7 @@ private:
// TakeObjName...() is for the display in the UI, for example "3 frames
selected".
virtual OUString TakeObjNameSingul() const;
-virtual void TakeObjNamePlural(String& rName) const;
+virtual OUString TakeObjNamePlural() const;
// set/get local parameters with geometry recreation
void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew);
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 4628bcd..8195ee3 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -185,7 +185,7 @@ public:
// TakeObjName...() is for the display in the UI, for example "3 frames
selected".
virtual OUString TakeObjNameSingul() const;
-virtual void TakeObjNamePlural(String& rName) const;
+virtual OUString TakeObjNamePlural() const;
sal_uInt16 GetLogicalGroup() { return 0; }
virtual E3dObject* Clone() const;
E3dObject& operator=( const E3dObject& rObj );
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 04273fe..2dd0faa 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -215,7 +215,7 @@ public:
// TakeObjName...() is for the display in the UI, for example "3 frames
selected".
virtual OUString TakeObjNameSingul() const;
-virtual void TakeObjNamePlural(String&
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 35785, which changed state. Bug 35785 Summary: LibreOffice's support of the "recent documents" feature of the Windows 7 Start menu broken https://bugs.freedesktop.org/show_bug.cgi?id=35785 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/inc
svx/inc/pch/precompiled_svx.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit b14688f07f2d2e1e53cf0b99bd2f7a055e2ddb3d Author: Julien Nabet Date: Fri Jul 26 09:41:02 2013 +0200 fdo#46037: oups forgot about pch part in svx Change-Id: Id7de641fdc5ac96163ecfc1542eb8e40e98d283b diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 8f86107..ae8cab2 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -202,7 +202,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/Library_svx.mk svx/source
svx/Library_svx.mk|4 +++
svx/source/dialog/docrecovery.cxx | 45 ++
svx/source/inc/docrecovery.hxx| 10
svx/source/unodraw/recoveryui.cxx | 15 +---
4 files changed, 28 insertions(+), 46 deletions(-)
New commits:
commit 513212eb71ffca09e47025ac82e0203d3df22d4a
Author: Julien Nabet
Date: Fri Jul 26 09:36:53 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in svx
+ sal_Bool -> bool conversion
Change-Id: Id8dc56e61984af599dcd53bb2cc9665db5fa0a1e
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2a51f46..e1e7f45 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Library_set_include,svx,\
$(eval $(call gb_Library_use_sdk_api,svx))
+$(eval $(call gb_Library_use_custom_headers,svx,\
+officecfg/registry \
+))
+
$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index dc1e62c..e3c57b4 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -25,7 +25,6 @@
#include "docrecovery.hxx"
#include "docrecovery.hrc"
-#include
#include
#include
#include
@@ -56,6 +55,7 @@
#include
#include
#include "svtools/treelistentry.hxx"
+#include
namespace svx{
namespace DocRecovery{
@@ -959,11 +959,11 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
, m_pDefButton ( NULL
)
, m_pCore ( pCore
)
, m_eRecoveryState (RecoveryDialog::E_RECOVERY_PREPARED)
-, m_bWaitForUser(sal_False)
-, m_bWaitForCore(sal_False)
-, m_bUserDecideNext (sal_False)
-, m_bWasRecoveryStarted (sal_False)
-, m_bRecoveryOnly (sal_False)
+, m_bWaitForUser(false)
+, m_bWaitForCore(false)
+, m_bUserDecideNext (false)
+, m_bWasRecoveryStarted (false)
+, m_bRecoveryOnly (false)
{
static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 };
m_aFileListLB.SetTabs( &nTabs[0] );
@@ -971,18 +971,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
FreeResource();
-OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" );
-OUString CFG_PATH_CRASHREPORTER( "CrashReporter" );
-OUString CFG_ENTRY_ENABLED( "Enabled" );
-
-sal_Bool bCrashRepEnabled( sal_False );
-css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
-pCore->getComponentContext(),
-CFG_PACKAGE_RECOVERY,
-CFG_PATH_CRASHREPORTER,
-CFG_ENTRY_ENABLED,
-::comphelper::ConfigurationHelper::E_READONLY);
-aVal >>= bCrashRepEnabled;
+bool
bCrashRepEnabled(officecfg::Office::Recovery::CrashReporter::Enabled::get());
m_bRecoveryOnly = !bCrashRepEnabled;
PluginProgress* pProgress = new PluginProgress( &m_aProgrParent,
pCore->getComponentContext() );
@@ -1044,7 +1033,7 @@ short RecoveryDialog::execute()
// This decision will be made inside the NextBtn handler.
m_aNextBtn.Enable(sal_True);
m_aCancelBtn.Enable(sal_True);
-m_bWaitForUser = sal_True;
+m_bWaitForUser = true;
while(m_bWaitForUser)
Application::Yield();
if (m_bUserDecideNext)
@@ -1057,7 +1046,7 @@ short RecoveryDialog::execute()
case RecoveryDialog::E_RECOVERY_IN_PROGRESS :
{
// user decided to start recovery ...
-m_bWasRecoveryStarted = sal_True;
+m_bWasRecoveryStarted = true;
// do it asynchronous (to allow repaints)
// and wait for this asynchronous operation.
m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
@@ -1067,7 +1056,7 @@ short RecoveryDialog::execute()
m_pCore->setUpdateListener(this);
m_pCore->doRecovery();
-m_bWaitForCore = sal_True;
+m_bWaitForCore = true;
while(m_bWaitForCore)
Application::Yield();
@@ -1095,7 +1084,7 @@ short RecoveryDialog::execute()
m_aCancelBtn.Enable(sal_True);
}
- m_bWaitForUser = sal_True;
+ m_bWaitForUser = true;
while(m_bWaitForUser)
Application::Yield();
@@ -1233,7 +1222,7 @@ short RecoveryDialog::execute()
case RecoveryDialog::E_RECOVERY_HANDLED :
{
- m_bWaitForUser = sal_True;
+
[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac
config_host/config_features.h.in | 12
configure.ac |1 -
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 9f8a350c2131f1289f9edb652c8e86e7b806040f
Author: Siqi
Date: Fri Jul 26 09:16:59 2013 +0200
discriptive comments on HAvE_FEATURE_AVAHI and remove unused ac_def
Change-Id: I37183561a264625505036bcc6b945a6b24f05b5a
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index e5d5187..3437e13 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -66,6 +66,18 @@
#define HAVE_FEATURE_OPENCL 0
+/*
+ * Whether the OS has Avahi support,
+ * This library is used for zeroconf service publication on the local network
+ * for the Impress remote control, so that the remote can automatically
+ * discover the running libO instance and its IP address.
+ *
+ * This library should be present on most mordern linux distributions
+ * but not on "all" of them. For now, you should add --enable-avahi for
+ * this to be taken into account. Otherwise the test of its presence
+ * will not take place.
+ */
+
#define HAVE_FEATURE_AVAHI 0
#endif
diff --git a/configure.ac b/configure.ac
index 10ffd2a..b45b175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11392,7 +11392,6 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a
"$enable_avahi" = "yes"; then
PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6.10],
[ENABLE_AVAHI="TRUE"], [ENABLE_AVAHI=""])
if test "$ENABLE_AVAHI" = "TRUE"; then
-AC_DEFINE(ENABLE_AVAHI)
AC_DEFINE(HAVE_FEATURE_AVAHI)
AVAHI_CFLAGS=$(printf '%s' "$AVAHI_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal sw/source
include/sal/log-areas.dox |4 +---
sw/source/core/text/inftxt.cxx |4 ++--
sw/source/ui/app/docstyle.cxx |2 +-
sw/source/ui/fmtui/tmpdlg.cxx |4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit e9ee572198992868e7beae2911446a70aa4b7aee
Author: Zolnai Tamás
Date: Fri Jul 26 08:59:48 2013 +0200
Add more usefull log areas
Change-Id: Ic9d8ee7cee5b1b4b54151825e025e0d4815d3bb1
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 085af00..6ff5372 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -328,14 +328,12 @@ certain functionality.
@section Writer
@li @c sw
-@li @c sw.app.docstyle
@li @c sw.core - Writer core
@li @c sw.docx
@li @c sw.envelp
-@li @c sw.fmtui
@li @c sw.level2
@li @c sw.rtf - .rtf export filter
-@li @c sw.text.txtinfo
+@li @c sw.ui
@li @c sw.uno - Writer UNO interfaces
@li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
@li @c sw.ww8.level2 - further info for sw.ww8
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 39efe1f..2ce4a60 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -370,7 +370,7 @@ void SwTxtSizeInfo::NoteAnimation() const
KSHORT SwTxtSizeInfo::GetAscent() const
{
-SAL_WARN_IF( !GetOut(), "sw.text.txtinfo", "SwTxtSizeInfo::GetAscent()
without m_pOut" );
+SAL_WARN_IF( !GetOut(), "sw.core", "SwTxtSizeInfo::GetAscent() without
m_pOut" );
sal_uInt16 nAscent = ((SwFont*)GetFont())->GetAscent( m_pVsh, *GetOut() );
@@ -382,7 +382,7 @@ KSHORT SwTxtSizeInfo::GetAscent() const
KSHORT SwTxtSizeInfo::GetTxtHeight() const
{
-SAL_WARN_IF( !GetOut(), "sw.text.txtinfo", "SwTxtSizeInfo::GetTxtHeight()
without m_pOut" );
+SAL_WARN_IF( !GetOut(), "sw.core", "SwTxtSizeInfo::GetTxtHeight() without
m_pOut" );
sal_uInt16 nHeight = ((SwFont*)GetFont())->GetHeight( m_pVsh, *GetOut() );
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 886e3cf..740b30f 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1047,7 +1047,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet()
if( nFamily == SFX_STYLE_FAMILY_CHAR )
{
-SAL_WARN_IF(!pCharFmt, "sw.app.docstyle", "Where's
SwCharFmt");
+SAL_WARN_IF(!pCharFmt, "sw.ui", "Where's SwCharFmt");
aCoreSet.Put(pCharFmt->GetAttrSet());
aCoreSet.Put( aBoxInfo );
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 4dc1041..af1c631 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -119,8 +119,8 @@ SwTemplateDlg::SwTemplateDlg(Window*pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ,
"GetTabPageRangesFunc fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )
);
-SAL_WARN_IF(!pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"sw.fmtui", "GetTabPageCreatorFunc fail!");
-SAL_WARN_IF(!pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
"sw.fmtui", "GetTabPageRangesFunc fail!");
+SAL_WARN_IF(!pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"sw.ui", "GetTabPageCreatorFunc fail!");
+SAL_WARN_IF(!pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
"sw.ui", "GetTabPageRangesFunc fail!");
AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
SvtCJKOptions aCJKOptions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
