Re: lightproof and python3.3 (was: Re: [Grammar checking] Using LanguageTool lexicons with Lightproof) new possible
Hi again, On Mon, Dec 17, 2012 at 06:49:55PM +0100, Németh László wrote: It seems, the LinguServiceManager used by the optlingu.cxx (Writing Aids) doesn't know the bundled English package (I have checked on Windows and Linux). I will check the python 3.3 port again. FWIW: With lightproof of 2012-11-23 and python-uno from this night (built against 2.7) this doesn't work either. (doesn't warn, does not appear in writing aids/corrects.) So it *seems* that it's not only a python 3.3 port problem? Regards, Rene P.S: Is the python3.3-capable lightproof also supporting python2 or does it really need python 3.3? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] syslog output from SAL_* messages
On Mon, Dec 17, 2012 at 09:15:21PM +0100, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: i've refreshed my patch for adding possibility to send SAL_* messages to syslog. I have two issues: - am not able to send the ENABLE_SYSLOG definition down to sal/osl/unx/salinit.cxx - if i add calls to SAL_INFO in vcl/headless/headlessinst.cxx like, i see the fprintf but i don't see the SAL_INFO one. Tried with SAL_WARN, same result. What environment variable did you use? SAL_INFO is disabled by default, you need something like SAL_LOG=+INFO.vcl to get it. The trailing newline is not necessary. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||56048 -- 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
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on|56048 | -- 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
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #56 from Roman Eisele b...@eikota.de --- (In reply to comment #55) bug#56048 has been there forever and a day - it belongs better vs. 3.6 I think. Definitely right -- moved bug 56048 to 3.6 MAB list. -- 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
Re: [RFC] syslog output from SAL_* messages
On 12/17/2012 09:15 PM, Riccardo Magliocchetti wrote: i've refreshed my patch for adding possibility to send SAL_* messages to syslog. I have two issues: - am not able to send the ENABLE_SYSLOG definition down to sal/osl/unx/salinit.cxx You need to add it to config_host.mk.in to have it visible in solenv/gbuild/gbuild.mk (or use the newly introduced mechanism of adding a config/config_*.h that you then include in sal/osl/unx/salinit.cxx, removing the change from solenv/gbuild/gbuild.mk again). - if i add calls to SAL_INFO in vcl/headless/headlessinst.cxx like, i see the fprintf but i don't see the SAL_INFO one. Tried with SAL_WARN, same result. Did you configure --enable-dbgutil or at least --enable-debug? Also, the definition of sal_use_syslog in sal/osl/all/log.cxx is in an unnamed namespace, so the extern declaration in sal/osl/unx/salinit.cxx is unrelated (and the code should result in a link error?); so move the definition out of the unnamed namespace. It would be best to place the extern declaration into a header anyway, but it looks like there is no good header directory that would be included from both sal/osl/all and sal/osl/unx, so short of that please at least add comments to the declaration and definition linking those two together across the two .cxx files. And in any case, wrap sal_use_syslog in #ifdef ENABLE_SYSLOG. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] syslog output from SAL_* messages
Hi Miklos, Il 18/12/2012 09:10, Miklos Vajna ha scritto: On Mon, Dec 17, 2012 at 09:15:21PM +0100, Riccardo Magliocchettiriccardo.magliocche...@gmail.com wrote: i've refreshed my patch for adding possibility to send SAL_* messages to syslog. I have two issues: - am not able to send the ENABLE_SYSLOG definition down to sal/osl/unx/salinit.cxx - if i add calls to SAL_INFO in vcl/headless/headlessinst.cxx like, i see the fprintf but i don't see the SAL_INFO one. Tried with SAL_WARN, same result. What environment variable did you use? SAL_INFO is disabled by default, you need something like SAL_LOG=+INFO.vcl to get it. The trailing newline is not necessary. I totally overlooked this :) shouldn't i have seen the WARNs though? In sal/osl/all/log.cxx:87 getEnvironmentVariable +WARN is default when std::getenv(SAL_LOG) == 0. Btw in practice probably doesn't count but shouldn't these be checks against NULL instead of 0? thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtw8esh.cxx | 24 ++--
sw/source/filter/ww8/ww8par3.cxx | 44 ++
2 files changed, 33 insertions(+), 35 deletions(-)
New commits:
commit bc1387714118773b3ac27903080200fc7c9a50d7
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 18 09:56:10 2012 +0100
sw: kill C2U in filter
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 31c3b40..216f132 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -163,12 +163,12 @@ bool WW8Export::MiserableFormFieldExportHack(const
SwFrmFmt rFrmFmt)
uno::Reference lang::XServiceInfo xInfo(xControlModel,
uno::UNO_QUERY);
uno::Referencebeans::XPropertySet xPropSet(xControlModel,
uno::UNO_QUERY);
-if
(xInfo-supportsService(C2U(com.sun.star.form.component.ComboBox)))
+if (xInfo-supportsService(com.sun.star.form.component.ComboBox))
{
DoComboBox(xPropSet);
bHack = true;
}
-else if
(xInfo-supportsService(C2U(com.sun.star.form.component.CheckBox)))
+else if
(xInfo-supportsService(com.sun.star.form.component.CheckBox))
{
DoCheckBox(xPropSet);
bHack = true;
@@ -183,11 +183,11 @@ void
WW8Export::DoComboBox(uno::Referencebeans::XPropertySet xPropSet)
{
rtl::OUString sSelected;
uno::Sequencertl::OUString aListItems;
-xPropSet-getPropertyValue(C2U(StringItemList)) = aListItems;
+xPropSet-getPropertyValue(StringItemList) = aListItems;
sal_Int32 nNoStrings = aListItems.getLength();
if (nNoStrings)
{
-uno::Any aTmp = xPropSet-getPropertyValue(C2U(DefaultText));
+uno::Any aTmp = xPropSet-getPropertyValue(DefaultText);
const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
if (pStr)
sSelected = *pStr;
@@ -195,7 +195,7 @@ void
WW8Export::DoComboBox(uno::Referencebeans::XPropertySet xPropSet)
rtl::OUString sName;
{
-uno::Any aTmp = xPropSet-getPropertyValue(C2U(Name));
+uno::Any aTmp = xPropSet-getPropertyValue(Name);
const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
if (pStr)
sName = *pStr;
@@ -207,7 +207,7 @@ void
WW8Export::DoComboBox(uno::Referencebeans::XPropertySet xPropSet)
// property Help does not exist and due to the no-existence an
exception is thrown.
try
{
-uno::Any aTmp = xPropSet-getPropertyValue(C2U(HelpText));
+uno::Any aTmp = xPropSet-getPropertyValue(HelpText);
const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
if (pStr)
sHelp = *pStr;
@@ -218,7 +218,7 @@ void
WW8Export::DoComboBox(uno::Referencebeans::XPropertySet xPropSet)
rtl::OUString sToolTip;
{
-uno::Any aTmp = xPropSet-getPropertyValue(C2U(Name));
+uno::Any aTmp = xPropSet-getPropertyValue(Name);
const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
if (pStr)
sToolTip = *pStr;
@@ -309,27 +309,27 @@ void
WW8Export::DoCheckBox(uno::Referencebeans::XPropertySet xPropSet)
aFFData.setCheckboxHeight(0x14);
sal_Int16 nTemp = 0;
-xPropSet-getPropertyValue(C2U(DefaultState)) = nTemp;
+xPropSet-getPropertyValue(DefaultState) = nTemp;
aFFData.setDefaultResult(nTemp);
-xPropSet-getPropertyValue(C2U(State)) = nTemp;
+xPropSet-getPropertyValue(State) = nTemp;
aFFData.setResult(nTemp);
::rtl::OUString aStr;
-static ::rtl::OUString sName(C2U(Name));
+static ::rtl::OUString sName(Name);
if (xPropSetInfo-hasPropertyByName(sName))
{
xPropSet-getPropertyValue(sName) = aStr;
aFFData.setName(aStr);
}
-static ::rtl::OUString sHelpText(C2U(HelpText));
+static ::rtl::OUString sHelpText(HelpText);
if (xPropSetInfo-hasPropertyByName(sHelpText))
{
xPropSet-getPropertyValue(sHelpText) = aStr;
aFFData.setHelp(aStr);
}
-static ::rtl::OUString sHelpF1Text(C2U(HelpF1Text));
+static ::rtl::OUString sHelpF1Text(HelpF1Text);
if (xPropSetInfo-hasPropertyByName(sHelpF1Text))
{
xPropSet-getPropertyValue(sHelpF1Text) = aStr;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 9017061..ed3c969 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2262,7 +2262,7 @@ awt::Size
SwWW8ImplReader::MiserableDropDownFormHack(const String rString,
case RES_CHRATR_COLOR:
{
String pNm;
-if (xPropSetInfo-hasPropertyByName(pNm = C2U(TextColor)))
+if (xPropSetInfo-hasPropertyByName(pNm = TextColor))
{
aTmp =
Hackfest travel refund
Hello everyone, as I've just managed to arrange the travel refunds for the Conference, it's now time to take care of the Hackfest. ;-) In case you want to apply for a travel refund for the Hackfest, please send 1. your travel receipt 2. your hotel receipt 3. the form at http://wiki.documentfoundation.org/File:SPI_reimbursement_request.pdf (*please* ask your bank what needs to be filled in, most likely *not* your normal bank data!) to treasu...@documentfoundation.org for consideration. In total, the board has approved 3.000 € for the Hackfest, and is happy to consider valid travel requests. If possible, please send your requests in before Christmas, so we can close this in 2012. :-) Thanks a lot, Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 Jabber: flo...@jabber.org | SIP: flo...@iptel.org The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] syslog output from SAL_* messages
Hi Riccardo, On Tue, Dec 18, 2012 at 09:55:23AM +0100, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: I totally overlooked this :) shouldn't i have seen the WARNs though? IIRC you get WARNs only with dbglevel 0 (i.e. when you configure with --enable-debug or --enable-dbgutil) In sal/osl/all/log.cxx:87 getEnvironmentVariable +WARN is default when std::getenv(SAL_LOG) == 0. Btw in practice probably doesn't count but shouldn't these be checks against NULL instead of 0? http://c-faq.com/null/nullor0.html I think that's true for C++ as well. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/writerwordglue.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit f15b317a7c081dc0601805ffb07cb6778a2bf122
Author: Luke Deller l...@deller.id.au
Date: Wed Dec 5 23:09:38 2012 +1100
fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc
Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Reviewed-on: https://gerrit.libreoffice.org/1251
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/1386
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 9a843dd..12e9a1c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -349,6 +349,8 @@ namespace sw
const SwColumns rFollowColumns = rFollowCols.GetColumns();
const SvxLRSpaceItem rOneLR = rTitleFmt.GetLRSpace();
const SvxLRSpaceItem rTwoLR= rFollowFmt.GetLRSpace();
+const SwFmtFrmSize rFirstFrmSize = rTitleFmt.GetFrmSize();
+const SwFmtFrmSize rFollowFrmSize = rFollowFmt.GetFrmSize();
if (rFirstColumns.size() != rFollowColumns.size())
{
@@ -357,6 +359,8 @@ namespace sw
}
else if (rOneLR != rTwoLR)
bPlausableTitlePage = false;
+else if (rFirstFrmSize != rFollowFrmSize)
+bPlausableTitlePage = false;
else
{
HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fix for fdo#57551: landscape/portrait sequence lost in FILES...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1386 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1386 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/writerwordglue.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 5220a3615a806224d3a54283da4abdaae4b15795
Author: Luke Deller l...@deller.id.au
Date: Wed Dec 5 23:09:38 2012 +1100
fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc
Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Reviewed-on: https://gerrit.libreoffice.org/1251
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/1387
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 2c1bd54..6be5a8d 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -358,6 +358,8 @@ namespace sw
const SwColumns rFollowColumns = rFollowCols.GetColumns();
const SvxLRSpaceItem rOneLR = rTitleFmt.GetLRSpace();
const SvxLRSpaceItem rTwoLR= rFollowFmt.GetLRSpace();
+const SwFmtFrmSize rFirstFrmSize = rTitleFmt.GetFrmSize();
+const SwFmtFrmSize rFollowFrmSize = rFollowFmt.GetFrmSize();
if (rFirstColumns.size() != rFollowColumns.size())
{
@@ -366,6 +368,8 @@ namespace sw
}
else if (rOneLR != rTwoLR)
bPlausableTitlePage = false;
+else if (rFirstFrmSize != rFollowFrmSize)
+bPlausableTitlePage = false;
else
{
HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/lib
src/lib/VSD6Parser.cpp | 44
src/lib/VSDParser.cpp | 45 +
src/lib/VSDTypes.h | 12
3 files changed, 77 insertions(+), 24 deletions(-)
New commits:
commit 8e8bf14463dc2777c1cea49af1159adede727711
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 18 10:14:24 2012 +0100
When cached fg and bg colours are 0, trust index more
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index 335872c..645d569 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -206,31 +206,51 @@ void libvisio::VSD6Parser::readParaIX(WPXInputStream
*input)
void libvisio::VSD6Parser::readFillAndShadow(WPXInputStream *input)
{
- Colour colourFG = _colourFromIndex(readU8(input));
+ unsigned char colourFGIndex = readU8(input);
+ Colour colourFG;
colourFG.r = readU8(input);
colourFG.g = readU8(input);
colourFG.b = readU8(input);
colourFG.a = readU8(input);
- double fillFGTransparency = (double)colourFG.a / 255.0;
- Colour colourBG = _colourFromIndex(readU8(input));
+ unsigned char colourBGIndex = readU8(input);
+ Colour colourBG;
colourBG.r = readU8(input);
colourBG.g = readU8(input);
colourBG.b = readU8(input);
colourBG.a = readU8(input);
+ if (!colourFG !colourBG)
+ {
+colourFG = _colourFromIndex(colourFGIndex);
+colourBG = _colourFromIndex(colourBGIndex);
+ }
+ double fillFGTransparency = (double)colourFG.a / 255.0;
double fillBGTransparency = (double)colourBG.a / 255.0;
+
unsigned char fillPattern = readU8(input);
- input-seek(1, WPX_SEEK_CUR);
- Colour shfgc;// Shadow Foreground Colour
- shfgc.r = readU8(input);
- shfgc.g = readU8(input);
- shfgc.b = readU8(input);
- shfgc.a = readU8(input);
- input-seek(5, WPX_SEEK_CUR); // Shadow Background Colour skipped
+
+ unsigned char shadowFGIndex = readU8(input);
+ Colour shadowFG;
+ shadowFG.r = readU8(input);
+ shadowFG.g = readU8(input);
+ shadowFG.b = readU8(input);
+ shadowFG.a = readU8(input);
+ unsigned char shadowBGIndex = readU8(input);
+ Colour shadowBG;
+ shadowBG.r = readU8(input);
+ shadowBG.g = readU8(input);
+ shadowBG.b = readU8(input);
+ shadowBG.a = readU8(input);
+ if (!shadowFG !shadowBG)
+ {
+shadowFG = _colourFromIndex(shadowFGIndex);
+shadowBG = _colourFromIndex(shadowBGIndex);
+ }
+
unsigned char shadowPattern = readU8(input);
if (m_isInStyles)
m_collector-collectFillStyle(m_header.level, colourFG, colourBG,
fillPattern,
- fillFGTransparency, fillBGTransparency,
shadowPattern, shfgc);
+ fillFGTransparency, fillBGTransparency,
shadowPattern, shadowFG);
else
{
double shadowOffsetX = 0.0;
@@ -247,7 +267,7 @@ void libvisio::VSD6Parser::readFillAndShadow(WPXInputStream
*input)
shadowOffsetY = m_shadowOffsetY;
}
m_shape.m_fillStyle.override(VSDOptionalFillStyle(colourFG, colourBG,
fillPattern, fillFGTransparency,
- fillBGTransparency, shfgc, shadowPattern,
shadowOffsetX, shadowOffsetY));
+ fillBGTransparency, shadowFG, shadowPattern,
shadowOffsetX, shadowOffsetY));
}
}
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index e649c56..bab29b6 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -1668,27 +1668,48 @@ void libvisio::VSDParser::readParaIX(WPXInputStream
*input)
void libvisio::VSDParser::readFillAndShadow(WPXInputStream *input)
{
- Colour colourFG = _colourFromIndex(readU8(input));
+ unsigned char colourFGIndex = readU8(input);
+ Colour colourFG;
colourFG.r = readU8(input);
colourFG.g = readU8(input);
colourFG.b = readU8(input);
colourFG.a = readU8(input);
- double fillFGTransparency = (double)colourFG.a / 255.0;
- Colour colourBG = _colourFromIndex(readU8(input));
+ unsigned char colourBGIndex = readU8(input);
+ Colour colourBG;
colourBG.r = readU8(input);
colourBG.g = readU8(input);
colourBG.b = readU8(input);
colourBG.a = readU8(input);
+ if (!colourFG !colourBG)
+ {
+colourFG = _colourFromIndex(colourFGIndex);
+colourBG = _colourFromIndex(colourBGIndex);
+ }
+ double fillFGTransparency = (double)colourFG.a / 255.0;
double fillBGTransparency = (double)colourBG.a / 255.0;
+
unsigned char fillPattern = readU8(input);
- input-seek(1, WPX_SEEK_CUR);
- Colour shfgc;// Shadow Foreground Colour
- shfgc.r = readU8(input);
- shfgc.g = readU8(input);
- shfgc.b = readU8(input);
- shfgc.a = readU8(input);
- input-seek(5, WPX_SEEK_CUR); // Shadow Background Colour skipped
+
+ unsigned char shadowFGIndex = readU8(input);
+ Colour shadowFG;
+ shadowFG.r = readU8(input);
+ shadowFG.g = readU8(input);
+ shadowFG.b = readU8(input);
+ shadowFG.a = readU8(input);
+ unsigned char shadowBGIndex = readU8(input);
+ Colour shadowBG;
+ shadowBG.r =
[PUSHED] Change in core[libreoffice-3-6]: fix for fdo#57551: landscape/portrait sequence lost in FILES...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1387 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1387 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8par3.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa655c0038ad6f9d4e26b78e5438953615e9bdb7 Author: Miklos Vajna vmik...@suse.cz Date: Tue Dec 18 10:15:22 2012 +0100 SwMSConvertControls::InsertControl: typo diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index ed3c969..0821e94 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2510,7 +2510,7 @@ sal_Bool SwMSConvertControls::InsertControl( return sal_False; uno::Reference uno::XInterface xCreate = rServiceFactory-createInstance( -com.sun.star.drawing.ControlShape)); +com.sun.star.drawing.ControlShape); if( !xCreate.is() ) return sal_False; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac src/lib
configure.ac |2 +-
src/lib/VSDXMLParserBase.cpp |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d421a44cd16ac32b5622f11884265751a04bfc82
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 18 10:22:46 2012 +0100
Bump version in view of a possible release
diff --git a/configure.ac b/configure.ac
index 0b83c05..7f44b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
#
m4_define([libvisio_version_major],[0])
m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[23])
+m4_define([libvisio_version_micro],[24])
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
# =
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index e18c8bb..4174e16 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1430,7 +1430,7 @@ void
libvisio::VSDXMLParserBase::readParaIX(xmlTextReaderPtr reader)
tokenType = xmlTextReaderNodeType(reader);
switch (tokenId)
- {
+{
case XML_INDFIRST:
if (XML_READER_TYPE_ELEMENT == tokenType)
ret = readDoubleData(indFirst, reader);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove unused ScTabPopShell
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1392 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/1392/1 Remove unused ScTabPopShell As Thomas Arnhold pointed, it seems that ScTabPopShell is useless. I did a full compile without ScTabPopShell and run sometimes cal, writer and all still works. Change-Id: Ia05d4fb53999b816101b5757153942df0c606022 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- D sc/sdi/tabpopsh.sdi D sc/source/ui/inc/tabpopsh.hxx D sc/source/ui/view/tabpopsh.cxx 3 files changed, 0 insertions(+), 130 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1392 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia05d4fb53999b816101b5757153942df0c606022 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove duplicate code from Presenter Help View
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1391 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1391/1 Remove duplicate code from Presenter Help View Change-Id: Ie33419ffe04dccc71956f7475d7b7a4acee7df12 --- M sdext/source/presenter/PresenterHelpView.cxx 1 file changed, 31 insertions(+), 47 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1391 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie33419ffe04dccc71956f7475d7b7a4acee7df12 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libvisio-0.0.24'
Tag 'libvisio-0.0.24' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2012-12-18 09:31 -0800 Tagging libvisio 0.0.24 release Changes since libvisio-0.0.23-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: download.lst libvisio/libvisio-lineheight.patch libvisio/UnpackedTarball_visio.mk
download.lst |4 ++-- libvisio/UnpackedTarball_visio.mk |8 libvisio/libvisio-lineheight.patch | 11 --- 3 files changed, 2 insertions(+), 21 deletions(-) New commits: commit 687138f72c607e02f9dabf0ca6c936209e4c76b7 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 18 10:36:20 2012 +0100 Fix the regression in fdo#47499: wrong fill colour Change-Id: I986a5f4c944f9fe9e985c408a72f766d9b1eed12 diff --git a/download.lst b/download.lst index bbca618..3abd8ed 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a export CDR_TARBALL := libcdr-0.0.9.tar.bz2 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2 -VISIO_MD5SUM := 2552fffcc8428c8b5506218f0cf802db -export VISIO_TARBALL := libvisio-0.0.23.tar.bz2 +VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea +export VISIO_TARBALL := libvisio-0.0.24.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 3afd8af..aa9113b 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,visio,\ -libvisio/libvisio-lineheight.patch \ -)) -# libvisio/libvisio-lineheight.patch: see upstream -# https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff; -# h=257e1896942a7028f1d0669ac6d4f61f294cb14d -# Fixed line height is in inches :( - # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-lineheight.patch b/libvisio/libvisio-lineheight.patch deleted file mode 100644 index 922fac8..000 --- a/libvisio/libvisio-lineheight.patch +++ /dev/null @@ -1,11 +0,0 @@ misc/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -+++ misc/build/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -@@ -526,7 +526,7 @@ void libvisio::VSDContentCollector::_flushText() - break; - } - if ((*paraIt).spLine 0) -- paraProps.insert(fo:line-height, (*paraIt).spLine, WPX_POINT); -+ paraProps.insert(fo:line-height, (*paraIt).spLine); - else - paraProps.insert(fo:line-height, -(*paraIt).spLine, WPX_PERCENT); - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - download.lst libvisio/libvisio-lineheight.patch libvisio/UnpackedTarball_visio.mk
download.lst |4 ++-- libvisio/UnpackedTarball_visio.mk |8 libvisio/libvisio-lineheight.patch | 11 --- 3 files changed, 2 insertions(+), 21 deletions(-) New commits: commit 8e7a38669ae3c99ea3a90b2af15c6be2234ac284 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 18 10:36:20 2012 +0100 Fix the regression in fdo#47499: wrong fill colour Change-Id: I986a5f4c944f9fe9e985c408a72f766d9b1eed12 diff --git a/download.lst b/download.lst index b9859c2..9989c06 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a export CDR_TARBALL := libcdr-0.0.9.tar.bz2 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2 -VISIO_MD5SUM := 2552fffcc8428c8b5506218f0cf802db -export VISIO_TARBALL := libvisio-0.0.23.tar.bz2 +VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea +export VISIO_TARBALL := libvisio-0.0.24.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 3afd8af..aa9113b 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,visio,\ -libvisio/libvisio-lineheight.patch \ -)) -# libvisio/libvisio-lineheight.patch: see upstream -# https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff; -# h=257e1896942a7028f1d0669ac6d4f61f294cb14d -# Fixed line height is in inches :( - # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-lineheight.patch b/libvisio/libvisio-lineheight.patch deleted file mode 100644 index 922fac8..000 --- a/libvisio/libvisio-lineheight.patch +++ /dev/null @@ -1,11 +0,0 @@ misc/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -+++ misc/build/libvisio-0.0.23/src/lib/VSDContentCollector.cpp -@@ -526,7 +526,7 @@ void libvisio::VSDContentCollector::_flushText() - break; - } - if ((*paraIt).spLine 0) -- paraProps.insert(fo:line-height, (*paraIt).spLine, WPX_POINT); -+ paraProps.insert(fo:line-height, (*paraIt).spLine); - else - paraProps.insert(fo:line-height, -(*paraIt).spLine, WPX_PERCENT); - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: undefined reference to `__gcov_init' when using FLAGS+='-fprofile-arcs -ftest-coverage'
On Mon, Dec 17, 2012 at 10:20 AM, David Tardon dtar...@redhat.com wrote: Hi, The old build system looks for ENVLINKFLAGS variable. So if you set ENVLINKFLAGS to the same value as LDFLAGS, the build should pass. D. Thanks, that works great. Added it to the lcov wiki page. Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/DiscoveryService.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit c0e21788c1c9b98493b41a0020f660f4fa5983f3
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Dec 18 12:04:55 2012 +0200
Store some (sadly ignored) return values in variables to make debugging
easier...
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 6542062..9d8efa3 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -38,6 +38,8 @@ using namespace sd;
DiscoveryService::DiscoveryService() :
mSocket(0)
{
+int rc;
+
mSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
sockaddr_in aAddr;
@@ -45,14 +47,14 @@ DiscoveryService::DiscoveryService() :
aAddr.sin_addr.s_addr = htonl(INADDR_ANY);
aAddr.sin_port = htons( PORT_DISCOVERY );
-bind( mSocket, (sockaddr*) aAddr, sizeof(sockaddr_in) );
+rc = bind( mSocket, (sockaddr*) aAddr, sizeof(sockaddr_in) );
struct ip_mreq multicastRequest;
multicastRequest.imr_multiaddr.s_addr = inet_addr( 239.0.0.1 );
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
-setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
#ifdef WNT
(const char*)
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svx/source
svx/source/svdraw/svdobj.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit edc212a5393c17ef68f97c7d6e2a215d3718579c Author: Noel Power noel.po...@suse.com Date: Mon Dec 17 17:49:00 2012 + fix problematic calc object selection after object create (at non 100% zoom) sometimes difficult to select custom shapes etc. created at non 100% zoom levels. workaround was to use selection tool to select an area. Change-Id: I112a60ebf37a37b16f6af5e70358853088e648a8 diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 31fef51..fefe00d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -943,6 +943,7 @@ void SdrObject::RecalcBoundRect() aOutRect = Rectangle( (sal_Int32)floor(aRange.getMinX()), (sal_Int32)floor(aRange.getMinY()), (sal_Int32)ceil(aRange.getMaxX()), (sal_Int32)ceil(aRange.getMaxY())); +aOutRect -= GetGridOffset(); // don't include grid offset return; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/uiconfig
svx/uiconfig/ui/compressgraphicdialog.ui | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 351b71edc0bb3076578dfcc4a32d349448e7c24c Author: Rene Engelhard r...@debian.org Date: Tue Dec 18 11:34:55 2012 +0100 set numbers in svx/uiconfig/ui/compressgraphicdialog.ui to translatable=no as otherwise we get uiex's output is invalid: svx uiconfig\ui Change-Id: I39b776cdb3561be0bffb8e9ebe3bf9f2660162f6 diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index dc0ef32..2f944f8 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -390,13 +390,13 @@ property name=column_span_column0/property property name=has_entryTrue/property items - item translatable=yes50/item - item translatable=yes75/item - item translatable=yes96/item - item translatable=yes150/item - item translatable=yes200/item - item translatable=yes300/item - item translatable=yes600/item + item translatable=no50/item + item translatable=no75/item + item translatable=no96/item + item translatable=no150/item + item translatable=no200/item + item translatable=no300/item + item translatable=no600/item /items child internal-child=entry object class=GtkEntry id=comboboxtext-entry ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svx/uiconfig
svx/uiconfig/ui/compressgraphicdialog.ui | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 6f14709d55e343886abdfb73bcd530ace2a13e4f Author: Rene Engelhard r...@debian.org Date: Tue Dec 18 11:34:55 2012 +0100 set numbers in svx/uiconfig/ui/compressgraphicdialog.ui to translatable=no as otherwise we get uiex's output is invalid: svx uiconfig\ui Change-Id: I39b776cdb3561be0bffb8e9ebe3bf9f2660162f6 Signed-off-by: Caolan McNamara caol...@redhat.com diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index dc0ef32..2f944f8 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -390,13 +390,13 @@ property name=column_span_column0/property property name=has_entryTrue/property items - item translatable=yes50/item - item translatable=yes75/item - item translatable=yes96/item - item translatable=yes150/item - item translatable=yes200/item - item translatable=yes300/item - item translatable=yes600/item + item translatable=no50/item + item translatable=no75/item + item translatable=no96/item + item translatable=no150/item + item translatable=no200/item + item translatable=no300/item + item translatable=no600/item /items child internal-child=entry object class=GtkEntry id=comboboxtext-entry ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk svtools/inc svx/source
sfx2/UI_sfx.mk |1
sfx2/inc/sfx2/dinfdlg.hxx | 14 +--
sfx2/source/dialog/dinfdlg.cxx | 106 +++--
sfx2/source/dialog/dinfdlg.hrc |8 -
sfx2/source/dialog/dinfdlg.src | 72 -
sfx2/source/inc/helpid.hrc |1
sfx2/uiconfig/ui/documentinfopage.ui|2
sfx2/uiconfig/ui/documentproperties.ui | 117
svtools/inc/svtools/svmedit.hxx |8 -
svx/source/dialog/compressgraphicdialog.cxx |8 -
10 files changed, 60 insertions(+), 277 deletions(-)
New commits:
commit 4dd309ed472f4860ed60ccdd38226c3fcbdfb59d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 10:26:21 2012 +
remove manual entry of 50 to 600 now that we support items in .ui
Change-Id: I68e5547916af4986dfab31aac9e25cc8fad8d0e0
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 7232936..1709ea4 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -65,14 +65,6 @@ void CompressGraphicsDialog::Initialize()
get(m_pBtnCalculate,calculate);
get(m_pInterpolationCombo, interpolation-method-combo);
-m_pResolutionLB-InsertEntry(OUString(50));
-m_pResolutionLB-InsertEntry(OUString(75));
-m_pResolutionLB-InsertEntry(OUString(96));
-m_pResolutionLB-InsertEntry(OUString(150));
-m_pResolutionLB-InsertEntry(OUString(200));
-m_pResolutionLB-InsertEntry(OUString(300));
-m_pResolutionLB-InsertEntry(OUString(600));
-
m_pInterpolationCombo-SelectEntry( OUString(Lanczos) );
m_pMFNewWidth-SetModifyHdl( LINK( this, CompressGraphicsDialog,
NewWidthModifiedHdl ));
commit 6154e1b4e9c39adac57b0131ceee3a6d2be86fa9
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 09:04:43 2012 +
split out description info page and convert to .ui
Change-Id: I502a51018f7281c9e4bc42d6f9ae76e6cd6a3d86
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index 917926f..9505cdf 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,sfx))
$(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/checkin \
+ sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/password \
sfx2/uiconfig/ui/printeroptionsdialog \
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index b5147ec..09b7a1f 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -214,15 +214,11 @@ public:
class SfxDocumentDescPage : public SfxTabPage
{
private:
-FixedText aTitleFt;
-EditaTitleEd;
-FixedText aThemaFt;
-EditaThemaEd;
-FixedText aKeywordsFt;
-EditaKeywordsEd;
-FixedText aCommentFt;
-MultiLineEdit aCommentEd;
-SfxDocumentInfoItem*pInfoItem;
+Edit* m_pTitleEd;
+Edit* m_pThemaEd;
+Edit* m_pKeywordsEd;
+VclMultiLineEdit* m_pCommentEd;
+SfxDocumentInfoItem*m_pInfoItem;
protected:
SfxDocumentDescPage( Window* pParent, const SfxItemSet );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b147e87..775baff 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -616,23 +616,15 @@ bool SfxDocumentInfoItem::PutValue( const Any rVal,
sal_uInt8 nMemberId )
}
//
-SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet
rItemSet ) :
-
-SfxTabPage( pParent, SfxResId( TP_DOCINFODESC ), rItemSet ),
-
-aTitleFt( this, SfxResId( FT_TITLE ) ),
-aTitleEd( this, SfxResId( ED_TITLE ) ),
-aThemaFt( this, SfxResId( FT_THEMA ) ),
-aThemaEd( this, SfxResId( ED_THEMA ) ),
-aKeywordsFt ( this, SfxResId( FT_KEYWORDS ) ),
-aKeywordsEd ( this, SfxResId( ED_KEYWORDS ) ),
-aCommentFt ( this, SfxResId( FT_COMMENT ) ),
-aCommentEd ( this, SfxResId( ED_COMMENT ) ),
-
-pInfoItem ( NULL )
+SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet
rItemSet )
+: SfxTabPage(pParent, DescriptionInfoPage,
sfx/ui/descriptioninfopage.ui, rItemSet)
+, m_pInfoItem ( NULL )
{
-FreeResource();
+get(m_pTitleEd, title);
+get(m_pThemaEd, subject);
+get(m_pKeywordsEd, keywords);
+get(m_pCommentEd, comments);
}
//
@@ -645,10 +637,10 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent,
const SfxItemSet rItem
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
{
// Test whether a
Re: [RFC] syslog output from SAL_* messages
- am not able to send the ENABLE_SYSLOG definition down to sal/osl/unx/salinit.cxx Surely the tradityional name for this should be HAVE_SYSLOG_H ? ENABLE_FOO things are for stuff you enable or disable on the configure command line, not for results of checks of header file presence. (Of course, it might be that there are counter-examples in LO's configure.ac, but we shouldn't continue to follow such anti-patterns.) I guess you need to add to config/config_global.h.in: #undef HAVE_SYSLOG_H and change the test to a simple: AC_CHECK_HEADERS(syslog.h) ? Isn't that the simple, normal way to check for some header? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/pagechg.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1b67d91b0065c46ca7b36db0836c9159ca8b50cf
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 18 11:17:06 2012 +0100
fdo#58376 SwFrm::CheckPageDescs: fix crash on fallback
The problem was that fallback worked like this: if we have no page
style, then right falls back to left, and left falls back to right.
This is no longer enough when 'first' is missing: for odd 'first' pages,
first we should fall back to right.
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 8509a40..2c9a4b7 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1194,7 +1194,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool
bNotifyFields )
else if ( !pFmtWish ) //6.
{
//Format mit verdrehter Logic besorgen.
-pFmtWish = bOdd ? pDesc-GetLeftFmt() : pDesc-GetRightFmt();
+if (bFirst)
+pFmtWish = bOdd ? pDesc-GetRightFmt() :
pDesc-GetRightFmt();
+if (!pFmtWish)
+pFmtWish = bOdd ? pDesc-GetLeftFmt() :
pDesc-GetRightFmt();
if ( pPage-GetFmt() != pFmtWish )
pPage-SetFrmFmt( pFmtWish );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#58376 fix crash when no page format is found
Werner Körner has abandoned this change. Change subject: fdo#58376 fix crash when no page format is found .. Patch Set 1: Abandoned already fixed... -- To view, visit https://gerrit.libreoffice.org/1400 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6849afc476e16de533478e761a8a535648827211 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Werner Körner wk66...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#58376 fix crash when no page format is found
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1400 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1400/1 fdo#58376 fix crash when no page format is found Change-Id: I6849afc476e16de533478e761a8a535648827211 --- M sw/source/core/layout/pagechg.cxx 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1400 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6849afc476e16de533478e761a8a535648827211 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Werner Körner wk66...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/pagechg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5b7810581c573c4406a0e4529193dd3a7871a56c
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 18 12:42:33 2012 +0100
SwFrm::CheckPageDescs: if bOdd is false, we want left format
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 2c9a4b7..54b2f22 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1195,7 +1195,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool
bNotifyFields )
{
//Format mit verdrehter Logic besorgen.
if (bFirst)
-pFmtWish = bOdd ? pDesc-GetRightFmt() :
pDesc-GetRightFmt();
+pFmtWish = bOdd ? pDesc-GetRightFmt() :
pDesc-GetLeftFmt();
if (!pFmtWish)
pFmtWish = bOdd ? pDesc-GetLeftFmt() :
pDesc-GetRightFmt();
if ( pPage-GetFmt() != pFmtWish )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/uiconfig
sfx2/uiconfig/ui/descriptioninfopage.ui | 142 1 file changed, 142 insertions(+) New commits: commit 2c261400e79d790453ad3d4beb72b397c0795d90 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 18 11:45:11 2012 + bah, missing file Change-Id: I09626f2d7b5b786e35e02964554d7f5c0239d952 diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui new file mode 100644 index 000..c4f4212 --- /dev/null +++ b/sfx2/uiconfig/ui/descriptioninfopage.ui @@ -0,0 +1,142 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkGrid id=DescriptionInfoPage +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property +property name=column_spacing18/property +child + object class=GtkLabel id=label27 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yes_Title/property +property name=use_underlineTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkLabel id=label28 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yes_Subject/property +property name=use_underlineTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkLabel id=label29 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yes_Keywords/property +property name=use_underlineTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkLabel id=label30 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=valignstart/property +property name=xalign0/property +property name=label translatable=yes_Comments/property +property name=use_underlineTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach3/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkEntry id=title +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=invisible_charâ¢/property +property name=invisible_char_setTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkEntry id=subject +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=invisible_charâ¢/property +property name=invisible_char_setTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkEntry id=keywords +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=invisible_charâ¢/property +property name=invisible_char_setTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkScrolledWindow id=scrolledwindow1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=vscrollbar_policyalways/property +property name=shadow_typein/property +child +
[Libreoffice-commits] .: sc/sdi sc/source
sc/sdi/tabpopsh.sdi| 22 --
sc/source/ui/inc/tabpopsh.hxx | 46 --
sc/source/ui/view/tabpopsh.cxx | 62 -
3 files changed, 130 deletions(-)
New commits:
commit 1d9f281c8c3d098bc70e0e0cbe081c696fe2b7b9
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Tue Dec 18 07:07:37 2012 -0200
Remove unused ScTabPopShell
As Thomas Arnhold pointed, it seems that ScTabPopShell is useless. I did a
full
compile without ScTabPopShell and run sometimes cal, writer and all still
works.
Change-Id: Ia05d4fb53999b816101b5757153942df0c606022
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1392
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/sdi/tabpopsh.sdi b/sc/sdi/tabpopsh.sdi
deleted file mode 100644
index 0a3d646..000
--- a/sc/sdi/tabpopsh.sdi
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-shell ScTabPopShell
-{
-// nix drin
-}
-
diff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxx
deleted file mode 100644
index 6580f00..000
--- a/sc/source/ui/inc/tabpopsh.hxx
+++ /dev/null
@@ -1,46 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SC_TABPOPSH_HXX
-#define SC_TABPOPSH_HXX
-
-#include sfx2/module.hxx
-#include sfx2/shell.hxx
-
-#include shellids.hxx
-
-class ScTabPopShell : public SfxShell
-{
-public:
-TYPEINFO();
-SFX_DECL_INTERFACE(SCID_TABPOP_SHELL);
-
-ScTabPopShell(SfxItemPool rItemPool);
-~ScTabPopShell();
-
-voidDummyExec( SfxRequest rReq );
-voidDummyState( SfxItemSet rSet );
-};
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxx
deleted file mode 100644
index 901e9f4..000
--- a/sc/source/ui/view/tabpopsh.cxx
+++ /dev/null
@@ -1,62 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include tabpopsh.hxx
-#include sc.hrc
-
-#undef ShellClass
-#define ShellClass ScTabPopShell
-SFX_SLOTMAP(ScTabPopShell)
-{
-SFX_SLOT( 0,0, DummyExec, DummyState, 0, SfxVoidItem )
-};
-
-
-TYPEINIT1(ScTabPopShell,SfxShell);
-
-//SFX_IMPL_IDL_INTERFACE(ScTabPopShell, SfxShell, 0)
[Libreoffice-commits] .: 3 commits - jvmfwk/inc jvmfwk/source odk/util stoc/source ure/source
jvmfwk/inc/jvmfwk/framework.h |8 +-
jvmfwk/source/framework.cxx | 144 +---
odk/util/makefile.pmk |1
stoc/source/javavm/javavm.cxx | 28 ++-
ure/source/uretest/Makefile | 15 +---
ure/source/uretest/Makefile.pln | 15 +---
6 files changed, 118 insertions(+), 93 deletions(-)
New commits:
commit e5546342cb4e4f106257a7f7594d4356e6adbff3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 18 12:41:12 2012 +0100
Let JavaVirtualMachine::getJavaVm start the VM it already found
Since b69951996967a1c79e3a55dd13dd5609b19db6a1 Drop support for
/etc/opt/ure
and ~/.ure from LibreOffice 4 there is no place any more where a plain URE
will
store information about a selected JVM, so JavaVirtualMachine::getJavaVM
will
go into an endless loop of jfw_startVM - JFW_E_NO_SELECT -
jfw_findAndSelectJRE - jfw_startVM - ... The solution is to pass the
JavaInfo
determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM
(for which the parameter list of the latter needed to be changed), instead
of
relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating
that
information via user configuration files.
Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 98c49c3..7f61f21 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -482,6 +482,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_getJavaInfoByPath(
created and JFW_E_NEED_RESTART error is returned. If a VM is already
running
then a JFW_E_RUNNING_JVM is returned./p
+@param pInfo
+[in] optional pointer to a specific JRE; must be caller-freed if not NULL
@param arOptions
[in] the array containing additional start arguments or NULL.
@param nSize
@@ -516,9 +518,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_getJavaInfoByPath(
JFW_E_FAILED_VERSION the quot;Default Modequot; is active. The JRE
determined by
codeJAVA_HOME/codedoes not meet the version requirements.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions,
- sal_Int32 nSize, JavaVM **ppVM,
- JNIEnv **ppEnv);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(
+JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize,
+JavaVM ** ppVM, JNIEnv ** ppEnv);
/** determines the JRE that is to be used.
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index d6e687d..6bfe53a 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -25,6 +25,7 @@
#include osl/module.hxx
#include jvmfwk/framework.h
#include jvmfwk/vendorplugin.h
+#include cassert
#include vector
#include functional
#include algorithm
@@ -290,10 +291,12 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo
***pparInfo, sal_Int32 *pSi
#endif
}
-javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32
cOptions,
- JavaVM **ppVM, JNIEnv **ppEnv)
+javaFrameworkError SAL_CALL jfw_startVM(
+JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 cOptions,
+JavaVM ** ppVM, JNIEnv ** ppEnv)
{
#ifndef SOLAR_JAVA
+(void) pInfo;
(void) arOptions;
(void) cOptions;
(void) ppVM;
@@ -320,84 +323,89 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions, sal_Int32 cOpti
std::vectorrtl::OString vmParams;
rtl::OString sUserClassPath;
jfw::CJavaInfo aInfo;
-jfw::JFW_MODE mode = jfw::getMode();
-if (mode == jfw::JFW_MODE_APPLICATION)
+if (pInfo == NULL)
{
-const jfw::MergedSettings settings;
-if (sal_False == settings.getEnabled())
-return JFW_E_JAVA_DISABLED;
-aInfo.attach(settings.createJavaInfo());
-//check if a Java has ever been selected
-if (aInfo == NULL)
-return JFW_E_NO_SELECT;
+jfw::JFW_MODE mode = jfw::getMode();
+if (mode == jfw::JFW_MODE_APPLICATION)
+{
+const jfw::MergedSettings settings;
+if (sal_False == settings.getEnabled())
+return JFW_E_JAVA_DISABLED;
+aInfo.attach(settings.createJavaInfo());
+//check if a Java has ever been selected
+if (aInfo == NULL)
+return JFW_E_NO_SELECT;
#ifdef WNT
-//Because on Windows there is no system setting that we can use to
determine
-//if Assistive Technology Tool support is needed, we ship a .reg
file that the
-//user can use to create a registry setting. When the user forgets
to set
-//the key before he starts the office then a JRE may be selected
without
[PUSHED] Remove unused ScTabPopShell
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1392 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1392 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia05d4fb53999b816101b5757153942df0c606022 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - jvmfwk/inc jvmfwk/source stoc/source
jvmfwk/inc/jvmfwk/framework.h |8 +-
jvmfwk/source/framework.cxx | 144 ++
stoc/source/javavm/javavm.cxx | 28 +++-
3 files changed, 106 insertions(+), 74 deletions(-)
New commits:
commit 0ec4ca54bd11752f3bc91b6e785053287c3618d9
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 18 12:41:12 2012 +0100
Let JavaVirtualMachine::getJavaVm start the VM it already found
Since b69951996967a1c79e3a55dd13dd5609b19db6a1 Drop support for
/etc/opt/ure
and ~/.ure from LibreOffice 4 there is no place any more where a plain URE
will
store information about a selected JVM, so JavaVirtualMachine::getJavaVM
will
go into an endless loop of jfw_startVM - JFW_E_NO_SELECT -
jfw_findAndSelectJRE - jfw_startVM - ... The solution is to pass the
JavaInfo
determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM
(for which the parameter list of the latter needed to be changed), instead
of
relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating
that
information via user configuration files.
Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
(cherry picked from commit e5546342cb4e4f106257a7f7594d4356e6adbff3)
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 98c49c3..7f61f21 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -482,6 +482,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_getJavaInfoByPath(
created and JFW_E_NEED_RESTART error is returned. If a VM is already
running
then a JFW_E_RUNNING_JVM is returned./p
+@param pInfo
+[in] optional pointer to a specific JRE; must be caller-freed if not NULL
@param arOptions
[in] the array containing additional start arguments or NULL.
@param nSize
@@ -516,9 +518,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_getJavaInfoByPath(
JFW_E_FAILED_VERSION the quot;Default Modequot; is active. The JRE
determined by
codeJAVA_HOME/codedoes not meet the version requirements.
*/
-JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions,
- sal_Int32 nSize, JavaVM **ppVM,
- JNIEnv **ppEnv);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(
+JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize,
+JavaVM ** ppVM, JNIEnv ** ppEnv);
/** determines the JRE that is to be used.
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index d6e687d..6bfe53a 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -25,6 +25,7 @@
#include osl/module.hxx
#include jvmfwk/framework.h
#include jvmfwk/vendorplugin.h
+#include cassert
#include vector
#include functional
#include algorithm
@@ -290,10 +291,12 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo
***pparInfo, sal_Int32 *pSi
#endif
}
-javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32
cOptions,
- JavaVM **ppVM, JNIEnv **ppEnv)
+javaFrameworkError SAL_CALL jfw_startVM(
+JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 cOptions,
+JavaVM ** ppVM, JNIEnv ** ppEnv)
{
#ifndef SOLAR_JAVA
+(void) pInfo;
(void) arOptions;
(void) cOptions;
(void) ppVM;
@@ -320,84 +323,89 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption
*arOptions, sal_Int32 cOpti
std::vectorrtl::OString vmParams;
rtl::OString sUserClassPath;
jfw::CJavaInfo aInfo;
-jfw::JFW_MODE mode = jfw::getMode();
-if (mode == jfw::JFW_MODE_APPLICATION)
+if (pInfo == NULL)
{
-const jfw::MergedSettings settings;
-if (sal_False == settings.getEnabled())
-return JFW_E_JAVA_DISABLED;
-aInfo.attach(settings.createJavaInfo());
-//check if a Java has ever been selected
-if (aInfo == NULL)
-return JFW_E_NO_SELECT;
+jfw::JFW_MODE mode = jfw::getMode();
+if (mode == jfw::JFW_MODE_APPLICATION)
+{
+const jfw::MergedSettings settings;
+if (sal_False == settings.getEnabled())
+return JFW_E_JAVA_DISABLED;
+aInfo.attach(settings.createJavaInfo());
+//check if a Java has ever been selected
+if (aInfo == NULL)
+return JFW_E_NO_SELECT;
#ifdef WNT
-//Because on Windows there is no system setting that we can use to
determine
-//if Assistive Technology Tool support is needed, we ship a .reg
file that the
-//user can use to create a registry setting. When the user forgets
to set
-//the key before he starts the office then a JRE may be selected
without access bridge.
-//When he later sets the key then we
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/DiscoveryService.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 1f5401e6c9c260354022aeab6a02512bdbfa7a4b
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 18 12:47:21 2012 +0100
DiscoveryService: -Werror=unused-but-set-variable
Change-Id: If0175642ebcbe1f4f6cc7640d87385c96e097180
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 9d8efa3..6b46aa0 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -49,6 +49,12 @@ DiscoveryService::DiscoveryService() :
rc = bind( mSocket, (sockaddr*) aAddr, sizeof(sockaddr_in) );
+if (rc)
+{
+SAL_WARN(sd, DiscoveryService: bind failed: errno);
+return; // would be better to throw, but unsure if caller handles that
+}
+
struct ip_mreq multicastRequest;
multicastRequest.imr_multiaddr.s_addr = inet_addr( 239.0.0.1 );
@@ -59,6 +65,12 @@ DiscoveryService::DiscoveryService() :
(const char*)
#endif
multicastRequest, sizeof(multicastRequest));
+
+if (rc)
+{
+SAL_WARN(sd, DiscoveryService: setsockopt failed: errno);
+return; // would be better to throw, but unsure if caller handles that
+}
}
DiscoveryService::~DiscoveryService()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/layout/pagechg.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1c717cbc41174c2e86f649f1045c1d023e9d19a7
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 18 11:17:06 2012 +0100
fdo#58376 SwFrm::CheckPageDescs: fix crash on fallback
The problem was that fallback worked like this: if we have no page
style, then right falls back to left, and left falls back to right.
This is no longer enough when 'first' is missing: for odd 'first' pages,
first we should fall back to right.
(cherry picked from commits 1b67d91b0065c46ca7b36db0836c9159ca8b50cf and
5b7810581c573c4406a0e4529193dd3a7871a56c)
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 8509a40..54b2f22 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1194,7 +1194,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool
bNotifyFields )
else if ( !pFmtWish ) //6.
{
//Format mit verdrehter Logic besorgen.
-pFmtWish = bOdd ? pDesc-GetLeftFmt() : pDesc-GetRightFmt();
+if (bFirst)
+pFmtWish = bOdd ? pDesc-GetRightFmt() :
pDesc-GetLeftFmt();
+if (!pFmtWish)
+pFmtWish = bOdd ? pDesc-GetLeftFmt() :
pDesc-GetRightFmt();
if ( pPage-GetFmt() != pFmtWish )
pPage-SetFrmFmt( pFmtWish );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/odfimport/data/hello.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 10 ++
2 files changed, 10 insertions(+)
New commits:
commit 159fc90e1692f3cc17261c0db9fec48eb6bef28b
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 18 12:58:06 2012 +0100
fdo#58376 testcase
diff --git a/sw/qa/extras/odfimport/data/hello.odt
b/sw/qa/extras/odfimport/data/hello.odt
new file mode 100644
index 000..23ce6a4
Binary files /dev/null and b/sw/qa/extras/odfimport/data/hello.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 05584bf..78531b4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -25,6 +25,7 @@
* instead of those above.
*/
+#include com/sun/star/style/PageStyleLayout.hpp
#include com/sun/star/table/XCell.hpp
#include com/sun/star/table/BorderLine.hpp
#include com/sun/star/text/XTextTable.hpp
@@ -39,6 +40,7 @@ public:
void testEmptySvgFamilyName();
void testHideAllSections();
void testOdtBorders();
+void testPageStyleLayoutRight();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -56,6 +58,7 @@ void Test::run()
{empty-svg-family-name.odt, Test::testEmptySvgFamilyName},
{fdo53210.odt, Test::testHideAllSections},
{borders_ooo33.odt, Test::testOdtBorders},
+{hello.odt, Test::testPageStyleLayoutRight},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -270,6 +273,13 @@ void Test::testOdtBorders()
} while(xParaEnum-hasMoreElements());
}
+void Test::testPageStyleLayoutRight()
+{
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(Default Style),
uno::UNO_QUERY);
+// This caused a crash.
+xPropertySet-setPropertyValue(PageStyleLayout,
uno::makeAny(style::PageStyleLayout_RIGHT));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58376, which changed state. Bug 58376 Summary: EDITING: PAGE FORMAT page layout - Only right - CRASH https://bugs.freedesktop.org/show_bug.cgi?id=58376 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] .: sfx2/uiconfig sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sfx2/uiconfig/ui/documentproperties.ui | 275 --- sw/AllLangResTarget_sw.mk|1 sw/UI_swriter.mk |1 sw/inc/helpid.h |1 sw/source/ui/dialog/docstdlg.cxx | 69 ++--- sw/source/ui/dialog/docstdlg.hrc | 40 --- sw/source/ui/dialog/docstdlg.src | 151 sw/source/ui/inc/docstdlg.hxx| 31 +- sw/uiconfig/swriter/ui/statisticsinfopage.ui | 315 +++ 9 files changed, 359 insertions(+), 525 deletions(-) New commits: commit f34cd255366bd045c5728918a390b7c843470554 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 18 10:34:23 2012 + split out statistics info page and convert to .ui Change-Id: I0c940128e535cfadbd7ac917601dd9da0d0a347a diff --git a/sfx2/uiconfig/ui/documentproperties.ui b/sfx2/uiconfig/ui/documentproperties.ui index 60030e8..2805a0c 100644 --- a/sfx2/uiconfig/ui/documentproperties.ui +++ b/sfx2/uiconfig/ui/documentproperties.ui @@ -579,280 +579,7 @@ /packing /child child - object class=GtkGrid id=grid7 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=row_spacing5/property -property name=column_spacing20/property -child - object class=GtkGrid id=grid8 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=column_spacing100/property -child - object class=GtkLabel id=label45 -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkButton id=button8 -property name=label translatable=yesUpdate/property -property name=use_action_appearanceFalse/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property - /object - packing -property name=left_attach1/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child - /object - packing -property name=left_attach1/property -property name=top_attach8/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=label4 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0.0500074505806/property -property name=label translatable=yesNumber of Pages : /property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=label5 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0.0500074505806/property -property name=label translatable=yesNumber of Tables :/property - /object - packing -property name=left_attach0/property -property name=top_attach1/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkLabel id=label6 -property name=visibleTrue/property -property name=can_focusFalse/property -property
About fdo#58026, Localization problem for GoogleDocs extension
Hello, I opened fdo#58026 (https://bugs.freedesktop.org/show_bug.cgi?id=58026), so I'll just quote what I put. With Google docs extension 2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt, and with English localization, one of the option isn't translated. In fact, the problem is just here on Addon.xcu: 88 prop oor:name=Title oor:type=xs:string 89 value xml:lang=enExport to Zoho/value 90 value xml:lang=plEksport do Zoho/value 91 value xml:lang=deExport zu Zoho/value 92 value xml:lang=enExportar a Zoho/value 93 value xml:lang=itEsporta in Zoho/value 94 value xml:lang=csExportovat do Zoho/value Obviously, there's just a typo : en instead of es line 92. the oxt is 2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt I found a contact on description.xml but since it's a modified version, I don't know whom to ping. Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/About-fdo-58026-Localization-problem-for-GoogleDocs-extension-tp4024946.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ccd519c582cc897b9276b5d04801688c253c1e94 Author: Tor Lillqvist t...@iki.fi Date: Tue Dec 18 14:52:04 2012 +0200 The Impress remote control makes sense only on desktop OSes Change-Id: I48166fd5ee3dec8c140ef1905023db72c2aa2bd4 diff --git a/configure.ac b/configure.ac index 2e9983b..a2b1777 100644 --- a/configure.ac +++ b/configure.ac @@ -2279,6 +2279,7 @@ dnl cross-compiling would imply a non-desktop OS. if test $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE DESKTOP +BUILD_TYPE_IS_DESKTOP=YES fi # Currently we build only viewer apps for Android (and for iOS not even that yet), so to avoid getting @@ -9498,7 +9499,7 @@ fi AC_SUBST(ENABLE_PACKAGEKIT) AC_MSG_CHECKING([whether to enable Impress remote control]) -if test -n $enable_sdremote -a $enable_sdremote != no; then +if test $BUILD_TYPE_IS_DESKTOP = YES -a -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/DiscoveryService.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5f189199021929a50be244498cca05bc3dcf0816 Author: Michael Stahl mst...@redhat.com Date: Tue Dec 18 13:52:19 2012 +0100 DiscoveryService: include errno.h Change-Id: I8bf8ce8324e6ebe89dca1c58f02d973b8998ff2a diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index 6b46aa0..89127f9 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -6,13 +6,15 @@ * 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/. */ + +#include errno.h #include stdlib.h +#include string.h #include algorithm #include vector #include comphelper/processfactory.hxx #include rtl/strbuf.hxx -#include string.h #include DiscoveryService.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scaddins/source
scaddins/source/pricing/pricing.src | 38 +++-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 32e90d832a19ea6a6b642858ee482691a505578d
Author: tino ttk...@gmail.com
Date: Tue Dec 18 14:12:28 2012 +0100
added RID_PRICING_DEFFUNCTION_NAMES string resources
Change-Id: I2a4e596724abb82dccbe4a8e9110bbb9b9479ff7
diff --git a/scaddins/source/pricing/pricing.src
b/scaddins/source/pricing/pricing.src
index 6aa1675..2c0da88 100644
--- a/scaddins/source/pricing/pricing.src
+++ b/scaddins/source/pricing/pricing.src
@@ -429,8 +429,44 @@ Resource RID_PRICING_FUNCTION_NAMES
};
-// for translating function names
+
+// These were originally meant to be able to load Excel documents that for
+// some time were stored with localized function names.
+// This is not relevant to this add-in, so we only supply the same
+// (English) function names again.
+// see also: GetExcelName() or GetCompNames() or getCompatibilityNames()
Resource RID_PRICING_DEFFUNCTION_NAMES
{
+StringArray PRICING_DEFFUNCNAME_OptBarrier
+{
+ItemList =
+{
+ OPT_BARRIER; ;
+};
+};
+
+
+StringArray PRICING_DEFFUNCNAME_OptTouch
+{
+ItemList =
+{
+ OPT_TOUCH; ;
+};
+};
+
+StringArray PRICING_DEFFUNCNAME_OptProbHit
+{
+ItemList =
+{
+ OPT_PROB_HIT; ;
+};
+};
+StringArray PRICING_DEFFUNCNAME_OptProbInMoney
+{
+ItemList =
+{
+ OPT_PROB_INMONEY; ;
+};
+};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - scaddins/source
scaddins/source/pricing/pricing.src | 38 +++-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit bfab9feafcc9c6e1e631da019a9067c9837118cd
Author: tino ttk...@gmail.com
Date: Tue Dec 18 14:12:28 2012 +0100
added RID_PRICING_DEFFUNCTION_NAMES string resources
Change-Id: I2a4e596724abb82dccbe4a8e9110bbb9b9479ff7
(cherry picked from commit 32e90d832a19ea6a6b642858ee482691a505578d)
diff --git a/scaddins/source/pricing/pricing.src
b/scaddins/source/pricing/pricing.src
index 6aa1675..2c0da88 100644
--- a/scaddins/source/pricing/pricing.src
+++ b/scaddins/source/pricing/pricing.src
@@ -429,8 +429,44 @@ Resource RID_PRICING_FUNCTION_NAMES
};
-// for translating function names
+
+// These were originally meant to be able to load Excel documents that for
+// some time were stored with localized function names.
+// This is not relevant to this add-in, so we only supply the same
+// (English) function names again.
+// see also: GetExcelName() or GetCompNames() or getCompatibilityNames()
Resource RID_PRICING_DEFFUNCTION_NAMES
{
+StringArray PRICING_DEFFUNCNAME_OptBarrier
+{
+ItemList =
+{
+ OPT_BARRIER; ;
+};
+};
+
+
+StringArray PRICING_DEFFUNCNAME_OptTouch
+{
+ItemList =
+{
+ OPT_TOUCH; ;
+};
+};
+
+StringArray PRICING_DEFFUNCNAME_OptProbHit
+{
+ItemList =
+{
+ OPT_PROB_HIT; ;
+};
+};
+StringArray PRICING_DEFFUNCNAME_OptProbInMoney
+{
+ItemList =
+{
+ OPT_PROB_INMONEY; ;
+};
+};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk sfx2/util
sfx2/AllLangResTarget_sfx2.mk |1
sfx2/UI_sfx.mk |1
sfx2/source/appl/app.hrc |3
sfx2/source/appl/app.src |8 +
sfx2/source/dialog/securitypage.cxx| 166 +++--
sfx2/source/dialog/securitypage.hrc| 43
sfx2/source/dialog/securitypage.src| 158 ---
sfx2/source/inc/helpid.hrc |1
sfx2/uiconfig/ui/documentproperties.ui | 97 ---
sfx2/uiconfig/ui/securityinfopage.ui | 133 ++
sfx2/util/hidother.src |1
11 files changed, 206 insertions(+), 406 deletions(-)
New commits:
commit a2279bb2f52ee5bbe8d38433aac55aa1a16661fb
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 13:32:39 2012 +
split out security info page and convert to .ui
Change-Id: Ifb962186a80941beb57b75815fbb9d425ef44ee0
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index af2f5bc..d2f43ec 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/dialog/newstyle.src \
sfx2/source/dialog/printopt.src \
sfx2/source/dialog/recfloat.src \
-sfx2/source/dialog/securitypage.src \
sfx2/source/dialog/srchdlg.src \
sfx2/source/dialog/taskpane.src \
sfx2/source/dialog/templateinfodlg.src \
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index 9505cdf..d3d15c6 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/password \
sfx2/uiconfig/ui/printeroptionsdialog \
+ sfx2/uiconfig/ui/securityinfopage \
sfx2/uiconfig/ui/templatemanagementdialog \
))
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index fb322cb..cfe9ae1 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -142,6 +142,9 @@
#define PB_LICENSING_SHOW (RID_SFX_APP_START + 210)
#define PB_LICENSING_CLOSE (RID_SFX_APP_START + 211)
+#define RID_SVXSTR_END_REDLINING_WARNING(RID_SFX_APP_START + 212)
+#define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213)
+
#define MD_DDE_LINKEDIT (RID_SFX_APP_START + 1)
#endif // #ifndef _SFX_APP_HRC
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index d1dcccd..aa12e39 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -504,6 +504,14 @@ String RID_SVXSTR_GRFILTER_TOOBIG
{
Text [ en-US ] = Not enough memory to insert graphic ;
};
+String RID_SVXSTR_END_REDLINING_WARNING
+{
+Text [ en-US ] = This action will exit the change recording mode.\nAny
information about changes will be lost.\n\nExit change recording mode?\n\n ;
+};
+String RID_SVXSTR_INCORRECT_PASSWORD
+{
+Text [ en-US ] = Incorrect password ;
+};
ModalDialog DLG_HELP_LICENSING
{
diff --git a/sfx2/source/dialog/securitypage.cxx
b/sfx2/source/dialog/securitypage.cxx
index b4de6af..46f33f5 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -20,7 +20,6 @@
#include sfx2/securitypage.hxx
-#include securitypage.hrc
#include sfxresid.hxx
#include sfx2/sfx.hrc
@@ -40,6 +39,8 @@
#include svl/PasswordHelper.hxx
#include svtools/xwindowitem.hxx
+#include ../appl/app.hrc
+
using namespace ::com::sun::star;
@@ -125,7 +126,7 @@ static bool lcl_IsPasswordCorrect( const String rPassword )
if (SvPasswordHelper::CompareHashPassword( aPasswordHash, rPassword ))
bRes = true;// password was correct
else
-InfoBox( NULL, SfxResId( RID_SFX_INCORRECT_PASSWORD ).toString()
).Execute();
+InfoBox( NULL, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD) ).Execute();
return bRes;
}
@@ -135,25 +136,10 @@ struct SfxSecurityPage_Impl
{
SfxSecurityPagem_rMyTabPage;
-FixedLine m_aNewPasswordToOpenFL;
-FixedText m_aNewPasswordToOpenFT;
-Editm_aNewPasswordToOpenED;
-FixedText m_aConfirmPasswordToOpenFT;
-Editm_aConfirmPasswordToOpenED;
-FixedText m_aNewPasswordInfoFT;
-
-FixedLine m_aNewPasswordToModifyFL;
-FixedText m_aNewPasswordToModifyFT;
-Editm_aNewPasswordToModifyED;
-FixedText m_aConfirmPasswordToModifyFT;
-Editm_aConfirmPasswordToModifyED;
-
-FixedLine m_aOptionsFL;
-CheckBoxm_aOpenReadonlyCB;
-CheckBoxm_aRecordChangesCB; // for record changes
-PushButton m_aChangeProtectionPB; // for record changes
-String m_aProtectSTR; // for record changes
-String m_aUnProtectSTR;//
MS Word import: bug-to-bug or correct
Hi, What is our policy about MS Word import? Should it give the same result as in MS Word, or where MS Word is buggy it should give a correct result? I ask this in context of the attached bug. -- Lionel ---BeginMessage--- https://bugs.freedesktop.org/show_bug.cgi?id=49306 ydutri...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG -- You are receiving this mail because: You reported the bug. ---End Message--- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - oox/inc sal/inc sal/Library_sal.mk solenv/bin svx/inc
oox/inc/pch/precompiled_oox.hxx |1 sal/Library_sal.mk |2 - sal/inc/pch/precompiled_sal.cxx | 12 sal/inc/pch/precompiled_sal.hxx | 29 solenv/bin/update_pch.sh| 57 ++-- svx/inc/pch/precompiled_svx.hxx |7 6 files changed, 52 insertions(+), 56 deletions(-) New commits: commit decf6bf7207ae36bc5882f2e945a7d3f8587cf03 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 18 14:56:56 2012 +0100 update PCH headers using the current pch script Removing PCH for sal, as that one is too complicated to be updated automatically right now (#include premac.h needs to be handled, Change-Id: I3ffe9526942f58d0f66430af109b13f7ec1d6c90 diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 59a0721..43b8a58 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -276,6 +276,7 @@ #include com/sun/star/text/WritingMode.hpp #include com/sun/star/text/XNumberingRulesSupplier.hpp #include com/sun/star/text/XSimpleText.hpp +#include com/sun/star/text/XTextAppend.hpp #include com/sun/star/text/XTextContent.hpp #include com/sun/star/text/XTextCursor.hpp #include com/sun/star/text/XTextDocument.hpp diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index acec543..878453b 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_packages,sal,\ sal_inc \ )) -$(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) - $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ -I$(SRCDIR)/sal/inc \ diff --git a/sal/inc/pch/precompiled_sal.cxx b/sal/inc/pch/precompiled_sal.cxx deleted file mode 100644 index 5386a69..000 --- a/sal/inc/pch/precompiled_sal.cxx +++ /dev/null @@ -1,12 +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/. - */ - -#include precompiled_sal.hxx - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx deleted file mode 100644 index 939af83..000 --- a/sal/inc/pch/precompiled_sal.hxx +++ /dev/null @@ -1,29 +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/. - */ - -#include vector -#include map -#include list -#include iterator -#include memory -#include deque -#include stdio.h -#include stdlib.h -#include limits.h -#include iostream -#include cassert -#include cstdarg -#include sstream -#include boost/shared_ptr.hpp -#include boost/unordered_map.hpp -#include boost/unordered_set.hpp -#include boost/ptr_container/ptr_vector.hpp -#include boost/bind.hpp - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 13b85611..1f5c039 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -250,16 +250,21 @@ #include numeric #include osl/diagnose.h #include osl/diagnose.h +#include osl/file.hxx #include osl/file.hxx #include osl/interlck.h #include osl/mutex.hxx #include osl/nlsupport.h +#include osl/process.h #include osl/security.hxx +#include pwd.h +#include rtl/bootstrap.hxx #include rtl/bootstrap.hxx #include rtl/instance.hxx #include rtl/locale.h #include rtl/math.hxx #include rtl/ref.hxx +#include rtl/strbuf.hxx #include rtl/strbuf.hxx #include rtl/tencinfo.h #include rtl/textenc.h @@ -349,6 +354,7 @@ #include toolkit/helper/externallock.hxx #include toolkit/helper/vclunohelper.hxx #include toolkit/unohlp.hxx +#include tools/appendunixshellword.hxx #include tools/color.hxx #include tools/debug.hxx #include tools/errinf.hxx @@ -364,6 +370,7 @@ #include tools/string.hxx #include tools/urlobj.hxx #include unicode/uchar.h +#include unistd.h #include uno/lbnames.h #include uno/mapping.hxx #include unotools/accessiblerelationsethelper.hxx commit eb976220e0d1fb156fe1e3e839a85c9ed78fea73 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 18 14:30:37 2012 +0100 update update_pch.sh Change-Id: I8353ab9808e5a496ec1b484ef7c80949534ab640 diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh index 864d0df..3756083 100755 --- a/solenv/bin/update_pch.sh +++ b/solenv/bin/update_pch.sh @@ -10,7 +10,7 @@ root=`dirname $0` root=`cd $root/../.. pwd` -if test -z $1; then +if test -z
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 015bcb0840a584a660cefec412493107b74f4712 Author: Noel Power noel.po...@suse.com Date: Tue Dec 18 14:33:20 2012 + finalize pivot *before* scenario sheet to ensure table numbers are correct Change-Id: I15cf378b51b1ecfbd05c7013e5a5b69fb87fdafb diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index e5521e7..c3c2fbb 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -597,11 +597,6 @@ void WorkbookGlobals::finalize() // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); -// Insert all pivot tables. Must be done after loading all sheets and -// formulas, because data pilots expect existing source data on -// creation. -getPivotTables().finalizeImport(); - // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) @@ -674,6 +669,12 @@ void WorkbookHelper::finalizeWorkbookImport() // need to import formulas before scenarios mrBookGlob.getFormulaBuffer().finalizeImport(); + +// Insert all pivot tables. Must be done after loading all sheets and +// formulas, because data pilots expect existing source data on +// creation. +getPivotTables().finalizeImport(); + /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - starmath/source
starmath/source/ooxmlimport.cxx |8
starmath/source/ooxmlimport.hxx |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c237369bc2f4a1931e241c8f6efd7c2854ee657b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 18 15:48:15 2012 +0100
avoid infinite loop when parsing malformed ooxml math (fdo#57886)
Change-Id: I2f66bc335795a9e84f532fb28d3585aed783ebd6
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index c83fc9b..0b1beda 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -69,7 +69,7 @@ OUString SmOoxmlImport::handleStream()
{
// strictly speaking, it is not OMathArg here, but currently supported
// functionality is the same like OMathArg, in the future this may
need improving
-OUString item = readOMathArg();
+OUString item = readOMathArg( M_TOKEN( oMath ));
if( item.isEmpty())
continue;
if( !ret.isEmpty())
@@ -87,10 +87,10 @@ OUString SmOoxmlImport::handleStream()
return ret;
}
-OUString SmOoxmlImport::readOMathArg()
+OUString SmOoxmlImport::readOMathArg( int stoptoken )
{
OUString ret;
-while( !stream.atEnd() stream.currentToken() != CLOSING(
stream.currentToken()))
+while( !stream.atEnd() stream.currentToken() != CLOSING( stoptoken ))
{
if( !ret.isEmpty())
ret += ;
@@ -164,7 +164,7 @@ OUString SmOoxmlImport::readOMathArg()
OUString SmOoxmlImport::readOMathArgInElement( int token )
{
stream.ensureOpeningTag( token );
-OUString ret = readOMathArg();
+OUString ret = readOMathArg( token );
stream.ensureClosingTag( token );
return ret;
}
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index bdb8348..6e4835d 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -63,7 +63,7 @@ private:
OUString handleSsub();
OUString handleSsubsup();
OUString handleSsup();
-OUString readOMathArg();
+OUString readOMathArg( int stoptoken );
OUString readOMathArgInElement( int token );
oox::formulaimport::XmlStream stream;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: python3/ExternalProject_python3.mk
python3/ExternalProject_python3.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ea11e31e9f70e8ea33fbbf217370a7d911fdacb Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Dec 18 16:53:04 2012 +0200 /p:VisualStudioVersion=11.0 here, too Change-Id: Ifa463327e9f33696012b3add0640b12f6d585178 diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 2bde4cf..dc6999d 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -26,7 +26,7 @@ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,python3,build) : ifeq ($(VCVER),110) cd $(EXTERNAL_WORKDIR)/PCbuild \ -MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=v110 \ +MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 \ cd $(EXTERNAL_WORKDIR) \ ln -s PCbuild LO_lib \ touch $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/source svx/source
sd/source/filter/eppt/epptso.cxx | 11 ++-
svx/source/svdraw/svdobj.cxx |4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit d397024411d2d73161e6a7410ccc82ee222648d8
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 17 13:26:02 2012 +0100
fix assertion
Change-Id: I67bf571062c5246402979170e0395ede320dac82
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index fefe00d..f74ec47 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2937,9 +2937,9 @@ SvxShape* SdrObject::getSvxShape() const
// retrieving the impl pointer and subsequently using it is not
thread-safe, of course, so it needs to be
// guarded by the SolarMutex
-#if OSL_DEBUG_LEVE 0
+#if OSL_DEBUG_LEVEL 0
uno::Reference uno::XInterface xShape( maWeakUnoShape );
-OSL_ENSURE( !( !xShapeGuard.is() mpSvxShape ),
+OSL_ENSURE( !( !xShape.is() mpSvxShape ),
SdrObject::getSvxShape: still having IMPL-Pointer to dead object! );
#endif
commit cd69be65786cb49d0748433360b05db8c4f6d890
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 17 09:59:42 2012 +0100
fdo#49277 use correct default tab size
Change-Id: If8e1936b897bfe0f3ae0d791c573267df3381954
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b216a88..201f1f1 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1310,7 +1310,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream rOut,
int nTextInstance, sal_u
}
nParaFlags = 16;
-sal_uInt32 nDefaultTabSize = MapSize(
::com::sun::star::awt::Size( 2011, 1 ) ).Width;
+sal_Int32 nDefaultTabSizeSrc = 2011; // I've no idea where this
number came from, honestly
+const uno::Reference beans::XPropertySet xPropSet( mXModel,
uno::UNO_QUERY );
+if ( xPropSet.is() )
+{
+ImplGetPropertyValue( xPropSet, rtl::OUString( TabStop ) );
+sal_Int32 nTabStop( 0 );
+if ( mAny = nTabStop )
+nDefaultTabSizeSrc = nTabStop;
+}
+const sal_uInt32 nDefaultTabSize = MapSize( awt::Size(
nDefaultTabSizeSrc, 1 ) ).Width;
sal_uInt32 nDefaultTabs = abs( maRect.GetWidth() ) /
nDefaultTabSize;
if ( nTabs )
nDefaultTabs -= (sal_Int32)( ( ( pTabStop[ nTabs - 1
].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/oox/workbookhelper.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 28549ae77dee063da50a56eb3cdf9114365a6afd Author: Noel Power noel.po...@suse.com Date: Tue Dec 18 14:33:20 2012 + finalize pivot *before* scenario sheet to ensure table numbers are correct Change-Id: I15cf378b51b1ecfbd05c7013e5a5b69fb87fdafb Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index dce942c..c10a159 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -591,11 +591,6 @@ void WorkbookGlobals::finalize() // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); -// Insert all pivot tables. Must be done after loading all sheets and -// formulas, because data pilots expect existing source data on -// creation. -getPivotTables().finalizeImport(); - // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) @@ -664,6 +659,12 @@ void WorkbookHelper::finalizeWorkbookImport() // need to import formulas before scenarios mrBookGlob.getFormulaBuffer().finalizeImport(); + +// Insert all pivot tables. Must be done after loading all sheets and +// formulas, because data pilots expect existing source data on +// creation. +getPivotTables().finalizeImport(); + /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sd/source svx/source
sd/source/filter/eppt/epptso.cxx | 11 ++-
svx/source/svdraw/svdobj.cxx |4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 2bb808b50151db339b88309618a75f853d9dc056
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 17 13:26:02 2012 +0100
fix assertion
Change-Id: I67bf571062c5246402979170e0395ede320dac82
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index fefe00d..f74ec47 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2937,9 +2937,9 @@ SvxShape* SdrObject::getSvxShape() const
// retrieving the impl pointer and subsequently using it is not
thread-safe, of course, so it needs to be
// guarded by the SolarMutex
-#if OSL_DEBUG_LEVE 0
+#if OSL_DEBUG_LEVEL 0
uno::Reference uno::XInterface xShape( maWeakUnoShape );
-OSL_ENSURE( !( !xShapeGuard.is() mpSvxShape ),
+OSL_ENSURE( !( !xShape.is() mpSvxShape ),
SdrObject::getSvxShape: still having IMPL-Pointer to dead object! );
#endif
commit 6488c424654cd5d6872f40c15dcdd72071843efd
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 17 09:59:42 2012 +0100
fdo#49277 use correct default tab size
Change-Id: If8e1936b897bfe0f3ae0d791c573267df3381954
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b216a88..201f1f1 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1310,7 +1310,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream rOut,
int nTextInstance, sal_u
}
nParaFlags = 16;
-sal_uInt32 nDefaultTabSize = MapSize(
::com::sun::star::awt::Size( 2011, 1 ) ).Width;
+sal_Int32 nDefaultTabSizeSrc = 2011; // I've no idea where this
number came from, honestly
+const uno::Reference beans::XPropertySet xPropSet( mXModel,
uno::UNO_QUERY );
+if ( xPropSet.is() )
+{
+ImplGetPropertyValue( xPropSet, rtl::OUString( TabStop ) );
+sal_Int32 nTabStop( 0 );
+if ( mAny = nTabStop )
+nDefaultTabSizeSrc = nTabStop;
+}
+const sal_uInt32 nDefaultTabSize = MapSize( awt::Size(
nDefaultTabSizeSrc, 1 ) ).Width;
sal_uInt32 nDefaultTabs = abs( maRect.GetWidth() ) /
nDefaultTabSize;
if ( nTabs )
nDefaultTabs -= (sal_Int32)( ( ( pTabStop[ nTabs - 1
].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.beta2'
Tag 'libreoffice-4.0.0.0.beta2' created by Petr Mladek pmla...@suse.cz at 2012-12-18 15:16 -0800 Tag libreoffice-4.0.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ0IjpAAoJEPQ0oe+v7q6jRkIQALcwgg1bIveh2lDIluyZr1j/ L4TjDkMd2LOl/TWKB6HBgiMfzO94HOcMCVWbIjT2/yfo7EmdXEXJpgqbbOyghlIF XCz3ekknNE6N2BA2Ptks5ZwHQobSsPF3Woe68bQCsrYjs0N3BdHOS6bA3XsDjQR7 AnjgafKA/2crfDuS/qBPMz9RGBNQ6vvZZU1ON1d7ncCizjJPyEqfg5bmc2+jIjwy aSNGC4zaifwMXS0uHEcFTykF2Wcej4WnvM8lgrZRf4XnNXsgT21+//YRdWarXLjp W4p1obwzhFhUh29OU5M9as/lzJAh3iQmYCOldSKKKT/G094nd+X7F7yVo0HWaFJ3 IujQDrJZplQMq+rVRFyG6e+Z1Ux/ZyhkVNWWmLwp7TBoduJ+hFRuAtwC0i0CmLIl 7lvh0tND+XTy2o4/zejbPr51K7XUnKCfvEtKxKXMb9+lNIfQ+BctAUsrIdrHVNTr Sr0XNs0nddIag/rJrdM+JEiJWUDdNYKMZp8Z8TBJ1bBJQOadQvDNdMoLL+3HAJze 2RvVaNWftB+Ba/kKz3qXV7QHsYJQFPvto2ZkRiDqQ2hRKxOSCg6ZfBGi/a/uLjxo eYgW3zO8RTZzvxsXsO0VCwQxoQFkBfOHqcLhrkyTNjEzKIJCXew5g1Eqh0PnQlqI 4hGbgMFtrKxyxAjiyhqf =/qfz -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.beta2'
Tag 'libreoffice-4.0.0.0.beta2' created by Petr Mladek pmla...@suse.cz at 2012-12-18 15:17 -0800 Tag libreoffice-4.0.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ0Ij/AAoJEPQ0oe+v7q6jFEQQALIXjOoYv2kFY/PZjvFcYftl aUHzLbMCUX1+Oj6GH8XckqsoR3rfaQkU94uSTXLJ51fuo1YbjtsxukX7H6N7YiMX BmvOmUbPeh0sK3yZsJdD8ILHWB3xczdRQ8PWI2Bub5DKkfA5QXXkqxds3N6VOV5b MISRbrJ0HzprOvFSPed+EIUPQeRktA+HOvnzYLk4HmNogwa0oHMUMszoOU9laCsT yW71c9hSmsxbDa7MjSW3afJyXuz9xFYdOkycf0rY5owdgZ3ZJyEcevWc4StdRVPv Jw1AnA7sxsDC3YZN753cCN9AX322v5WBhopKGgQBDQbiMkg75vcwK1Z56jbI2uyN 2wIE0naclH5YzekX0Y3hxP0Lwis2NjW5o6tcUkKhXbAjsmP0BBh3CuLunV6L0l8d NVLCezVswbKa7uFzEswh/9Y0FjrKXTKfKqKNL1iJNlb7+SwD5fS1VlBRaxGoczjq RgoJbMsck5IKzpTj2b3a+uACXK3pqmE6J0EZN6aBQlLjgxwnaIew2MUqLYuboKlU 9qKaggV7lLiJgnWT+SICqpumu88KA7PBXIgvMnUUixVJ4HI6XEVhT4MNoKllTW9g rKxCFvQkLxkVWgxbooORoDENiOUHLJnU9+QeiWEDoeWMDkm8J49GkyyCGKF0NgEr rZQyYPSeglnBfNLIYirX =tuZI -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.beta2'
Tag 'libreoffice-4.0.0.0.beta2' created by Petr Mladek pmla...@suse.cz at 2012-12-18 15:15 -0800 Tag libreoffice-4.0.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ0IieAAoJEPQ0oe+v7q6jazMP/048oQI/bgqIko0Fnmp0N4k5 LyR6LJHBv/8aFbn2vT+aWvESNt7/WswZwffCU1uFzhPQ4am+c42t9Z6iVTGJTlRc LV8pGx93d+seovXBvHqfo15xpYq+os95cJ2lybRmjp7oCJvaiL62e6ETE92jfwcC GgyMD51PMSy+vnnZnJlgJNx/sEARlLJKwjU02R00w1ngeOw+xWHfeEIhxwSFA2Z+ 9Pwu2VWJug1U322LEKqH0QbFe7ekrfvFbAesMXGFv2Nl3bmxOAIWOxdW1MDcQ1SX KoTMS/QwaXpckYLEvHR3lqN2qVAuPYRnQbMTODfNN8bg8u7CuD7SvabTlB1yX4nL sQz0XsrLKmAQ1/dL6HJlbShroU51HRek4lnAfuUEHyu2lwc99TGk/EL9EXtBQaQJ Tz+4qU3Fna0z0N+a3BFGLlmagpamikP/eWTn9Ne/WfNn5TRVYbOvQ5WSDG56UsSr 83PcWhA5onvC6fnyqx3Xb+MjHPlTr+/+7sdHK/egMXDELD74/JuOrimoFsqnBevv mmfMmiv13nwZUqBha1UXMTgDbwJPxuSX2cgj6FH+vpd0f/5k5YgVNa37cmpRGNoC SpYd1Lg8gGrqRdYJXTqWbjM+HAoih9pASw2Nma8CshiT1Jxsg3vv6ct2BUC1zBnw J8KdsvMKwprmiqc4w8Vp =DNXO -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-276: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - cpputools/Executable_regcomp.mk cpputools/Module_cpputools.mk cpputools/Package_bin.mk cpputools/source odk/docs odk/settings odk/util Repository.mk scp2/source so
Repository.mk|1 cpputools/Executable_regcomp.mk | 44 cpputools/Module_cpputools.mk|1 cpputools/Package_bin.mk |1 cpputools/source/registercomponent/registercomponent.cxx | 841 --- cpputools/source/unoexe/unoexe.cxx | 68 - odk/docs/tools.html | 68 - odk/settings/std.mk |1 odk/util/odk_rules.pmk |4 scp2/source/ooo/ure.scp | 31 solenv/bin/guw.pl|1 solenv/inc/settings.mk |5 ure/source/README| 16 ure/source/uretest/JavaTest.java |6 ure/source/uretest/Makefile |9 ure/source/uretest/Makefile.pln | 22 ure/source/uretest/cpptest.cc|7 ure/source/uretest/services.rdb.in | 24 18 files changed, 65 insertions(+), 1085 deletions(-) New commits: commit b7215602c00f392e30e0e23e21f32dd37fba07dd Author: Stephan Bergmann sberg...@redhat.com Date: Mon Dec 17 15:29:12 2012 +0100 API CHANGE: Remove obsolete regcomp from URE Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7 diff --git a/Repository.mk b/Repository.mk index 6f62ae2..5479d36 100755 --- a/Repository.mk +++ b/Repository.mk @@ -176,7 +176,6 @@ endif ifneq ($(OS),IOS) $(eval $(call gb_Helper_register_executables,UREBIN,\ - regcomp \ regmerge \ regview \ uno \ diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk deleted file mode 100644 index 844fd94..000 --- a/cpputools/Executable_regcomp.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Executable_Executable,regcomp)) - -$(eval $(call gb_Executable_use_internal_comprehensive_api,regcomp,\ -udkapi \ -)) - -$(eval $(call gb_Executable_use_libraries,regcomp,\ -cppu \ -cppuhelper \ -sal \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Executable_add_exception_objects,regcomp,\ -cpputools/source/registercomponent/registercomponent \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index 9f5e932..504d281 100644 --- a/cpputools/Module_cpputools.mk +++ b/cpputools/Module_cpputools.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,cpputools,\ )) $(eval $(call gb_Module_add_targets,cpputools,\ -Executable_regcomp \ Executable_regsingleton \ Executable_uno \ )) diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk index 9a0b8d4..1a22247 100644 --- a/cpputools/Package_bin.mk +++ b/cpputools/Package_bin.mk @@ -28,7 +28,6 @@ # because the installation system is so incredibly inflexible... $(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR))) -$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp)) $(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx deleted file mode 100644 index 950952b..000 --- a/cpputools/source/registercomponent/registercomponent.cxx +++ /dev/null @@ -1,841 +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
[Libreoffice-commits] .: 2 commits - solenv/bin svx/inc
solenv/bin/update_pch.sh| 108 svx/inc/pch/precompiled_svx.hxx |7 -- 2 files changed, 55 insertions(+), 60 deletions(-) New commits: commit 626969aa7cce72692767e265a2a98ef111202487 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 18 16:53:31 2012 +0100 fix conditionals detection Change-Id: I50b335375b8b2ac67c50f887a4eb58456b9cea33 diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh index 0cda8f4..1302df4 100755 --- a/solenv/bin/update_pch.sh +++ b/solenv/bin/update_pch.sh @@ -30,7 +30,7 @@ for x in $headers; do inobjects= ifstack=0 while read line ; do -if (test $line = ))) || (echo $line | grep -q , ); then +if test $line = )) ; then inobjects= elif echo $line | grep -q -e add_exception_objects -e add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then inobjects=1 @@ -43,7 +43,9 @@ for x in $headers; do ifstack=$((ifstack - 1)) elif test -n $inobjects -a $ifstack -eq 0; then file=$line -if ! test -f $root/$file.cxx ; then +if echo $line | grep -q , ; then +true # $if() probably, or something similar +elif ! test -f $root/$file.cxx ; then echo No file $file in $module/$makefile 2 else cat $root/$file.cxx | grep -e '^\s*#include' | sed 's/\(#include [][^]*[]\).*/\1/' | sed 's#\.\./##g#' $tmpfile diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 1f5c039..13b85611 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -250,21 +250,16 @@ #include numeric #include osl/diagnose.h #include osl/diagnose.h -#include osl/file.hxx #include osl/file.hxx #include osl/interlck.h #include osl/mutex.hxx #include osl/nlsupport.h -#include osl/process.h #include osl/security.hxx -#include pwd.h -#include rtl/bootstrap.hxx #include rtl/bootstrap.hxx #include rtl/instance.hxx #include rtl/locale.h #include rtl/math.hxx #include rtl/ref.hxx -#include rtl/strbuf.hxx #include rtl/strbuf.hxx #include rtl/tencinfo.h #include rtl/textenc.h @@ -354,7 +349,6 @@ #include toolkit/helper/externallock.hxx #include toolkit/helper/vclunohelper.hxx #include toolkit/unohlp.hxx -#include tools/appendunixshellword.hxx #include tools/color.hxx #include tools/debug.hxx #include tools/errinf.hxx @@ -370,7 +364,6 @@ #include tools/string.hxx #include tools/urlobj.hxx #include unicode/uchar.h -#include unistd.h #include uno/lbnames.h #include uno/mapping.hxx #include unotools/accessiblerelationsethelper.hxx commit 17e0f42234c67df60e5599289fdb2cda683bea6e Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 18 16:46:40 2012 +0100 indent Change-Id: I4c41f5f8b0498deacbe296804047befa5f19fa3d diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh index 3756083..0cda8f4 100755 --- a/solenv/bin/update_pch.sh +++ b/solenv/bin/update_pch.sh @@ -11,48 +11,48 @@ root=`dirname $0` root=`cd $root/../.. pwd` if test -z $1; then -headers=`ls $root/*/inc/pch/precompiled_*.hxx` +headers=`ls $root/*/inc/pch/precompiled_*.hxx` else -headers=$1 +headers=$1 fi for x in $headers; do -header=$x -echo updating `echo $header | sed -e s%$root/%%` -module=`echo $header | sed -e s%$root/%% -e s%/.*%%` -name=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//` -makefile=Library_$name.mk - -tmpfile=`mktemp` - -cat $root/$module/$makefile | sed 's#\\$##' | \ -( -inobjects= -ifstack=0 -while read line ; do -if (test $line = ))) || (echo $line | grep -q , ); then -inobjects= -elif echo $line | grep -q -e add_exception_objects -e add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then -inobjects=1 -if test $ifstack -ne 0 ; then -echo Sources in a conditional, ignoring for now. 2 -fi -elif echo $line | grep -q ^if ; then -ifstack=$((ifstack + 1)) -elif echo $line | grep -q ^endif ; then -ifstack=$((ifstack - 1)) -elif test -n $inobjects -a $ifstack -eq 0; then -file=$line -if ! test -f $root/$file.cxx ; then -echo No file $file in $module/$makefile 2 -else -cat $root/$file.cxx | grep -e '^\s*#include' | sed 's/\(#include [][^]*[]\).*/\1/' | sed 's#\.\./##g#' $tmpfile -fi -fi -done -) +header=$x +echo updating `echo $header | sed -e s%$root/%%` +module=`echo $header | sed -e s%$root/%% -e s%/.*%%` +name=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//` +makefile=Library_$name.mk -cat $header EOF +tmpfile=`mktemp` + +cat $root/$module/$makefile | sed 's#\\$##' | \ +( +inobjects= +ifstack=0 +while read line ; do +if (test
[Libreoffice-commits] .: sc/source vcl/aqua
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |2 +
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 20 +++---
vcl/aqua/source/a11y/aqua11ywrapper.mm | 37 +--
3 files changed, 44 insertions(+), 15 deletions(-)
New commits:
commit 15aac31ebac23ef745400a8d9c146aef85923c9d
Author: Michael Meeks michael.me...@suse.com
Date: Tue Dec 18 13:29:03 2012 +
fdo#56937 - mac a11y hang related to traversing vast, broken hierarchies.
Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index d57d92e..e4d0060 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -44,6 +44,8 @@ using namespace ::com::sun::star::accessibility;
//= internal
+// FIXME: really unclear why we have an ScAccessibleTableBase with
+// only this single sub-class
ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
ScAccessibleDocument* pAccDoc,
ScTabViewShell* pViewShell,
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 780638b..3a950c4 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL
ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow
return false;
}
-//= XAccessibleExtendedTable
+// = XAccessibleExtendedTable
sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow,
sal_Int32 nColumn )
throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
@@ -304,7 +304,7 @@ sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI
return nChildIndex % static_castsal_Int32(maRange.aEnd.Col() -
maRange.aStart.Col() + 1);
}
-//= XAccessibleContext ==
+// = XAccessibleContext ==
sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleChildCount(void)
@@ -312,9 +312,16 @@ sal_Int32 SAL_CALL
{
SolarMutexGuard aGuard;
IsObjectValid();
-return static_castsal_Int32(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
-(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
-// return 1;
+
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+sal_Int64 nMax = ((sal_Int64)(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
+ (sal_Int64)(maRange.aEnd.Col() - maRange.aStart.Col() +
1));
+if (nMax SAL_MAX_INT32)
+nMax = SAL_MAX_INT32;
+if (nMax 0)
+return 0;
+return static_castsal_Int32(nMax);
}
uno::Reference XAccessible SAL_CALL
@@ -328,6 +335,9 @@ uno::Reference XAccessible SAL_CALL
if (nIndex = getAccessibleChildCount() || nIndex 0)
throw lang::IndexOutOfBoundsException();
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+
sal_Int32 nRow(0);
sal_Int32 nColumn(0);
sal_Int32 nTemp(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index b3517b0..94dbe1b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -977,21 +977,38 @@ Reference XAccessibleContext hitTestRunner (
com::sun::star::awt::Point poin
Reference XAccessibleComponent rxAccessibleComponent (
rxAccessibleContext, UNO_QUERY );
if ( rxAccessibleComponent.is() ) {
com::sun::star::awt::Point location = rxAccessibleComponent -
getLocationOnScreen();
-com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
+com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
Reference XAccessible rxAccessible = rxAccessibleComponent -
getAccessibleAtPoint ( hitPoint );
if ( rxAccessible.is() rxAccessible -
getAccessibleContext().is()
rxAccessible - getAccessibleContext() -
getAccessibleChildCount() == 0 ) {
hitChild = rxAccessible - getAccessibleContext();
}
-}
-if ( !hitChild.is() rxAccessibleContext -
getAccessibleChildCount() 0 ) { // special treatment for e.g. comboboxes
-for ( int i = 0; i rxAccessibleContext -
getAccessibleChildCount(); i++ ) {
-Reference XAccessible rxAccessibleChild =
rxAccessibleContext - getAccessibleChild ( i );
-if (
[Libreoffice-commits] .: mysqlc/source
mysqlc/source/makefile.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit 259cdd64ac850fa9105bd21001d466a82671f75e Author: Tomas Chvatal tchva...@suse.cz Date: Tue Dec 18 17:05:47 2012 +0100 Do not define CPPCONN_LIB if using system version This is used for dlopen internal library only anyway and breaks when building in strict-multilib environment. Change-Id: I9dea9e37161aab17ab605bec33482ddb48beeb46 diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 207d785..fee18728 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -88,8 +88,6 @@ CFLAGS+=-DSYSTEM_MYSQL_CPPCONN CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD .IF $(SYSTEM_MYSQL_CPPCONN) != YES CDEFS += -DCPPCONN_LIB=\$(DLLPRE)mysqlcppconn$(DLLPOST)\ -.ELSE -CDEFS += -DCPPCONN_LIB=\$(shell readlink /usr/lib/libmysqlcppconn.so)\ .ENDIF # --- MySQL settings -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/filter/oox/workbookhelper.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit bc199d7eaeeb24760eced5573e59ac285bde5bc0 Author: Noel Power noel.po...@suse.com Date: Tue Dec 18 14:33:20 2012 + finalize pivot *before* scenario sheet to ensure table numbers are correct Change-Id: I15cf378b51b1ecfbd05c7013e5a5b69fb87fdafb diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index e5521e7..c3c2fbb 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -597,11 +597,6 @@ void WorkbookGlobals::finalize() // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); -// Insert all pivot tables. Must be done after loading all sheets and -// formulas, because data pilots expect existing source data on -// creation. -getPivotTables().finalizeImport(); - // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) @@ -674,6 +669,12 @@ void WorkbookHelper::finalizeWorkbookImport() // need to import formulas before scenarios mrBookGlob.getFormulaBuffer().finalizeImport(); + +// Insert all pivot tables. Must be done after loading all sheets and +// formulas, because data pilots expect existing source data on +// creation. +getPivotTables().finalizeImport(); + /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source vcl/source
unotools/source/misc/fontcvt.cxx | 100 +--
vcl/source/gdi/outdev3.cxx | 13 +
2 files changed, 108 insertions(+), 5 deletions(-)
New commits:
commit 84a99c009e76582e79cc8341e2931d5b8261bb68
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 16:06:03 2012 +
Related: fdo#50284 apple's modern symbol font is unicode encoded
So codepoints that are from the legacy range need to be converted to their
unicode equivalents even in the presence of an installed symbol font on
MacOSX.
This should work out ok if input codepoints that exist in the apple symbol
unicode are used, they should be left untouched by this conversion.
Change-Id: Ia9996e2d9bf632c86c8d26832d77c7c662cf1076
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 96212c0..6aaef61 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -719,6 +719,79 @@ static const sal_Unicode aMTExtraTab[224] =
0, 0, 0, 0
};
+static const sal_Unicode aAdobeSymbolToAppleSymbolTab[224] =
+{
+// F020
+0x0020,0x0021,0x2200,0x0023,
+0x2203,0x0025,0x0026,0x220D,
+0x0028,0x0029,0x2217,0x002B,
+0x002C,0x2212,0x002E,0x002F,
+// F030
+0x0030,0x0031,0x0032,0x0033,
+0x0034,0x0035,0x0036,0x0037,
+0x0038,0x0039,0x003A,0x003B,
+0x003C,0x003D,0x003E,0x003F,
+// F040
+0x2245,0x0391,0x0392,0x03A7,
+0x0394,0x0395,0x03A6,0x0393,
+0x0397,0x0399,0x03D1,0x039A,
+0x039B,0x039C,0x039D,0x039F,
+// F050
+0x03A0,0x0398,0x03A1,0x03A3,
+0x03A4,0x03A5,0x03C2,0x03A9,
+0x039E,0x03A8,0x0396,0x005B,
+0x2234,0x005D,0x22A5,0x005F,
+// F060
+0xF8E5,0x03B1,0x03B2,0x03C7,
+0x03B4,0x03B5,0x03C6,0x03B3,
+0x03B7,0x03B9,0x03D5,0x03BA,
+0x03BB,0x03BC,0x03BD,0x03BF,
+// F070
+0x03C0,0x03B8,0x03C1,0x03C3,
+0x03C4,0x03C5,0x03D6,0x03C9,
+0x03BE,0x03C8,0x03B6,0x007B,
+0x007C,0x007D,0x223C,0x007F,
+// F080
+0x0080,0x0081,0x0082,0x0083,
+0x0084,0x0085,0x0086,0x0087,
+0x0088,0x0089,0x008A,0x008B,
+0x008C,0x008D,0x008E,0x008F,
+// F090
+0x0090,0x0091,0x0092,0x0093,
+0x0094,0x0095,0x0096,0x0097,
+0x0098,0x0099,0x009A,0x009B,
+0x009C,0x009D,0x009E,0x009F,
+// F0a0
+0x20AC,0x03D2,0x2032,0x2264,
+0x2044,0x221E,0x0192,0x2663,
+0x2666,0x2665,0x2660,0x2194,
+0x2190,0x2191,0x2192,0x2193,
+// F0b0
+0x00B0,0x00B1,0x2033,0x2065,
+0x00D7,0x221D,0x2202,0x2022,
+0x00F7,0x2260,0x2261,0x2248,
+0x2026,0x23D0,0x23AF,0x21B5,
+// F0c0
+0x2135,0x2111,0x211C,0x2118,
+0x2297,0x2295,0x2205,0x2229,
+0x222A,0x2283,0x2287,0x2284,
+0x2282,0x2286,0x2208,0x2209,
+// F0d0
+0x2220,0x2207,0x00AE,0x00A9,
+0x2122,0x220F,0x221A,0x22C5,
+0x00AC,0x2227,0x2228,0x21D4,
+0x21D0,0x21D1,0x21D2,0x21D3,
+// F0e0
+0x25CA,0x3008,0x00AE,0x00A9,
+0x2122,0x2211,0x239B,0x239C,
+0x239D,0x23A1,0x23A2,0x23A3,
+0x23A7,0x23A8,0x23A9,0x23AA,
+// F0f0
+0xF8FF,0x3009,0x222B,0x2320,
+0x23AE,0x2321,0x239E,0x239F,
+0x23A0,0x23A4,0x23A5,0x23A6,
+0x23AB,0x23AC,0x23AD,0x00FF
+};
//===
@@ -1324,7 +1397,7 @@ void ConvertChar::RecodeString( String rStr, xub_StrLen
nIndex, xub_StrLen nLen
struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
-static RecodeTable aRecodeTable[] =
+static RecodeTable aStarSymbolRecodeTable[] =
{
// the first two entries must be StarMath and StarBats; do not reorder!
// reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
@@ -1348,6 +1421,10 @@ static RecodeTable aRecodeTable[] =
{mtextra, {aMTExtraTab, StarSymbol, NULL}}
};
+static RecodeTable aAppleSymbolRecodeTable[] = {
+{symbol, {aAdobeSymbolToAppleSymbolTab, AppleSymbol, NULL}}
+};
+
static ConvertChar aImplStarSymbolCvt = { NULL, StarBats,
ImplStarSymbolToStarBats };
//
[ANNOUNCE] libreoffice-4.0.0.0.beta2 tag created
Hi, there have been created the libreoffice-4.0.0.0.beta2 tag. The corresponding official builds will be available within next few days. See the attached list of changes against 4.0.0.0.beta1. See also http://wiki.documentfoundation.org/ReleaseNotes/4.0 Note that this is the last beta. The next build will be 4.0.0.1 (aka rc1) in January. Now, you might switch your current 4-0 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-4.0.0.0.beta2 libreoffice-4.0.0.0.beta2 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#4.0_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr bnc#791706 support multiple selection in page fields. [Kohei Yoshida] bnc#791731 revert fix for preserve cell formatting of datapilot area ( [Kohei Yoshida] bnc#791952 setting properties for all data labels. [Kohei Yoshida] bnc#792528 import static data series labels from xlsx correctly. [Kohei Yoshida] fdo#31055 misleading font replacement for list bullets [Caolán McNamara] fdo#31309 [UI]: Tasks pane items visibility can not be restored [Rob Snelders] fdo#32181 PRINTING: underlining in Justified aligned paragraph bleed over margin, also PDFEXPORT [Caolán McNamara] fdo#32958 query design: once a join has two fields, cannot go back to one field [Lionel Elie Mamane] fdo#33365 EDITING, Rand() Function [Tino Kluge] fdo#33484 Printing multiple files from Windows Explorer at once makes LibreOffice unusable [Stephan Bergmann] fdo#35680 FORMATTING: Gradient rendered wrongly in presentation mode when grouped [Michael Meeks] fdo#35943 Improve speed for Refresh PIVOTTABLE [Kohei Yoshida] fdo#38606 UI: Under Style and Formatting, clicking Apply always resets to initial tab [Caolán McNamara] fdo#42553 VIEWING: wrong rectangular gradient geometry in SLIDESHOW [Michael Meeks] fdo#44736 FILEOPEN: Loading RTF files is slow in comparison with LibO 3.4.4 (part of closed bug #44157) [Michael Meeks] fdo#46808 Adapt UNO services to new-style [Noel Grandin] fdo#47499 Visio file does not display correctly. Font problems. [Fridrich Štrba] fdo#47520 ODBC with sqliteodbc: primary key field mostly empty, broken scolling [Lionel Elie Mamane] fdo#49934 RTF editing/import doesn't recognize page breaks [Miklos Vajna] fdo#52240 [Task] EDITING: Incomplete Date values are no longer detected [Eike Rathke] fdo#53009 Large UserInstallation's user/extensions/bundled/ tree [Stephan Bergmann] fdo#53281 A double-plus-more extremely slow search/browse table in embedded HSQLDB since 3.5.5/3.6.0.beta [Lionel Elie Mamane] fdo#53471 Removed old file formats from save as, Word 95/6.0 and Excel 95/6.0 [Bryan Quigley] fdo#53525 FILEOPEN existing document: 2 columns Table of contents exceeds page width [Michael Meeks] fdo#55289 FILEOPEN .docx document crashes LibreOffice [Michael Stahl] fdo#55570 autocorrect slow-down [Michael Meeks] fdo#56402 No LibreOffice logo image anymore in about box of current master builds [Muthu Subramanian] fdo#57254 FILESAVE: hidden text visible in xhtml export [Arne de Bruijn] fdo#57320 FILESAVE: hidden text visible in HTML export [Arne de Bruijn] fdo#57413 Tools Options Language Settings Languages CRASH [Eike Rathke] fdo#57469 key handling broken in dialog Tools Customize .. Add [Caolán McNamara] fdo#57497 EDITING: PIVOTTABLE crash LibO while ungroping [Kohei Yoshida] fdo#57551 landscape/portrait sequence lost in FILESAVE as .doc [Luke Deller] fdo#57569 PyUNO deadlock when setting attributes [Ariel Constenla-Haile] fdo#57780 CRASH when FILEOPEN particular .doc with drawing object (AT_CHAR) in paragraph in table cell that is split across pages [Michael Stahl] fdo#57886 CRASH (hang) when FILEOPEN particular .RTF [Luboš Luňák] fdo#57895 UI: Conditional Formatting for cells shown incorrectly and and incompletely in CF dialog [Markus Mohrhard] fdo#57927 Only the dictionary of my mother tongue was installed [Stephan Bergmann] fdo#57939 FILEOPEN kerning is always disabled in imported ODT document [Caolán McNamara] fdo#58018 Help texts appear as menu items in menu File [Andras Timar] fdo#58029 EDITING: Selecting words in very large documents needs too much time [Michael Meeks] fdo#58060 autocorrect entries in the [All] list are saved as English(USA) [Michael Meeks, Eike Rathke] fdo#58068 Localization broken in master [Andras Timar, Petr Mladek] fdo#58142 EDITING: CRASH when copy paste multiple pictures from file explorer [Michael Stahl] fdo#58145 Windows installer is not localized [Andras Timar] fdo#58149 FILEOPEN: HYPERLINK formula functions set wrong URL upon loading [Kohei Yoshida] fdo#58156 mysqlc does not build --with-lang=ALL [Andras Timar] fdo#58196 VIEWING: Mirrored bitmaps are displayed unmirrored, but print mirrored. [Werner Koerner] fdo#58232 CONDITIONAL FORMATTING: Loss
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - unotools/source vcl/source
unotools/source/misc/fontcvt.cxx | 100 +--
vcl/source/gdi/outdev3.cxx | 13 +
2 files changed, 108 insertions(+), 5 deletions(-)
New commits:
commit 7be7b800fb72ffa63f60cf1e1ce1e7b206eb1e43
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 16:06:03 2012 +
Related: fdo#50284 apple's modern symbol font is unicode encoded
So codepoints that are from the legacy range need to be converted to their
unicode equivalents even in the presence of an installed symbol font on
MacOSX.
This should work out ok if input codepoints that exist in the apple symbol
unicode are used, they should be left untouched by this conversion.
Change-Id: Ia9996e2d9bf632c86c8d26832d77c7c662cf1076
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 96212c0..6aaef61 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -719,6 +719,79 @@ static const sal_Unicode aMTExtraTab[224] =
0, 0, 0, 0
};
+static const sal_Unicode aAdobeSymbolToAppleSymbolTab[224] =
+{
+// F020
+0x0020,0x0021,0x2200,0x0023,
+0x2203,0x0025,0x0026,0x220D,
+0x0028,0x0029,0x2217,0x002B,
+0x002C,0x2212,0x002E,0x002F,
+// F030
+0x0030,0x0031,0x0032,0x0033,
+0x0034,0x0035,0x0036,0x0037,
+0x0038,0x0039,0x003A,0x003B,
+0x003C,0x003D,0x003E,0x003F,
+// F040
+0x2245,0x0391,0x0392,0x03A7,
+0x0394,0x0395,0x03A6,0x0393,
+0x0397,0x0399,0x03D1,0x039A,
+0x039B,0x039C,0x039D,0x039F,
+// F050
+0x03A0,0x0398,0x03A1,0x03A3,
+0x03A4,0x03A5,0x03C2,0x03A9,
+0x039E,0x03A8,0x0396,0x005B,
+0x2234,0x005D,0x22A5,0x005F,
+// F060
+0xF8E5,0x03B1,0x03B2,0x03C7,
+0x03B4,0x03B5,0x03C6,0x03B3,
+0x03B7,0x03B9,0x03D5,0x03BA,
+0x03BB,0x03BC,0x03BD,0x03BF,
+// F070
+0x03C0,0x03B8,0x03C1,0x03C3,
+0x03C4,0x03C5,0x03D6,0x03C9,
+0x03BE,0x03C8,0x03B6,0x007B,
+0x007C,0x007D,0x223C,0x007F,
+// F080
+0x0080,0x0081,0x0082,0x0083,
+0x0084,0x0085,0x0086,0x0087,
+0x0088,0x0089,0x008A,0x008B,
+0x008C,0x008D,0x008E,0x008F,
+// F090
+0x0090,0x0091,0x0092,0x0093,
+0x0094,0x0095,0x0096,0x0097,
+0x0098,0x0099,0x009A,0x009B,
+0x009C,0x009D,0x009E,0x009F,
+// F0a0
+0x20AC,0x03D2,0x2032,0x2264,
+0x2044,0x221E,0x0192,0x2663,
+0x2666,0x2665,0x2660,0x2194,
+0x2190,0x2191,0x2192,0x2193,
+// F0b0
+0x00B0,0x00B1,0x2033,0x2065,
+0x00D7,0x221D,0x2202,0x2022,
+0x00F7,0x2260,0x2261,0x2248,
+0x2026,0x23D0,0x23AF,0x21B5,
+// F0c0
+0x2135,0x2111,0x211C,0x2118,
+0x2297,0x2295,0x2205,0x2229,
+0x222A,0x2283,0x2287,0x2284,
+0x2282,0x2286,0x2208,0x2209,
+// F0d0
+0x2220,0x2207,0x00AE,0x00A9,
+0x2122,0x220F,0x221A,0x22C5,
+0x00AC,0x2227,0x2228,0x21D4,
+0x21D0,0x21D1,0x21D2,0x21D3,
+// F0e0
+0x25CA,0x3008,0x00AE,0x00A9,
+0x2122,0x2211,0x239B,0x239C,
+0x239D,0x23A1,0x23A2,0x23A3,
+0x23A7,0x23A8,0x23A9,0x23AA,
+// F0f0
+0xF8FF,0x3009,0x222B,0x2320,
+0x23AE,0x2321,0x239E,0x239F,
+0x23A0,0x23A4,0x23A5,0x23A6,
+0x23AB,0x23AC,0x23AD,0x00FF
+};
//===
@@ -1324,7 +1397,7 @@ void ConvertChar::RecodeString( String rStr, xub_StrLen
nIndex, xub_StrLen nLen
struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
-static RecodeTable aRecodeTable[] =
+static RecodeTable aStarSymbolRecodeTable[] =
{
// the first two entries must be StarMath and StarBats; do not reorder!
// reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
@@ -1348,6 +1421,10 @@ static RecodeTable aRecodeTable[] =
{mtextra, {aMTExtraTab, StarSymbol, NULL}}
};
+static RecodeTable aAppleSymbolRecodeTable[] = {
+{symbol, {aAdobeSymbolToAppleSymbolTab, AppleSymbol, NULL}}
+};
+
static ConvertChar aImplStarSymbolCvt = { NULL, StarBats,
ImplStarSymbolToStarBats };
//
[PATCH] Change in core[libreoffice-4-0]: fdo#56937 - mac a11y hang related to traversing vast, broken...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1401 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1401/1 fdo#56937 - mac a11y hang related to traversing vast, broken hierarchies. Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a Signed-off-by: Tor Lillqvist t...@iki.fi --- M sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx M sc/source/ui/Accessibility/AccessibleTableBase.cxx M vcl/aqua/source/a11y/aqua11ywrapper.mm 3 files changed, 44 insertions(+), 15 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1401 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MS Word import: bug-to-bug or correct
Hi, Just for clarification: Are we talking about an ill-formed or corrupted document here, and the way such documents should be handled ? Regards, John Smith. On Tue, Dec 18, 2012 at 2:51 PM, Lionel Elie Mamane lio...@mamane.lu wrote: Hi, What is our policy about MS Word import? Should it give the same result as in MS Word, or where MS Word is buggy it should give a correct result? I ask this in context of the attached bug. -- Lionel -- Forwarded message -- From: bugzilla-dae...@freedesktop.org To: lio...@mamane.lu Cc: Date: Tue, 18 Dec 2012 08:58:25 + Subject: [Bug 49306] FILEOPEN catastrophically bad import of one specific .doc (Microsoft Word) document https://bugs.freedesktop.org/show_bug.cgi?id=49306 ydutri...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG -- You are receiving this mail because: You reported the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source codemaker/source sw/source xmloff/source
basctl/source/basicide/bastype3.cxx |8 +---
basctl/source/basicide/bastypes.cxx | 11 ---
codemaker/source/javamaker/javatype.cxx |6 +-
sw/source/filter/ww8/docxexport.cxx |6 ++
sw/source/filter/ww8/ww8graf.cxx|7 ++-
xmloff/source/core/RDFaExportHelper.cxx |7 +--
6 files changed, 11 insertions(+), 34 deletions(-)
New commits:
commit 5198c4a41f9cb793abd1276e75a640f7391ce0c3
Author: Christos Strubulis strubu...@gmail.com
Date: Tue Dec 18 06:59:28 2012 -0800
Replace chained O(U)StringBuffer::append() with operator+
Change-Id: I0fcd70cff092c7d90b57b9af9dcec99f23750f1c
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/basctl/source/basicide/bastype3.cxx
b/basctl/source/basicide/bastype3.cxx
index 194d52d..db15a6a 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -455,13 +455,7 @@ SvTreeListEntry* TreeListBox::FindRootEntry( const
ScriptDocument rDocument, Li
OUString CreateMgrAndLibStr( const OUString rMgrName, const OUString
rLibName )
{
-OUStringBuffer aName;
-aName.append('[');
-aName.append(rMgrName);
-aName.append(']');
-aName.append('.');
-aName.append(rLibName);
-return aName.makeStringAndClear();
+return [ + rMgrName + ]. + rLibName;
}
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 461044c..340ea40 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -183,17 +183,14 @@ OUString BaseWindow::GetTitle()
OUString BaseWindow::CreateQualifiedName()
{
-OUStringBuffer aName;
+OUString aName;
if ( !m_aLibName.isEmpty() )
{
LibraryLocation eLocation = m_aDocument.getLibraryLocation( m_aLibName
);
-aName.append(m_aDocument.getTitle(eLocation));
-aName.append('.');
-aName.append(m_aLibName);
-aName.append('.');
-aName.append(GetTitle());
+aName = m_aDocument.getTitle(eLocation) + . + m_aLibName + . +
+GetTitle();
}
-return aName.makeStringAndClear();
+return aName;
}
void BaseWindow::SetReadOnly (bool)
diff --git a/codemaker/source/javamaker/javatype.cxx
b/codemaker/source/javamaker/javatype.cxx
index b0edb7f..5b8748e 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -855,11 +855,7 @@ void handleEnumType(
rtl::OString(RTL_CONSTASCII_STRINGPARAM(com/sun/star/uno/Enum)),
rtl::OString()));
SAL_WNODEPRECATED_DECLARATIONS_POP
-rtl::OStringBuffer buf;
-buf.append('L');
-buf.append(className);
-buf.append(';');
-rtl::OString classDescriptor(buf.makeStringAndClear());
+rtl::OString classDescriptor(L + className + ;);
{for (sal_uInt16 i = 0; i fields; ++i) {
RTConstValue fieldValue(reader.getFieldValue(i));
if (fieldValue.m_type != RT_TYPE_INT32
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 59e9bd1..1b3c8f8 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -294,14 +294,12 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
rtl::OString DocxExport::OutputChart( uno::Reference frame::XModel xModel,
sal_Int32 nCount )
{
-rtl::OUString aFileName =
rtl::OUStringBuffer().append(charts/chart).append(nCount).append(.xml).makeStringAndClear();
-
+OUString aFileName = charts/chart + OUString::valueOf(nCount) + .xml;
OUString sId = m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart;,
aFileName );
-aFileName =
rtl::OUStringBuffer().append(word/charts/chart).append(nCount).append(.xml).makeStringAndClear();
-
+aFileName = word/charts/chart + OUString::valueOf(nCount) + .xml;
::sax_fastparser::FSHelperPtr pChartFS =
m_pFilter-openFragmentStreamWithSerializer( aFileName,
application/vnd.openxmlformats-officedocument.drawingml.chart );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index c432363..da4cae6 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -154,11 +154,8 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt,
const rtl::OUString rF
{
if (mbIsDisabled || rFixed.isEmpty())
return;
-rtl::OUStringBuffer aName(msSeed);
-aName.append(++mnImportedGraphicsCount);
-aName.append(: );
-aName.append(rFixed);
-pFrmFmt-SetName(aName.makeStringAndClear());
+
+pFrmFmt-SetName(msSeed+OUString::valueOf(++mnImportedGraphicsCount) + :
+ rFixed);
}
// ReadGrafStart liest die ObjektDaten ein und erzeugt falls noetig einen Anker
diff --git a/xmloff/source/core/RDFaExportHelper.cxx
b/xmloff/source/core/RDFaExportHelper.cxx
index
[Libreoffice-commits] .: lcms2/ExternalProject_lcms2.mk
lcms2/ExternalProject_lcms2.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a65f6ef56ea9b8382451500ea8454db4b9738e2b Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Dec 18 18:33:42 2012 +0200 /p:VisualStudioVersion=11.0 here, too Change-Id: I7843d3e9565b6577d7c84e547f5b913672cfe1d8 diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index c8d93eb..da43a43 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -21,7 +21,7 @@ ifeq ($(filter-out 14 13,$(COMEX)),) $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \ MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ - $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110) \ + $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ touch $@ else $(call gb_ExternalProject_get_state_target,lcms2,build): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source vcl/aqua
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |2 +
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 20 +++---
vcl/aqua/source/a11y/aqua11ywrapper.mm | 37 +--
3 files changed, 44 insertions(+), 15 deletions(-)
New commits:
commit a4a467c6e742ea40986287c5f546b0daec295289
Author: Michael Meeks michael.me...@suse.com
Date: Tue Dec 18 13:29:03 2012 +
fdo#56937 - mac a11y hang related to traversing vast, broken hierarchies.
Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index d57d92e..e4d0060 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -44,6 +44,8 @@ using namespace ::com::sun::star::accessibility;
//= internal
+// FIXME: really unclear why we have an ScAccessibleTableBase with
+// only this single sub-class
ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
ScAccessibleDocument* pAccDoc,
ScTabViewShell* pViewShell,
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 780638b..3a950c4 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL
ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow
return false;
}
-//= XAccessibleExtendedTable
+// = XAccessibleExtendedTable
sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow,
sal_Int32 nColumn )
throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
@@ -304,7 +304,7 @@ sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI
return nChildIndex % static_castsal_Int32(maRange.aEnd.Col() -
maRange.aStart.Col() + 1);
}
-//= XAccessibleContext ==
+// = XAccessibleContext ==
sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleChildCount(void)
@@ -312,9 +312,16 @@ sal_Int32 SAL_CALL
{
SolarMutexGuard aGuard;
IsObjectValid();
-return static_castsal_Int32(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
-(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
-// return 1;
+
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+sal_Int64 nMax = ((sal_Int64)(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
+ (sal_Int64)(maRange.aEnd.Col() - maRange.aStart.Col() +
1));
+if (nMax SAL_MAX_INT32)
+nMax = SAL_MAX_INT32;
+if (nMax 0)
+return 0;
+return static_castsal_Int32(nMax);
}
uno::Reference XAccessible SAL_CALL
@@ -328,6 +335,9 @@ uno::Reference XAccessible SAL_CALL
if (nIndex = getAccessibleChildCount() || nIndex 0)
throw lang::IndexOutOfBoundsException();
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+
sal_Int32 nRow(0);
sal_Int32 nColumn(0);
sal_Int32 nTemp(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index b3517b0..94dbe1b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -977,21 +977,38 @@ Reference XAccessibleContext hitTestRunner (
com::sun::star::awt::Point poin
Reference XAccessibleComponent rxAccessibleComponent (
rxAccessibleContext, UNO_QUERY );
if ( rxAccessibleComponent.is() ) {
com::sun::star::awt::Point location = rxAccessibleComponent -
getLocationOnScreen();
-com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
+com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
Reference XAccessible rxAccessible = rxAccessibleComponent -
getAccessibleAtPoint ( hitPoint );
if ( rxAccessible.is() rxAccessible -
getAccessibleContext().is()
rxAccessible - getAccessibleContext() -
getAccessibleChildCount() == 0 ) {
hitChild = rxAccessible - getAccessibleContext();
}
-}
-if ( !hitChild.is() rxAccessibleContext -
getAccessibleChildCount() 0 ) { // special treatment for e.g. comboboxes
-for ( int i = 0; i rxAccessibleContext -
getAccessibleChildCount(); i++ ) {
-Reference XAccessible rxAccessibleChild =
rxAccessibleContext - getAccessibleChild ( i );
-if (
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source vcl/aqua
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |2 +
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 20 +++---
vcl/aqua/source/a11y/aqua11ywrapper.mm | 37 +--
3 files changed, 44 insertions(+), 15 deletions(-)
New commits:
commit 1211bf4682b7e8454d86d5a812df421abf68f662
Author: Michael Meeks michael.me...@suse.com
Date: Tue Dec 18 13:29:03 2012 +
fdo#56937 - mac a11y hang related to traversing vast, broken hierarchies.
Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a
Signed-off-by: Tor Lillqvist t...@iki.fi
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 0408458..cf29eae 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -55,6 +55,8 @@ using namespace ::com::sun::star::accessibility;
//= internal
+// FIXME: really unclear why we have an ScAccessibleTableBase with
+// only this single sub-class
ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
ScAccessibleDocument* pAccDoc,
ScTabViewShell* pViewShell,
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index c1408db..8220339 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -272,7 +272,7 @@ sal_Bool SAL_CALL
ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow
return false;
}
-//= XAccessibleExtendedTable
+// = XAccessibleExtendedTable
sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow,
sal_Int32 nColumn )
throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
@@ -315,7 +315,7 @@ sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI
return nChildIndex % static_castsal_Int32(maRange.aEnd.Col() -
maRange.aStart.Col() + 1);
}
-//= XAccessibleContext ==
+// = XAccessibleContext ==
sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleChildCount(void)
@@ -323,9 +323,16 @@ sal_Int32 SAL_CALL
{
SolarMutexGuard aGuard;
IsObjectValid();
-return static_castsal_Int32(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
-(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
-// return 1;
+
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+sal_Int64 nMax = ((sal_Int64)(maRange.aEnd.Row() - maRange.aStart.Row() +
1) *
+ (sal_Int64)(maRange.aEnd.Col() - maRange.aStart.Col() +
1));
+if (nMax SAL_MAX_INT32)
+nMax = SAL_MAX_INT32;
+if (nMax 0)
+return 0;
+return static_castsal_Int32(nMax);
}
uno::Reference XAccessible SAL_CALL
@@ -339,6 +346,9 @@ uno::Reference XAccessible SAL_CALL
if (nIndex = getAccessibleChildCount() || nIndex 0)
throw lang::IndexOutOfBoundsException();
+// FIXME: representing rows columns this way is a plain and simple
madness.
+// this needs a radical re-think.
+
sal_Int32 nRow(0);
sal_Int32 nColumn(0);
sal_Int32 nTemp(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 1be3e4a..a48aa5a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -986,21 +986,38 @@ Reference XAccessibleContext hitTestRunner (
com::sun::star::awt::Point poin
Reference XAccessibleComponent rxAccessibleComponent (
rxAccessibleContext, UNO_QUERY );
if ( rxAccessibleComponent.is() ) {
com::sun::star::awt::Point location = rxAccessibleComponent -
getLocationOnScreen();
-com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
+com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
Reference XAccessible rxAccessible = rxAccessibleComponent -
getAccessibleAtPoint ( hitPoint );
if ( rxAccessible.is() rxAccessible -
getAccessibleContext().is()
rxAccessible - getAccessibleContext() -
getAccessibleChildCount() == 0 ) {
hitChild = rxAccessible - getAccessibleContext();
}
-}
-if ( !hitChild.is() rxAccessibleContext -
getAccessibleChildCount() 0 ) { // special treatment for e.g. comboboxes
-for ( int i = 0; i rxAccessibleContext -
getAccessibleChildCount(); i++ ) {
-Reference XAccessible rxAccessibleChild =
rxAccessibleContext -
[PUSHED] Change in core[libreoffice-4-0]: fdo#56937 - mac a11y hang related to traversing vast, broken...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1401 -- To view, visit https://gerrit.libreoffice.org/1401 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff0537a69b2c6ae929da6a05f26c0d55415d6d8a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#31055 fallback to a default bullet on symbol l...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1402 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1402/1 Resolves: fdo#31055 fallback to a default bullet on symbol lack a) fix up some entries in Wingdings for which we do have a suitable mapping after all b) on complete failure for mapping to OpenSymbol show a default bullet, which is better than no glyph c) document that the original tables were against StarSymbol which had extra glyphs (and/or I thought it had) (cherry picked from commit 0d777f33a1d818a7fd27d755e54db64823f46636) Change-Id: I5e43cc0a5216e76d00b7df1a69967e08c3656e21 --- M unotools/source/misc/fontcvt.cxx 1 file changed, 28 insertions(+), 16 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1402 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e43cc0a5216e76d00b7df1a69967e08c3656e21 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 50284, which changed state. Bug 50284 Summary: FILEOPEN .doc/.docx (MSO2007) Bullet lists show wrong bullet symbols MacOS X https://bugs.freedesktop.org/show_bug.cgi?id=50284 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] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/html/htmlfly.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bdce3306e84353f0d428a8ec2b74cf620ba10c63
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 17 17:44:22 2012 +0100
fdo#58286: sw HTML export: fix missing end tags on FrmFmts
SwHTMLWriter::OutFrmFmtOptions must return a value that includes the
parameter rEndTags.
(regression from 3852a6f54880af8ed9161227baa80c7d4517)
Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec
(cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)
Reviewed-on: https://gerrit.libreoffice.org/1390
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/html/htmlfly.cxx
b/sw/source/filter/html/htmlfly.cxx
index 9aabb32..dd55694 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -545,7 +545,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt
rFrmFmt,
sal_uInt32 nFrmOpts,
const rtl::OString rEndTags )
{
-rtl::OString sRetEndTags;
+rtl::OString sRetEndTags(rEndTags);
rtl::OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet rItemSet = rFrmFmt.GetAttrSet();
@@ -822,6 +822,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt
rFrmFmt,
sRetEndTags = sOut.makeStringAndClear();
}
}
+assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
return sRetEndTags;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#58286: sw HTML export: fix missing end tags on FrmFmts
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1390 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1390 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Related: fdo#50284 apple's modern symbol font is unicode enc...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1403 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1403/1 Related: fdo#50284 apple's modern symbol font is unicode encoded So codepoints that are from the legacy range need to be converted to their unicode equivalents even in the presence of an installed symbol font on MacOSX. This should work out ok if input codepoints that exist in the apple symbol unicode are used, they should be left untouched by this conversion. Change-Id: Ia9996e2d9bf632c86c8d26832d77c7c662cf1076 --- M unotools/source/misc/fontcvt.cxx M vcl/source/gdi/outdev3.cxx 2 files changed, 108 insertions(+), 5 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1403 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9996e2d9bf632c86c8d26832d77c7c662cf1076 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 34 +--
1 file changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 75c05bd7d2e0e2fb41d4218eb0bb8f5631ca46fe
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Dec 14 16:05:24 2012 +0100
docx export: graphics relativeFrom attributes now matches import code
Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e
Reviewed-on: https://gerrit.libreoffice.org/1342
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 29bef4a..b97b368 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2077,8 +2077,38 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
break;
case FLY_AT_CHAR:
default:
-relativeFromH = character;
-relativeFromV = line;
+// We apply the same conversion that we do in import
+// (see writerfilter/source/dmapper/GraphicHelper.cxx)
+switch (pFrmFmt-GetVertOrient().GetRelationOrient() )
+{
+case text::RelOrientation::PAGE_PRINT_AREA:
+relativeFromV = margin;
+break;
+case text::RelOrientation::PAGE_FRAME:
+relativeFromV = page;
+break;
+case text::RelOrientation::FRAME:
+relativeFromV = paragraph;
+break;
+case text::RelOrientation::TEXT_LINE:
+default:
+relativeFromV = line;
+}
+switch (pFrmFmt-GetHoriOrient().GetRelationOrient() )
+{
+case text::RelOrientation::PAGE_PRINT_AREA:
+relativeFromH = margin;
+break;
+case text::RelOrientation::PAGE_FRAME:
+relativeFromH = page;
+break;
+case text::RelOrientation::CHAR:
+relativeFromH = character;
+break;
+case text::RelOrientation::FRAME:
+default:
+relativeFromH = column;
+}
break;
};
Point pos( 0, 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/data/conditio.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 664baba931bafd4e36fb822291b1d42c4554b88b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Dec 5 02:25:33 2012 +0100
adapt cond format range when copying sheets, fdo#56742
Change-Id: I9b28ac161f326ebeeaf0fa22e0a96915187d7c94
(cherry picked from commit 1c60abfdb617039cedc53982c7c8eca640e28cac)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d0c40e9..0ab670b 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1547,7 +1547,11 @@ void ScConditionalFormat::CompileXML()
void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange rRange, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz )
{
-maRanges.UpdateReference( eUpdateRefMode, pDoc, rRange, nDx, nDy, nDz );
+if( eUpdateRefMode == URM_COPY nDz != 0 )
+maRanges.UpdateReference( URM_MOVE, pDoc, rRange, nDx, nDy, nDz );
+else
+maRanges.UpdateReference( eUpdateRefMode, pDoc, rRange, nDx, nDy, nDz
);
+
for(CondFormatContainer::iterator itr = maEntries.begin(); itr !=
maEntries.end(); ++itr)
itr-UpdateReference(eUpdateRefMode, rRange, nDx, nDy, nDz);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx export: graphics relativeFrom attributes now matches im...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1342 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1342 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/uiconfig
cui/uiconfig/ui/numberformatpage.ui | 37 ++-- 1 file changed, 23 insertions(+), 14 deletions(-) New commits: commit df271449deecef88abdddeb2f5248da32b922311 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 18 17:12:09 2012 + restore accelerators for format cell numbers tab Change-Id: Id0c55d52c233ef276a38edc6e0b96d3c000e2046 diff --git a/cui/uiconfig/ui/numberformatpage.ui b/cui/uiconfig/ui/numberformatpage.ui index fd70120..280d3e0 100644 --- a/cui/uiconfig/ui/numberformatpage.ui +++ b/cui/uiconfig/ui/numberformatpage.ui @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + object class=GtkAdjustment id=adjustment1 +property name=upper20/property +property name=step_increment1/property +property name=page_increment10/property + /object object class=GtkGrid id=NumberFormatPage property name=visibleTrue/property property name=can_focusFalse/property @@ -136,7 +141,8 @@ object class=GtkLabel id=formatf property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesFormat code/property +property name=label translatable=yes_Format code/property +property name=use_underlineTrue/property attributes attribute name=weight value=bold/ /attributes @@ -202,7 +208,8 @@ object class=GtkLabel id=decimalsft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesDecimal places/property +property name=label translatable=yes_Decimal places/property +property name=use_underlineTrue/property /object packing property name=left_attach0/property @@ -215,7 +222,8 @@ object class=GtkLabel id=leadzerosft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesLeading zeroes /property +property name=label translatable=yesLeading _zeroes/property +property name=use_underlineTrue/property /object packing property name=left_attach0/property @@ -226,12 +234,13 @@ /child child object class=GtkCheckButton id=negnumred -property name=label translatable=yesNegative numbers red/property +property name=label translatable=yes_Negative numbers red/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property /object @@ -244,12 +253,13 @@ /child child object class=GtkCheckButton id=thousands -property name=label translatable=yesThousands separator/property +property name=label translatable=yes_Thousands separator/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property /object @@ -326,7 +336,8 @@ object class=GtkLabel id=categoryft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesCategory/property +property name=label translatable=yes_Category/property +property name=use_underlineTrue/property attributes attribute name=weight value=semibold/ /attributes @@ -396,7 +407,8 @@ object class=GtkLabel id=formatft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesFormat/property +property name=label translatable=yesF_ormat/property +
Re: [PUSHED 3-6] fix for fdo#56742 , ScRangeList::UpdateReference does not handle URM_COPY
Hi Markus, On Sunday, 2012-12-16 03:10:07 +0100, Markus Mohrhard wrote: I'm only using URM_MOVE to update references inside a ScRangeList which just contains a vector of ScRange entries. Since ScRange does not contain a notion of relative or absolute references this is a safe change, Pushed with my sign-off http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=664baba931bafd4e36fb822291b1d42c4554b88b Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpdvY8uuKcxL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/README | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit 058702256211804a449ae7e16b4fc4bd16236f40 Author: Miklos Vajna vmik...@suse.cz Date: Tue Dec 18 18:16:44 2012 +0100 sw: update README of qa/extras Change-Id: I7fc9fb44cbcabfc6d9e766777a3425794beb2bb2 diff --git a/sw/qa/extras/README b/sw/qa/extras/README index 261478d..09a9b6d 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -5,12 +5,13 @@ tests. This file documents how to add new testcases to this framework. == Import tests -Import tests are the easier ones. All start with a `load()` method that loads a -file to `mxComponent`, which represents the UNO model of the document. +Import tests are the easier ones. First you need to add a new entry to the +table inside the `run()` method, so the framework will load the specified file +to `mxComponent`, which represents the UNO model of the document. -The rest of the testcase is about asserting this document model: use the UNO -API to retrieve properties, then use `CPPUNIT_ASSERT_EQUAL()` to test against -an expected value. +The rest of the testcase is about implementing the test method asserting this +document model: use the UNO API to retrieve properties, then use +`CPPUNIT_ASSERT_EQUAL()` to test against an expected value. See below for more details on writing the UNO code see below. @@ -26,8 +27,10 @@ Yes, this means that you can test the export code (using this framework) if the importer is working correctly. (But that's not so bad, users usually expect a feature to work in both the importer and the exporter.) -The only difference is that instead of `load()`, you call `roundtrip()` to load -the test document, then you can assert it as discussed above. +The only difference is that in these tests the test method is called twice: +once after the initial import -- so you can see if the export fails due to an +import problem in fact -- and once after the export and import. The test +method should still assert the document model only, as discussed above. == Helper methods ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/rtl
sal/inc/rtl/string.h |2 ++
sal/inc/rtl/ustring.h |5 +++--
sal/rtl/source/strtmpl.cxx |4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 09123760860f99756d37b70557d83f707fda6b17
Author: Michael Meeks michael.me...@suse.com
Date: Tue Dec 18 17:43:56 2012 +
fdo#58473 - fix transliteration crasher caused by writing const string.
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index bfeecf7..26fa5c7 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -821,6 +821,8 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_new( rtl_String **
newStr ) SAL_THROW_EXT
The reference count of the new string will be 1. The length of the string
will be nLen. This function does not handle out-of-memory conditions.
+For nLen 0 or failed allocation this method returns NULL.
+
The characters of the capacity are not cleared, and the length is set to
nLen, unlike the similar method of rtl_String_new_WithLength which
zeros out the buffer, and sets the length to 0. So should be somewhat
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index fe2f2f4..1ff75bd 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1152,8 +1152,9 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_new(
/** Allocate a new string containing space for a given number of characters.
The reference count of the new string will be 1. The length of the string
-will be nLen. This function throws std::bad_alloc on out-of-memory
-conditions.
+will be nLen. This function does not handle out-of-memory conditions.
+
+For nLen 0 or failed allocation this method returns NULL.
The characters of the capacity are not cleared, and the length is set to
nLen, unlike the similar method of rtl_uString_new_WithLength which
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index f715a58..cdb4f11 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -1069,8 +1069,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( new )(
IMPL_RTL_STRINGDATA** ppThis )
IMPL_RTL_STRINGDATA* SAL_CALL IMPL_RTL_STRINGNAME( alloc )( sal_Int32 nLen )
SAL_THROW_EXTERN_C()
{
-if ( nLen = 0 )
-return (IMPL_RTL_STRINGDATA*) (IMPL_RTL_EMPTYSTRING);
+if ( nLen 0 )
+return NULL;
else
return IMPL_RTL_STRINGNAME( ImplAlloc )( nLen );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 7431458606db21d695b0b891f25d3617030bf0f4 Author: Xisco Fauli aniste...@gmail.com Date: Tue Dec 18 19:07:55 2012 +0100 pywizards: Fix finish in Windows one and for all Change-Id: I450e2f32a3579778163655b65cd112f952f0456f diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index 75d7d72..97197ab 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -16,9 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import os.path import traceback -from unohelper import systemPathToFileUrl +from unohelper import systemPathToFileUrl, absolutize from ..ui.event.CommonListener import TerminateListenerProcAdapter from ..common.Desktop import Desktop @@ -210,9 +209,11 @@ class OfficeDocument(object): else: oStoreProperties = list(range(0)) +StorePath = systemPathToFileUrl(StorePath) +sPath = StorePath[:(StorePath.rfind(/) + 1)] +sFile = StorePath[(StorePath.rfind(/) + 1):] xComponent.storeToURL( -os.path.abspath(systemPathToFileUrl(StorePath)), -tuple(oStoreProperties)) +absolutize(sPath, sFile), tuple(oStoreProperties)) return True except ErrorCodeIOException: #Throw this exception when trying to save a file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 2a1943b15234980d906511ed06fb3e14b3933a00 Author: Xisco Fauli aniste...@gmail.com Date: Tue Dec 18 19:07:55 2012 +0100 pywizards: Fix finish in Windows one and for all Change-Id: I450e2f32a3579778163655b65cd112f952f0456f diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index 2e892a4..0891952 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -16,9 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import os.path import traceback -from unohelper import systemPathToFileUrl +from unohelper import systemPathToFileUrl, absolutize from ..ui.event.CommonListener import TerminateListenerProcAdapter from ..common.Desktop import Desktop @@ -210,9 +209,11 @@ class OfficeDocument(object): else: oStoreProperties = list(range(0)) +StorePath = systemPathToFileUrl(StorePath) +sPath = StorePath[:(StorePath.rfind(/) + 1)] +sFile = StorePath[(StorePath.rfind(/) + 1):] xComponent.storeToURL( -os.path.abspath(systemPathToFileUrl(StorePath)), -tuple(oStoreProperties)) +absolutize(sPath, sFile), tuple(oStoreProperties)) return True except ErrorCodeIOException: #Throw this exception when trying to save a file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 91d3c0ce2b808e917ee45f18f2c40a58329d2c19
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 18 19:16:43 2012 +0100
resolved fdo#58179 ImpSvNumberformatScan::RemoveQuotes: both ...
Bug crept in with String to OUString change of
1599fc9e54a7c4855bee1c30d92dd1f5be05f530
Change-Id: I25a6b40de10785bc861fa2b353edada0e4a623c9
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 0b88129..24c14a7 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2853,7 +2853,7 @@ sal_Int32 ImpSvNumberformatScan::RemoveQuotes( OUString
rStr )
sal_Int32 n = rStr.getLength() - 1;
if ( c == '' rStr[n] == '' )
{
-rStr = rStr.copy(1,n);
+rStr = rStr.copy( 1, n-1);
return 2;
}
else if ( c == '\\' )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svl/source
svl/source/numbers/zforscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9525bf5c0704c7a27b3ee6249d33d875abb51bc1
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 18 19:16:43 2012 +0100
resolved fdo#58179 ImpSvNumberformatScan::RemoveQuotes: both ...
Bug crept in with String to OUString change of
1599fc9e54a7c4855bee1c30d92dd1f5be05f530
Change-Id: I25a6b40de10785bc861fa2b353edada0e4a623c9
(cherry picked from commit 91d3c0ce2b808e917ee45f18f2c40a58329d2c19)
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 0b88129..24c14a7 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2853,7 +2853,7 @@ sal_Int32 ImpSvNumberformatScan::RemoveQuotes( OUString
rStr )
sal_Int32 n = rStr.getLength() - 1;
if ( c == '' rStr[n] == '' )
{
-rStr = rStr.copy(1,n);
+rStr = rStr.copy( 1, n-1);
return 2;
}
else if ( c == '\\' )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpcache.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 87bfd731cbb9610252b39e9ef1d0d3d6c6c71f09
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Dec 18 13:31:40 2012 -0500
Check the validity of row ranges after after the data area shrinkage.
Or else it might crash again in the pivot layout dialog.
Change-Id: I2254e5901f4736fffc6940346a866fc1f22b7c7f
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 724c842..5f075a3 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -303,7 +303,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange rRange)
SCROW nEndRow = rRange.aEnd.Row();
// Sanity check
-if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow-nStartRow = 0)
+if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow = nStartRow)
return false;
sal_uInt16 nStartCol = rRange.aStart.Col();
@@ -322,6 +322,15 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange rRange)
bool bTailEmptyRows = nEndRow nRow2; // Trailing empty rows exist.
nEndRow = nRow2;
+if (nEndRow = nStartRow)
+{
+// Check this again since the end row position has changed. It's
+// possible that the new end row becomes lower than the start row
+// after the shrinkage.
+Clear();
+return false;
+}
+
maFields.reserve(mnColumnCount);
for (size_t i = 0; i static_castsize_t(mnColumnCount); ++i)
maFields.push_back(new Field);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/core/data/dpcache.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 1d83c7ac82ae83b88ff800853bb8d06dc29d22b1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Dec 18 13:31:40 2012 -0500
Check the validity of row ranges after after the data area shrinkage.
Or else it might crash again in the pivot layout dialog.
Change-Id: I2254e5901f4736fffc6940346a866fc1f22b7c7f
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 724c842..5f075a3 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -303,7 +303,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange rRange)
SCROW nEndRow = rRange.aEnd.Row();
// Sanity check
-if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow-nStartRow = 0)
+if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow = nStartRow)
return false;
sal_uInt16 nStartCol = rRange.aStart.Col();
@@ -322,6 +322,15 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange rRange)
bool bTailEmptyRows = nEndRow nRow2; // Trailing empty rows exist.
nEndRow = nRow2;
+if (nEndRow = nStartRow)
+{
+// Check this again since the end row position has changed. It's
+// possible that the new end row becomes lower than the start row
+// after the shrinkage.
+Clear();
+return false;
+}
+
maFields.reserve(mnColumnCount);
for (size_t i = 0; i static_castsize_t(mnColumnCount); ++i)
maFields.push_back(new Field);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - wizards/com
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 20 -- 1 file changed, 9 insertions(+), 11 deletions(-) New commits: commit d83499a864fd39b1e05706298b95594caae33e0c Author: Xisco Fauli aniste...@gmail.com Date: Tue Dec 18 20:06:51 2012 +0100 pywizards: Delete all empty TextFields after finishing Change-Id: Ic1c0c6e6f6174d4337abf06f32d9fd8072c2511d diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py index 379abb1..0037f2b 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py @@ -154,14 +154,12 @@ class TextFieldHandler(object): def removeUserFieldByContent(self): #Remove userfield when its text is empty -try: -xDependentTextFields = TextFieldHandler.dictTextFields.values() -for i in xDependentTextFields: -try: -if not i.TextFieldMaster.Content: -i.dispose() -except UnknownPropertyException: -pass - -except Exception: -traceback.print_exc() +xDependentTextFields = TextFieldHandler.arrayTextFields +for i in xDependentTextFields: +try: +if not i.TextFieldMaster.Content: +i.dispose() +except Exception: +#TextField doesn't even have the attribute Content, +#so it's empty +i.dispose() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 20 -- 1 file changed, 9 insertions(+), 11 deletions(-) New commits: commit 8347fa7f8ed75a341e22733e53e7d64e7a930db2 Author: Xisco Fauli aniste...@gmail.com Date: Tue Dec 18 20:06:51 2012 +0100 pywizards: Delete all empty TextFields after finishing Change-Id: Ic1c0c6e6f6174d4337abf06f32d9fd8072c2511d diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py index 379abb1..0037f2b 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py @@ -154,14 +154,12 @@ class TextFieldHandler(object): def removeUserFieldByContent(self): #Remove userfield when its text is empty -try: -xDependentTextFields = TextFieldHandler.dictTextFields.values() -for i in xDependentTextFields: -try: -if not i.TextFieldMaster.Content: -i.dispose() -except UnknownPropertyException: -pass - -except Exception: -traceback.print_exc() +xDependentTextFields = TextFieldHandler.arrayTextFields +for i in xDependentTextFields: +try: +if not i.TextFieldMaster.Content: +i.dispose() +except Exception: +#TextField doesn't even have the attribute Content, +#so it's empty +i.dispose() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MS Word import: bug-to-bug or correct
On Tue, Dec 18, 2012 at 05:23:10PM +0100, John Smith wrote: Just for clarification: Are we talking about an ill-formed or corrupted document here, and the way such documents should be handled ? Yeah, well, the person that closed the bug claims the document was corrupted; I'm not sure I agree, but I don't have the MS Word format skills to understand what is going on: some graphical object is in the file, is invisible in MS Word, but visible in LibreOffice. On Tue, Dec 18, 2012 at 2:51 PM, Lionel Elie Mamane lio...@mamane.lu wrote: What is our policy about MS Word import? Should it give the same result as in MS Word, or where MS Word is buggy it should give a correct result? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] syslog output from SAL_* messages
Il 18/12/2012 11:52, Tor Lillqvist ha scritto: - am not able to send the ENABLE_SYSLOG definition down to sal/osl/unx/salinit.cxx Surely the tradityional name for this should be HAVE_SYSLOG_H ? ENABLE_FOO things are for stuff you enable or disable on the configure command line, not for results of checks of header file presence. (Of course, it might be that there are counter-examples in LO's configure.ac, but we shouldn't continue to follow such anti-patterns.) I guess you need to add to config/config_global.h.in: #undef HAVE_SYSLOG_H and change the test to a simple: AC_CHECK_HEADERS(syslog.h) ? Isn't that the simple, normal way to check for some header? Yep, and differently from my previous approach it even works :) thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] syslog output from SAL_* messages
Hi Miklos, Il 18/12/2012 10:04, Miklos Vajna ha scritto: Hi Riccardo, On Tue, Dec 18, 2012 at 09:55:23AM +0100, Riccardo Magliocchettiriccardo.magliocche...@gmail.com wrote: I totally overlooked this :) shouldn't i have seen the WARNs though? IIRC you get WARNs only with dbglevel 0 (i.e. when you configure with --enable-debug or --enable-dbgutil) Ah! I think i'll stick with SAL_INFO then. In sal/osl/all/log.cxx:87 getEnvironmentVariable +WARN is default when std::getenv(SAL_LOG) == 0. Btw in practice probably doesn't count but shouldn't these be checks against NULL instead of 0? http://c-faq.com/null/nullor0.html I think that's true for C++ as well. Sure, i think am a fan of a gentle reminder that a pointer is involved convention. thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: bug/bug
bug/bug/bug.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 1197552b25d3237d055ecc3e09f7b52cf174da5e
Author: Rob Snelders programm...@ertai.nl
Date: Tue Dec 18 21:42:09 2012 +0100
Save version in comment
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index ecd1447..f41d283 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -280,6 +280,7 @@
if (($.bug.regression_id = 0) ($.bug.regression_id =
$.bug.lo_version_id))
$.bug.regression_id = -1;
comment = comment + \nOperating System: + $(.op_sys
.chosen).text();
+comment = comment + \nVersion: + $.bug.lo_version;
comment = comment + (($.bug.regression_id = 0)?\nLast
worked in: + $.bug.regression:);
$(body).css(cursor, progress);
$('input[name=token]', form).val($.bug.token);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/Makefile
bug/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 343104ff3b79509465725559d91b270b92a15178 Author: Rob Snelders programm...@ertai.nl Date: Tue Dec 18 21:49:56 2012 +0100 fix for the movement of the wiki diff --git a/bug/Makefile b/bug/Makefile index d294009..4ae7318 100644 --- a/bug/Makefile +++ b/bug/Makefile @@ -18,7 +18,7 @@ all: extract compose extract: mkdir -p build - curl --silent http://wiki.documentfoundation.org/BugReport_Details | tidy --numeric-entities yes -asxhtml 2/dev/null build/tidyout.xhtml || echo ignoring tidy error + curl --silent https://wiki.documentfoundation.org/BugReport_Details | tidy --numeric-entities yes -asxhtml 2/dev/null build/tidyout.xhtml || echo ignoring tidy error xsltproc --encoding UTF-8 --novalid stripnamespace.xsl build/tidyout.xhtml build/BugReport_Details.xhtml xsltproc --encoding UTF-8 --novalid component_comments.xsl build/BugReport_Details.xhtml build/component_comments.xhtml xsltproc --encoding UTF-8 --novalid subcomponents.xsl build/BugReport_Details.xhtml build/subcomponents.xhtml ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
