[Libreoffice-commits] .: src/lib
src/lib/MSPUBCollector.cpp | 103 +++---
src/lib/MSPUBCollector.h | 11 ++
src/lib/MSPUBParser.cpp|2
src/lib/MSPUBParser97.cpp |2
src/lib/libmspub_utils.cpp | 178 ++---
src/lib/libmspub_utils.h |8 --
6 files changed, 163 insertions(+), 141 deletions(-)
New commits:
commit 17f68425119bb587ca8db474beb34884511b9a12
Author: Brennan T. Vincent brenn...@email.arizona.edu
Date: Fri Jan 18 00:55:25 2013 -0700
Autodetect character set for pre-unicode MSPUB versions (still need to test
for languages other than Russian, but appears to be working)
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 635c049..5653df8 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent brenn...@email.arizona.edu
+ * Copyright (C) 2012-2013 Brennan Vincent brenn...@email.arizona.edu
* Copyright (C) 2012 Fridrich Strba fridrich.st...@bluewin.ch
*
*
@@ -29,12 +29,16 @@
*/
#include math.h
+
+#include unicode/ucsdet.h
+
#include MSPUBCollector.h
#include libmspub_utils.h
#include MSPUBConstants.h
#include MSPUBTypes.h
#include PolygonUtils.h
#include Coordinate.h
+
#pragma GCC diagnostic ignored -Wpragmas
#pragma GCC diagnostic ignored -Wuninitialized
#pragma GCC diagnostic ignored -Wmaybe-uninitialized
@@ -169,8 +173,10 @@
libmspub::MSPUBCollector::MSPUBCollector(libwpg::WPGPaintInterface *painter) :
m_shapeInfosBySeqNum(), m_masterPages(),
m_shapesWithCoordinatesRotated90(),
m_masterPagesByPageSeqNum(),
- m_encoding(), m_tableCellTextEndsVector(), m_stringOffsetsByTextId(),
- m_calculationValuesSeen(), m_pageSeqNumsOrdered()
+ m_tableCellTextEndsVector(), m_stringOffsetsByTextId(),
+ m_calculationValuesSeen(), m_pageSeqNumsOrdered(),
+ m_encodingHeuristic(false), m_allText(),
+ m_calculatedEncoding()
{
}
@@ -186,9 +192,9 @@ void libmspub::MSPUBCollector::setNextTableCellTextEnds(
m_tableCellTextEndsVector.push_back(ends);
}
-void libmspub::MSPUBCollector::setEncoding(Encoding encoding)
+void libmspub::MSPUBCollector::useEncodingHeuristic()
{
- m_encoding = encoding;
+ m_encodingHeuristic = true;
}
void libmspub::MSPUBCollector::setShapeShadow(unsigned seqNum, const Shadow
shadow)
@@ -784,7 +790,7 @@ boost::functionvoid(void)
libmspub::MSPUBCollector::paintShape(const ShapeInfo
{
WPXString textString;
appendCharacters(textString, text[i_lines].spans[i_spans].chars,
- m_encoding.get_value_or(UTF_16));
+ getCalculatedEncoding());
WPXPropertyList charProps =
getCharStyleProps(text[i_lines].spans[i_spans].style,
text[i_lines].style.m_defaultCharStyleIndex);
m_painter-startTextSpan(charProps);
m_painter-insertText(textString);
@@ -801,6 +807,68 @@ boost::functionvoid(void)
libmspub::MSPUBCollector::paintShape(const ShapeInfo
return no_op;
}
+const char *libmspub::MSPUBCollector::getCalculatedEncoding() const
+{
+ if (m_calculatedEncoding.is_initialized())
+ {
+return m_calculatedEncoding.get();
+ }
+ // modern versions are somewhat sane and use Unicode
+ if (! m_encodingHeuristic)
+ {
+m_calculatedEncoding = UTF-16LE;
+return m_calculatedEncoding.get();
+ }
+ // for older versions of PUB, see if we can get ICU to tell us the encoding.
+ UErrorCode status = U_ZERO_ERROR;
+ UCharsetDetector *ucd = NULL;
+ const UCharsetMatch **matches = NULL;
+ const UCharsetMatch *ucm = NULL;
+ ucd = ucsdet_open(status);
+ int matchesFound = -1;
+ const char *name = NULL;
+ const char *windowsName = NULL;
+ if (m_allText.empty())
+ {
+goto csd_fail;
+ }
+ if (U_FAILURE(status))
+ {
+goto csd_fail;
+ }
+ // don't worry, the below call doesn't require a null-terminated string.
+ ucsdet_setText(ucd, (const char *)(m_allText[0]), m_allText.size(),
status);
+ if (U_FAILURE(status))
+ {
+goto csd_fail;
+ }
+ matches = ucsdet_detectAll(ucd, matchesFound, status);
+ if (U_FAILURE(status))
+ {
+goto csd_fail;
+ }
+ //find best fit that is an actual Windows encoding
+ for (int i = 0; i matchesFound; ++i)
+ {
+ucm = matches[i];
+name = ucsdet_getName(ucm, status);
+if (U_FAILURE(status))
+{
+ goto csd_fail;
+}
+windowsName = windowsCharsetNameByOriginalCharset(name);
+if (windowsName)
+{
+ m_calculatedEncoding = windowsName;
+ ucsdet_close(ucd);
+ return windowsName;
+}
+ }
+csd_fail:
+ ucsdet_close(ucd);
+ return windows-1252; // Pretty likely to give garbage text, but it's the
best we can do.
+}
+
void libmspub::MSPUBCollector::setShapeLineBackColor(unsigned shapeSeqNum,
ColorReference backColor)
{
@@ -1142,7 +1210,7 @@ WPXPropertyList
libmspub::MSPUBCollector::getCharStyleProps(const CharacterStyle
{
WPXString str;
[Libreoffice-commits] .: bug/bug_fr bug/op_sys.txt
bug/bug_fr/op_sys.txt | 13 +++-- bug/op_sys.txt| 13 +++-- 2 files changed, 14 insertions(+), 12 deletions(-) New commits: commit 99d00cd7853f0fc3e51da2c17a1577f981081d1e Author: Jan Holesovsky ke...@suse.cz Date: Fri Jan 18 09:03:33 2013 +0100 Move Windows to front, and add openSUSE. diff --git a/bug/bug_fr/op_sys.txt b/bug/bug_fr/op_sys.txt index 75f858a..011b9b2 100644 --- a/bug/bug_fr/op_sys.txt +++ b/bug/bug_fr/op_sys.txt @@ -1,12 +1,13 @@ All::All -Ubuntu::Linux (All) -Debian::Linux (All) -Fedora::Linux (All) -Linux (Other)::Linux (All) -BSD::BSD (Others) -Mac OS X::Mac OS X (All) Windows XP::Windows (All) Windows 7::Windows (All) Windows 8::Windows (All) Windows (other)::Windows (All) +Debian::Linux (All) +Fedora::Linux (All) +openSUSE::Linux (All) +Ubuntu::Linux (All) +Linux (Other)::Linux (All) +Mac OS X::Mac OS X (All) +BSD::BSD (Others) other::other diff --git a/bug/op_sys.txt b/bug/op_sys.txt index 75f858a..011b9b2 100644 --- a/bug/op_sys.txt +++ b/bug/op_sys.txt @@ -1,12 +1,13 @@ All::All -Ubuntu::Linux (All) -Debian::Linux (All) -Fedora::Linux (All) -Linux (Other)::Linux (All) -BSD::BSD (Others) -Mac OS X::Mac OS X (All) Windows XP::Windows (All) Windows 7::Windows (All) Windows 8::Windows (All) Windows (other)::Windows (All) +Debian::Linux (All) +Fedora::Linux (All) +openSUSE::Linux (All) +Ubuntu::Linux (All) +Linux (Other)::Linux (All) +Mac OS X::Mac OS X (All) +BSD::BSD (Others) other::other ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - AUTHORS src/lib
AUTHORS|2 +-
src/lib/MSPUBParser.cpp|4 ++--
src/lib/MSPUBParser.h |4 ++--
src/lib/MSPUBParser97.cpp |2 +-
src/lib/MSPUBTypes.h |4 ++--
src/lib/libmspub_utils.cpp |2 +-
src/lib/libmspub_utils.h |2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 27334faa41525b7f85fd193817956d4e34390fde
Author: Brennan T. Vincent brenn...@email.arizona.edu
Date: Fri Jan 18 01:15:02 2013 -0700
styling
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 9e96c0c..490c6f2 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -339,7 +339,7 @@ bool libmspub::MSPUBParser::parseContents(WPXInputStream
*input)
if (m_contentChunks.size() 1)
{
m_contentChunks[m_contentChunks.size() - 2].end
- = m_contentChunks.back().offset;
+= m_contentChunks.back().offset;
}
}
}
diff --git a/src/lib/MSPUBParser.h b/src/lib/MSPUBParser.h
index 3d2b989..1cc8215 100644
--- a/src/lib/MSPUBParser.h
+++ b/src/lib/MSPUBParser.h
@@ -93,7 +93,7 @@ protected:
struct TextSpanReference
{
-TextSpanReference(unsigned short f, unsigned short l, const
CharacterStyle cs) : first(f), last(l), charStyle(cs) { }
+TextSpanReference(unsigned short f, unsigned short l, const CharacterStyle
cs) : first(f), last(l), charStyle(cs) { }
unsigned short first;
unsigned short last;
CharacterStyle charStyle;
@@ -101,7 +101,7 @@ protected:
struct TextParagraphReference
{
-TextParagraphReference(unsigned short f, unsigned short l, const
ParagraphStyle ps) : first(f), last(l), paraStyle(ps) { }
+TextParagraphReference(unsigned short f, unsigned short l, const
ParagraphStyle ps) : first(f), last(l), paraStyle(ps) { }
unsigned short first;
unsigned short last;
ParagraphStyle paraStyle;
diff --git a/src/lib/MSPUBTypes.h b/src/lib/MSPUBTypes.h
index 9e08207..2950ad5 100644
--- a/src/lib/MSPUBTypes.h
+++ b/src/lib/MSPUBTypes.h
@@ -168,14 +168,14 @@ struct ParagraphStyle
struct TextSpan
{
- TextSpan(const std::vectorunsigned char c, const CharacterStyle s) :
chars(c), style(s) { }
+ TextSpan(const std::vectorunsigned char c, const CharacterStyle s) :
chars(c), style(s) { }
std::vectorunsigned char chars;
CharacterStyle style;
};
struct TextParagraph
{
- TextParagraph(const std::vectorTextSpan sp, const ParagraphStyle st) :
spans(sp), style(st) { }
+ TextParagraph(const std::vectorTextSpan sp, const ParagraphStyle st) :
spans(sp), style(st) { }
std::vectorTextSpan spans;
ParagraphStyle style;
};
commit 7635d9ef0eaf07f3f60d0ee3f550c2c62685fedd
Author: Brennan T. Vincent brenn...@email.arizona.edu
Date: Fri Jan 18 01:14:13 2013 -0700
Update copyright dates and author email
diff --git a/AUTHORS b/AUTHORS
index 155e8df..f8d0aa5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,7 @@ CREDITS
Current maintainers and authors of libmspub
-
-Brennan Vincent (brenn...@email.arizona.edu)
+Brennan Vincent (brennan.vinc...@gmail.com)
Fridrich Strba (fridrich.st...@bluewin.ch)
Special thanks
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 548dd48..9e96c0c 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent brenn...@email.arizona.edu
+ * Copyright (C) 2012-2013 Brennan Vincent brenn...@email.arizona.edu
* Copyright (C) 2012 Fridrich Strba fridrich.st...@bluewin.ch
*
* All Rights Reserved.
diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index 8b8efd9..b2bd872 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent brenn...@email.arizona.edu
+ * Copyright (C) 2012-2013 Brennan Vincent brenn...@email.arizona.edu
*
* All Rights Reserved.
*
diff --git a/src/lib/libmspub_utils.cpp b/src/lib/libmspub_utils.cpp
index 17c3d5c..d61db1d 100644
--- a/src/lib/libmspub_utils.cpp
+++ b/src/lib/libmspub_utils.cpp
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent brenn...@email.arizona.edu
+ * Copyright (C) 2012-2013 Brennan Vincent brenn...@email.arizona.edu
* Copyright (C) 2011 Fridrich Strba fridrich.st...@bluewin.ch
* Copyright (C) 2011 Eilidh McAdam tibbylic...@gmail.com
*
diff --git a/src/lib/libmspub_utils.h b/src/lib/libmspub_utils.h
index c2bfb0d..c1ff6f8 100644
--- a/src/lib/libmspub_utils.h
+++ b/src/lib/libmspub_utils.h
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2012 Brennan Vincent brenn...@email.arizona.edu
+ * Copyright (C) 2012-2013 Brennan Vincent brenn...@email.arizona.edu
* Copyright (C) 2012 Fridrich Strba fridrich.st...@bluewin.ch
*
* All
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Fernand s...@pmg.be changed: What|Removed |Added Depends on||59516 --- Comment #82 from Fernand s...@pmg.be --- 59516 = the MySQL native connector do not longer install with Windows 78, who uses LO as frontend to Mysql is out of buisiness -- 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: MySQL connector and LO 4.0 Windows 78
Joren thanks, i just added it also to most annoying bugs Greetz Fernand Op 17-01-13 19:05, Fernand Vanrie schreef: The native MySQL connector (extension 1.0.1 made by Oracle) can no longer been installed on LO 4.0 with Windows 78 (op XP it is still functioning) Before we go to a issue, can someone explain wath are the future plans to connect LO to MySQL There is already a bug report about it: https://bugs.freedesktop.org/show_bug.cgi?id=59516 OO Apache made there proper extension but this tool is also not working on LO 4.0 with Windows 78 Kind regards, Joren ___ 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
Re: LATE FEATURE: Personas in LibreOffice
Hi Olivier, Olivier Hallot píše v Út 08. 01. 2013 v 08:11 -0200: I got it working on master. Really nice work and some room or improvement as well:I wonder if the persona also has a footer to decorate the LO status bar. Yes, I've had it in mind, so there is some code for that already in, but incomplete - work for 4.1. I got a crash on changing a persona to another, but I'll get a traceback as soon as I can. Should be fixed now thanks to Markus :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] LATE FEATURE: Personas in LibreOffice
Hi Michel, Michel Renon píše v St 09. 01. 2013 v 18:15 +0100: May i make some suggestions on the pref panel ? - why not keep the own image to select an image in local hd ? - if i understand ok (images and personas are exclusive), we can have the choices : *Toolbar background* O Default O Image Select Image... O Firefox PersonaSelect Persona... (I renamed own image to Image) I've updated the wording there already based on the Astron's suggestions - I hope it works for you too? - would it be possible to add a preview of image/persona ? and a status text if there is an error (error loading image, error loading persona, timeout...). From a user pov, it's an expected feed-back before validating. Very good idea - unfortunately more for 4.1, it's too late to do it now. I'll keep it in mind, thank you! - to be complete, LO should keep the path of image/url of persona, and show it below the preview ; and the url should be entered automatically in the persona dialog. I am not sure if it is useful to pre-file the current URL in the Persona dialog - it is supposed to be only a place to be pasted with the URL, no real editing, so... But showing the current Persona's URL might be good, indeed. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/sfxbasemodel.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 89fb1aee1a9e80e901f9e23ef6239177645b0101
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 15 21:25:14 2013 +0100
fdo#58893: Revert Resolves: rhbz#818557 crash with NULL shell...
This reverts commit a1d265be484f1c70f57ab3de9b2d8c27d2fd3aa4.
This commit causes the crash, because apparently it causes some event to
be delayed via SfxHintPoster which refers to some SfxRequest that is
then deleted too early.
Change-Id: I301f3b52001c1d8b1b60f5b1cfb3b093c9f81607
(cherry picked from commit 5090267eada3d68a618769c5dbae8b2ee8d6dab5)
Reviewed-on: https://gerrit.libreoffice.org/1721
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5dd7d63..540c190 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1119,10 +1119,7 @@ void SAL_CALL SfxBaseModel::connectController( const
uno::Reference frame::XCon
{
SfxViewFrame* pViewFrame = SfxViewFrame::Get( xController,
GetObjectShell() );
ENSURE_OR_THROW( pViewFrame, SFX document without SFX view!? );
-bool bOldLock = pViewFrame-GetDispatcher()-IsLocked();
-pViewFrame-GetDispatcher()-Lock(sal_True);
pViewFrame-UpdateDocument_Impl();
-pViewFrame-GetDispatcher()-Lock(bOldLock);
const String sDocumentURL = GetObjectShell()-GetMedium()-GetName();
if ( sDocumentURL.Len() )
SFX_APP()-Broadcast( SfxStringHint( SID_OPENURL, sDocumentURL ) );
___
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/ui/app/docst.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 2b9edadd637ea52293473e63062d334371bc83af
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 16 16:23:30 2013 +0100
rhbz#818557: fix it differently: SwDocShell::_LoadStyles():
Try to prevent pushing of SfxShells from this function via EndAllAction
and SwView::AttrChangedNotify() by setting a ridiculous pre-exising
global bNoInterrupt variable.
Change-Id: I9c91ca882891c8dfcd9dc08ba197233cfefddefd
(cherry picked from commit beacee6fad46aa2c8fc813bb0150e5c7a5175b26)
Reviewed-on: https://gerrit.libreoffice.org/1722
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index ad8c702..f974fe7 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -22,6 +22,8 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/container/XNameAccess.hpp
+#include comphelper/flagguard.hxx
+
#include hintids.hxx
#include sfx2/app.hxx
#include svl/whiter.hxx
@@ -77,6 +79,8 @@
#include paratr.hxx //#outline level,add by zhaojianwei
+extern bool bNoInterrupt; // in mainwn.cxx
+
using namespace ::com::sun::star;
void SwDocShell::StateStyleSheet(SfxItemSet rSet, SwWrtShell* pSh)
@@ -1280,6 +1284,11 @@ void SwDocShell::_LoadStyles( SfxObjectShell rSource,
sal_Bool bPreserveCurrent
((SwDocShell)rSource).pDoc-SetFixFields(false, NULL);
if( pWrtShell )
{
+// rhbz#818557, fdo#58893: EndAllAction will call SelectShell(),
+// which pushes a bunch of SfxShells that are not cleared
+// (for unknown reasons) when closing the document, causing crash;
+// setting bNoInterrupt appears to avoid the problem.
+::comphelper::FlagRestorationGuard g(bNoInterrupt, true);
pWrtShell-StartAllAction();
pDoc-ReplaceStyles( *((SwDocShell)rSource).pDoc );
pWrtShell-EndAllAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#58893: Revert Resolves: rhbz#818557 crash with NULL she...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1721 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1721 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I301f3b52001c1d8b1b60f5b1cfb3b093c9f81607 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: rhbz#818557: fix it differently: SwDocShell::_LoadStyles():
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1722 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1722 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c91ca882891c8dfcd9dc08ba197233cfefddefd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@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/core/frmedt/feshview.cxx |4 ++--
sw/source/ui/app/swmodul1.cxx | 16
sw/source/ui/app/swmodule.cxx |2 +-
sw/source/ui/cctrl/actctrl.cxx |4 ++--
sw/source/ui/chrdlg/drpcps.cxx | 12 ++--
sw/source/ui/chrdlg/numpara.cxx|4 ++--
sw/source/ui/chrdlg/pardlg.cxx |2 +-
sw/source/ui/docvw/edtdd.cxx |4 ++--
sw/source/ui/docvw/edtwin.cxx | 34 ++
sw/source/ui/ribbar/conform.cxx|4 ++--
sw/source/ui/ribbar/drawbase.cxx | 16
sw/source/ui/shells/textfld.cxx|6 +++---
sw/source/ui/uiview/view.cxx |6 +++---
sw/source/ui/wrtsh/wrtsh3.cxx |6 +++---
14 files changed, 61 insertions(+), 59 deletions(-)
New commits:
commit 4ca4d659de8ff32572634d9e3ef7ea7b21ef87f9
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jan 8 10:09:22 2013 +0900
sal_Bool to bool
Backport needed to fix build after backport of
6306c7befaa676df62272da7f3ddbcba54c5759c .
Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index be852a9..a3d5391 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -119,13 +119,13 @@ void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
{
// now call set macro if applicable
pSh-GetFlyMacroLnk().Call( (void*)pFlyFmt );
-extern sal_Bool bNoInterrupt; // in swapp.cxx
+extern bool bNoInterrupt; // in swapp.cxx
// if a dialog was started inside a macro, then
// MouseButtonUp arrives at macro and not to us. Therefore
// flag is always set here and will never be switched to
// respective Shell !!!
-bNoInterrupt = sal_False;
+bNoInterrupt = false;
}
else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt-Which() )
{
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 24630bd..e4f8715 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -83,9 +83,9 @@ using namespace ::com::sun::star::lang;
void lcl_SetUIPrefs(const SwViewOption rPref, SwView* pView, ViewShell* pSh )
{
// in FrameSets the actual visibility can differ from the ViewOption's
setting
-sal_Bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh-GetViewOptions()-IsViewVScrollBar();
-sal_Bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh-GetViewOptions()-IsViewHScrollBar();
-sal_Bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh-GetViewOptions()-IsVRulerRight();
+bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh-GetViewOptions()-IsViewVScrollBar();
+bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh-GetViewOptions()-IsViewHScrollBar();
+bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh-GetViewOptions()-IsVRulerRight();
pSh-SetUIOptions(rPref);
const SwViewOption* pNewPref = pSh-GetViewOptions();
@@ -165,7 +165,7 @@ void SwModule::ApplyUsrPref(const SwViewOption rUsrPref,
SwView* pActView,
pCurrView
pCurrView-ISA(SwWebView) ));
// with Uno, only sdbcx::View, but not the Module should be changed
-sal_Bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
+bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
// fob PreView off
SwPagePreView* pPPView;
if( !pCurrView 0 != (pPPView = PTR_CAST( SwPagePreView,
SfxViewShell::Current())) )
@@ -312,11 +312,11 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar,
sal_Bool bWeb)
pPref = pUsrPref;
}
sal_Bool bOldApplyCharUnit = pPref-IsApplyCharUnit();
-sal_Bool bHasChanged = sal_False;
+bool bHasChanged = false;
if(bOldApplyCharUnit != bApplyChar)
{
pPref-SetApplyCharUnit(bApplyChar);
-bHasChanged = sal_True;
+bHasChanged = true;
}
if( !bHasChanged )
@@ -471,7 +471,7 @@ void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet
rSet,
sizeof( aColArr[0] )) ] );
}
-sal_Bool bBackGr = COL_NONE == rAttr.nColor;
+bool bBackGr = COL_NONE == rAttr.nColor;
switch (rAttr.nItemId)
{
@@ -514,7 +514,7 @@ void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet
rSet,
case SID_ATTR_BRUSH:
rSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ));
-bBackGr = sal_True;
+bBackGr = true;
break;
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 4c97524..a1fcd36 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -139,7 +139,7 @@
#include app.hrc
#include svx/xmlsecctrl.hxx
ResMgr *pSwResMgr = 0;
-sal_Bool bNoInterrupt = sal_False;
+bool bNoInterrupt = false;
#include sfx2/app.hxx
diff --git
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/frmedt/feshview.cxx |4 ++--
sw/source/ui/app/swmodul1.cxx | 16
sw/source/ui/app/swmodule.cxx |2 +-
sw/source/ui/cctrl/actctrl.cxx |4 ++--
sw/source/ui/chrdlg/drpcps.cxx | 12 ++--
sw/source/ui/chrdlg/numpara.cxx|4 ++--
sw/source/ui/chrdlg/pardlg.cxx |2 +-
sw/source/ui/docvw/edtdd.cxx |4 ++--
sw/source/ui/docvw/edtwin.cxx | 34 ++
sw/source/ui/ribbar/conform.cxx|4 ++--
sw/source/ui/ribbar/drawbase.cxx | 16
sw/source/ui/shells/textfld.cxx|6 +++---
sw/source/ui/uiview/view.cxx |6 +++---
sw/source/ui/wrtsh/wrtsh3.cxx |6 +++---
14 files changed, 61 insertions(+), 59 deletions(-)
New commits:
commit 86623057d0b6e5c06c6137ca5bc5f49b833e87a6
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jan 8 10:09:22 2013 +0900
sal_Bool to bool
Backport needed to fix build after backport of
2b9edadd637ea52293473e63062d334371bc83af .
Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 01c2956..e9c493e 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -110,13 +110,13 @@ static void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm*
pOldSelFly)
{
// now call set macro if applicable
pSh-GetFlyMacroLnk().Call( (void*)pFlyFmt );
-extern sal_Bool bNoInterrupt; // in swapp.cxx
+extern bool bNoInterrupt; // in swapp.cxx
// if a dialog was started inside a macro, then
// MouseButtonUp arrives at macro and not to us. Therefore
// flag is always set here and will never be switched to
// respective Shell !!!
-bNoInterrupt = sal_False;
+bNoInterrupt = false;
}
else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt-Which() )
{
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index b0621bd..a40f44a 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -74,9 +74,9 @@ using namespace ::com::sun::star::lang;
static void lcl_SetUIPrefs(const SwViewOption rPref, SwView* pView,
ViewShell* pSh )
{
// in FrameSets the actual visibility can differ from the ViewOption's
setting
-sal_Bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh-GetViewOptions()-IsViewVScrollBar();
-sal_Bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh-GetViewOptions()-IsViewHScrollBar();
-sal_Bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh-GetViewOptions()-IsVRulerRight();
+bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh-GetViewOptions()-IsViewVScrollBar();
+bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh-GetViewOptions()-IsViewHScrollBar();
+bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh-GetViewOptions()-IsVRulerRight();
pSh-SetUIOptions(rPref);
const SwViewOption* pNewPref = pSh-GetViewOptions();
@@ -156,7 +156,7 @@ void SwModule::ApplyUsrPref(const SwViewOption rUsrPref,
SwView* pActView,
pCurrView
pCurrView-ISA(SwWebView) ));
// with Uno, only sdbcx::View, but not the Module should be changed
-sal_Bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
+bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
// fob PreView off
SwPagePreView* pPPView;
if( !pCurrView 0 != (pPPView = PTR_CAST( SwPagePreView,
SfxViewShell::Current())) )
@@ -303,11 +303,11 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar,
sal_Bool bWeb)
pPref = pUsrPref;
}
sal_Bool bOldApplyCharUnit = pPref-IsApplyCharUnit();
-sal_Bool bHasChanged = sal_False;
+bool bHasChanged = false;
if(bOldApplyCharUnit != bApplyChar)
{
pPref-SetApplyCharUnit(bApplyChar);
-bHasChanged = sal_True;
+bHasChanged = true;
}
if( !bHasChanged )
@@ -460,7 +460,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor,
SfxItemSet rSet,
sizeof( aColArr[0] )) ] );
}
-sal_Bool bBackGr = COL_NONE == rAttr.nColor;
+bool bBackGr = COL_NONE == rAttr.nColor;
switch (rAttr.nItemId)
{
@@ -503,7 +503,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor,
SfxItemSet rSet,
case SID_ATTR_BRUSH:
rSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ));
-bBackGr = sal_True;
+bBackGr = true;
break;
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 0add2ed..3c61ac7 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -128,7 +128,7 @@
#include app.hrc
#include svx/xmlsecctrl.hxx
ResMgr *pSwResMgr = 0;
-sal_Bool bNoInterrupt = sal_False;
+bool bNoInterrupt = false;
#include
[Libreoffice-commits] .: sc/source
sc/source/ui/dbgui/tpsort.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7af886d7784b321e6cda2a870b514607e355b112
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 18 10:17:57 2013 +0100
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6688166..78d04ac 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -358,6 +358,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: reset one of the sort containers before refilling, fdo#57465
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1752
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1752/1
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
---
M sc/source/ui/dbgui/tpsort.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6688166..78d04ac 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -358,6 +358,8 @@
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
--
To view, visit https://gerrit.libreoffice.org/1752
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: 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' - extras/source
extras/source/templates/layout/BrightBlue.otp |binary 1 file changed New commits: commit d9741ac18a32d0575fa5bc2d5391d3bb5e1c096a Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Wed Jan 16 18:40:39 2013 +0100 fdo#59396 Remove duplicate footer entries in BrightBlue Impress template This also removes an English text in the Master page: Click here to edit... and replaces it with a placeholder It would be nice to have this in 4.0 branch also. Change-Id: I1aadc20aa9916e40bbaf1b6f66ec58dfd02a35bb Reviewed-on: https://gerrit.libreoffice.org/1725 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com Signed-off-by: Noel Power noel.po...@suse.com diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp index 3cb8c16..2366b03 100644 Binary files a/extras/source/templates/layout/BrightBlue.otp and b/extras/source/templates/layout/BrightBlue.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: fdo#59396 Remove duplicate footer entries in BrightBlue Im...
On 17/01/13 19:57, Noel Power wrote: On 17/01/13 16:43, Samuel Mehrbrodt wrote: Hi Noel, thanks for pushing. Can you please push it also to 4.0? Or do I need to do something to get it there? I guess I can, or at least I will try remember to do that tomorrow done, pushed to 4.0 Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: reset one of the sort containers before refilling, fdo#57465
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1753
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1753/1
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
---
M sc/source/ui/dbgui/tpsort.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 38724dd..9a2145d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -341,6 +341,8 @@
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
--
To view, visit https://gerrit.libreoffice.org/1753
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6-5]: reset one of the sort containers before refilling, fdo#57465
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1754
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1754/1
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
---
M sc/source/ui/dbgui/tpsort.cxx
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 38724dd..9a2145d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -341,6 +341,8 @@
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
--
To view, visit https://gerrit.libreoffice.org/1754
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-5
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/androidapp' - 3 commits - android/experimental sal/android
android/experimental/LibreOffice4Android/native-code.cxx | 20 ++-
sal/android/lo-bootstrap.c |2 -
2 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit e6daeb74bc8add73254b2123fa1f378d5bfbdc47
Author: Michael Meeks michael.me...@suse.com
Date: Fri Jan 18 17:54:22 2013 +0800
add missing chartcore.
Change-Id: I069065fedddad0585851629b6c674cd613ad4409
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 676eed7..30dae38 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -14,6 +14,7 @@ extern C
extern void * animcore_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * avmedia_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * basprov_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * chartcore_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * dba_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * dbaxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * dlgprov_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
@@ -80,6 +81,7 @@ lo_get_libmap(void)
{ libanimcorelo.a, animcore_component_getFactory },
{ libavmedialo.a, avmedia_component_getFactory },
{ libbasprov.uno.a, basprov_component_getFactory },
+{ libchartcorelo.a, chartcore_component_getFactory },
{ libdlgprov.uno.a, dlgprov_component_getFactory },
{ libdbalo.a, dba_component_getFactory },
{ libdbaxmllo.a, dbaxml_component_getFactory },
commit 04518e4b8b62e2b2c899b13c98b1cfb6eec4930c
Author: Michael Meeks michael.me...@suse.com
Date: Fri Jan 18 00:17:20 2013 +0800
remove un-conditional 20 second sleep on-start for now.
Change-Id: I37ff2164b1f0fcdc4f3fad41f344b0d73105a2c1
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 9aeb32b..4bc0a94 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -489,7 +489,7 @@ Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env,
static int beenhere=0;
if (!beenhere) {
LOGI(lo-bootstrap: Sleeping for 20 seconds, start ndk-gdb NOW if
that is your intention);
-sleep(20);
+/*sleep(20); */
beenhere = 1;
}
}
commit c7c20d978ff55cb40598b7619c39e9184b001c24
Author: Michael Meeks michael.me...@suse.com
Date: Fri Jan 18 00:18:43 2013 +0800
Add other missing libraries.
Change-Id: I9ab478dc48cc0a0e521641dd89d28a7ee419d242
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 59ae30d..676eed7 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -17,8 +17,13 @@ extern C
extern void * dba_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * dbaxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * dlgprov_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * embobj_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * emboleobj_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * evtatt_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * expwrap_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * fastsax_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * fileacc_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * filterconfig1_component_getFactory( const char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * frm_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * fsstorage_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
extern void * fwk_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
@@ -38,6 +43,8 @@ extern C
extern void * scriptframe_component_getFactory(
Re: MySQL connector and LO 4.0 Windows 78
On 01/18/2013 09:22 AM, Fernand Vanrie wrote: Hi all, Before we go to a issue, can someone explain wath are the future plans to connect LO to MySQL That would be nice :-) but I'm pretty sure this was discussed on this list before, and from what I remember, backwards compatibility was to be maintained, given that the project itself did not want to integrate the native connector directly into LO releases for a variety of reasons. My understanding was : - Linux : the distribs will deal with it, as they have done so in the past; - Mac OSX : backwards compatibility to be maintained; - Windows : backwards compatibility to be maintained. Nevertheless, this was a while ago, and before the decision to allow ABI breakage was taken (i.e. meaning that extensions could break, and it would be up to the extension providers to fix them). So, if that approach is still the mantra, then the connector is doomed, at least on Windows 64bit OS, and also on OSX as I don't think Apache OO are currently inclined to do the LibreOffice project any particular favours, unless someone takes it under their wing (in a similar way to what occurred in AOO as it happens, as the connector there is not officially part of the project, from what I understand). I suppose an accessory to the above question would be whether the AOO connectors actually still work with the most recent versions of AOO, that would give an indication that the problem is of a more general nature, and not just with LO. That said, I could be completely wrong with my take on the situation, at least until some of the devs can comment. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/msodraw.py
src/msodraw.py |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 1329c0c7ef472aa7b8244a271e0dc143236f37fa
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 11:42:05 2013 +0100
LineColor xml dump
diff --git a/src/msodraw.py b/src/msodraw.py
index 81002a9..9c413c3 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -395,6 +395,13 @@ class FOPT:
color = ColorRef(prop.value)
color.appendLine(recHdl, level)
+def dumpXml(self, recHdl, prop):
+recHdl.appendLine('lineColor')
+color = ColorRef(prop.value)
+color.dumpXml(recHdl)
+recHdl.appendLine('/lineColor')
+
+
class GroupShape:
flagNames = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck : Variable 'bRet' is reassigned a value in autoform.cxx
On Thu, 2013-01-17 at 13:54 -0800, julien2412 wrote:
What should we do with bRet value, after line 1102?
bRet is supposed to return true if the save succeeded s
a) changing all the bRets after the initial initialization from
bRet = foo
to
bRet = foo
would ensure that the failed state of any check is kept
b) alternatively, could change the
bool bRet = ...
if (bRet)
{
bRet = foo
bRet = bar
}
to something like
bool bRet = true;
do
{
bRet = foo;
if (!bRet)
break;
bRet = bar;
if (!bRet)
break;
} while(0);
c) just do one bRet = (rStream.GetError() == 0); before the Flush and
remove the other ones inside the bRet block
Also, notice the line 1107 ++it to skip the first item. Shouldn't we add a
wrapper if(it != itEnd) for the for loop to be sure?
Yeah, I think you definitely should
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-dev] - trouble with building libreoffice 4.0 from source
On Thu, 2013-01-17 at 21:58 +, Rai, Neeraj wrote: Hi , I am trying to build libreoffice preview release 4.0.0 RC1 from source but having some trouble with make fetch and need some advice. It fails on cmd : git config --local --get submodule.dictionaries.url Complaining that local is not a valid option What's the output of git --version, I suppose its too old to have --local so manually editing g to remove --local might work C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cppcheck : unused pUnicodes variable in pdfwriter_impl.cxx
On Thu, 2013-01-17 at 13:43 -0800, julien2412 wrote: Hello, Cppcheck reported this: vcl/source/gdi/pdfwriter_impl.cxx 3203 unreadVariable style Variable 'pUnicodes' is assigned a value that is never used Can we just remove it or something lacking? Go ahead and remove the pUnicodes, its been unused since the initial commit in 2009, and there isn't anything local to that code that seems to have an intent to consume it. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/msodraw.py
src/msodraw.py | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 7f6b49d29daa965609697a860de533aef1188bbc
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 12:26:26 2013 +0100
msodraw: dump shadowOffsetX
diff --git a/src/msodraw.py b/src/msodraw.py
index 9c413c3..27b728f 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -34,6 +34,17 @@ def indent (level):
def headerLine ():
return + + -*58 + +
+def mm100_to_twip(value):
+if value = 0:
+return (((value)*72+63)/127)
+else:
+return (((value)*72-63)/127)
+
+def emu_to_mm100(value):
+return value / 360
+
+def emu_to_twip(value):
+return mm100_to_twip(emu_to_mm100(value))
class RecordHeader:
@@ -401,6 +412,14 @@ class FOPT:
color.dumpXml(recHdl)
recHdl.appendLine('/lineColor')
+class ShadowOffsetX:
+
+def appendLines(self, recHdl, prop, level):
+recHdl.appendLine(indent(level)+shadowOffsetX: %s%prop.value)
+
+def dumpXml(self, recHdl, prop):
+recHdl.appendLine('shadowOffsetX value=%s inTwips=%s/' %
(prop.value, emu_to_twip(prop.value)))
+
class GroupShape:
@@ -454,7 +473,8 @@ class FOPT:
0x01BF: ['Fill Style Boolean Properties', FillStyle],
0x01C0: ['Line Color', LineColor],
0x0303: ['Connector Shape Style (cxstyle)', CXStyle],
-0x03BF: ['Group Shape Boolean Properties', GroupShape]
+0x03BF: ['Group Shape Boolean Properties', GroupShape],
+0x0205: ['X Shadow Offset', ShadowOffsetX],
}
class E:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: curl/ExternalProject_curl.mk
curl/ExternalProject_curl.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16ac315c41e7d94db2be2b97b7cb4704cdd249f3 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 18 12:45:24 2013 +0100 Enable NTLM authentication (using sspi.h) in Windows build of curl Change-Id: I5e24338b937d32cd3a09f82bd3cf5a8b29f5d340 diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index c1c9219..e3df128 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -50,7 +50,7 @@ else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR)/lib \ MAKEFLAGS= LIB=$(ILIB) nmake -f Makefile.vc9 cfg=release-dll \ - EXCFLAGS=/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC) $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ + EXCFLAGS=/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC) $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ touch $@ endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit da3ddc4f909182b3afeefb7f327efec42ba42412 Author: Andras Timar ati...@suse.com Date: Fri Jan 18 13:21:07 2013 +0100 Updated core Project: help 64c3fdcaa366e74afa672542f0a94b84be5008d7 diff --git a/helpcontent2 b/helpcontent2 index a915dcd..64c3fdc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a915dcd521181918307d16fb2168d436e5370043 +Subproject commit 64c3fdcaa366e74afa672542f0a94b84be5008d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/shared/01/05200100.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 64c3fdcaa366e74afa672542f0a94b84be5008d7 Author: Andras Timar ati...@suse.com Date: Fri Jan 18 13:21:07 2013 +0100 fix paragraph attribute Change-Id: I674f1b39c3eb95dbec065afcda3fc5cdad766ce9 diff --git a/source/text/shared/01/05200100.xhp b/source/text/shared/01/05200100.xhp index 931fd3e..2d88bbc 100644 --- a/source/text/shared/01/05200100.xhp +++ b/source/text/shared/01/05200100.xhp @@ -90,7 +90,7 @@ paragraph role=paragraph id=par_id3154583 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLESelect the shape to be used at the corners of the line. In case of a small angle between lines, a mitered shape is replaced with a beveled shape./ahelp/paragraph bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXPAGE_LINE:LB_CAP_STYLE id=bm_id3154584 localize=false / paragraph role=heading id=hd_id3154585 xml-lang=en-US level=3 l10n=Cap style/paragraph -paragraph role=paragraph nil=par_id3154586 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLESelect the style of the line end caps. The caps are added to inner dashes as well./ahelp/paragraph +paragraph role=paragraph id=par_id3154586 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLESelect the style of the line end caps. The caps are added to inner dashes as well./ahelp/paragraph embed href=text/shared/00/0001.xhp#vorschau/ /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/cellsh1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1de8d78a8ee6ddd6f2b175330fcb709f56b35960 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Jan 18 14:07:25 2013 +0100 don't create multiple dialogs in the loop, fdo#59314 Change-Id: Ia48262cdf8b07caf6622f2d4a48f366f3f26c0fd diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6d434ce..4654596 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1803,6 +1803,7 @@ void ScCellShell::ExecuteEdit( SfxRequest rReq ) // found a matching range, edit this conditional format nKey = pCondFormat-GetKey(); pCondFormatDlg.reset( new ScCondFormatDlg( pTabViewShell-GetDialogParent(), pDoc, pCondFormat, rCondFormatRange, aPos, condformat::dialog::NONE ) ); +break; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/scmod.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 6d36a31df1726e45d5c4e3623354afe5c5ab814d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 18 14:14:32 2013 +0100
make sure we call SetInRefMode only once
Change-Id: I16ff8b6aaa24b1f8522117197226db39f0617fad
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 9f406d7..d4ed9da 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2317,6 +2317,11 @@ void ScModule::PushNewAnyRefDlg( ScAnyRefModalDlg*
pNewDlg )
{
maAnyRefDlgStack.push( pNewDlg );
+// prevent mismatch between calls to
+// SetInRefMode(true) and SetInRefMode(false)
+if(maAnyRefDlgStack.size() != 1)
+return;
+
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while(pViewShell)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 10 ++ sc/inc/sc.hrc |2 sc/sdi/cellsh.sdi |2 sc/sdi/scalc.sdi | 50 ++ sc/source/ui/condformat/condformatdlg.cxx |8 + sc/source/ui/inc/condformatdlg.hxx|4 sc/source/ui/view/cellsh1.cxx |9 + sc/uiconfig/scalc/menubar/menubar.xml |2 8 files changed, 85 insertions(+), 2 deletions(-) New commits: commit 16d50ae144d4ddd86177bd35ddd0b79529fbf79e Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Jan 18 14:38:48 2013 +0100 add all the new conditional formats to the menu, related fdo#58778 Change-Id: I398fac5c585b5ea6e40331b50119c90c180a32bc diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index b5b8bfd..f23b383 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -459,6 +459,16 @@ value xml:lang=en-USData Bar.../value /prop /node +node oor:name=.uno:IconSetFormatDialog oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USIcon Set.../value +/prop +/node +node oor:name=.uno:CondDateFormatDialog oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USDate.../value +/prop +/node node oor:name=.uno:ConditionalFormatManagerDialog oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USManage.../value diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index fb488d2..e410b63 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -245,6 +245,8 @@ #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) #define SID_OPENDLG_COLORSCALE (SC_MESSAGE_START + 66) #define SID_OPENDLG_DATABAR (SC_MESSAGE_START + 67) +#define SID_OPENDLG_ICONSET (SC_MESSAGE_START + 68) +#define SID_OPENDLG_CONDDATE(SC_MESSAGE_START + 69) // functions diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index d03e3f5..7d8bfb1 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -183,6 +183,8 @@ interface CellSelection SID_OPENDLG_CONDFRMT[ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_OPENDLG_COLORSCALE [ ExecMethod = ExecuteEdit; ] SID_OPENDLG_DATABAR [ ExecMethod = ExecuteEdit; ] +SID_OPENDLG_ICONSET [ ExecMethod = ExecuteEdit; ] +SID_OPENDLG_CONDDATE[ ExecMethod = ExecuteEdit; ] SID_OPENDLG_CONDFRMT_MANAGER[ ExecMethod = ExecuteEdit; ] SID_COLORSCALE [ ExecMethod = ExecuteEdit; ] SID_DATABAR [ ExecMethod = ExecuteEdit; ] diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index ac53029..7ab61a1 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -1135,6 +1135,56 @@ SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR ] //-- +SfxVoidItem IconSetFormatDialog SID_OPENDLG_ICONSET +() +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = TRUE, +ReadOnlyDoc = TRUE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +Synchron; + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_FORMAT; +] + +//-- +SfxVoidItem CondDateFormatDialog SID_OPENDLG_CONDDATE +() +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = TRUE, +ReadOnlyDoc = TRUE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +Synchron; + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_FORMAT; +] + +//-- SfxVoidItem ConditionalFormatManagerDialog SID_OPENDLG_CONDFRMT_MANAGER () [ diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 8b5960e..784f1ed 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -119,7 +119,13 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId rResId,
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/helper/helper.hxx |1 +
oox/inc/oox/vml/vmlformatting.hxx | 12
oox/inc/oox/vml/vmlshape.hxx |1 +
oox/source/token/properties.txt|1 +
oox/source/vml/vmlformatting.cxx | 28
oox/source/vml/vmlshape.cxx|2 ++
oox/source/vml/vmlshapecontext.cxx |8
7 files changed, 53 insertions(+)
New commits:
commit 01d059c13e39f4fba75e2152b4db6b0b746bca71
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 14:42:16 2013 +0100
oox: import VML's v:shadow to Writer
Change-Id: I48ea2dcf81c91c0fe476ecff6cd074cb699af533
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index bfe2796..e82cea7 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -82,6 +82,7 @@ const sal_uInt8 WINDOWS_CHARSET_OEM = 255;
const sal_Int32 API_RGB_TRANSPARENT = -1; /// Transparent color
for API calls.
const sal_Int32 API_RGB_BLACK = 0x00; /// Black color for
API calls.
+const sal_Int32 API_RGB_GRAY= 0x808080; /// Gray color for
API calls.
const sal_Int32 API_RGB_WHITE = 0xFF; /// White color for
API calls.
const sal_Int16 API_LINE_SOLID = 0;
diff --git a/oox/inc/oox/vml/vmlformatting.hxx
b/oox/inc/oox/vml/vmlformatting.hxx
index 277b358..0d8db16 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -225,6 +225,18 @@ struct FillModel
//
+/** The shadow model structure contains all shape shadow properties. */
+struct ShadowModel
+{
+OptValuebool moHasShadow; /// Specifies whether to
show a shadow.
+OptValueOUString moColor; /// Specifies the color of
the shadow.
+OptValueOUString moOffset; /// Specifies the shadow's
offset from the shape's location.
+OptValuedouble moOpacity; /// Specifies the opacity
of the shadow.
+
+/** Writes the properties to the passed property map. */
+void pushToPropMap(oox::drawingml::ShapePropertyMap rPropMap, const
GraphicHelper rGraphicHelper) const;
+};
+
} // namespace vml
} // namespace oox
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 2f4ab6f..1ef3058 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -87,6 +87,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel
StrokeModel maStrokeModel; /// Border line formatting.
FillModel maFillModel;/// Shape fill formatting.
+ShadowModel maShadowModel; /// Shape shadow formatting.
OptValue ::rtl::OUString moGraphicPath; /// Path to a graphic for
this shape.
OptValue ::rtl::OUString moGraphicTitle; /// Title of the graphic.
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index a252bb2..2430580 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -414,6 +414,7 @@ SelectedItems
SelectedPage
Shadow
ShadowColor
+ShadowFormat
ShadowTransparence
ShadowXDistance
ShadowYDistance
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 528cc06..3113d57 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -18,6 +18,7 @@
*/
#include oox/vml/vmlformatting.hxx
+#include com/sun/star/table/ShadowFormat.hpp
#include rtl/strbuf.hxx
#include oox/drawingml/color.hxx
#include oox/drawingml/drawingmltypes.hxx
@@ -32,6 +33,7 @@ namespace vml {
//
+using namespace ::com::sun::star;
using namespace ::com::sun::star::geometry;
using ::oox::drawingml::Color;
@@ -712,6 +714,32 @@ void FillModel::pushToPropMap( ShapePropertyMap rPropMap,
const GraphicHelper
//
+void ShadowModel::pushToPropMap(ShapePropertyMap rPropMap, const
GraphicHelper rGraphicHelper) const
+{
+if (moHasShadow.has() !moHasShadow.get())
+return;
+
+drawingml::Color aColor = ConversionHelper::decodeColor(rGraphicHelper,
moColor, moOpacity, API_RGB_GRAY);
+// nOffset* is in mm100, default value is 35 twips, see
DffPropertyReader::ApplyAttributes() in msfilter.
+sal_Int32 nOffsetX = 62, nOffsetY = 62;
+if (moOffset.has())
+{
+OUString aOffsetX, aOffsetY;
+ConversionHelper::separatePair(aOffsetX, aOffsetY, moOffset.get(),
',');
+if (!aOffsetX.isEmpty())
+nOffsetX = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
aOffsetX, 0, false, false );
+if (!aOffsetY.isEmpty())
+nOffsetY = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
aOffsetY, 0, false, false );
+}
+
+table::ShadowFormat
Re: Limit - New Database feature
On Thu, 2013-01-17 at 21:47 +0100, Zolnai Tamás wrote: an editable field on the Query Design Toolbar, with which the result of the query can be limited.. My question is what the process of adding a new feature to LO. What group decide whether a feature is useful and can be added. In practice the default is that a feature is accepted unless there's some reason not to accept it. Because it's a database thing, Lionel as our database guy has the most impact if he doesn't like it for some reason. I expect that no-one will object to your feature, as long as it works and makes sense :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/vml/vmlformatting.hxx |5 -
oox/source/vml/vmlformatting.cxx |7 ++-
oox/source/vml/vmlshapecontext.cxx |3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 2cacaf6ab0acf3188f43df02ef3fc87082e351b2
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 15:22:36 2013 +0100
oox::vml::ShadowModel: differentiate between not having it and having it off
Having it explicitly disabled was already handled, but apparently
01d059c13e39f4fba75e2152b4db6b0b746bca71 turned on shadows by default.
Fix this.
Change-Id: I1401a28b36a9b5aea302f9a19a6d02a29e6b358d
diff --git a/oox/inc/oox/vml/vmlformatting.hxx
b/oox/inc/oox/vml/vmlformatting.hxx
index 0d8db16..d675255 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -228,11 +228,14 @@ struct FillModel
/** The shadow model structure contains all shape shadow properties. */
struct ShadowModel
{
-OptValuebool moHasShadow; /// Specifies whether to
show a shadow.
+bool mbHasShadow; /// Is a v:shadow element
seen?
+OptValuebool moShadowOn;/// Is the element turned
on?
OptValueOUString moColor; /// Specifies the color of
the shadow.
OptValueOUString moOffset; /// Specifies the shadow's
offset from the shape's location.
OptValuedouble moOpacity; /// Specifies the opacity
of the shadow.
+ShadowModel();
+
/** Writes the properties to the passed property map. */
void pushToPropMap(oox::drawingml::ShapePropertyMap rPropMap, const
GraphicHelper rGraphicHelper) const;
};
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 3113d57..1af17a38 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -714,9 +714,14 @@ void FillModel::pushToPropMap( ShapePropertyMap rPropMap,
const GraphicHelper
//
+ShadowModel::ShadowModel()
+: mbHasShadow(false)
+{
+}
+
void ShadowModel::pushToPropMap(ShapePropertyMap rPropMap, const
GraphicHelper rGraphicHelper) const
{
-if (moHasShadow.has() !moHasShadow.get())
+if (!mbHasShadow || (moShadowOn.has() !moShadowOn.get()))
return;
drawingml::Color aColor = ConversionHelper::decodeColor(rGraphicHelper,
moColor, moOpacity, API_RGB_GRAY);
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index fc5ad9f..39ac325 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -335,7 +335,8 @@ ContextHandlerRef ShapeTypeContext::onCreateContext(
sal_Int32 nElement, const A
break;
case VML_TOKEN( shadow ):
{
-
mrTypeModel.maShadowModel.moHasShadow.assignIfUsed(lclDecodeBool(rAttribs,
XML_on));
+mrTypeModel.maShadowModel.mbHasShadow = true;
+
mrTypeModel.maShadowModel.moShadowOn.assignIfUsed(lclDecodeBool(rAttribs,
XML_on));
mrTypeModel.maShadowModel.moColor.assignIfUsed(rAttribs.getString(XML_color));
mrTypeModel.maShadowModel.moOffset.assignIfUsed(rAttribs.getString(XML_offset));
mrTypeModel.maShadowModel.moOpacity = lclDecodePercent(rAttribs,
XML_opacity, 1.0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/text
source/text/shared/01/05200100.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5a1a67cb0526aaec8667e5e602864d426930335 Author: Andras Timar ati...@suse.com Date: Fri Jan 18 13:21:07 2013 +0100 fix paragraph attribute Change-Id: I674f1b39c3eb95dbec065afcda3fc5cdad766ce9 Reviewed-on: https://gerrit.libreoffice.org/1755 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/01/05200100.xhp b/source/text/shared/01/05200100.xhp index 931fd3e..2d88bbc 100644 --- a/source/text/shared/01/05200100.xhp +++ b/source/text/shared/01/05200100.xhp @@ -90,7 +90,7 @@ paragraph role=paragraph id=par_id3154583 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLESelect the shape to be used at the corners of the line. In case of a small angle between lines, a mitered shape is replaced with a beveled shape./ahelp/paragraph bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXPAGE_LINE:LB_CAP_STYLE id=bm_id3154584 localize=false / paragraph role=heading id=hd_id3154585 xml-lang=en-US level=3 l10n=Cap style/paragraph -paragraph role=paragraph nil=par_id3154586 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLESelect the style of the line end caps. The caps are added to inner dashes as well./ahelp/paragraph +paragraph role=paragraph id=par_id3154586 xml-lang=en-US l10n=ahelp hid=SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLESelect the style of the line end caps. The caps are added to inner dashes as well./ahelp/paragraph embed href=text/shared/00/0001.xhp#vorschau/ /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c5c32fadc3e4cb130a56d43c185cb6223ae371f Author: Andras Timar ati...@suse.com Date: Fri Jan 18 13:21:07 2013 +0100 Updated core Project: help c5a1a67cb0526aaec8667e5e602864d426930335 fix paragraph attribute Change-Id: I674f1b39c3eb95dbec065afcda3fc5cdad766ce9 Reviewed-on: https://gerrit.libreoffice.org/1755 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index d3eed35..c5a1a67 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d3eed351daeca6f99c4e3dc43922cc71c5d9149d +Subproject commit c5a1a67cb0526aaec8667e5e602864d426930335 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MySQL connector and LO 4.0 Windows 78
Alex , +1 as long as we can install whatever extension, or whatever tool to connect to MySQL, with the ease , the robustness and the speed of the current connector we will be happy users :-) greetz On 01/18/2013 09:22 AM, Fernand Vanrie wrote: Hi all, Before we go to a issue, can someone explain wath are the future plans to connect LO to MySQL That would be nice :-) but I'm pretty sure this was discussed on this list before, and from what I remember, backwards compatibility was to be maintained, given that the project itself did not want to integrate the native connector directly into LO releases for a variety of reasons. My understanding was : - Linux : the distribs will deal with it, as they have done so in the past; - Mac OSX : backwards compatibility to be maintained; - Windows : backwards compatibility to be maintained. Nevertheless, this was a while ago, and before the decision to allow ABI breakage was taken (i.e. meaning that extensions could break, and it would be up to the extension providers to fix them). So, if that approach is still the mantra, then the connector is doomed, at least on Windows 64bit OS, and also on OSX as I don't think Apache OO are currently inclined to do the LibreOffice project any particular favours, unless someone takes it under their wing (in a similar way to what occurred in AOO as it happens, as the connector there is not officially part of the project, from what I understand). I suppose an accessory to the above question would be whether the AOO connectors actually still work with the most recent versions of AOO, that would give an indication that the problem is of a more general nature, and not just with LO. That said, I could be completely wrong with my take on the situation, at least until some of the devs can comment. Alex ___ 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] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/layout/atrfrm.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9bde6f8a0c5fed9d30cd0e296ec9258937376bdf
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 17 21:45:09 2013 +0100
fdo#59437: SwFmtAnchor::SetAnchor: Anchors may be on StartNodes
Assertion added in 90a0116ccb48388d91b21128fcac2e4609838581 wasn't quite
right.
Change-Id: Icac6c4e3932837ffaf170d9b18664e5b4ff579ff
(cherry picked from commit 0ed73a0817ad0ff0107cb297208252c0afe3b4a9)
Reviewed-on: https://gerrit.libreoffice.org/1747
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index f5d7798..180b145 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1514,8 +1514,11 @@ SwFmtAnchor::~SwFmtAnchor()
void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
{
-// anchor only to paragraphs
-assert(!pPos || dynamic_castSwTxtNode*(pPos-nNode.GetNode()));
+// anchor only to paragraphs, or start nodes in case of FLY_AT_FLY
+assert(!pPos
+|| ((FLY_AT_FLY == nAnchorId)
+dynamic_castSwStartNode*(pPos-nNode.GetNode()))
+|| dynamic_castSwTxtNode*(pPos-nNode.GetNode()));
m_pCntntAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 );
// Flys anchored AT paragraph should not point into the paragraph content
if (m_pCntntAnchor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#59437: SwFmtAnchor::SetAnchor: Anchors may be on StartNo...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1747 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1747 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icac6c4e3932837ffaf170d9b18664e5b4ff579ff Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 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
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/inc
sw/inc/pagedesc.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit c41675a7d13dac64540ad420f905e80dbcbc023d Author: Michael Stahl mst...@redhat.com Date: Thu Jan 17 21:55:32 2013 +0100 fdo#59428: SwPageDesc::GetUseOn(): mask PD_FIRSTSHARE. There is at least one call in SwDoc::ChgPageDesc() checks if the result equals PD_MIRROR. (regression from fa0f42bafbf24e9141ddee728b160b5ab47077f2) Change-Id: Id37ca46eec5885f7f5230337d8a8a594845f7842 (cherry picked from commit 8d301533f0c7764c94f8ad72fced2ce9d9de7585) Reviewed-on: https://gerrit.libreoffice.org/1748 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index b6c40a8..dbf3144 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -292,6 +292,7 @@ inline UseOnPage SwPageDesc::GetUseOn() const UseOnPage eRet = eUse; eRet = (UseOnPage) (eRet nsUseOnPage::PD_NOHEADERSHARE); eRet = (UseOnPage) (eRet nsUseOnPage::PD_NOFOOTERSHARE); +eRet = (UseOnPage) (eRet nsUseOnPage::PD_NOFIRSTSHARE); return eRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#59428: SwPageDesc::GetUseOn(): mask PD_FIRSTSHARE.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1748 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1748 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id37ca46eec5885f7f5230337d8a8a594845f7842 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 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
RE: [libreoffice-dev] - trouble with building libreoffice 4.0 from source
Hi Caolan, I am using version 1.7.1 and your suggestion of manually editing g, worked. I ran into trouble with firewall and had to update .git/config to the http url. Make fetch finished successfully. Thanks for your inputs. Neeraj -Original Message- From: Caolán McNamara [mailto:caol...@redhat.com] Sent: Friday, January 18, 2013 6:05 AM To: Rai, Neeraj [ICG-MKTS] Cc: 'libreoffice@lists.freedesktop.org' Subject: Re: [libreoffice-dev] - trouble with building libreoffice 4.0 from source On Thu, 2013-01-17 at 21:58 +, Rai, Neeraj wrote: Hi , I am trying to build libreoffice preview release 4.0.0 RC1 from source but having some trouble with make fetch and need some advice. It fails on cmd : git config --local --get submodule.dictionaries.url Complaining that local is not a valid option What's the output of git --version, I suppose its too old to have --local so manually editing g to remove --local might work C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extras/source
extras/source/truetype/symbol/OpenSymbol.sfd | 74 --- 1 file changed, 68 insertions(+), 6 deletions(-) New commits: commit 460346098714d119fc814b485c5b49bfc2c74023 Author: Mathias Hasselmann math...@openismus.com Date: Mon Jan 14 19:11:27 2013 +0100 Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenSymbol This adds glyphs for prime (U+2032), double prime (U+2033) and triple prime (U+2034). Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f Reviewed-on: https://gerrit.libreoffice.org/1679 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index a2169dc..53a85c0 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -4,7 +4,7 @@ FullName: OpenSymbol FamilyName: OpenSymbol Weight: Book Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot -Version: 102.2 +Version: 102.3 ItalicAngle: 0 UnderlinePosition: -143 UnderlineWidth: 20 @@ -19,7 +19,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1144938807 -ModificationTime: 1321359108 +ModificationTime: 1358186116 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -773,18 +773,18 @@ ShortTable: maxp 16 0 0 EndShort -LangName: 1033 Regular OpenSymbol Version 102.2 -GaspTable: 1 65535 2 +LangName: 1033 Regular OpenSymbol Version 102.3 +GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 360 45 15 +WinInfo: 0 45 15 BeginPrivate: 0 EndPrivate -BeginChars: 1001 1001 +BeginChars: 8834 1004 StartChar: Alpha Encoding: 909 913 0 @@ -107629,5 +107629,67 @@ SplineSet 859 592 859 592 795 615 c 1,22,-1 EndSplineSet EndChar + +StartChar: prime +Encoding: 2032 8242 1001 +Width: 681 +Flags: WO +HStem: 1110 346 +VStem: 236 329 +LayerCount: 2 +Fore +SplineSet +565 1456 m 5,0,-1 + 270 1110 l 5,1,-1 + 236 1110 l 5,2,-1 + 342 1456 l 5,3,-1 + 565 1456 l 5,0,-1 +EndSplineSet +EndChar + +StartChar: primedbl +Encoding: 2033 8243 1002 +Width: 957 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: primetriple +Encoding: 2034 8244 1003 +Width: 1233 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +1117 1456 m 1,8,-1 + 822 1110 l 1,9,-1 + 788 1110 l 1,10,-1 + 894 1456 l 1,11,-1 + 1117 1456 l 1,8,-1 +EndSplineSet +EndChar EndChars EndSplineFont ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenS...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1679 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1679 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PyUno - CSV Opening With Writer
Hi All,
I wanted to get some help trying to get pyuno to behave. Trying to
automate our stats with pyuno :) The csv file opens with write no matter
what I do to try to get it to open with spreadsheet. Thanks all.
import uno
# get the uno component context from the PyUNO runtime
localContext = uno.getComponentContext()
# create the UnoUrlResolver
resolver = localContext.ServiceManager.createInstanceWithContext(
com.sun.star.bridge.UnoUrlResolver,
localContext)
# connect to the running office
ctx =
resolver.resolve(uno:pipe,name=pypipe;urp;StarOffice.ComponentContext)
smgr = ctx.ServiceManager
# get the central desktop object
DESKTOP =smgr.createInstanceWithContext(com.sun.star.frame.Desktop, ctx)
#The calling it's not exactly this way, just to simplify the code
DESKTOP.loadComponentFromURL('/data/Joel_Documents/Work/Non-Profit/Libre-Office/FDOBugs/PerDay/2013_01_15.csv',_blank,0,(),FilterName=Text
- txt - csv
(StarCalc),DocumentService=com.sun.star.sheet.SpreadsheetDocument)
Best Regards,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extras/source
extras/source/truetype/symbol/OpenSymbol.sfd |4 ++-- extras/source/truetype/symbol/README |8 extras/source/truetype/symbol/opens___.ttf |binary 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit d3f397ed4166535b87c1b0c26e8a72c315fdca75 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 18 15:02:40 2013 + add new author to font copyright list and regenerate .ttf Change-Id: I725043c00bd3dd924ac022859bbf5957dc2450b7 diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index 53a85c0..9a8efb0 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -3,7 +3,7 @@ FontName: OpenSymbol FullName: OpenSymbol FamilyName: OpenSymbol Weight: Book -Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot +Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME - TRIPLE PRIME (c) 2013 Mathias Hasselmann Version: 102.3 ItalicAngle: 0 UnderlinePosition: -143 @@ -774,7 +774,7 @@ ShortTable: maxp 16 0 EndShort LangName: 1033 Regular OpenSymbol Version 102.3 -GaspTable: 1 65535 2 0 +GaspTable: 1 65535 2 Encoding: Custom UnicodeInterp: none NameList: Adobe Glyph List diff --git a/extras/source/truetype/symbol/README b/extras/source/truetype/symbol/README index 889dd36..fee3cef 100644 --- a/extras/source/truetype/symbol/README +++ b/extras/source/truetype/symbol/README @@ -9,8 +9,8 @@ that the most recent font can be detected and favoured. Bumping the font version is easiest done manually by bumping the two places in the .sfd where the version is mentioned, e.g. --Version: 102.2 -+Version: 102.3 +-Version: 102.3 ++Version: 102.4 --LangName: 1033 Regular OpenSymbol Version 102.2 -+LangName: 1033 Regular OpenSymbol Version 102.3 +-LangName: 1033 Regular OpenSymbol Version 102.3 ++LangName: 1033 Regular OpenSymbol Version 102.4 diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf index 61a9790..e4d4080 100644 Binary files a/extras/source/truetype/symbol/opens___.ttf and b/extras/source/truetype/symbol/opens___.ttf differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 45 ++ officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 10 ++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 10 ++ 3 files changed, 65 insertions(+) New commits: commit 98502dcc3534f5526eed1ebf801a718ff3f37ecb Author: Andras Timar ati...@suse.com Date: Thu Jan 17 23:50:23 2013 +0100 fdo#58712 add missing UNO command names Change-Id: I68919572b0e5f624e433375f5c523281a8416e70 Reviewed-on: https://gerrit.libreoffice.org/1749 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 64ffb88..9c70f1f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1694,6 +1694,51 @@ value xml:lang=en-USInsert Current Time/value /prop /node +node oor:name=.uno:ExportAsGraphic oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USExport as graphic/value +/prop +/node +node oor:name=.uno:EditShapeHyperlink oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USEdit Hyperlink/value +/prop +/node +node oor:name=.uno:DeleteShapeHyperlink oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USRemove Hyperlink/value +/prop +/node +node oor:name=.uno:ColorScaleDialog oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USColor Scale.../value +/prop +/node +node oor:name=.uno:DataBarDialog oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USData Bar.../value +/prop +/node +node oor:name=.uno:PasteOnly oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USPaste Only/value +/prop +/node +node oor:name=.uno:PasteOnlyFormula oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USPaste Only Formula/value +/prop +/node +node oor:name=.uno:PasteOnlyText oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USPaste Only Text/value +/prop +/node +node oor:name=.uno:PasteOnlyValue oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USPaste Only Value/value +/prop +/node /node /node /oor:component-data diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 3c78ec6..d52bafc 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2111,6 +2111,16 @@ value1/value /prop /node + node oor:name=.uno:TextAutoFitToSize oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-USAutofit Text/value +/prop + /node + node oor:name=.uno:TaskPaneInsertPage oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-USInsert Slide/value +/prop + /node /node /node /oor:component-data diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 42188b6..b8973b0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5493,6 +5493,16 @@ value xml:lang=en-USE-mail as ~OpenDocument Format.../value /prop /node +node oor:name=.uno:TemplateManager oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USTemplate Manager/value +/prop +/node +node oor:name=.uno:ExternalEdit oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USEdit with External Tool/value +/prop +/node
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aafffe6d1c3734fb2acef4b2bb1385c1e2f49043
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jan 18 16:03:42 2013 +0100
disable the test case for paragraph mark export
I don't know what's wrong with it or why the problem shows only for
me on openSUSE12.2, but it's been broken for several days now
and there's not much point in keeping it that way given that it
didn't work from the beginning.
Change-Id: I608bc01e4ee914629db1aa75ce8463044fe20ca6
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8d14409..a6a7783 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -106,7 +106,7 @@ void Test::run()
{table-borders.docx, Test::testTableBorders},
{fdo51550.odt, Test::testFdo51550},
{n789482.docx, Test::testN789482},
-{1-table-1-page.docx, Test::test1Table1Page},
+// {1-table-1-page.docx, Test::test1Table1Page}, // doesn't work on
openSUSE12.2 at least
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unit test failing on some machine
On Wednesday 16 of January 2013, Pierre-Eric Pelloux-Prayer wrote: Hi all, I recently added a new unit test to Writer docx test suite. It's quite simple: a single page document with one table filling all the page. The test then verifies that after import/export the document has indeed 1 page. (see sw/qa/extras/ooxmlexport/ooxmlexport.cxx and sw/qa/extras/ooxmlexport/data/1-table-1-page.docx) The problem is: on some machine, for instance Linux-openSUSE-x86@18-Clang Tinderbox, this test is failing like this: For the record, I've commented out calling this specific test, until it gets fixed. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#58712 add missing UNO command names
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1749 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1749 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68919572b0e5f624e433375f5c523281a8416e70 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source vcl/inc vcl/source
sw/source/ui/dochdl/swdtflvr.cxx | 16 +-
sw/source/ui/docvw/edtdd.cxx | 20 +-
sw/source/ui/docvw/edtwin.cxx| 299 +++
sw/source/ui/inc/edtwin.hxx | 11 -
sw/source/ui/uiview/view1.cxx|2
vcl/inc/vcl/svapp.hxx|2
vcl/source/app/svapp.cxx |4
7 files changed, 174 insertions(+), 180 deletions(-)
New commits:
commit eed249f55522f3a9df0742430d1f738efafa00f4
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Jan 19 00:31:00 2013 +0900
sal_Bool to bool
Change-Id: I36603ac94b190a67b61b63b5ae0d981c09fcb270
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 30b8ae9..079f878 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -114,9 +114,9 @@
#include swserv.hxx
#include switerator.hxx
-extern sal_Bool bFrmDrag;
-extern sal_Bool bDDINetAttr;
-extern sal_Bool bExecuteDrag;
+extern bool bFrmDrag;
+extern bool bDDINetAttr;
+extern bool bExecuteDrag;
#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
@@ -1940,7 +1940,7 @@ void SwTransferable::SetSelInShell( SwWrtShell rSh,
sal_Bool bSelectFrm,
{
rSh.HideCrsr();
rSh.EnterSelFrmMode( pPt );
-bFrmDrag = sal_True;
+bFrmDrag = true;
}
}
}
@@ -1951,7 +1951,7 @@ void SwTransferable::SetSelInShell( SwWrtShell rSh,
sal_Bool bSelectFrm,
rSh.UnSelectFrm();
rSh.LeaveSelFrmMode();
rSh.GetView().GetEditWin().StopInsFrm();
-bFrmDrag = sal_False;
+bFrmDrag = false;
}
else if( rSh.GetView().GetDrawFuncPtr() )
rSh.GetView().GetEditWin().StopInsFrm();
@@ -3142,7 +3142,7 @@ int SwTransferable::PrivateDrop( SwWrtShell rSh, const
Point rDragPt,
{
rSh.HideCrsr();
rSh.EnterSelFrmMode( rDragPt );
-bFrmDrag = sal_True;
+bFrmDrag = true;
}
const int nSelection = rSh.GetSelectionType();
@@ -3164,7 +3164,7 @@ int SwTransferable::PrivateDrop( SwWrtShell rSh, const
Point rDragPt,
rSh.LeaveSelFrmMode();
rSh.UnSelectFrm();
rSh.ShowCrsr();
-bFrmDrag = sal_False;
+bFrmDrag = false;
}
}
}
@@ -3270,7 +3270,7 @@ int SwTransferable::PrivateDrop( SwWrtShell rSh, const
Point rDragPt,
// is there an URL attribute at the insert point? Then replace that,
// so simply put up a selection?
rSh.DelINetAttrWithText();
-bDDINetAttr = sal_True;
+bDDINetAttr = true;
}
if ( rSrcSh.IsSelFrmMode() )
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index fab1fa8..7b9d970 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -45,24 +45,24 @@ using namespace ::com::sun::star;
// no include dbgoutsw.hxx here!!
extern bool bNoInterrupt;
-extern sal_Bool bFrmDrag;
-extern sal_Bool bDDTimerStarted;
+extern bool bFrmDrag;
+extern bool bDDTimerStarted;
-sal_Bool bExecuteDrag = sal_False;
+bool bExecuteDrag = false;
void SwEditWin::StartDDTimer()
{
aTimer.SetTimeoutHdl(LINK(this, SwEditWin, DDHandler));
aTimer.SetTimeout(480);
aTimer.Start();
-bDDTimerStarted = sal_True;
+bDDTimerStarted = true;
}
void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point rPt)
{
aTimer.Stop();
-bDDTimerStarted = sal_False;
+bDDTimerStarted = false;
if(!pSh-IsSelFrmMode())
pSh-SetCursor(rPt, false);
aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
@@ -118,8 +118,8 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const
Point rPosPixel )
{
bMBPressed = sal_False;
ReleaseMouse();
-bFrmDrag = sal_False;
-bExecuteDrag = sal_True;
+bFrmDrag = false;
+bExecuteDrag = true;
SwEditWin::nDDStartPosY = aDocPos.Y();
SwEditWin::nDDStartPosX = aDocPos.X();
aMovePos = aDocPos;
@@ -483,16 +483,16 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent
rEvt )
IMPL_LINK_NOARG(SwEditWin, DDHandler)
{
-bDDTimerStarted = sal_False;
+bDDTimerStarted = false;
aTimer.Stop();
aTimer.SetTimeout(240);
bMBPressed = sal_False;
ReleaseMouse();
-bFrmDrag = sal_False;
+bFrmDrag = false;
if ( rView.GetViewFrame() )
{
-bExecuteDrag = sal_True;
+bExecuteDrag = true;
StartExecuteDrag();
}
return 0;
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 52f7ae8..9b4ec05 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -157,14 +157,14 @@ extern bool bNoInterrupt; // in mainwn.cxx
// is being selected at double/triple click.
[Libreoffice-commits] .: 3 commits - cppuhelper/source desktop/unx desktop/win32 libxslt/libxslt-1.1.26-memdump.patch libxslt/makefile.mk stoc/source
cppuhelper/source/defaultbootstrap.cxx |3
cppuhelper/source/typedescriptionprovider.cxx | 124 ++---
cppuhelper/source/typedescriptionprovider.hxx | 11 -
desktop/unx/source/start.c |5
desktop/win32/source/officeloader/officeloader.cxx |8
libxslt/libxslt-1.1.26-memdump.patch | 10 +
libxslt/makefile.mk|3
stoc/source/tdmanager/tdmgr.cxx| 195 +++--
8 files changed, 196 insertions(+), 163 deletions(-)
New commits:
commit 6f6ed9c7e2212e5e7acb2c5b827e4e4f1e156ecd
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 18 14:23:27 2013 +0100
Avoid .memdump files left behind by xsltproc in the build
Change-Id: If79896a2f73cacd9880e8beb9cc42993b49cc3b5
diff --git a/libxslt/libxslt-1.1.26-memdump.patch
b/libxslt/libxslt-1.1.26-memdump.patch
new file mode 100644
index 000..28724f7
--- /dev/null
+++ b/libxslt/libxslt-1.1.26-memdump.patch
@@ -0,0 +1,10 @@
+--- misc/libxslt-1.1.26/xsltproc/xsltproc.c2009-08-23 14:53:33.0
+0200
misc/build/libxslt-1.1.26/xsltproc/xsltproc.c 2013-01-18
14:16:12.202767222 +0100
+@@ -877,7 +877,6 @@
+ xsltFreeSecurityPrefs(sec);
+ xsltCleanupGlobals();
+ xmlCleanupParser();
+-xmlMemoryDump();
+ return(errorno);
+ }
+
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 1574709..691c50b 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -57,7 +57,8 @@ PATCH_FILES=libxslt-configure.patch \
libxslt-mingw.patch \
libxslt-internal-symbols.patch \
libxslt-aix.patch \
-libxslt-vc10.patch
+libxslt-vc10.patch \
+libxslt-1.1.26-memdump.patch
.IF $(OS)==ANDROID
PATCH_FILES+= libxslt-android.patch
commit 2fcba16dc48ed7c0a507c18731a41a99f485ee46
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 18 13:19:45 2013 +0100
Never pass -env: arguments across OfficeIPC connection
Change-Id: I1874ad0542bc8dcbe9ec588599a054030fd5d7d8
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 0e32c59..c6b4339 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -45,6 +45,7 @@
#include osl/thread.h
#include rtl/bootstrap.h
#include rtl/digest.h
+#include rtl/process.h
#include rtl/ustrbuf.h
#include sal/main.h
@@ -454,7 +455,7 @@ send_args( int fd, rtl_uString *pCwdPath )
size_t nLen;
rtl_uString *pEscapedCwdPath = escape_path( pCwdPath );
sal_uInt32 nArg = 0;
-sal_uInt32 nArgCount = osl_getCommandArgCount();
+sal_uInt32 nArgCount = rtl_getAppCommandArgCount();
rtl_uString_new_WithLength( pBuffer, nCapacity );
rtl_uString_new( pTmp );
@@ -487,7 +488,7 @@ send_args( int fd, rtl_uString *pCwdPath )
rtl_uString_getLength( pBuffer ),
,, 1 );
-osl_getCommandArg( nArg, pTmp );
+rtl_getAppCommandArg( nArg, pTmp );
pEscapedTmp = escape_path( pTmp );
diff --git a/desktop/win32/source/officeloader/officeloader.cxx
b/desktop/win32/source/officeloader/officeloader.cxx
index c7c91c6..527125f 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -21,6 +21,7 @@
#define _UNICODE
#include cstddef
+#include cwchar
#define WIN32_LEAN_AND_MEAN
#if defined _MSC_VER
@@ -290,7 +291,12 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
}
for ( int argn = 1; fSuccess argn argc2; argn++ )
{
-fSuccess = writeArgument(hPipe, ',', argv2[argn]);
+if (std::wcsncmp(
+argv2[argn], L-env:,
std::wcslen(L-env:))
+!= 0)
+{
+fSuccess = writeArgument(hPipe, ',',
argv2[argn]);
+}
}
if ( fSuccess )
commit 36e8d5d137260decabb7d2436fff2d3a93278f9d
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 18 12:46:16 2013 +0100
Insert type rdbs individually into theTypeDescriptionManager
...to make it easier in the future to replace the binary rdb format with
something else, but also keep support for the old format for backwards
compatibility (extensions).
This should have no performance impact, as the type description manager (a)
caches information about requested type descriptions, and (b) has been
changed
to process the bootstrap rdbs en bloc without doing costly consistency
checks
(which are useful though when inserting an rdb when installing an
extension, but
which would exhaustively read all type descriptions from the inserted rdb,
so
would negate any benefit of
[Libreoffice-commits] .: 2 commits - src/msodraw.py
src/msodraw.py | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 165a1135d6986938f91bb699409c0deaf61fa8b9
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 16:56:23 2013 +0100
msodraw: add a few more shape prop constants, without actually dumping them
diff --git a/src/msodraw.py b/src/msodraw.py
index 7c6cc3e..f4b887c 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -484,6 +484,17 @@ class FOPT:
0x03BF: ['Group Shape Boolean Properties', GroupShape],
0x0205: ['X Shadow Offset', ShadowOffsetX],
0x01CB: ['Line Width', LineWidth],
+0x0186: ['fillBlip'],
+0x01C5: ['lineFillBlip'],
+0x0080: ['lTxid'],
+0x008A: ['hspNext'],
+0x0200: ['shadowType'],
+0x0201: ['shadowColor'],
+0x0207: ['shadowSecondOffsetX'],
+0x023F: ['Shadow Style Boolean Properties'],
+0x01FF: ['Line Style Boolean Properties'],
+0x0304: ['Black-and-white Display Mode'],
+0x033F: ['Shape Boolean Properties'],
}
class E:
@@ -522,7 +533,7 @@ class FOPT:
for i in xrange(0, rh.recInstance):
recHdl.appendLine(+-*57)
prop = self.properties[i]
-if FOPT.propTable.has_key(prop.ID):
+if FOPT.propTable.has_key(prop.ID) and
len(FOPT.propTable[prop.ID]) 1:
# We have a handler for this property.
# propData is expected to have two elements: name (0) and
handler (1).
propHdl = FOPT.propTable[prop.ID]
@@ -536,6 +547,8 @@ class FOPT:
recHdl.appendLine(blip ID: %d%prop.value)
else:
# regular property value
+if FOPT.propTable.has_key(prop.ID):
+recHdl.appendLine(property name:
%s%FOPT.propTable[prop.ID][0])
recHdl.appendLine(property value: 0x%8.8X%prop.value)
def dumpXml(self, recHdl, model, rh):
@@ -552,7 +565,7 @@ class FOPT:
recHdl.appendLine('opid fBid=%d/' % prop.flagBid)
recHdl.appendLine('opid fComplex=%d/' % prop.flagComplex)
recHdl.appendLine('/opid')
-if FOPT.propTable.has_key(prop.ID):
+if FOPT.propTable.has_key(prop.ID) and
len(FOPT.propTable[prop.ID]) 1:
# We have a handler for this property.
# propData is expected to have two elements: name (0) and
handler (1).
propHdl = FOPT.propTable[prop.ID]
@@ -560,7 +573,10 @@ class FOPT:
propHdl[1]().dumpXml(recHdl, prop)
recHdl.appendLine('/op')
else:
-recHdl.appendLine('op value=0x%8.8X/' % prop.value)
+if FOPT.propTable.has_key(prop.ID):
+recHdl.appendLine('op name=%s value=0x%8.8X/' %
(FOPT.propTable[prop.ID][0], prop.value))
+else:
+recHdl.appendLine('op value=0x%8.8X/' % prop.value)
if prop.flagComplex:
recHdl.appendLine('todo what=FOPT: fComplex != 0
unhandled/')
recHdl.appendLine('/rgfopte')
commit 8852635b71a013fdad5010895a533b4d12da8f22
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 18 16:26:15 2013 +0100
msodraw: dump LineWidth
diff --git a/src/msodraw.py b/src/msodraw.py
index 27b728f..7c6cc3e 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -420,6 +420,14 @@ class FOPT:
def dumpXml(self, recHdl, prop):
recHdl.appendLine('shadowOffsetX value=%s inTwips=%s/' %
(prop.value, emu_to_twip(prop.value)))
+class LineWidth:
+
+def appendLines(self, recHdl, prop, level):
+recHdl.appendLine(indent(level)+lineWidth: %s%prop.value)
+
+def dumpXml(self, recHdl, prop):
+recHdl.appendLine('lineWidth value=%s inTwips=%s/' %
(prop.value, emu_to_twip(prop.value)))
+
class GroupShape:
@@ -475,6 +483,7 @@ class FOPT:
0x0303: ['Connector Shape Style (cxstyle)', CXStyle],
0x03BF: ['Group Shape Boolean Properties', GroupShape],
0x0205: ['X Shadow Offset', ShadowOffsetX],
+0x01CB: ['Line Width', LineWidth],
}
class E:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Bug 59481 - FILEOPEN: Linux rpm: Native MySQL-connector aoo-my-sdbc-1.1.0 didn't work any more with LO 4.0
Can someone triage this one? Thanks in advance! Best Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk sal/inc sal/qa
sal/CppunitTest_sal_rtl_strings.mk |1
sal/inc/rtl/string.hxx | 138 +++--
sal/inc/rtl/ustring.hxx| 138 +++--
sal/qa/rtl/strings/test_strings_valuex.cxx | 117
4 files changed, 382 insertions(+), 12 deletions(-)
New commits:
commit 2b31e751db38e7ba0e2ec668520f50daf5eb25d5
Author: Noel Grandin n...@peralex.com
Date: Thu Jan 10 09:37:14 2013 +0200
Create OUString and OString number(*) methods.
API CHANGE: Adds new methods (several overloads)
OString::number()
OUString::number()
and marks all of the existing fromValue() methods as deprecated.
The purpose of this change is to clean up call sites
by hiding the necessary casts.
The casts are necessary because of overload resolution rules which are
somewhat vague about which methods to choose when using integer types.
See mailing list discussion here:
http://nabble.documentfoundation.org/replacing-OUString-valueOf-static-cast-lt-sal-Int32-gt-td4027989.html
Subject: replacing OUString::valueOf(static_castsal_Int32) ??
Change-Id: Id3d150a6525eb0334e41e2ec6640bb06cd790b43
Reviewed-on: https://gerrit.libreoffice.org/1625
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sal/CppunitTest_sal_rtl_strings.mk
b/sal/CppunitTest_sal_rtl_strings.mk
index a30bf70..222cedf 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -38,6 +38,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sal_rtl_strings,\
sal/qa/rtl/strings/test_oustring_noadditional \
sal/qa/rtl/strings/test_oustring_startswith \
sal/qa/rtl/strings/test_oustring_stringliterals \
+sal/qa/rtl/strings/test_strings_valuex \
))
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 8e33973..325fe28 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1399,8 +1399,9 @@ public:
@paramb a sal_Bool.
@return a string with the string representation of the argument.
+ @deprecated there is no replacement, just code your own
*/
-static OString valueOf( sal_Bool b ) SAL_THROW(())
+SAL_DEPRECATED_INTERNAL(just code your own) static OString valueOf(
sal_Bool b ) SAL_THROW(())
{
sal_Char aBuf[RTL_STR_MAX_VALUEOFBOOLEAN];
rtl_String* pNewData = 0;
@@ -1413,8 +1414,9 @@ public:
@paramc a character.
@return a string with the string representation of the argument.
+ @deprecated just use the + or += operator
*/
-static OString valueOf( sal_Char c ) SAL_THROW(())
+SAL_DEPRECATED_INTERNAL(use the + or += operator) static OString
valueOf( sal_Char c ) SAL_THROW(())
{
return OString( c, 1 );
}
@@ -1427,8 +1429,9 @@ public:
@parami a int32.
@paramradix the radix (between 2 and 36)
@return a string with the string representation of the argument.
+ @deprecated use number(sal_Int64,sal_Int16)
*/
-static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
+SAL_DEPRECATED_INTERNAL(use number) static OString valueOf( sal_Int32 i,
sal_Int16 radix = 10 ) SAL_THROW(())
{
sal_Char aBuf[RTL_STR_MAX_VALUEOFINT32];
rtl_String* pNewData = 0;
@@ -1437,15 +1440,67 @@ public:
}
/**
+ Returns the string representation of the int argument.
+
+ This function can't be used for language specific conversion.
+
+ @parami a int32.
+ @paramradix the radix (between 2 and 36)
+ @return a string with the string representation of the argument.
+*/
+static OString number( int i, sal_Int16 radix = 10 )
+{
+sal_Char aBuf[RTL_STR_MAX_VALUEOFINT32];
+rtl_String* pNewData = 0;
+rtl_string_newFromStr_WithLength( pNewData, aBuf,
rtl_str_valueOfInt32( aBuf, i, radix ) );
+return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+}
+
+/**
+ Returns the string representation of the int argument.
+
+ This function can't be used for language specific conversion.
+
+ @parami a int32.
+ @paramradix the radix (between 2 and 36)
+ @return a string with the string representation of the argument.
+*/
+static OString number( unsigned int i, sal_Int16 radix = 10 )
+{
+sal_Char aBuf[RTL_STR_MAX_VALUEOFINT64];
+rtl_String* pNewData = 0;
+rtl_string_newFromStr_WithLength( pNewData, aBuf,
rtl_str_valueOfInt64( aBuf, i, radix ) );
+return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+}
+
+/**
+ Returns the string representation of the long argument.
+
+ This function can't be used for language specific conversion.
+
+
[PUSHED] Create OUString and OString number(*) methods.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1625 -- To view, visit https://gerrit.libreoffice.org/1625 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3d150a6525eb0334e41e2ec6640bb06cd790b43 Gerrit-PatchSet: 10 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: icu/UnpackedTarball_icu_data.mk icu/UnpackedTarball_icu.mk
icu/UnpackedTarball_icu.mk |8 icu/UnpackedTarball_icu_data.mk |8 2 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 202fb73ccd0ce574ab9197824c1b813738d93de0 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 18 18:32:59 2013 +0200 Move comment to perhaps more relevant place diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk index ed58c32..4b35dd9 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/icu/UnpackedTarball_icu.mk @@ -11,14 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu)) $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) -# Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by -# the interactive web tool at http://apps.icu-project.org/datacustom/ICUData49.html by dropping -# the Charset Mapping Tables. Probably we could carefully cherry-pick other items in the data to -# be dropped, too. A bit tedious using that web tool, though. - -# If you do that, upload a new subset data zip file with just the MD5 part of the name changed -# appropriately. Let's not bother trying to list what stuff has been removed in the file name. -# Describe it in the comment above instead. $(call gb_UnpackedTarball_get_target,icu): $(call gb_UnpackedTarball_get_target,icu_data) $(eval $(call gb_UnpackedTarball_set_post_action,icu,\ cp $(call gb_UnpackedTarball_get_dir,icu_data)/icudt49l.dat \ diff --git a/icu/UnpackedTarball_icu_data.mk b/icu/UnpackedTarball_icu_data.mk index bc406a0..9b15ad9 100644 --- a/icu/UnpackedTarball_icu_data.mk +++ b/icu/UnpackedTarball_icu_data.mk @@ -9,6 +9,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu_data)) +# Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by +# the interactive web tool at http://apps.icu-project.org/datacustom/ICUData49.html by dropping +# the Charset Mapping Tables. Probably we could carefully cherry-pick other items in the data to +# be dropped, too. A bit tedious using that web tool, though. + +# If you do that, upload a new subset data zip file with just the MD5 part of the name changed +# appropriately. Let's not bother trying to list what stuff has been removed in the file name. +# Describe it in the comment above instead. $(eval $(call gb_UnpackedTarball_set_tarball,icu_data,$(ICU_DATA_SUBSET_ZIP),0)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/uiconfig
cui/uiconfig/ui/charnamepage.ui | 22 ++ 1 file changed, 6 insertions(+), 16 deletions(-) New commits: commit a187122ff66dceca1fab1a6c2c1bbe8d9588741c Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 18 16:49:41 2013 + super-long language names make character dialog look real ugly so move language to the first column and let it span all columns, but not fill the availabl area Change-Id: I8c9a410861c3fb942569af7523313a84ae7f6c98 diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 01267b7..2df58c5 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -74,14 +74,15 @@ object class=GtkLabel id=westlangft-nocjk property name=visibleTrue/property property name=can_focusFalse/property +property name=halignstart/property property name=hexpandTrue/property property name=xalign0/property property name=label translatable=yesLanguage/property /object packing -property name=left_attach1/property +property name=left_attach0/property property name=top_attach3/property -property name=width1/property +property name=width3/property property name=height1/property /packing /child @@ -90,11 +91,12 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=halignstart/property /object packing -property name=left_attach1/property +property name=left_attach0/property property name=top_attach4/property -property name=width1/property +property name=width3/property property name=height1/property /packing /child @@ -177,18 +179,6 @@ property name=height1/property /packing /child -child - placeholder/ -/child -child - placeholder/ -/child -child - placeholder/ -/child -child - placeholder/ -/child /object /child /object ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 51 +
1 file changed, 33 insertions(+), 18 deletions(-)
New commits:
commit 8f766122f0c5fbbb5442e1a5dd6f4eab9744d5cd
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Jan 18 18:44:22 2013 +0100
mark *all* tables of a nested join as added
Else, if the n^{th} (with n2) table also appears in a (non-NATURAL) INNER
JOIN, it is repeated later, leading to an error from the database engine
Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9ef92b9..5507634 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -476,10 +476,29 @@ namespace
return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh),
data);
}
//--
+typedef ::std::map ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess
tableNames_t;
+
//--
+void addConnectionTableNames( const Reference XConnection _xConnection,
+ const OQueryTableConnection* const
pEntryConn,
+ tableNames_t _rTableNames )
+{
+// insert tables into table list to avoid double entries
+const OQueryTableWindow* const pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
+const OQueryTableWindow* const pEntryTabTo =
static_castOQueryTableWindow*(pEntryConn-GetDestWin());
+
+::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+sTabName = BuildTable(_xConnection,pEntryTabTo);
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+}
+
//--
void GetNextJoin( const Reference XConnection _xConnection,
OQueryTableConnection* pEntryConn,
OQueryTableWindow* pEntryTabTo,
-::rtl::OUString aJoin)
+::rtl::OUString aJoin,
+tableNames_t _rTableNames)
{
OQueryTableConnectionData* pEntryConnData =
static_castOQueryTableConnectionData*(pEntryConn-GetData().get());
if ( pEntryConnData-GetJoinType() == INNER_JOIN
!pEntryConnData-isNatural() )
@@ -487,15 +506,18 @@ namespace
if(aJoin.isEmpty())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
OQueryTableWindow* pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
aJoin =
BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetDestWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetSourceWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData);
}
@@ -514,7 +536,7 @@ namespace
// exists there a connection to a OQueryTableWindow that holds
a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
@@ -532,7 +554,7 @@ namespace
// exists there a connection to a OQueryTableWindow that
holds a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
}
@@ -1014,7 +1036,7 @@ namespace
//--
void searchAndAppendName(const Reference XConnection _xConnection,
const OQueryTableWindow* _pTableWindow,
- ::std::map
::rtl::OUString,sal_Bool,::comphelper::UStringMixLess _rTableNames,
+ tableNames_t _rTableNames,
::rtl::OUString
[PATCH] Change in core[libreoffice-4-0]: mark *all* tables of a nested join as added
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1756
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/1756/1
mark *all* tables of a nested join as added
Else, if the n^{th} (with n2) table also appears in a (non-NATURAL) INNER
JOIN, it is repeated later, leading to an error from the database engine
Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd
---
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 816991a..3c386db 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -476,10 +476,29 @@
return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh),
data);
}
//--
+typedef ::std::map ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess
tableNames_t;
+
//--
+void addConnectionTableNames( const Reference XConnection _xConnection,
+ const OQueryTableConnection* const
pEntryConn,
+ tableNames_t _rTableNames )
+{
+// insert tables into table list to avoid double entries
+const OQueryTableWindow* const pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
+const OQueryTableWindow* const pEntryTabTo =
static_castOQueryTableWindow*(pEntryConn-GetDestWin());
+
+::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+sTabName = BuildTable(_xConnection,pEntryTabTo);
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+}
+
//--
void GetNextJoin( const Reference XConnection _xConnection,
OQueryTableConnection* pEntryConn,
OQueryTableWindow* pEntryTabTo,
-::rtl::OUString aJoin)
+::rtl::OUString aJoin,
+tableNames_t _rTableNames)
{
OQueryTableConnectionData* pEntryConnData =
static_castOQueryTableConnectionData*(pEntryConn-GetData().get());
if ( pEntryConnData-GetJoinType() == INNER_JOIN
!pEntryConnData-isNatural() )
@@ -487,15 +506,18 @@
if(aJoin.isEmpty())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
OQueryTableWindow* pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
aJoin =
BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetDestWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetSourceWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData);
}
@@ -514,7 +536,7 @@
// exists there a connection to a OQueryTableWindow that holds
a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
@@ -532,7 +554,7 @@
// exists there a connection to a OQueryTableWindow that
holds a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
}
@@ -1014,7 +1036,7 @@
//--
void searchAndAppendName(const Reference XConnection _xConnection,
const OQueryTableWindow* _pTableWindow,
- ::std::map
::rtl::OUString,sal_Bool,::comphelper::UStringMixLess _rTableNames,
+ tableNames_t _rTableNames,
::rtl::OUString _rsTableListStr
)
{
@@
[BUILD FAILS DEBUG MODE] with test_strings_valuex.cxx
Hello,
On pc Debian x86-64 with master sources after having runned make clean,
I've got this:
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:
In instantiation of ‘void testInt() [with T = rtl::OUString]’:
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:77:28:
required from here
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:48:5:
error: passing ‘unsigned char’ chooses ‘int’ over ‘unsigned int’
[-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:48:5:
error: in call to ‘static rtl::OUString rtl::OUString::number(int,
sal_Int16)’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:50:5:
error: passing ‘short unsigned int’ chooses ‘int’ over ‘unsigned int’
[-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:50:5:
error: in call to ‘static rtl::OUString rtl::OUString::number(int,
sal_Int16)’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:60:5:
error: passing ‘sal_uInt8 {aka unsigned char}’ chooses ‘int’ over ‘unsigned
int’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:60:5:
error: in call to ‘static rtl::OUString rtl::OUString::number(int,
sal_Int16)’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:62:5:
error: passing ‘sal_uInt16 {aka short unsigned int}’ chooses ‘int’ over
‘unsigned int’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:62:5:
error: in call to ‘static rtl::OUString rtl::OUString::number(int,
sal_Int16)’ [-Werror=sign-promo]
/home/julien/compile-libreoffice/libo/sal/qa/rtl/strings/test_strings_valuex.cxx:
In instantiation of ‘void testInt() [with T = rtl::OString]’:
(--enable-dbgutil in autogen.lastrun)
Julien
--
View this message in context:
http://nabble.documentfoundation.org/BUILD-FAILS-DEBUG-MODE-with-test-strings-valuex-cxx-tp4030218.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] .: sal/inc sal/qa
sal/inc/rtl/string.hxx |1 +
sal/inc/rtl/ustring.hxx|1 +
sal/qa/rtl/strings/test_strings_valuex.cxx |1 -
3 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c881b1b50e3be023efd4dfdebddd002545ed71b3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jan 18 19:43:17 2013 +0100
long and long long can be the same size (and thus also sal_Int64)
Change-Id: I3961ec27d23915b038c3a803dc71e7d937ca331c
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 325fe28..c04cd13 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1522,6 +1522,7 @@ public:
*/
static OString number( unsigned long ll, sal_Int16 radix = 10 )
{
+assert( ll = SAL_MAX_INT64 ); // valueOfInt64 may not be able to
handle the highest bit
sal_Char aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( pNewData, aBuf,
rtl_str_valueOfInt64( aBuf, ll, radix ) );
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index c87978f..c0370ff 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -2156,6 +2156,7 @@ public:
*/
static OUString number( unsigned long ll, sal_Int16 radix = 10 )
{
+assert( ll = SAL_MAX_INT64 ); // valueOfInt64 may not be able to
handle the highest bit
sal_Unicode aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( pNewData, aBuf,
rtl_ustr_valueOfInt64( aBuf, ll, radix ) );
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx
b/sal/qa/rtl/strings/test_strings_valuex.cxx
index d350b0f..9573b19 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -70,7 +70,6 @@ void testInt() {
assert( sizeof( long ) = sizeof( sal_Int64 ));
assert( sizeof( long long ) = sizeof( sal_Int64 ));
assert( sizeof( unsigned int ) sizeof( sal_Int64 ));
-assert( sizeof( unsigned long ) sizeof( sal_Int64 ));
}
void test::strings::valueX::testOUInt() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Duplicated default templates
Hello everybody, working on agenda wizard I came across this folder install/share/template/common/wizard/agenda where all default agenda templates are duplicated. Is there any reason why they are duplicated ? None of the other wizard's templates are. If noone yeld about it I'd like to proceed and delete them. It'll let us save ~180kb. Regards, Xisco ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/qa sc/source
sc/inc/column.hxx|1
sc/inc/document.hxx | 10 ++
sc/inc/table.hxx |1
sc/qa/unit/ucalc.cxx | 31 ++
sc/source/core/data/column.cxx | 105 +++
sc/source/core/data/document.cxx | 15 +++
sc/source/core/data/table2.cxx | 13 ++
sc/source/ui/view/drawvie4.cxx | 178 ++-
8 files changed, 349 insertions(+), 5 deletions(-)
New commits:
commit c55d52262ea1d5f869a9528fd051ee19e687f1cc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jan 18 14:36:33 2013 -0500
fdo#58988, fdo#58562: Populate draw clip document with data for charts.
Without populating the clip document, copying a chart (or charts) into
clipboard makes the charts lose all their referenced data, which causes
the pasted chart to appear empty.
Change-Id: I3675f76baed19b48cec403964c19df00725a044b
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 96df4d9..f4370a9 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -168,6 +168,7 @@ public:
voidDeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16
nDelFlag );
voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn rColumn, bool
bKeepScenarioFlags) const;
+void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn rDestCol);
voidCopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScColumn rColumn);
voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7573a80..3874916 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1029,6 +1029,16 @@ public:
const ScMarkData* pMarks = NULL, bool bAllTabs
= false, bool bKeepScenarioFlags = false,
bool bIncludeObjects = false, bool
bCloneNoteCaptions = true, bool bUseRangeForVBA = false );
+/**
+ * Copy only raw cell values to another document. Formula cells are
+ * converted to raw cells. No formatting info are copied.
+ *
+ * @param rSrcRange source range in the source document
+ * @param nDestTab table in the clip document to copy to.
+ * @param pDestDoc document to copy to
+ */
+void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab,
ScDocument* pDestDoc);
+
voidCopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
SCTAB nTab, ScDocument* pClipDoc = NULL);
voidCopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fa03a7f..30eb97a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -351,6 +351,7 @@ public:
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
voidCopyToClip(const ScRangeList rRanges, ScTable* pTable,
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
+void CopyStaticToDocument(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScTable* pDestTab);
voidCopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, SCsCOL nDx, SCsROW nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScTable* pTable);
voidStartListeningInArea( SCCOL nCol1, SCROW nRow1,
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9e116c3..6a2ac0f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -117,7 +117,7 @@ public:
void testRangeList();
void testInput();
void testCellFunctions();
-
+void testCopyToDocument();
/**
* Make sure the SHEETS function gets properly updated during sheet
* insertion and removal.
@@ -268,6 +268,7 @@ public:
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
CPPUNIT_TEST(testCellFunctions);
+CPPUNIT_TEST(testCopyToDocument);
CPPUNIT_TEST(testSheetsFunc);
CPPUNIT_TEST(testVolatileFunc);
CPPUNIT_TEST(testFormulaDepTracking);
@@ -1153,6 +1154,34 @@ void Test::testCellFunctions()
m_pDoc-DeleteTab(0);
}
+void Test::testCopyToDocument()
+{
+CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0,
src));
+
+m_pDoc-SetString(0, 0, 0, Header);
+m_pDoc-SetString(0, 1, 0, 1);
+m_pDoc-SetString(0, 2, 0, 2);
+m_pDoc-SetString(0, 3, 0, 3);
+m_pDoc-SetString(0, 4, 0, =4/2);
+m_pDoc-CalcAll();
+
+// Copy statically to another document.
+
+ScDocument aDestDoc(SCDOCMODE_DOCUMENT);
+aDestDoc.InsertTab(0, src);
+m_pDoc-CopyStaticToDocument(ScRange(0,1,0,0,3,0), 0, aDestDoc); // Copy
A2:A4
+m_pDoc-CopyStaticToDocument(ScAddress(0,0,0), 0, aDestDoc); // Copy A1
+
Re: PyUno - CSV Opening With Writer
Hi Joel,
On Friday, 2013-01-18 07:05:33 -0800, Joel Madero wrote:
#The calling it's not exactly this way, just to simplify the code
DESKTOP.loadComponentFromURL('/data/Joel_Documents/Work/Non-Profit/Libre-Office/FDOBugs/PerDay/2013_01_15.csv',_blank,0,(),FilterName=Text
- txt - csv
(StarCalc),DocumentService=com.sun.star.sheet.SpreadsheetDocument)
What is the (), in there? Isn't that an empty tuple then? Or is it when
followed by the filter properties indicating that these are passed as
the properties array?
Note that the first argument should be an URL, so file:///data/...
As .csv is (should be ...) loaded in Calc as default, it might also
suffice to simply invoke
loadComponentFromURL( url, _blank, 0, ())
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Old 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
pgpwxbkQeGI4Y.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PyUno - CSV Opening With Writer
On 01/18/2013 01:50 PM, Eike Rathke wrote: As .csv is (should be ...) loaded in Calc as default, Not necessarily. After my type detection rework during the 3.6 cycle, csv is treated just as a simple plain text file, which *may* be opened in Writer by default if you don't specify the document service property. This is why I advised him earlier to pass DocumentService=com.sun.star.sheet.SpreadsheetDocument. I'm not very familiar with how UNO is mapped to Python calls, but I have the feeling that somehow that property is not passed onto the type detection code... Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sal/inc
sal/inc/rtl/string.hxx | 26 ++
sal/inc/rtl/ustring.hxx | 26 ++
2 files changed, 52 insertions(+)
New commits:
commit ed26a93b2fc640f5b727ba7dbabc80990438f5b3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jan 18 21:05:04 2013 +0100
avoid warning about a comparison being always true
Change-Id: Ie0bd47a16af56b7d3ae070d5b82ec46ed21834c0
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index b750264..6b3d2ff 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1522,7 +1522,9 @@ public:
*/
static OString number( unsigned long ll, sal_Int16 radix = 10 )
{
+#if SAL_TYPES_SIZEOFLONG == 8
assert( ll = SAL_MAX_INT64 ); // valueOfInt64 may not be able to
handle the highest bit
+#endif
sal_Char aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( pNewData, aBuf,
rtl_str_valueOfInt64( aBuf, ll, radix ) );
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index f057166..a4051ac 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -2156,7 +2156,9 @@ public:
*/
static OUString number( unsigned long ll, sal_Int16 radix = 10 )
{
+#if SAL_TYPES_SIZEOFLONG == 8
assert( ll = SAL_MAX_INT64 ); // valueOfInt64 may not be able to
handle the highest bit
+#endif
sal_Unicode aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( pNewData, aBuf,
rtl_ustr_valueOfInt64( aBuf, ll, radix ) );
commit 1efe9a15f86a7a9dc08b57fd1dd12336522ba515
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Jan 18 20:31:44 2013 +0100
avoid -Wsign-promo warnings
I actually find the warning to be obsolete nonsense (the manpage talks
about cfront), but at least for now.
Change-Id: I4390b1779f6f8de062afd441f6855cb760adf93d
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index c04cd13..b750264 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1550,6 +1550,30 @@ public:
return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
}
+/// @overload
+/// @since LibreOffice 4.1
+static OString number( short i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OString number( unsigned short i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OString number( signed char i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OString number( unsigned char i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
/**
Returns the string representation of the float argument.
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index c0370ff..f057166 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -2184,6 +2184,30 @@ public:
return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
}
+/// @overload
+/// @since LibreOffice 4.1
+static OUString number( short i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OUString number( unsigned short i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OUString number( signed char i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
+/// @overload
+/// @since LibreOffice 4.1
+static OUString number( unsigned char i, sal_Int16 radix = 10 )
+{
+return number( static_cast long long ( i ), radix );
+}
/**
Returns the string representation of the float argument.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#57510 show Icons in menus by default -regardles of os de...
Cor Nouws has abandoned this change. Change subject: fdo#57510 show Icons in menus by default -regardles of os default .. Patch Set 3: Abandoned no agreement in discussion in bugzilla -- To view, visit https://gerrit.libreoffice.org/1168 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I13ea8caddeb1c59120efb60c8d101670f96bc04a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cor Nouws oo...@nouenoff.nl Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Cor Nouws oo...@nouenoff.nl Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PyUno - CSV Opening With Writer
Not necessarily. After my type detection rework during the 3.6 cycle, csv is treated just as a simple plain text file, which *may* be opened in Writer by default if you don't specify the document service property. This is why I advised him earlier to pass DocumentService=com.sun.star.** sheet.SpreadsheetDocument. ^^ what Kohei said :) The file opens fine it just opens with writer which isn't what I need. The addition of DocumentService = com.sun doesn't change this behavior at all. As for the (), without them I get an error about incorrect number of arguments, this fixed that issue so I just left them (as for the technical details why...no clue). Further suggestions welcome :) If someone just tests a csv file with pyuno you'll see the same behavior I'm sure. Best Regards and thanks to all, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: First steps finding regression bug(s)
Op 17-01-13 20:44, Michael Meeks schreef:
Hi Joren,
On Wed, 2013-01-02 at 19:59 +0100, Joren wrote:
I try now to take a little step forward and try to comprehend a bit of
the source code. I would like to help core developers point at
regressions (find the erroneous commit).
Which is really amazingly useful - thanks so much for this work. I
didn't see a reply to your mail - so let me have a go:
Following the alert, I can search for the string 'does not exists.'. I
found it here:
A good way to try to trace this bottom-up:
String RID_FILEOPEN_INVALIDFOLDER
{
Text [ en-US ] = $name$ does not exist.;
};
So this is quite probably the string as you say.
fpicker/source/office/OfficeFilePicker.hrc:#define
RID_FILEOPEN_INVALIDFOLDER (RID_FPICKER_START+23)
fpicker/source/office/iodlg.src:String RID_FILEOPEN_INVALIDFOLDER
However there are only two hits - I would expect to see some code that
would load this string something like this:
String(ResId(RID_FILEOPEN_INVALIDFOLDER))
or somesuch; but that isn't there - so - either - we are getting this
string by doing some arithmetic around the RID_s - sometimes strings are
arranged in sequence in an array so the define is only used in the .src
- or the string isn't used and it's the wrong one ;-)
Ok... Now I found this ... Can I 'conclude' that my string is at
'position' 16393 (=23 + 6370 + 1). That's 0x4009 in hex notation.
I searched for 0x4009 and 16393; but I can't find anything relevant
Yep - in general, the code wouldn't hard-code a specific number like
that (it'd be terrible style at least ;-). A git grep for
RID_FPICKER_START shows:
vcl/inc/vcl/fpicker.hrc:#define STR_SVT_FILEPICKER_START
(RID_FPICKER_START+1)
But looking at that - I'd rather suspect that this string is just not
used - as such we should kill it in master (and any others we can verify
are not used from that .hrc).
I need to check some things first before 'just delete it'?
I suspect that one of the other:
git grep 'does not exist.'
hits is the source of that string ?
I found a string related to macro-handling ... but I don't think that's
a domain I need to search?
Because the bug is a regression bug 3.5 vs 3.6, and the source code of
3.6 is frozen on Week 23, Jun 4 - Jun 10, 2012 I compared the
current version of resmgr.cxx with a version at the beginning of 2012
(to be sure not overlook something)... But I couldn't find something.
Otherwise with this information I still can't find the code that
triggers the string.
Yep - the problem is unlikely to be in resmgr - that's the basic /
underlying translation functionality.
Is that helpful ? sorry for the appallingly slow reply :-)
Yes :-), thanks.
I'll abort my search for now :p. I think I'm not that advanced yet.
Thanks for picking up this mail!
Greets,
Joren
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/core/data/column.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 3fd16d489ef402893ee8df6913e6bd011d61d1fa
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jan 18 15:55:41 2013 -0500
Try not to leak removed cell instances.
Change-Id: I25da4a34a3e53bc001519194729e613eef167713
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8520dc3..01f85fe 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1216,6 +1216,14 @@ public:
}
};
+struct DeleteCell : std::unary_functionColEntry, void
+{
+void operator() (ColEntry rEntry)
+{
+rEntry.pCell-Delete();
+}
+};
+
}
void ScColumn::CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn
rDestCol)
@@ -1230,6 +1238,7 @@ void ScColumn::CopyStaticToDocument(SCROW nRow1, SCROW
nRow2, ScColumn rDestCol
if (it != rDestCol.maItems.end())
{
itEnd = std::find_if(it, rDestCol.maItems.end(), FindAboveRow(nRow2));
+std::for_each(it, itEnd, DeleteCell());
rDestCol.maItems.erase(it, itEnd);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: fdo#58988, fdo#58562: Populate draw clip document with data ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1757
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1757/1
fdo#58988, fdo#58562: Populate draw clip document with data for charts.
Without populating the clip document, copying a chart (or charts) into
clipboard makes the charts lose all their referenced data, which causes
the pasted chart to appear empty.
Conflicts:
sc/source/ui/view/drawvie4.cxx
Change-Id: I0e7ce7cfbcdb3c9f120c6f0c72c58ab320901e6b
---
M sc/inc/column.hxx
M sc/inc/document.hxx
M sc/inc/table.hxx
M sc/qa/unit/ucalc.cxx
M sc/source/core/data/column.cxx
M sc/source/core/data/document.cxx
M sc/source/core/data/table2.cxx
M sc/source/ui/view/drawvie4.cxx
8 files changed, 362 insertions(+), 6 deletions(-)
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7abce09..3e927c8 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -168,6 +168,7 @@
voidDeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16
nDelFlag );
voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn rColumn, bool
bKeepScenarioFlags) const;
+void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn rDestCol);
voidCopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScColumn rColumn);
voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 76df284..c7c09d8 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1027,6 +1027,16 @@
const ScMarkData* pMarks = NULL, bool bAllTabs
= false, bool bKeepScenarioFlags = false,
bool bIncludeObjects = false, bool
bCloneNoteCaptions = true, bool bUseRangeForVBA = false );
+/**
+ * Copy only raw cell values to another document. Formula cells are
+ * converted to raw cells. No formatting info are copied.
+ *
+ * @param rSrcRange source range in the source document
+ * @param nDestTab table in the clip document to copy to.
+ * @param pDestDoc document to copy to
+ */
+void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab,
ScDocument* pDestDoc);
+
voidCopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
SCTAB nTab, ScDocument* pClipDoc = NULL);
voidCopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 512dee2..26d5a69 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -350,6 +350,7 @@
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
voidCopyToClip(const ScRangeList rRanges, ScTable* pTable,
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
+void CopyStaticToDocument(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScTable* pDestTab);
voidCopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, SCsCOL nDx, SCsROW nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScTable* pTable);
voidStartListeningInArea( SCCOL nCol1, SCROW nRow1,
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 14d0da1..11ca7fe 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -117,7 +117,7 @@
void testRangeList();
void testInput();
void testCellFunctions();
-
+void testCopyToDocument();
/**
* Make sure the SHEETS function gets properly updated during sheet
* insertion and removal.
@@ -263,6 +263,7 @@
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
CPPUNIT_TEST(testCellFunctions);
+CPPUNIT_TEST(testCopyToDocument);
CPPUNIT_TEST(testSheetsFunc);
CPPUNIT_TEST(testVolatileFunc);
CPPUNIT_TEST(testFormulaDepTracking);
@@ -1146,6 +1147,34 @@
m_pDoc-DeleteTab(0);
}
+void Test::testCopyToDocument()
+{
+CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0,
src));
+
+m_pDoc-SetString(0, 0, 0, Header);
+m_pDoc-SetString(0, 1, 0, 1);
+m_pDoc-SetString(0, 2, 0, 2);
+m_pDoc-SetString(0, 3, 0, 3);
+m_pDoc-SetString(0, 4, 0, =4/2);
+m_pDoc-CalcAll();
+
+// Copy statically to another document.
+
+ScDocument aDestDoc(SCDOCMODE_DOCUMENT);
+aDestDoc.InsertTab(0, src);
+m_pDoc-CopyStaticToDocument(ScRange(0,1,0,0,3,0), 0, aDestDoc); // Copy
A2:A4
+m_pDoc-CopyStaticToDocument(ScAddress(0,0,0), 0, aDestDoc); // Copy A1
+m_pDoc-CopyStaticToDocument(ScRange(0,4,0,0,7,0), 0, aDestDoc); // Copy
A5:A8
+
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(0,0,0), aDestDoc.GetString(0,0,0));
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(0,1,0), aDestDoc.GetString(0,1,0));
Remove linked-git functionality.
Thorsten Behrens has abandoned this change. Change subject: Remove linked-git functionality. .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1333 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4226a6d5648090fbcbeac16e1cfca98c7e5a936d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Christian Lohmaier lohmaier+libreoff...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Add close findbar button also on other LO components
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1759 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1759/1 Add close findbar button also on other LO components Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Reviewed-on: https://gerrit.libreoffice.org/1727 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com --- M basctl/uiconfig/basicide/toolbar/findbar.xml M sc/uiconfig/scalc/toolbar/findbar.xml M sd/uiconfig/sdraw/toolbar/findbar.xml M sd/uiconfig/simpress/toolbar/findbar.xml M sw/uiconfig/sglobal/toolbar/findbar.xml M sw/uiconfig/sweb/toolbar/findbar.xml M sw/uiconfig/swxform/toolbar/findbar.xml 7 files changed, 7 insertions(+), 0 deletions(-) diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index d8f02d1..5de9e66 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml b/sc/uiconfig/scalc/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sc/uiconfig/scalc/toolbar/findbar.xml +++ b/sc/uiconfig/scalc/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/sdraw/toolbar/findbar.xml +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/simpress/toolbar/findbar.xml +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml b/sw/uiconfig/sglobal/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sglobal/toolbar/findbar.xml +++ b/sw/uiconfig/sglobal/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sweb/toolbar/findbar.xml b/sw/uiconfig/sweb/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sweb/toolbar/findbar.xml +++ b/sw/uiconfig/sweb/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/swxform/toolbar/findbar.xml b/sw/uiconfig/swxform/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/swxform/toolbar/findbar.xml +++ b/sw/uiconfig/swxform/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar -- To view, visit https://gerrit.libreoffice.org/1759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list
[PATCH] Change in core[libreoffice-4-0]: add close option to findbar in Writer
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1758
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1758/1
add close option to findbar in Writer
Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67
Reviewed-on: https://gerrit.libreoffice.org/1557
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
---
A icon-themes/galaxy/cmd/lc_exitsearch.png
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/swriter/toolbar/findbar.xml
8 files changed, 195 insertions(+), 2 deletions(-)
diff --git a/icon-themes/galaxy/cmd/lc_exitsearch.png
b/icon-themes/galaxy/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/galaxy/cmd/lc_exitsearch.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index a60dd09..fe27c05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -396,6 +396,17 @@
valuecom.sun.star.svx.DownSearchToolboxController/value
/prop
/node
+ node oor:name=com.sun.star.svx.ExitFindbarToolboxController
oor:op=replace
+prop oor:name=Command
+ value.uno:ExitSearch/value
+/prop
+prop oor:name=Module
+ value/
+/prop
+prop oor:name=Controller
+ valuecom.sun.star.svx.ExitFindbarToolboxController/value
+/prop
+ /node
node oor:name=com.sun.star.svx.UpSearchToolboxController
oor:op=replace
prop oor:name=Command
value.uno:UpSearch/value
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b8973b0..ac67696 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1471,6 +1471,14 @@
value1/value
/prop
/node
+node oor:name=.uno:ExitSearch oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USExit Search/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+/node
node oor:name=vnd.sun.star.findbar:FocusToFindbar
oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-US~Find.../value
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 47a1d00..87f9756 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -135,6 +135,48 @@
};
+class ExitSearchToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+enum Type { EXIT };
+
+ExitSearchToolboxController( const css::uno::Reference
css::lang::XMultiServiceFactory rServiceManager, Type eType );
+~ExitSearchToolboxController();
+
+// XInterface
+virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
css::uno::Type aType ) throw ( css::uno::RuntimeException );
+virtual void SAL_CALL acquire() throw ();
+virtual void SAL_CALL release() throw ();
+
+// XServiceInfo
+virtual ::rtl::OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+static ::rtl::OUString getImplementationName_Static( ) throw()
+{
+return ::rtl::OUString(
com.sun.star.svx.ExitFindbarToolboxController );
+}
+
+static css::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
+
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+// XToolbarController
+virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (
css::uno::RuntimeException );
+
+// XStatusListener
+virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent
rEvent ) throw ( css::uno::RuntimeException );
+
+private:
+Type meType;
+};
+
[ANN] LibreOffice 3.6.5 RC2 available
Dear Community, The Document Foundation is happy to announce the second release candidate of LibreOffice 3.6.5. The upcoming 3.6.5 will be the fifth in a series of frequent bugfix releases for our stable 3.6 branch. Please be aware that LibreOffice 3.6.5 RC2 is not ready for production use, you should continue to use LibreOffice 3.6.4 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 3.6.5 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.5/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] LibreOffice 3.6.5 RC2 available
I write: The Document Foundation is happy to announce the second release candidate of LibreOffice 3.6.5. In case you wonder if you missed RC1 - that version was tagged, but no binaries built and released because of a regression found very early on. :) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - cui/source desktop/source framework/source instsetoo_native/util Makefile.in sfx2/source solenv/bin svx/source unotools/source xmloff/inc xmloff/source
Makefile.in |2
cui/source/dialogs/about.src |2
desktop/source/app/app.cxx |2
desktop/source/app/cmdlinehelp.cxx |2
framework/source/fwe/helper/titlehelper.cxx | 15
instsetoo_native/util/openoffice.lst.in | 24 +--
sfx2/source/bastyp/bastyp.src|2
solenv/bin/modules/installer.pm |3
solenv/bin/modules/installer/download.pm |4 -
solenv/bin/modules/installer/setupscript.pm | 25 ---
solenv/bin/modules/installer/ziplist.pm |4 -
solenv/bin/modules/t/installer-setupscript.t |1
svx/source/dialog/linkwarn.src |2
svx/source/src/app.src |2
unotools/source/config/docinfohelper.cxx |1
xmloff/inc/xmloff/xmlimp.hxx |8 ++
xmloff/source/core/xmlimp.cxx| 89 +--
xmloff/source/draw/ximpshap.cxx |6 -
xmloff/source/meta/xmlmetai.cxx | 31 ++---
19 files changed, 122 insertions(+), 103 deletions(-)
New commits:
commit c106167f5f6ec1bff9b2291ff8791ca6d4d411c3
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 18 22:14:57 2013 +0100
PRODUCTEXTENSION: fix various obvious strings and such...
... to look pretty; most of these expect PRODUCTEXTENSION to be a word
like Beta but nowadays it is .micro.rc.alphabeta numbers so there
should be no space before it.
ReplaceStringHookProc adds insult to injury by refusing to
replace %ABOUTBOX variables unless some %PRODUCT is in the string.
Change-Id: Ib676f3837ab0785529a226fc9359e8defacf3459
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index defcf90..8daf783 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -63,7 +63,7 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_VERSION
{
-Text [ en-US ] = Version
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION;
+Text [ en-US ] = Version
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX;
};
String ABOUT_STR_DESCRIPTION
{
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 96010c9..e384912 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -477,7 +477,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString
rStr )
{
rtl::OUString sRet(rStr);
-if ( sRet.indexOf( %PRODUCT ) != -1 )
+if (sRet.indexOf(%PRODUCT) != -1 || sRet.indexOf(%ABOUTBOX) != -1)
{
rtl::OUString sBrandName = BrandName::get();
rtl::OUString sVersion = Version::get();
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index 8ed32f7..73d5613 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -45,7 +45,7 @@ namespace desktop
// [OK]
const char aCmdLineHelp_version[] =
-%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n\
+%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION\n\
\n;
const char aCmdLineHelp_head[] =
Usage: %CMDNAME [options] [documents...]\n\
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index ff64742..ec2ae43 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -490,7 +490,6 @@ void TitleHelper::impl_updateTitleForFrame (const
css::uno::Reference css::fram
impl_appendComponentTitle (sTitle, xComponent);
impl_appendProductName (sTitle);
impl_appendModuleName (sTitle);
-impl_appendProductExtension (sTitle);
impl_appendDebugVersion (sTitle);
// SYNCHRONIZED -
@@ -531,17 +530,6 @@ void TitleHelper::impl_appendProductName
(::rtl::OUStringBuffer sTitle)
}
//*
-void TitleHelper::impl_appendProductExtension (::rtl::OUStringBuffer sTitle)
-{
-rtl::OUString ext(utl::ConfigManager::getProductExtension());
-if (!ext.isEmpty())
-{
-sTitle.append(' ');
-sTitle.append(ext);
-}
-}
-
-//*
void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer sTitle)
{
// SYNCHRONIZED -
@@ -578,6 +566,9 @@ void TitleHelper::impl_appendModuleName
(::rtl::OUStringBuffer sTitle)
#ifdef DBG_UTIL
void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer sTitle)
{
+rtl::OUString version(utl::ConfigManager::getProductVersion());
+sTitle.append(' ');
+sTitle.append(version);
::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM(development));
::rtl::OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault);
Change in core[libreoffice-4-0]: add close option to findbar in Writer
Joren De Cuyper has abandoned this change. Change subject: add close option to findbar in Writer .. Patch Set 1: Abandoned Sorry, didn't know about string freeze -- To view, visit https://gerrit.libreoffice.org/1758 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Add close findbar button also on other LO components
Joren De Cuyper has abandoned this change. Change subject: Add close findbar button also on other LO components .. Patch Set 1: Abandoned related to abandoned change because of string freeze -- To view, visit https://gerrit.libreoffice.org/1759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59517: fix detection of ancient OOo ODF generator string...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1760
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/1760/1
fdo#59517: fix detection of ancient OOo ODF generator strings:
SvXMLMetaDocumentContext::setBuildId: check only the prefix of the
generator string, not all of it.
(regression from 17ff7b41d15ab9928e2e2706faa26234a09802cd)
Change-Id: I0cdd958d67cd13fd2368cc6958893ce3528a9e94
(cherry picked from commit 0669d78ea76ab9bfeff27ea02d785973f3720d6b)
---
M xmloff/source/meta/xmlmetai.cxx
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 651d6a5..ba9c58b 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -268,12 +268,13 @@
if ( sBuildId.isEmpty() )
{
-if ( i_rBuildId == StarOffice 7 || i_rBuildId == StarSuite 7 ||
- i_rBuildId == OpenOffice.org 1 )
+if (i_rBuildId.startsWith(StarOffice 7)
+|| i_rBuildId.startsWith(StarSuite 7)
+|| i_rBuildId.startsWith(OpenOffice.org 1))
{
sBuildId = OUString(645$8687);
}
-else if ( i_rBuildId == NeoOffice/2 )
+else if (i_rBuildId.startsWith(NeoOffice/2))
{
sBuildId = OUString(680$9134); // fake NeoOffice as
OpenOffice.org 2.2 release
}
@@ -282,7 +283,7 @@
#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
else
{
-if ( i_rBuildId == LibreOffice/3 )
+if (i_rBuildId.startsWith(LibreOffice/3))
{
// #118558# fake LibreOffice3 as OpenOffice.org 3.3 release
sBuildId = OUString::createFromAscii( 330$9567 );
--
To view, visit https://gerrit.libreoffice.org/1760
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cdd958d67cd13fd2368cc6958893ce3528a9e94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: xmloff: refactor Generator version handling:
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1761
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/1761/1
xmloff: refactor Generator version handling:
Since there are now 2 forks of OpenOffice.org, we cannot rely on a
simple total ordering of versions any more; add a new function
SvXMLImport::isGeneratorVersionOlderThan(), taking 2 reference versions.
Also extract the LibreOffice version number from the generator string,
and extend the BuildId property to store this as a third number.
This also allows removal of the fake LibreOffice3 as OpenOffice.org
3.3 release hack, which is not future-proof.
(cherry picked from commit bea63709d05514555d5283279cd66439f4ceed73)
Conflicts:
xmloff/source/core/xmlimp.cxx
Change-Id: I44d8105eb537ac43fb9529a8b1b661ae0f2bba30
---
M xmloff/inc/xmloff/xmlimp.hxx
M xmloff/source/core/xmlimp.cxx
M xmloff/source/draw/ximpshap.cxx
M xmloff/source/meta/xmlmetai.cxx
4 files changed, 97 insertions(+), 30 deletions(-)
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 125728f..3a5d1e0 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -422,8 +422,16 @@
static const sal_uInt16 OOo_32x = 32;
static const sal_uInt16 OOo_33x = 33;
static const sal_uInt16 OOo_34x = 34;
+static const sal_uInt16 LO_flag = 0x100;
+static const sal_uInt16 LO_3x = 30 | LO_flag;
+static const sal_uInt16 LO_4x = 40 | LO_flag;
static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
+/** depending on whether the generator version indicates LO, compare
+against either the given LO or given OOo version */
+bool isGeneratorVersionOlderThan(
+sal_uInt16 const nOOoVersion, sal_uInt16 const nLOVersion);
+
/** this checks the build ID and returns
* OOo_1x for files created with OpenOffice.org 1.x or StarOffice 7
(this also includes binary import over binfilter)
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d6e29df..858f838 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -157,6 +157,31 @@
namespace
{
+
+static OUString
+getBuildIdsProperty(uno::Referencebeans::XPropertySet const xImportInfo)
+{
+if (xImportInfo.is())
+{
+try
+{
+Reference XPropertySetInfo const xSetInfo(
+xImportInfo-getPropertySetInfo());
+if (xSetInfo.is() xSetInfo-hasPropertyByName(BuildId))
+{
+OUString aBuildId;
+xImportInfo-getPropertyValue(BuildId) = aBuildId;
+return aBuildId;
+}
+}
+catch (Exception const e)
+{
+SAL_WARN(xmloff, exception getting BuildId e.Message);
+}
+}
+return OUString();
+}
+
class DocumentInfo
{
private:
@@ -166,6 +191,30 @@
DocumentInfo( const SvXMLImport rImport )
: mnGeneratorVersion( SvXMLImport::ProductVersionUnknown )
{
+OUString const buildIds(
+getBuildIdsProperty(rImport.getImportInfo()));
+if (!buildIds.isEmpty())
+{
+sal_Int32 const ix = buildIds.indexOf(';');
+if (-1 != ix)
+{
+OUString const loVersion(buildIds.copy(ix + 1));
+if (!loVersion.isEmpty())
+{
+if ('3' == loVersion[0])
+{
+mnGeneratorVersion = SvXMLImport::LO_3x;
+}
+else
+{
+SAL_INFO_IF('4' != loVersion[0], xmloff,
+unknown LO version: loVersion);
+mnGeneratorVersion = SvXMLImport::LO_4x;
+}
+return; // ignore buildIds
+}
+}
+}
sal_Int32 nUPD, nBuild;
if ( rImport.getBuildIds( nUPD, nBuild ) )
{
@@ -1838,28 +1887,19 @@
bool SvXMLImport::getBuildIds( sal_Int32 rUPD, sal_Int32 rBuild ) const
{
bool bRet = false;
-if( mxImportInfo.is() ) try
+OUString const aBuildId(getBuildIdsProperty(mxImportInfo));
+if (!aBuildId.isEmpty())
{
-const OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(BuildId));
-Reference XPropertySetInfo xSetInfo(
mxImportInfo-getPropertySetInfo() );
-if( xSetInfo.is() xSetInfo-hasPropertyByName( aPropName ) )
+sal_Int32 nIndex = aBuildId.indexOf('$');
+if (nIndex != -1)
{
-OUString aBuildId;
-mxImportInfo-getPropertyValue( aPropName ) =
Smartphone S3 Frete Gratis Mais 5 Brindes a Pronta Entrega Para Todo o Brasil
Seu cliente de e-mail não pode ler este e-mail. Para visualizá-lo on-line, por favor, clique aqui: http://www.ofertacelularesnews.com/display.php?M=2470733C=afb220d87c8c8380c3dd4643ef47abb9S=21L=15N=4 Para parar de receber nossos Emails:http://www.ofertacelularesnews.com/unsubscribe.php?M=2470733C=afb220d87c8c8380c3dd4643ef47abb9L=15N=21 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/dbgui/tpsort.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit baa9a119dabfc5e5dbb5c174cebf8c24298bad67
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 18 10:17:57 2013 +0100
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
Reviewed-on: https://gerrit.libreoffice.org/1752
Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com
Tested-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6688166..78d04ac 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -358,6 +358,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: reset one of the sort containers before refilling, fdo#57465
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1752 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1752 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: PRODUCTEXTENSION: fix various obvious strings and such...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1763
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/1763/1
PRODUCTEXTENSION: fix various obvious strings and such...
... to look pretty; most of these expect PRODUCTEXTENSION to be a word
like Beta but nowadays it is .micro.rc.alphabeta numbers so there
should be no space before it.
ReplaceStringHookProc adds insult to injury by refusing to
replace %ABOUTBOX variables unless some %PRODUCT is in the string.
Change-Id: Ib676f3837ab0785529a226fc9359e8defacf3459
(cherry picked from commit c106167f5f6ec1bff9b2291ff8791ca6d4d411c3)
---
M cui/source/dialogs/about.src
M desktop/source/app/app.cxx
M desktop/source/app/cmdlinehelp.cxx
M framework/source/fwe/helper/titlehelper.cxx
M sfx2/source/bastyp/bastyp.src
M svx/source/dialog/linkwarn.src
M svx/source/src/app.src
M unotools/source/config/docinfohelper.cxx
8 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index defcf90..8daf783 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -63,7 +63,7 @@
};
String ABOUT_STR_VERSION
{
-Text [ en-US ] = Version
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION;
+Text [ en-US ] = Version
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX;
};
String ABOUT_STR_DESCRIPTION
{
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9ac63a5..86a545b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -467,7 +467,7 @@
{
rtl::OUString sRet(rStr);
-if ( sRet.indexOf( %PRODUCT ) != -1 )
+if (sRet.indexOf(%PRODUCT) != -1 || sRet.indexOf(%ABOUTBOX) != -1)
{
rtl::OUString sBrandName = BrandName::get();
rtl::OUString sVersion = Version::get();
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index 8ed32f7..73d5613 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -45,7 +45,7 @@
// [OK]
const char aCmdLineHelp_version[] =
-%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n\
+%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION\n\
\n;
const char aCmdLineHelp_head[] =
Usage: %CMDNAME [options] [documents...]\n\
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index b54c304..10409e4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -490,7 +490,6 @@
impl_appendComponentTitle (sTitle, xComponent);
impl_appendProductName (sTitle);
impl_appendModuleName (sTitle);
-impl_appendProductExtension (sTitle);
impl_appendDebugVersion (sTitle);
// SYNCHRONIZED -
@@ -531,17 +530,6 @@
}
//*
-void TitleHelper::impl_appendProductExtension (::rtl::OUStringBuffer sTitle)
-{
-rtl::OUString ext(utl::ConfigManager::getProductExtension());
-if (!ext.isEmpty())
-{
-sTitle.append(' ');
-sTitle.append(ext);
-}
-}
-
-//*
void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer sTitle)
{
// SYNCHRONIZED -
@@ -578,6 +566,9 @@
#ifdef DBG_UTIL
void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer sTitle)
{
+rtl::OUString version(utl::ConfigManager::getProductVersion());
+sTitle.append(' ');
+sTitle.append(version);
::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM(development));
::rtl::OUString sVersion = ::utl::Bootstrap::getProductSource(sDefault);
sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM( [));
diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
index 1d31cc8..6ade628 100644
--- a/sfx2/source/bastyp/bastyp.src
+++ b/sfx2/source/bastyp/bastyp.src
@@ -19,5 +19,5 @@
String STR_HTML_GENERATOR
{
-Text = %PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION (%1) ;
+Text = %PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION (%1) ;
};
diff --git a/svx/source/dialog/linkwarn.src b/svx/source/dialog/linkwarn.src
index 56e0538..dd8eb54 100644
--- a/svx/source/dialog/linkwarn.src
+++ b/svx/source/dialog/linkwarn.src
@@ -28,7 +28,7 @@
Moveable = TRUE;
SVLook = TRUE;
-Text = %PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION;
+Text = %PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION;
FixedImage FI_QUERY
{
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 6591eb1..3b61482 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -22,7 +22,7 @@
//
String
[PATCH] Change in core[libreoffice-4-0]: installer: remove SHORT_PRODUCTEXTENSION
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1762
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/1762/1
installer: remove SHORT_PRODUCTEXTENSION
Currently PRODUCTEXTENSION does not have a value, which is unfortunate
because some places such as the soffice --help output and
utl::DocInfoHelper::GetGeneratorString() which creates the
meta:generator for ODF files (via Setup.xcu Product/ooSetupExtension)
write an incomplete version number.
Since there doesn't appear to be a point in having 2 variables here,
remove SHORT_ one and use PRODUCTEXTENSION consistently.
(cherry picked from commit e024a8d88dbca3a2d178ad88c069721a92156ddf)
Conflicts:
instsetoo_native/util/openoffice.lst
Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0
---
M instsetoo_native/util/openoffice.lst
M solenv/bin/modules/installer/download.pm
M solenv/bin/modules/installer/ziplist.pm
3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 81eb4dc..632ae20 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -48,9 +48,7 @@
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
@@ -100,9 +98,7 @@
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
@@ -163,10 +159,8 @@
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0.0.1
PACKAGEREVISION 1
-PRODUCTEXTENSION
+PRODUCTEXTENSION .0.1
BRANDPACKAGEVERSION 4.0
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -196,9 +190,7 @@
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -237,9 +229,7 @@
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -284,9 +274,7 @@
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -325,9 +313,7 @@
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -371,9 +357,7 @@
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION
-LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.1
+PRODUCTEXTENSION .0.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 21bd62f..6d370ae 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -345,7 +345,7 @@
my $version = ;
$version = $allvariables-{'PRODUCTVERSION'};
-if (( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) (
$allvariables-{'SHORT_PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
+if (( $allvariables-{'PRODUCTEXTENSION'} ) (
$allvariables-{'PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'PRODUCTEXTENSION'}; }
return $version;
}
@@ -586,7 +586,7 @@
$downloadname =~ s/\{packageversion\}/$packageversion/;
my $extension = ;
-if ( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) { $extension =
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
+if (
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/dbgui/tpsort.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c3f7589fb540072f3a2434f6de99fe2472dad3b1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 18 10:17:57 2013 +0100
reset one of the sort containers before refilling, fdo#57465
Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5
Reviewed-on: https://gerrit.libreoffice.org/1753
Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com
Tested-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 38724dd..9a2145d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -341,6 +341,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16
nStartField )
SCROW nFirstSortRow = aSortData.nRow1;
SCTAB nTab= pViewData-GetTabNo();
sal_uInt16 i = 1;
+nFieldArr.clear();
+nFieldArr.push_back(0);
if ( bSortByRows )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: reset one of the sort containers before refilling, fdo#57465
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1753 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1753 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: mark *all* tables of a nested join as added
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1764
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/1764/1
mark *all* tables of a nested join as added
Else, if the n^{th} (with n2) table also appears in a (non-NATURAL) INNER
JOIN, it is repeated later, leading to an error from the database engine
Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd
---
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 7b33375..e1d7427 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -485,10 +485,29 @@
return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh),
data);
}
//--
+typedef ::std::map ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess
tableNames_t;
+
//--
+void addConnectionTableNames( const Reference XConnection _xConnection,
+ const OQueryTableConnection* const
pEntryConn,
+ tableNames_t _rTableNames )
+{
+// insert tables into table list to avoid double entries
+const OQueryTableWindow* const pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
+const OQueryTableWindow* const pEntryTabTo =
static_castOQueryTableWindow*(pEntryConn-GetDestWin());
+
+::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+sTabName = BuildTable(_xConnection,pEntryTabTo);
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+}
+
//--
void GetNextJoin( const Reference XConnection _xConnection,
OQueryTableConnection* pEntryConn,
OQueryTableWindow* pEntryTabTo,
-::rtl::OUString aJoin)
+::rtl::OUString aJoin,
+tableNames_t _rTableNames)
{
OQueryTableConnectionData* pEntryConnData =
static_castOQueryTableConnectionData*(pEntryConn-GetData().get());
if ( pEntryConnData-GetJoinType() == INNER_JOIN
!pEntryConnData-isNatural() )
@@ -496,15 +515,18 @@
if(aJoin.isEmpty())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
OQueryTableWindow* pEntryTabFrom =
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
aJoin =
BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetDestWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData);
}
else if(pEntryTabTo == pEntryConn-GetSourceWin())
{
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData);
}
@@ -523,7 +545,7 @@
// exists there a connection to a OQueryTableWindow that holds
a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
@@ -541,7 +563,7 @@
// exists there a connection to a OQueryTableWindow that
holds a connection that has been already visited
JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin,
_rTableNames);
}
}
}
@@ -1024,7 +1046,7 @@
//--
void searchAndAppendName(const Reference XConnection _xConnection,
const OQueryTableWindow* _pTableWindow,
- ::std::map
::rtl::OUString,sal_Bool,::comphelper::UStringMixLess _rTableNames,
+ tableNames_t _rTableNames,
::rtl::OUString _rsTableListStr
)
{
@@
[Libreoffice-commits] 9 commits - tb/tb tb/tb_internals_Darwin.sh tb/tb_internals.sh tb/tb_phases.sh
tb/tb | 31 -
tb/tb_internals.sh| 238 +-
tb/tb_internals_Darwin.sh | 37 +++
tb/tb_phases.sh | 117 +-
4 files changed, 327 insertions(+), 96 deletions(-)
New commits:
commit 7c5543081c8134a3edc81f3e047ac47b31b1e90f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Jan 18 19:39:09 2013 -0600
tb: misc code fixup/typo
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index fb01ce5..7d1af8c 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -18,7 +18,7 @@
# Exception: P : project name
#B : current branch name. gerrit_* are reserved branch names for
gerrit works
#R : build result indicator ( 0=OK 1=KO 2=False positive )
-#V : verbose messages (V=1 = verbose message V= = no verbose
message, iow: [ $V ] msgs_log
+#V : verbose messages (V=1 = verbose message V= = no verbose
message, iow: [ $V ] log_msgs
# MAKE : environement variable is use if set to point to a gnu-make
#otherwise overriden to a gne-make found in the PATH
#
@@ -140,7 +140,7 @@ check_branch_profile()
local rb=
if [ ! -d ${tb_PROFILE_DIR?}/${b?} ] ; then
-msgs_log No branch specific config for branch '${b?}', using default
from profile
+log_msgs No branch specific config for branch '${b?}', using default
from profile
fi
if [ ${tb_MODE?} = dual -o ${tb_MODE?} = tb ] ; then
rb=$(check_branch_profile_tb $b)
@@ -157,7 +157,7 @@ check_branch_profile()
rb=$(check_branch_profile_gerrit ${b?})
ret=$?
if [ ${ret?} = 0 ] ; then
-if [ -z ${tb_GERRIT_BRANCHES} ; then
+if [ -z ${tb_GERRIT_BRANCHES} ] ; then
tb_GERRIT_BRANCHES=${rb?}
else
tb_GERRIT_BRANCHES=${tb_GERRIT_BRANCHES?} ${rb?}
@@ -348,7 +348,7 @@ check_for_commit()
r=1
fi
else
-msgs_log Git error while checking for commit on ${TB_GIT_REPO?}
for branch ${b?}
+log_msgs Git error while checking for commit on ${TB_GIT_REPO?}
for branch ${b?}
printf Git repo broken - error is:\n\n$err_msgs error_log.log
report_error owner $(print_date) error_log.log
exit -1
@@ -503,7 +503,7 @@ determine_make()
#
die()
{
-echo [$(print_date) ${P?}] Error: $@ | tee -a ${tb_LOGFILE?}
+echo [$(print_date) ${P}:${B}] Error: $@ | tee -a ${tb_LOGFILE?}
exit -1;
}
@@ -647,7 +647,7 @@ load_profile()
log_msgs()
{
-echo [$(print_date) ${P?}] $@ | tee -a ${tb_LOGFILE?}
+echo [$(print_date) ${P?}:${B}] $@ | tee -a ${tb_LOGFILE?}
}
prepare_git_repo_for_gerrit()
@@ -922,13 +922,13 @@ local log_type=$1
local status=failed
local gzlog=
-[ $V ] echo report to gerrit retval=${retval} log_type=${log_type}
+[ $V ] echo report to gerrit retval=${R} log_type=${log_type}
if [ $log_type = short -a ${R?} = 0 ] ; then
gzlog=tinder.log.gz
(
-echo gerrit_task_ticket:$GERRIT_TASK_TICKET
-echo gerrit_task_branch:$GERRIT_TASK_BRANCH
-echo gerrit task_ref:$GERRIT_TASK_REF
+echo gerrit_task_ticket:${GERRIT_TASK_TICKET?}
+echo gerrit_task_branch:${GERRIT_TASK_BRANCH?}
+echo gerrit task_ref:${GERRIT_TASK_REF?}
echo
echo Build: OK
echo
@@ -937,11 +937,11 @@ local gzlog=
else
gzlog=tinder.log.gz
(
-echo gerrit_task_ticket:$GERRIT_TASK_TICKET
-echo gerrit_task_branch:$GERRIT_TASK_BRANCH
-echo gerrit task_ref:$GERRIT_TASK_REF
+echo gerrit_task_ticket:${GERRIT_TASK_TICKET?}
+echo gerrit_task_branch:${GERRIT_TASK_BRANCH?}
+echo gerrit task_ref:${GERRIT_TASK_REF?}
echo
-if [ ${retval?} = 0 ] ; then
+if [ ${R?} = 0 ] ; then
echo Build: OK
else
echo Build: FAIL
@@ -952,12 +952,15 @@ local gzlog=
fi
if [ ${R?} = 0 ] ; then
+log_msgs Report Success for gerrit ref ${GERRIT_TASK_TICKET?}
status=success
elif [ ${R?} = 2 ] ; then
+log_msgs Report Cancellation for gerrit ref ${GERRIT_TASK_TICKET?}
status=canceled
+else
+log_msgs Report Failure for gerrit ref ${GERRIT_TASK_TICKET?}
fi
-log_msgs Report Success for gerrit ref '$GERRIT_TASK_TICKET'.
-cat ${gzlog} | ssh ${TB_GERRIT_HOST?} buildbot put --id ${TB_ID?}
--ticket ${GERRIT_TASK_TICKET} --status $status --log -
+cat ${gzlog} | ssh ${TB_GERRIT_HOST?} buildbot put --id ${TB_ID?}
--ticket ${GERRIT_TASK_TICKET?} --status $status --log -
}
@@ -995,7 +998,7 @@ tinderbox: END
(
echo $message_content
cat ${TB_METADATA_DIR?}/${P}_${B?}_current-git-timestamp.log
-
Re: [ANN] LibreOffice 3.6.5 RC2 available
On Fri, Jan 18, 2013 at 11:43:17PM +0100, Thorsten Behrens wrote: I write: The Document Foundation is happy to announce the second release candidate of LibreOffice 3.6.5. In case you wonder if you missed RC1 - that version was tagged, but no binaries built and released because of a regression found very early on. :) https://wiki.documentfoundation.org/ReleasePlan/3.6#3.6.5_release was not adapted. I understand that this is our last RC in 3.6.5, and thus any non-blocker bugfix will not get in 3.6.5? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Limit - New Database feature
On Thu, Jan 17, 2013 at 09:47:05PM +0100, Zolnai Tamás wrote: I'm working on a new Database feature (...) This feature is an editable field on the Query Design Toolbar, with which the result of the query can be limited. I assume you refer to the SQL clause LIMIT $n$ whose effect is that the query returns at most $n$ results? Yes, it would be cool to have that feature. I dislike having a feature only in the toolbar, so please make sure it is also available by some menu. Our main competitor has a per-query property window, maybe we should do the same and put such stuff there? We can also put the DISTINCT / DISTINCT VALUES choice in the same window. Make sure I get a copy of the patch and I'll take a look at it: - in Gerrit, add me as reviewer - in Bugzilla, put me as CC - when posting to the mailing list, CC me -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: TINYINT set as signed in formcontrolfactory.cxx
On Sat, Jan 12, 2013 at 08:43:53PM +0100, Alexander Thurgood wrote:
I came across this in the file formcontrolfactory.cxx, which has
left me a bit puzzled :
sal_Int32 nDataType = DataType::OTHER;
OSL_VERIFY( _rxDatabaseField-getPropertyValue(
FM_PROP_FIELDTYPE ) = nDataType );
if ( xModelPSI-hasPropertyByName( FM_PROP_VALUEMIN )
xModelPSI-hasPropertyByName( FM_PROP_VALUEMAX )
)
{
sal_Int32 nMinValue = -10, nMaxValue = 10;
switch ( nDataType )
{
case DataType::TINYINT : nMinValue = 0; nMaxValue =
255; break;
case DataType::SMALLINT : nMinValue = -32768;
nMaxValue = 32767; break;
case DataType::INTEGER : nMinValue = 0x8000;
nMaxValue = 0x7FFF; break;
// double and singles are ignored
}
In particular, the line :
case DataType::TINYINT : nMinValue = 0; nMaxValue = 255; break
sets TINYINT as signed.
It sets it as *un*signed.
This code seems to match the behaviour of Microsoft SQL Server.
It is exactly the opposite of the capabilities of LibreOffice's
internal system with 8-bit integers (most notably the Any type; see
http://lists.freedesktop.org/archives/libreoffice/2012-December/043160.html )
In MySQL, any integer type can be signed or unsigned. Most database
engines don't allow that choice (they simply use signed, except
tinyint in Microsoft SQL Server which is always unsigned). See the
first/best answer at
http://stackoverflow.com/questions/2991405/what-is-the-difference-between-tinyint-smallint-mediumint-bigint-and-int-in-s
The central question is: what are the consequences of this code? If it
somewhat restrains user input, we should probably set it to cover
signed and unsigned:
case DataType::TINYINT : nMinValue = -127; nMaxValue = 255; break;
case DataType::SMALLINT : nMinValue = -32768; nMaxValue = 65535; break;
case DataType::INTEGER : nMinValue = 0x8000; nMaxValue = 0x7FFF;
break;
Err... But this will not cover unsigned (32 bit) integer, and neither
will it cover any BIGINT :-(
Pff... This could become a mess to handle.
Oh, and if anyone happens to know where the Default font for form
controls is defined, I would be most obliged ;-)
Controls where? In a Form? Isn't it the default font of the underlying
Writer document?
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: First steps finding regression bug(s)
Joren,
maybe that string is caught from here (note that's is inside Writer module)
http://opengrok.libreoffice.org/xref/core/sw/source/ui/app/error.src
Then you should try searching for ERR_AUTOPATH_ERROR or ERRCODE_CLASS_PATH.
Or here, but I don't have any idea what is UUI.
http://opengrok.libreoffice.org/xref/core/uui/source/ids.src#168
( ERRCODE_UUI_IO_NOTEXISTS )
I found these matches seraching like this
http://opengrok.libreoffice.org/search?q=%22does+not+exist.%22project=coredefs=refs=path=hist=
I've tried to use does not exist.\ (inserting the quote), but
opengrok ignore it.
Looking at that screenshot on bug report, I'd say the problem is the
filenames are concatenated into a single string separated by a newline
character - but I don't know anything about Mac. Or the message string
is just ugly ;)
I hope it helps.
Rodolfo
2013/1/18 Joren joren.libreoff...@telenet.be:
Op 17-01-13 20:44, Michael Meeks schreef:
Hi Joren,
On Wed, 2013-01-02 at 19:59 +0100, Joren wrote:
I try now to take a little step forward and try to comprehend a bit of
the source code. I would like to help core developers point at
regressions (find the erroneous commit).
Which is really amazingly useful - thanks so much for this work. I
didn't see a reply to your mail - so let me have a go:
Following the alert, I can search for the string 'does not exists.'. I
found it here:
A good way to try to trace this bottom-up:
String RID_FILEOPEN_INVALIDFOLDER
{
Text [ en-US ] = $name$ does not exist.;
};
So this is quite probably the string as you say.
fpicker/source/office/OfficeFilePicker.hrc:#define
RID_FILEOPEN_INVALIDFOLDER (RID_FPICKER_START+23)
fpicker/source/office/iodlg.src:String RID_FILEOPEN_INVALIDFOLDER
However there are only two hits - I would expect to see some code
that
would load this string something like this:
String(ResId(RID_FILEOPEN_INVALIDFOLDER))
or somesuch; but that isn't there - so - either - we are getting
this
string by doing some arithmetic around the RID_s - sometimes strings are
arranged in sequence in an array so the define is only used in the .src
- or the string isn't used and it's the wrong one ;-)
Ok... Now I found this ... Can I 'conclude' that my string is at
'position' 16393 (=23 + 6370 + 1). That's 0x4009 in hex notation.
I searched for 0x4009 and 16393; but I can't find anything relevant
Yep - in general, the code wouldn't hard-code a specific number
like
that (it'd be terrible style at least ;-). A git grep for
RID_FPICKER_START shows:
vcl/inc/vcl/fpicker.hrc:#define STR_SVT_FILEPICKER_START
(RID_FPICKER_START+1)
But looking at that - I'd rather suspect that this string is just
not
used - as such we should kill it in master (and any others we can verify
are not used from that .hrc).
I need to check some things first before 'just delete it'?
I suspect that one of the other:
git grep 'does not exist.'
hits is the source of that string ?
I found a string related to macro-handling ... but I don't think that's a
domain I need to search?
Because the bug is a regression bug 3.5 vs 3.6, and the source code of
3.6 is frozen on Week 23, Jun 4 - Jun 10, 2012 I compared the
current version of resmgr.cxx with a version at the beginning of 2012
(to be sure not overlook something)... But I couldn't find something.
Otherwise with this information I still can't find the code that
triggers the string.
Yep - the problem is unlikely to be in resmgr - that's the basic /
underlying translation functionality.
Is that helpful ? sorry for the appallingly slow reply :-)
Yes :-), thanks.
I'll abort my search for now :p. I think I'm not that advanced yet.
Thanks for picking up this mail!
Greets,
Joren
___
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
[PATCH] Converted Table- Autofit- Row Height widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1765 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/1765/1 Converted Table- Autofit- Row Height widget Change-Id: I9cc578ff3355e720181e68f252d678696ecfeed1 --- A sw/uiconfig/swriter/ui/rowheight.ui 1 file changed, 139 insertions(+), 0 deletions(-) diff --git a/sw/uiconfig/swriter/ui/rowheight.ui b/sw/uiconfig/swriter/ui/rowheight.ui new file mode 100644 index 000..e3fc949 --- /dev/null +++ b/sw/uiconfig/swriter/ui/rowheight.ui @@ -0,0 +1,139 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Row Height +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkSpinButton id=spinbutton1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=invisible_char•/property +property name=digits2/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkCheckButton id=checkbutton1 +property name=label translatable=yes_Fit to size/property +property name=visibleTrue/property +
Re: [Libreoffice-qa] Bug 59481 - FILEOPEN: Linux rpm: Native MySQL-connector aoo-my-sdbc-1.1.0 didn't work any more with LO 4.0
On 01/18/2013 11:04 AM, Joel Madero wrote: Can someone triage this one? Thanks in advance! Best Regards, Joel I looked through the bugs reports for possible duplication. I found 59481 (Linux 32 bit RPM) which is this one, 59533 (Windows 32 bit), and 59516 (Windows 32 bit). All of them have the same problem: the MySQL native connector can not be used to connect to a MySQL data source. I use Ubuntu 12.04 LTS 32 bit, and I have the same problem with the MySQL native connector. My conclusion is that the 32 bit version of it has a regressive bug. I can use this connector with LO 3.5.7.2 and 3.6.4.3 but not 4.0.0.1RC. Being new at this, should I change Platform to All for 59481? Should 59533 and 59516 be marked as duplicates? Should I mark 59481 as confirmed? I believe that these are the things that need to be done. --Dan ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 3.6.5 RC2 available
Dear Community, The Document Foundation is happy to announce the second release candidate of LibreOffice 3.6.5. The upcoming 3.6.5 will be the fifth in a series of frequent bugfix releases for our stable 3.6 branch. Please be aware that LibreOffice 3.6.5 RC2 is not ready for production use, you should continue to use LibreOffice 3.6.4 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 3.6.5 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.5/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 3.6.5 RC2 available
I write: The Document Foundation is happy to announce the second release candidate of LibreOffice 3.6.5. In case you wonder if you missed RC1 - that version was tagged, but no binaries built and released because of a regression found very early on. :) Cheers, -- Thorsten signature.asc Description: Digital signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
