[PATCH] fixed java classpath parameter (required for gcj)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1073 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/1073/1 fixed java classpath parameter (required for gcj) Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a --- M solenv/gbuild/JavaClassSet.mk M solenv/gbuild/JunitTest.mk 2 files changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1073 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/inc/RemoteDialog.hrc |1 - 1 file changed, 1 deletion(-) New commits: commit 1ce76674a7188acb19a48ea2e828cd13e4e4699c Author: Andras Timar ati...@suse.com Date: Thu Nov 15 09:29:16 2012 +0100 warning: no newline at end of file Change-Id: I6bbb57bfc46fe6afe5652a1c83097d4f18e5ed03 diff --git a/sd/source/ui/inc/RemoteDialog.hrc b/sd/source/ui/inc/RemoteDialog.hrc index da2e889..a896f71 100644 --- a/sd/source/ui/inc/RemoteDialog.hrc +++ b/sd/source/ui/inc/RemoteDialog.hrc @@ -15,4 +15,4 @@ #define LB_SERVERS 3 #define INPUT_PIN 4 #define TEXT_PIN5 -#define STR_ENTER_PIN 6 \ No newline at end of file +#define STR_ENTER_PIN 6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove unused methods from writerfilter
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1074 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/1074/1 Remove unused methods from writerfilter Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M unusedcode.easy M writerfilter/inc/resourcemodel/WW8ResourceModel.hxx M writerfilter/source/resourcemodel/WW8Analyzer.cxx M writerfilter/source/resourcemodel/analyzerheader M writerfilter/source/resourcemodel/qnametostrfooter 5 files changed, 0 insertions(+), 30 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1074 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Roman Eisele b...@eikota.de changed: What|Removed |Added Summary|LibreOffice 3.7 most|LibreOffice 3.7/4.0 most |annoying bugs |annoying bugs --- Comment #28 from Roman Eisele b...@eikota.de --- Renamed to “LibreOffice 3.7/4.0 most annoying bugs” * Because LibreOffice 3.7 has been renamed to LibreOffice 4.0 now, we have to adapt this meta bug report accordingly. But it would be a bit irritating if we would simply rename it to “LibreOffice 4.0 most annoying bugs”, because it has started for version 3.7, and all comments talk about “3.7”. On the other hand it would be (IMHO) overkill to create a new, separate “LibreOffice 4.0 most annoying bugs” report; this approach would (falsely!) suggest that 3.7 and 4.0 were different versions and branches. Therefore the best solution (there is no perfect one!) seems to follow Rainer’s suggestion at http://wiki.documentfoundation.org/QA/Todo_rename_3.7_to_4.0#ToDos to rename the present meta bug to “LibreOffice 3.7/4.0 most annoying bugs”. One could argue that this name is a bit irritating in itself, but this time the irritation has the advantage to remind us (if we ever manage to forget it ;-) of the version history, i.e. of 4.0 being the continuation of 3.7 ... I hope that everybody can live with this solution :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: unusedcode.easy writerfilter/inc writerfilter/source
unusedcode.easy |2 --
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |3 ---
writerfilter/source/resourcemodel/WW8Analyzer.cxx |5 -
writerfilter/source/resourcemodel/analyzerheader|3 ---
writerfilter/source/resourcemodel/qnametostrfooter | 17 -
5 files changed, 30 deletions(-)
New commits:
commit dd77f79f0acf202ba7ff40cdd5b7411d277b9d1c
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Thu Nov 15 06:35:06 2012 -0200
Remove unused methods from writerfilter
Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1074
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/unusedcode.easy b/unusedcode.easy
index cc9cdb0..826a596 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -73,6 +73,4 @@ unicode::isDigit(unsigned short)
unicode::isLower(unsigned short)
unicode::isPrint(unsigned short)
unicode::isUpper(unsigned short)
-writerfilter::analyzerIds()
-writerfilter::createAnalyzer()
writerfilter::createStreamHandler()
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index ab076a2..d9dd772 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -400,9 +400,6 @@ protected:
*/
Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createStreamHandler();
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds();
-Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createAnalyzer();
-
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string
message);
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepthstring
o, const char * name, writerfilter::ReferenceProperties::Pointer_t props);
diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.cxx
b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
index 09ebb18..0426a6b 100644
--- a/writerfilter/source/resourcemodel/WW8Analyzer.cxx
+++ b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
@@ -200,11 +200,6 @@ void WW8Analyzer::dumpStats(ostream o) const
}
-Stream::Pointer_t createAnalyzer()
-{
-return Stream::Pointer_t(new WW8Analyzer());
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/resourcemodel/analyzerheader
b/writerfilter/source/resourcemodel/analyzerheader
index 3082bfa..e444811 100644
--- a/writerfilter/source/resourcemodel/analyzerheader
+++ b/writerfilter/source/resourcemodel/analyzerheader
@@ -22,6 +22,3 @@
namespace writerfilter
{
-void analyzerIds(::std::iostream out)
-{
-out ids endl;
diff --git a/writerfilter/source/resourcemodel/qnametostrfooter
b/writerfilter/source/resourcemodel/qnametostrfooter
index 4cba68b..3c79a48 100644
--- a/writerfilter/source/resourcemodel/qnametostrfooter
+++ b/writerfilter/source/resourcemodel/qnametostrfooter
@@ -4,21 +4,4 @@ QNameToString::QNameToString()
init_ooxml();
}
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds()
-{
-cout ids type=\sprm\ endl;
-
-sprmidsToXML(cout);
-ooxmlsprmidsToXML(cout);
-
-cout /ids endl;
-
-cout ids type=\attribute\ endl;
-
-doctokidsToXML(cout);
-ooxmlidsToXML(cout);
-
-cout /ids endl;
-}
-
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove unused methods from writerfilter
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1074 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1074 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/n789482.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 20
sw/source/filter/ww8/docxattributeoutput.cxx | 13 -
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
4 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit eac3e6e746300df379226941ba75c4e0ce1feb7a
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Nov 14 19:03:05 2012 +0100
n#789482 DOCX: export track change data after w:hyperlink
Change-Id: If204523d7da544b11b2d809993ada180476104ef
diff --git a/sw/qa/extras/ooxmlexport/data/n789482.docx
b/sw/qa/extras/ooxmlexport/data/n789482.docx
new file mode 100755
index 000..493e8ee
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/n789482.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1a1c157..8fe1985 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -66,6 +66,7 @@ public:
void testFdo47669();
void testTableBorders();
void testFdo51550();
+void testN789482();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -103,6 +104,7 @@ void Test::run()
{fdo47669.docx, Test::testFdo47669},
{table-borders.docx, Test::testTableBorders},
{fdo51550.odt, Test::testFdo51550},
+{n789482.docx, Test::testN789482},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -482,6 +484,24 @@ void Test::testFdo51550()
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount());
}
+void Test::testN789482()
+{
+// The problem was that w:del was exported before w:hyperlink, resulting
in an invalid XML.
+uno::Referencetext::XTextRange xParagraph = getParagraph(1);
+getRun(xParagraph, 1, Before. );
+
+CPPUNIT_ASSERT_EQUAL(OUString(Delete),
getPropertyOUString(getRun(xParagraph, 2), RedlineType));
+CPPUNIT_ASSERT_EQUAL(sal_True, getPropertysal_Bool(getRun(xParagraph,
2), IsStart));
+
+getRun(xParagraph, 3, www.test.com);
+CPPUNIT_ASSERT_EQUAL(OUString(http://www.test.com/;),
getPropertyOUString(getRun(xParagraph, 3), HyperLinkURL));
+
+CPPUNIT_ASSERT_EQUAL(OUString(Delete),
getPropertyOUString(getRun(xParagraph, 4), RedlineType));
+CPPUNIT_ASSERT_EQUAL(sal_False, getPropertysal_Bool(getRun(xParagraph,
4), IsStart));
+
+getRun(xParagraph, 5, After.);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 45abbf6..d69e2cc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -461,8 +461,9 @@ void DocxAttributeOutput::EndParagraphProperties()
void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool
/*bSingleEmptyRun*/ )
{
-// if there is some redlining in the document, output it
-StartRedline( pRedlineData );
+// Don't start redline data here, possibly there is a hyperlink later, and
+// that has to be started first.
+m_pRedlineData = pRedlineData;
// postpone the output of the start of a run (there are elements that need
// to be written before the start of the run, but we learn which they are
@@ -539,6 +540,9 @@ void DocxAttributeOutput::EndRun()
m_startedHyperlink = true;
}
+// if there is some redlining in the document, output it
+StartRedline();
+
DoWriteBookmarks( );
WriteCommentRanges();
@@ -1237,12 +1241,11 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
/*pRedline*/ )
OSL_TRACE( TODO DocxAttributeOutput::Redline( const SwRedlineData*
pRedline ) );
}
-void DocxAttributeOutput::StartRedline( const SwRedlineData* pRedlineData )
+void DocxAttributeOutput::StartRedline()
{
-m_pRedlineData = pRedlineData;
-
if ( !m_pRedlineData )
return;
+const SwRedlineData* pRedlineData = m_pRedlineData;
// FIXME check if it's necessary to travel over the Next()'s in
pRedlineData
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index b1302b6..f42ffdf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -132,7 +132,7 @@ public:
///
/// Start of the tag that encloses the run, fills the info according to
/// the value of m_pRedlineData.
-void StartRedline( const SwRedlineData* pRedlineData );
+void StartRedline();
/// Output redlining.
///
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl
sal/inc/osl/file.hxx|1 - sal/inc/rtl/byteseq.hxx |1 - sal/inc/rtl/string.hxx |1 - sal/inc/rtl/ustring.hxx |1 - sal/osl/unx/nlsupport.c |1 - sal/osl/w32/pipe.c |1 - 6 files changed, 6 deletions(-) New commits: commit 5e6401ffc58959394e2e06bd7ed68e6d03cae31f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 15 10:42:28 2012 +0100 Drop obsolete includes of deprecated rtl/memory.h Change-Id: I532558f5502898e036e01d64faa854c68e7109c9 diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx index 6b9522d..e47b342 100644 --- a/sal/inc/osl/file.hxx +++ b/sal/inc/osl/file.hxx @@ -36,7 +36,6 @@ #include cassert #include osl/time.h -#include rtl/memory.h #include rtl/ustring.hxx #include osl/file.h diff --git a/sal/inc/rtl/byteseq.hxx b/sal/inc/rtl/byteseq.hxx index 852670e..6402c84 100644 --- a/sal/inc/rtl/byteseq.hxx +++ b/sal/inc/rtl/byteseq.hxx @@ -31,7 +31,6 @@ #include osl/interlck.h #include rtl/byteseq.h #include rtl/alloc.h -#include rtl/memory.h #if ! defined EXCEPTIONS_OFF #include new diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index a2aacb2..c7dd48e 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -35,7 +35,6 @@ #include ostream #include osl/diagnose.h -#include rtl/memory.h #include rtl/textenc.h #include rtl/string.h #include rtl/stringutils.hxx diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index bbd6e96..2489e3c 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -38,7 +38,6 @@ #include rtl/ustring.h #include rtl/string.hxx #include rtl/stringutils.hxx -#include rtl/memory.h #include rtl/textenc.h #include sal/log.hxx diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index da25a38..c276cb8 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -29,7 +29,6 @@ #include osl/nlsupport.h #include osl/diagnose.h #include osl/process.h -#include rtl/memory.h #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ defined(FREEBSD) || defined(MACOSX) || defined(IOS) || defined(OPENBSD) || \ diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c index 3a9f110..1ddd776 100644 --- a/sal/osl/w32/pipe.c +++ b/sal/osl/w32/pipe.c @@ -40,7 +40,6 @@ #include osl/process.h #include rtl/alloc.h -#include rtl/memory.h #define PIPESYSTEM .\\pipe\\ #define PIPEPREFIXOSL_PIPE_ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi *, Michael Meeks-2 wrote + upgrade bundled python to 3.0 3.0 ? I assume there is a typo here. I hope you will choose Python 3.3 over Python 3.2, as it will be easier to maintain extensions with the newest version, especially for string literals. Python 3.3 restore support for Python 2's Unicode literal syntax, substantially increasing the number of lines of existing Python 2 code in Unicode aware applications that will run without modification on Python 3. http://www.python.org/dev/peps/pep-0414/ That would be useful for Lightproof and Grammalecte and it will help those who write macros and extensions in Python to maintain an unique code for older and newer versions of LO. Regards, Olivier -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4017528p4018688.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
[PATCH] Use the 0x std as unordered_hpp is othervise reported as not...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1075 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/1075/1 Use the 0x std as unordered_hpp is othervise reported as not working. Change-Id: Iedff10f3b2562f731063107df7220efa124aca08 --- M configure.ac 1 file changed, 5 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1075 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedff10f3b2562f731063107df7220efa124aca08 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
On Wed, Nov 14, 2012 at 09:00:05PM -0800, Joel Madero wrote: Open invite to anyone wanting to join QA call. Approximately 1 hour long If I'm missing any items please reply, feel free to edit wiki as well. One addition to the agenda: AFIAK we have already meetbot/supybot running on IRC. QA might decide to use it to generate agendas and minutes: http://meetbot.debian.net/Manual.html Lets dicuss in the call. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/docx-frame-export'
New branch 'feature/docx-frame-export' available with the following commits: commit 3012911abaedbf15bfe50c408194e590562bd200 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:56:28 2012 +0100 docx: add unit test for text frame export Change-Id: Id7bf805848296747116bc3a7c6f49a902caa6ad6 commit a231f4221e6e36f9e7db7d8064590c9f87943954 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:54:37 2012 +0100 docx: export text frames as vml:rect Change-Id: Ia4cb3844cd50a1536edf05a119265311828a8885 commit d3acc678cbd40c85e1089be9df12021b49dd00ca Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:52:38 2012 +0100 filter: treat 'Frame' type as 'drawing.Rectangle' This allows to support TextFrame export when saving to docx format. Change-Id: I60c1bd294394eca1501567bf1dc36bb51924a517 commit 3d31fcaec17ed12313c393ecc34fdb1e48808244 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:49:58 2012 +0100 vmlexport: support mso-horizontal-position-relative (and vertical) Change-Id: Ib55a055028a316934476eee8fda3d28c1a145e71 commit 9e36d63074ca5da380aaf1b24f401309c1c77add Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:48:01 2012 +0100 vmlexport: remove bit shifting for color export Change-Id: Ieab7f4d6682f1aa67b8d1c63dad5527c7f000acd commit 3b2f84b16291f593f83d8c964bc6d6ddcd04aa2f Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:46:21 2012 +0100 vmlexport: add boolean to decide end-shape tag delayed output This is needed for text frame export. In this case, the end-shape tag will be written after the paragraph/text content. Change-Id: I871c71a56db0c6e3d00e4591209f06a9b7354fe6 commit 56fd0ab7f98c7e26aa1f904efb6a7c2e6a279db8 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Nov 15 10:44:00 2012 +0100 sw: implement getPosition for SwXFrame Change-Id: Ib0e7816dad7fa0c2f4b47a08739680957d9ba837 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build failure, undefined symbols XML_...
Hi Terry, On Wed, 2012-11-14 at 11:25 -0800, Terrence Enger wrote: Sigh. My Linux machine is without internet access. I have not succeeded in building git on the Windows machine at my local library. Just trying to make do. Ah - that is annoying; if you could get git working on windows (under cygwin it should be easy to install I'd hope), then it should make your incremental updates significantly quicker [ if you can get the git protocol port open I suppose ]. (BTW, I do not know whether this response will make it to the list. Nabble has drastically truncated my messages in the past, and not it warns me that I am not subscribed to the list, even though I think I am. Double sigh.) You shouldn't need to be subscribed to post to this list: which should be a feature ! :-) So sorry for the pain building; due to the 4.0 feature-freeze being only ~2 weeks away, people are currently pushing quite a lot of features they had stored up - and trying to finish other pieces and ... unfortunately the effect is a tad de-stabilising for the build :-) That is expected to improve markedly post branch. Thanks for persevering :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fixed java classpath parameter (required for gcj)
By the way, Enrico, could you please send the list a blanket license statement that you provide your patches under the LGPL3 and MPL2 license? (Otherwise we will have to revert them.) Something like: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 13 -
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 6d634c9d05fecb39b1624008ca6c5edfc53cb357
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Nov 14 19:03:05 2012 +0100
n#789482 DOCX: export track change data after w:hyperlink
(cherry picked from commit eac3e6e746300df379226941ba75c4e0ce1feb7a)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Change-Id: If204523d7da544b11b2d809993ada180476104ef
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 94e3d6e..e6d4bc8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -507,8 +507,9 @@ void DocxAttributeOutput::EndParagraphProperties()
void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool
/*bSingleEmptyRun*/ )
{
-// if there is some redlining in the document, output it
-StartRedline( pRedlineData );
+// Don't start redline data here, possibly there is a hyperlink later, and
+// that has to be started first.
+m_pRedlineData = pRedlineData;
// postpone the output of the start of a run (there are elements that need
// to be written before the start of the run, but we learn which they are
@@ -585,6 +586,9 @@ void DocxAttributeOutput::EndRun()
m_startedHyperlink = true;
}
+// if there is some redlining in the document, output it
+StartRedline();
+
DoWriteBookmarks( );
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
@@ -1315,12 +1319,11 @@ static OString impl_DateTimeToOString( const DateTime
rDateTime )
return aBuffer.makeStringAndClear();
}
-void DocxAttributeOutput::StartRedline( const SwRedlineData* pRedlineData )
+void DocxAttributeOutput::StartRedline()
{
-m_pRedlineData = pRedlineData;
-
if ( !m_pRedlineData )
return;
+const SwRedlineData* pRedlineData = m_pRedlineData;
// FIXME check if it's necessary to travel over the Next()'s in
pRedlineData
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index aca7a3d..7fa6e4b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -137,7 +137,7 @@ public:
///
/// Start of the tag that encloses the run, fills the info according to
/// the value of m_pRedlineData.
-void StartRedline( const SwRedlineData* pRedlineData );
+void StartRedline();
/// Output redlining.
///
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi Olivier, On Thu, 2012-11-15 at 01:47 -0800, Olivier R. wrote: Michael Meeks-2 wrote + upgrade bundled python to 3.0 3.0 ? I assume there is a typo here. Yes - certainly a typo :-) We'll go for the best 3.x based python we can. I hope you will choose Python 3.3 over Python 3.2, IIRC Michael S. is doing that work - I recall him already making this point in the wiki page / elsewhere. That would be useful for Lightproof and Grammalecte and it will help those who write macros and extensions in Python to maintain an unique code for older and newer versions of LO. Yep - clearly we want to keep the migration cost down wherever possible. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - boost/prj curl/prj epm/prj expat/expat-2.1.0.patch expat/Module_expat.mk expat/StaticLibrary_ascii_expat_xmlparse.mk expat/StaticLibrary_expat.mk expat/StaticLibra
RepositoryExternal.mk | 11 +-- boost/prj/build.lst |3 curl/prj/build.lst |3 epm/prj/build.lst |2 expat/Module_expat.mk |5 - expat/StaticLibrary_ascii_expat_xmlparse.mk | 49 --- expat/StaticLibrary_expat.mk| 51 +++ expat/StaticLibrary_expat_utf16.mk | 55 + expat/StaticLibrary_expat_xmlparse.mk | 53 expat/StaticLibrary_expat_xmltok.mk | 50 --- expat/UnpackedTarball_expat.mk |2 expat/expat-2.1.0.patch | 90 fontconfig/fontconfig-2.8.0.patch | 20 -- fontconfig/prj/build.lst|3 freetype/prj/build.lst |2 graphite/prj/build.lst |3 helpcompiler/Library_helplinker.mk |2 hunspell/prj/build.lst |3 hyphen/prj/build.lst|3 libexttextcat/prj/build.lst |3 lpsolve/prj/build.lst |3 mythes/prj/build.lst|3 openldap/prj/build.lst |3 postgresql/prj/build.lst|2 sax/Library_expwrap.mk |2 solenv/gbuild/UnpackedTarball.mk|3 zlib/prj/build.lst |2 27 files changed, 133 insertions(+), 298 deletions(-) New commits: commit 9c52986f26f4c33bd68d0f73006bd97e9820df7d Author: Michael Stahl mst...@redhat.com Date: Wed Nov 14 22:09:31 2012 +0100 Revert Use different symbol names in the two expat variants we build This reverts commit 78c7bbc3ce92493ca98c605f92733e31ad87ef70. It is no longer the case that both expat_utf8 and expat_utf16 are linked into the same library: we only use expat_utf16 in shell Explorer extensions, which cannot be linked into libmerged anyway. Conflicts: expat/expat-2.1.0.patch Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16 diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch index cb85ec5..070dafc 100644 --- a/expat/expat-2.1.0.patch +++ b/expat/expat-2.1.0.patch @@ -1,93 +1,3 @@ misc/expat-2.1.0/lib/expat_external.h -+++ misc/build/expat-2.1.0/lib/expat_external.h -@@ -86,9 +86,11 @@ - typedef unsigned short XML_Char; - typedef char XML_LChar; - #endif /* XML_UNICODE_WCHAR_T */ -+#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16 - #else /* Information is UTF-8 encoded. */ - typedef char XML_Char; - typedef char XML_LChar; -+#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8 - #endif /* XML_UNICODE */ - - #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ misc/expat-2.1.0/lib/expat.h -+++ misc/build/expat-2.1.0/lib/expat.h -@@ -15,6 +15,73 @@ - #include stdlib.h - #include expat_external.h - -+#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent) -+#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString) -+#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion) -+#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo) -+#define XML_ExternalEntityParserCreate EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate) -+#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel) -+#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase) -+#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer) -+#define XML_GetCurrentByteCount EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount) -+#define XML_GetCurrentByteIndex EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex) -+#define XML_GetCurrentColumnNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber) -+#define XML_GetCurrentLineNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber) -+#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode) -+#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList) -+#define XML_GetIdAttributeIndex EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex) -+#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext) -+#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus) -+#define XML_GetSpecifiedAttributeCount EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount) -+#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree) -+#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc) -+#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc) -+#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse) -+#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer) -+#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate) -+#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS) -+#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM) -+#define
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
On Thu, Nov 15, 2012 at 5:02 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Wed, Nov 14, 2012 at 09:00:05PM -0800, Joel Madero wrote: Open invite to anyone wanting to join QA call. Approximately 1 hour long If I'm missing any items please reply, feel free to edit wiki as well. One addition to the agenda: AFIAK we have already meetbot/supybot running on IRC. QA might decide to use it to generate agendas and minutes: http://meetbot.debian.net/Manual.html Lets dicuss in the call. Best, Bjoern Thanks for the info Joel, -- -- Mas Walls Web Security Analyst | Senior Server Administrator Powserve.com / Gemini ISP Networks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#55991 -- LibreOffice commit tweets now online
Hi, as discussed in: https://bugs.freedesktop.org/show_bug.cgi?id=55971 we now have LibreOffice commits tweeted to the world: https://twitter.com/LOcommits Thanks to Sam for testing this. (Maybe doing the same for bugzilla and planet would be nice? Makes it much easier to retweet something cool) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sal/Library_sal.mk sfx2/source
sal/Library_sal.mk |3 +++ sfx2/source/appl/shutdowniconw32.cxx |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit afbbc9c44b80208a5374f987ef4072e1cb5cdb18 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 15 12:17:00 2012 +0100 fix mingw build diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index de22417..e1360f8 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -81,6 +81,9 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(if $(filter-out $(GUI),UNX), \ + uwinapi \ + ) \ $(gb_STDLIBS) \ )) commit a5d27e22c0c3be80a61c4d37252aeeaa81a704fa Author: Jan Holesovsky ke...@suse.cz Date: Tue Jul 17 10:34:30 2012 +0200 Fix MinGW build. Change-Id: I48bad55cc982fba6fb48a921746801de9993bff1 Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 28f783b..2f85ae5 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -289,7 +289,7 @@ static void addTaskbarIcon( HWND hWnd ) IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), LR_DEFAULTCOLOR | LR_SHARED ); -wcsncpy( nid.szTip, strTip.getStr(), 64 ); +wcsncpy( nid.szTip, reinterpret_castLPCWSTR(strTip.getStr()), 64 ); nid.cbSize = sizeof(nid); nid.hWnd= hWnd; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
trying to build on 10.7 with 10.4 sdk
When i got this mac it had 10.5 installed and has been upgraded since. The issue I am having when trying to build with 10.4 is checking the GCC version... ./configure: line 8489: gcc-4.0: command not found gcc configure: error: GCC is too old, must be at least GCC 4.0.0 Anyone else experiencing this on master build on mac? -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: chart2/AllLangResTarget_chartcontroller.mk connectivity/AllLangResTarget_hsqldb.mk dbaccess/AllLangResTarget_dbu.mk sd/AllLangResTarget_sd.mk sfx2/AllLangResTarget_sfx2.mk sol
chart2/AllLangResTarget_chartcontroller.mk |3 + connectivity/AllLangResTarget_hsqldb.mk|2 - dbaccess/AllLangResTarget_dbu.mk |5 ++- sd/AllLangResTarget_sd.mk |5 ++- sfx2/AllLangResTarget_sfx2.mk |5 ++- solenv/gbuild/AllLangResTarget.mk | 45 + svtools/AllLangResTarget_svt.mk|5 ++- svx/AllLangResTarget_svx.mk|5 ++- toolkit/AllLangResTarget_tk.mk |2 - wizards/AllLangResTarget_wzi.mk|2 - 10 files changed, 66 insertions(+), 13 deletions(-) New commits: commit 7a11b9cc6d8a4116771333445637bb5b251420c8 Author: David Tardon dtar...@redhat.com Date: Thu Nov 15 12:32:43 2012 +0100 ensure translations are built before using them Change-Id: Ia172f144616d7468466a057bb1a431b3047209fd diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index ec8dd82..9ebb4e0 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -93,6 +93,9 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/tp_TitleRotation.src \ chart2/source/controller/dialogs/tp_Trendline.src \ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \ +)) + +$(eval $(call gb_SrsTarget_add_nonlocalized_files,chart2/res,\ chart2/source/controller/menus/ShapeContextMenu.src \ chart2/source/controller/menus/ShapeEditContextMenu.src \ )) diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk index 4bccc5e..173a344 100644 --- a/connectivity/AllLangResTarget_hsqldb.mk +++ b/connectivity/AllLangResTarget_hsqldb.mk @@ -40,7 +40,7 @@ $(eval $(call gb_SrsTarget_set_include,hsqldb/res,\ $$(INCLUDE) \ )) -$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\ +$(eval $(call gb_SrsTarget_add_nonlocalized_files,hsqldb/res,\ connectivity/source/drivers/hsqldb/hsqlui.src \ )) diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 1e353af..7f2a3d1 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -81,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ dbaccess/source/ui/dlg/textconnectionsettings.src \ dbaccess/source/ui/dlg/UserAdminDlg.src \ dbaccess/source/ui/dlg/UserAdmin.src \ -dbaccess/source/ui/imagelists/dbimagelists.src \ dbaccess/source/ui/misc/dbumiscres.src \ dbaccess/source/ui/misc/WizardPages.src \ dbaccess/source/ui/querydesign/querydlg.src \ @@ -92,6 +91,10 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ dbaccess/source/ui/uno/dbinteraction.src \ )) +$(eval $(call gb_SrsTarget_add_nonlocalized_files,dbaccess/dbu,\ +dbaccess/source/ui/imagelists/dbimagelists.src \ +)) + $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 8b24917..455dbbc 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -99,11 +99,14 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/tpoption.src \ sd/source/ui/dlg/vectdlg.src \ sd/source/ui/slideshow/slideshow.src \ -sd/source/ui/slidesorter/view/SlsResource.src \ sd/source/ui/table/TableDesignPane.src \ sd/source/ui/view/DocumentRenderer.src \ )) +$(eval $(call gb_SrsTarget_add_nonlocalized_files,sd/res,\ +sd/source/ui/slidesorter/view/SlsResource.src \ +)) + $(eval $(call gb_SrsTarget_add_templates,sd/res,\ sd/source/ui/app/menuids3_tmpl.src \ sd/source/ui/app/menuids_tmpl.src \ diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index e106455..81ff3c7 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/appl/sfx.src \ sfx2/source/bastyp/bastyp.src \ sfx2/source/bastyp/fltfnc.src \ -sfx2/source/control/templateview.src \ sfx2/source/dialog/alienwarn.src \ sfx2/source/dialog/dialog.src \ sfx2/source/dialog/dinfdlg.src \ @@ -79,4 +78,8 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/view/view.src \ )) +$(eval $(call gb_SrsTarget_add_nonlocalized_files,sfx/res,\ +sfx2/source/control/templateview.src \ +)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index eaaf482..7247b18 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -67,6 +67,16 @@ endef $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET) $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$),mkdir -p $(dir $@) cp $
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx | 48 ++--
1 file changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 4a2236a4a8c069a7ab82ac9c2fe3d6bd5630d1aa
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 15 12:53:36 2012 +0100
changed tabs to spaces
tabs creeped in with b4d1aaa074e2be9fd778134c40f99d2ab8a01e93
Change-Id: Idb73a4db82970a3af06e7d50e4d71d4a3ece44cf
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 4f0f964..80946fd 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -79,14 +79,14 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
OUStringm_aCurrencyString; // USD-en-US or EUR-de-DE
OUStringm_aDatePatternsString; // Y-M-D;M-D
sal_Boolm_bDecimalSeparator; //use decimal separator
same as locale
- sal_Boolm_bIgnoreLanguageChange; //OS language
change doesn't affect LO document language
+sal_Boolm_bIgnoreLanguageChange; //OS language change
doesn't affect LO document language
sal_Boolm_bROLocale;
sal_Boolm_bROUILocale;
sal_Boolm_bROCurrency;
sal_Boolm_bRODatePatterns;
sal_Boolm_bRODecimalSeparator;
- sal_Boolm_bROIgnoreLanguageChange;
+sal_Boolm_bROIgnoreLanguageChange;
static const Sequence /* const */ OUString GetPropertyNames();
voidMakeRealLocale();
@@ -117,9 +117,9 @@ public:
sal_BoolIsDecimalSeparatorAsLocale() const { return
m_bDecimalSeparator;}
voidSetDecimalSeparatorAsLocale( sal_Bool bSet);
-
- sal_BoolIsIgnoreLanguageChange() const {
return m_bIgnoreLanguageChange;}
- voidSetIgnoreLanguageChange( sal_Bool
bSet);
+
+sal_BoolIsIgnoreLanguageChange() const { return
m_bIgnoreLanguageChange;}
+voidSetIgnoreLanguageChange( sal_Bool bSet);
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return m_aRealLocale; }
@@ -157,7 +157,7 @@ const Sequence OUString
SvtSysLocaleOptions_Impl::GetPropertyNames()
PROPERTYNAME_CURRENCY,
PROPERTYNAME_DECIMALSEPARATOR,
PROPERTYNAME_DATEPATTERNS,
- PROPERTYNAME_IGNORELANGCHANGE
+PROPERTYNAME_IGNORELANGCHANGE
};
const Sequence OUString seqPropertyNames( pProperties, PROPERTYCOUNT );
return seqPropertyNames;
@@ -173,7 +173,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
, m_bROCurrency(CFG_READONLY_DEFAULT)
, m_bRODatePatterns(CFG_READONLY_DEFAULT)
, m_bRODecimalSeparator(sal_False)
- , m_bROIgnoreLanguageChange(sal_False)
+, m_bROIgnoreLanguageChange(sal_False)
{
if ( IsValidConfigMgr() )
@@ -253,8 +253,8 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_bRODatePatterns = pROStates[nProp];
}
break;
- case
PROPERTYHANDLE_IGNORELANGCHANGE :
- {
+case PROPERTYHANDLE_IGNORELANGCHANGE :
+{
sal_Bool bValue = sal_Bool();
if ( pValues[nProp] = bValue )
m_bIgnoreLanguageChange = bValue;
@@ -263,8 +263,8 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
SAL_WARN( unotools.config, Wrong
property type! );
}
m_bROIgnoreLanguageChange = pROStates[nProp];
- }
- break;
+}
+break;
default:
SAL_WARN( unotools.config, Wrong property
type! );
}
@@ -406,14 +406,14 @@ void SvtSysLocaleOptions_Impl::Commit()
++nRealCount;
}
break;
- case PROPERTYHANDLE_IGNORELANGCHANGE :
- if (!m_bROIgnoreLanguageChange)
- {
- pNames[nRealCount] = aOrgNames[nProp];
- pValues[nRealCount] =
m_bIgnoreLanguageChange;
- ++nRealCount;
-
[Libreoffice-commits] .: extensions/AllLangResTarget_updchk.mk
extensions/AllLangResTarget_updchk.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c15b9dd7dd4ffa9d3d82703aef3d92eda3af16f0 Author: David Tardon dtar...@redhat.com Date: Thu Nov 15 13:05:14 2012 +0100 mark another non-localized .src file Change-Id: I0d67eedf37dc561aa8a8944e0670607e71723824 diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk index 8f956a2..5cf8c77 100644 --- a/extensions/AllLangResTarget_updchk.mk +++ b/extensions/AllLangResTarget_updchk.mk @@ -36,7 +36,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,updchk,\ $(eval $(call gb_SrsTarget_SrsTarget,updchk/res)) -$(eval $(call gb_SrsTarget_add_files,updchk/res,\ +$(eval $(call gb_SrsTarget_add_nonlocalized_files,updchk/res,\ extensions/source/update/ui/updatecheckui.src \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 deletions(-) New commits: commit c78d7a8a0e255d6603f8ce2e7f5566e127b0f0ef Author: Tomas Chvatal tchva...@suse.cz Date: Thu Nov 15 10:43:19 2012 +0100 Drop the check for unordered_map.hxx The check itself was always failing unless you added 0x to cxxflags and we can safely assume the header to be there. If the header fails during compile time it throws nice error explaining what is going on anyway. Change-Id: Iedff10f3b2562f731063107df7220efa124aca08 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/configure.ac b/configure.ac index 96ee115..39fb2cf 100644 --- a/configure.ac +++ b/configure.ac @@ -7924,8 +7924,6 @@ if test $with_system_boost = yes; then [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost = 1.36)], []) AC_CHECK_HEADER(boost/function.hpp, [], [AC_MSG_ERROR(boost/function.hpp not found. install boost)], []) -AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE], - [AC_MSG_WARN([boost/unordered_map.hpp not found])], []) save_CXXFLAGS=$CXXFLAGS CXXFLAGS=$CXXFLAGS -fno-exceptions @@ -7955,9 +7953,7 @@ else BUILD_TYPE=$BUILD_TYPE BOOST SYSTEM_BOOST=NO BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 -HAVE_BOOST_UNORDERED_MAP=TRUE fi -AC_SUBST([HAVE_BOOST_UNORDERED_MAP]) AC_SUBST([MINGW_BOOST_DATE_TIME_DLL]) AC_SUBST(SYSTEM_BOOST) AC_SUBST(BOOST_TARBALL) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Add icon files for template manager only
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1027 Approvals: Stefan Knorr: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1027 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbe03cbc209db9951d0dbdb19e4e5e7e184fdb76 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Alexander Wilms alexander.wi...@zoho.com Gerrit-Reviewer: Alexander Wilms alexander.wi...@zoho.com Gerrit-Reviewer: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Drop the check for unordered_map.hxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1075 -- To view, visit https://gerrit.libreoffice.org/1075 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedff10f3b2562f731063107df7220efa124aca08 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tomáš Chvátal tchva...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - officecfg/registry svtools/inc svtools/source svtools/uiconfig
officecfg/registry/data/org/openoffice/Office/Common.xcu | 22 + officecfg/registry/data/org/openoffice/Setup.xcu |2 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 svtools/inc/svtools/ServerDetailsControls.hxx |3 svtools/source/dialogs/ServerDetailsControls.cxx | 26 + svtools/uiconfig/ui/placeedit.ui | 220 +++-- 6 files changed, 185 insertions(+), 98 deletions(-) New commits: commit 812b7362c18a70fe97b3ebb8e1a6e32ff189f48e Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Nov 14 13:22:58 2012 +0100 Migrate places configuration in user profile Change-Id: Ia4494c3a1164026f5da25d2040a5cc187016b958 diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 4979ce7..bf5de32 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -857,6 +857,8 @@ it/org.openoffice.Office.Common/Misc/UseSystemFileDialog/it it/org.openoffice.Office.Common/Misc/UseSystemPrintDialog/it it/org.openoffice.Office.Common/Misc/SymbolStyle/it + it/org.openoffice.Office.Common/Misc/FilePickerPlacesNames/it + it/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls/it it/org.openoffice.Office.Common/Passwords/it it/org.openoffice.Office.Common/Print/PrintingModifiesDocument/it it/org.openoffice.Office.Common/Print/Warning/it commit b4fc58675b98d68544acc4aaa292548f10cb5c3b Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Nov 14 10:25:55 2012 +0100 PlaceEditDialog: simplified CMIS by adding template URLs for common servers Change-Id: I041d58d09e132e481cfa278300c494c9f1d75f29 diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 27f4ab6..45f4cfe 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -602,6 +602,28 @@ prop oor:name=FilePickerPlacesNames value/ /prop +prop oor:name=CmisServersUrls + value +ithttp://lt;hostgt;/alfresco/cmisws/RepositoryService?wsdl/it +ithttp://lt;hostgt;/p8cmis/wsdl/it +ithttps://apps.lotuslive.com/files/basic/cmis/my/servicedoc/it +ithttp://lt;hostgt;/servlet/cmis/repository/_Plt;Quickr place namegt;_RMain.nsf/servicedoc/it + ithttp://lt;hostgt;/nuxeo/webservices/cmis/RepositoryService?wsdl/it + ithttp://ec2-184-72-233-127.compute-1.amazonaws.com/ot-cmis/services/RepositoryService?wsdl/it +ithttp://lt;hostgt;/_vti_bin/CMISSoapwsdl.aspx/it + /value +/prop +prop oor:name=CmisServersNames + value +itAlfresco 4/it +itIBM FileNet P8/it +itLotus Live Files/it +itLotus Quickr Domino/it +itNuxeo 5.4/it +itOpenText ELS 10.2.0/it +itSharePoint 2010/it + /value +/prop /node node oor:name=Save node oor:name=Document diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 8295320..f857c32 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6792,6 +6792,16 @@ descList of names of the places the user bookmarked in the file picker dialog./desc /info /prop + prop oor:name=CmisServersUrls oor:type=oor:string-list oor:nillable=false +info + descList of sample URLs of the CMIS servers in the place edition dialog./desc +/info + /prop + prop oor:name=CmisServersNames oor:type=oor:string-list oor:nillable=false +info + descList of names of the CMIS servers in the place edition dialog./desc +/info + /prop /group group oor:name=Forms info diff --git a/svtools/inc/svtools/ServerDetailsControls.hxx b/svtools/inc/svtools/ServerDetailsControls.hxx index f29ec44..c6ab63f 100644 --- a/svtools/inc/svtools/ServerDetailsControls.hxx +++ b/svtools/inc/svtools/ServerDetailsControls.hxx @@ -135,12 +135,14 @@ class CmisDetailsContainer : public DetailsContainer private: rtl::OUString m_sUsername; com::sun::star::uno::Reference com::sun::star::ucb::XCommandEnvironment m_xCmdEnv; +std::vector rtl::OUString m_aServerTypesURLs; std::vector rtl::OUString m_aRepoIds; rtl::OUString m_sRepoId; Edit* m_pEDBinding; ListBox*m_pLBRepository; Button* m_pBTRepoRefresh; +ListBox*m_pLBServerType; public: CmisDetailsContainer( VclBuilderContainer* pBuilder ); @@ -152,6 +154,7 @@ class
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit e8fe57fc3f007db04a47a5b24aaf37b1c32d0d98
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Nov 15 17:44:09 2012 +0530
n#782833: Rotated text in emf images looks thicker.
Any rotated text in an emf image (image size != original size),
has thicker fonts.
This is kind of a regression caused by commit
8c2902ecbf135fae070ea032fa10a59bb76ec1b0
So, partially reverted it.
The code was kind of a workaround/copy-paste, so I am assuming
it is safe to revert.
Side-effects: The dotted borders (in calc) look a
little lighter and not so very visible in the page-preview.
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index b583d82..919b246 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -787,10 +787,6 @@ namespace drawinglayer
}
else
{
-// remember that we enter a PolygonStrokePrimitive2D
decomposition,
-// used for AA thick line drawing
-mnPolygonStrokePrimitive2D++;
-
mpOutputDevice-DrawPolyPolygon(aLocalPolyPolygon);
if(mnPolygonStrokePrimitive2D
@@ -808,9 +804,6 @@ namespace drawinglayer
mpOutputDevice-DrawPolyLine(aLocalPolyPolygon.getB2DPolygon(a), 0.0);
}
}
-
-// leave PolygonStrokePrimitive2D
-mnPolygonStrokePrimitive2D--;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] dropped obsolete test code
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1077 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/1077/1 dropped obsolete test code Change-Id: I2ec5c4b9c281c0afde2fdeb899418c2f9d199607 --- M sc/qa/extras/sccellrangeobj.cxx M sc/qa/extras/scdatapilotfieldobj.cxx M sc/qa/extras/scdatapilottableobj.cxx M sc/qa/unit/subsequent_filters-test.cxx M test/Library_subsequenttest.mk M test/Package_inc.mk M test/inc/test/beans/xpropertyset.hxx D test/inc/test/container/xelementaccess.hxx D test/inc/test/container/xindexaccess.hxx D test/inc/test/container/xnamereplace.hxx M test/inc/test/sheet/xcellrangesquery.hxx M test/inc/test/sheet/xdatapilotdescriptor.hxx M test/inc/test/sheet/xdatapilotfieldgrouping.hxx D test/inc/test/sheet/xspreadsheetdocument.hxx M test/source/beans/xpropertyset.cxx D test/source/container/xelementaccess.cxx D test/source/container/xindexaccess.cxx D test/source/container/xnamereplace.cxx M test/source/sheet/xcellrangesquery.cxx M test/source/sheet/xdatapilotdescriptor.cxx M test/source/sheet/xdatapilotfieldgrouping.cxx D test/source/sheet/xspreadsheetdocument.cxx M unusedcode.easy 23 files changed, 0 insertions(+), 582 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1077 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ec5c4b9c281c0afde2fdeb899418c2f9d199607 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - configure.ac jpeg/StaticLibrary_jpeg.mk liborcus/Package_liborcus.mk Module_tail_build.mk RepositoryFixes.mk RepositoryModule_ooo.mk solenv/gbuild tail_build/prj
Module_tail_build.mk |1 + RepositoryFixes.mk|2 -- RepositoryModule_ooo.mk |5 +++-- configure.ac |1 - jpeg/StaticLibrary_jpeg.mk|2 ++ liborcus/Package_liborcus.mk |1 - solenv/gbuild/CustomTarget.mk | 11 +++ tail_build/prj/build.lst |2 +- 8 files changed, 18 insertions(+), 7 deletions(-) New commits: commit 52a059349b0f1b0a933909a9ffcbabd47385902c Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Nov 10 12:58:34 2012 +0100 RepositoryModule_ooo: add svgio; use more gb_Helper_optional Change-Id: Ied60932e1a0e66b9721afbfd186f05e188edb70c diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 7145f26..63666cd 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ - boost \ + $(call gb_Helper_optional,BOOST,boost) \ bridges \ canvas \ chart2 \ @@ -109,7 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ libmspub \ liborcus \ - libpng \ + $(call gb_Helper_optional,LIBPNG,libpng) \ librelogo \ libvisio \ libwpd \ @@ -169,6 +169,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ starmath \ stoc \ store \ + svgio \ svl \ svtools \ svx \ commit e7d9492921fb064c1b155b5f3de49ea8d2f56e6e Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Nov 10 12:48:30 2012 +0100 add jpeg to tail_build Change-Id: Id67be2a0722930094c61ad99912934ebce5a4631 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index c62c484..4f2c9e2 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ io \ javaunohelper \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,JPEG,jpeg) \ jurt \ jvmaccess \ jvmfwk \ diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk index 91e3773..d3430ba 100644 --- a/jpeg/StaticLibrary_jpeg.mk +++ b/jpeg/StaticLibrary_jpeg.mk @@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,jpeg)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg)) +$(eval $(call gb_StaticLibrary_use_package,jpeg,jpeg_inc)) + $(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg)) $(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 653adf9..39c216e 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL commit cd992e621baba38c757fc1992082c06537bc8caf Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Nov 10 01:08:29 2012 +0100 gbuild: add gb_CustomTarget_register_targets Change-Id: I044bae6995f78ea70dea9da101036a6cf578d48f diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index d8b59d2..f56e262 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -47,4 +47,15 @@ $(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_targ endef +define gb_CustomTarget_register_target +$(call gb_CustomTarget_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(1))/$(2) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) :| $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir + +endef + +define gb_CustomTarget_register_targets +$(foreach target,$(2),$(call gb_CustomTarget_register_target,$(1),$(target))) + +endef + # vim: set noet sw=4: commit b8bd25548eb8d13db07ed976c47071a951ded786 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Nov 9 16:49:59 2012 +0100 let's have only one orcus library in solver Change-Id: Ida46affca95fcd582206d79ff7a5b4d48ed92e12 diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 51e8241..55f5ed7 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -91,8 +91,6 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst
[PATCH] dropped dead code from svg
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1078 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1078/1 dropped dead code from svg Change-Id: I73244d54f182f44c08a942dee95ff11b53a24f5a --- M svgio/inc/svgio/svgreader/svgdocument.hxx M svgio/inc/svgio/svgreader/svgstyleattributes.hxx M svgio/source/svgreader/svgdocument.cxx M svgio/source/svgreader/svgstyleattributes.cxx M svgio/source/svgreader/svgtextpathnode.cxx M svtools/inc/svtools/treelist.hxx M svtools/source/contnr/treelist.cxx M unusedcode.easy 8 files changed, 0 insertions(+), 48 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1078 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73244d54f182f44c08a942dee95ff11b53a24f5a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] ==== SUBMITTED ====
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1079 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1079/1 SUBMITTED Change-Id: Ia47e4b1959d9c8fdb8f6b0a82038c7ddee3b938b --- 0 files changed, 0 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1079 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia47e4b1959d9c8fdb8f6b0a82038c7ddee3b938b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f47f9f5a4e5c96a8b96a327ef364329412b7adcd Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 10:50:51 2012 +0100 Windows: Enable nicer toolbars even for XP, not only Vista and higher. Change-Id: I26837290d1416637032d2dfcfa45b4003c874309 diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 2f4df21..685249b 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1493,6 +1493,9 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) StyleSettings aStyleSettings = rSettings.GetStyleSettings(); ImplSVData* pSVData = ImplGetSVData(); +// don't draw frame around each and every toolbar +pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; + // check if vista or newer runs // in Aero theme (and similar ?) the menu text color does not change // for selected items; also on WinXP and earlier menus are not themed @@ -1505,9 +1508,6 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) pSVData-maNWFData.mnMenuFormatBorderY = 2; pSVData-maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor(); GetSalData()-mbThemeMenuSupport = TRUE; - -// don't draw frame around each and every toolbar -pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; } rSettings.SetStyleSettings( aStyleSettings ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] postprocess: convert to gbuild
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1080 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/1080/1 postprocess: convert to gbuild Change-Id: I6c81fa0f1b8d7273541d5d9883b5fc96a5091bbd --- M Makefile.top M RepositoryModule_ooo.mk M avmedia/Module_avmedia.mk M canvas/Module_canvas.mk M connectivity/Module_connectivity.mk A postprocess/CustomTarget_config.mk A postprocess/CustomTarget_registry.mk A postprocess/Makefile A postprocess/Module_postprocess.mk A postprocess/Package_config.mk A postprocess/Package_registry.mk A postprocess/Rdb_services.mk D postprocess/checkxml/checkxml.pl D postprocess/checkxml/makefile.mk D postprocess/packcomponents/makefile.mk D postprocess/packconfig/makefile.mk D postprocess/packregistry/makefile.mk M postprocess/prj/build.lst M postprocess/prj/d.lst D postprocess/prj/dmake D postprocess/signing/makefile.mk D postprocess/signing/no_signing.txt D postprocess/signing/signing.pl 23 files changed, 1,053 insertions(+), 1,521 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1080 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c81fa0f1b8d7273541d5d9883b5fc96a5091bbd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/packconfig
postprocess/packconfig/packconfig.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7be4968e8f7f8b3c9c88d0cccfca6cff8e44e14
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Nov 15 13:54:44 2012 +0100
Don't bail out when you don't find uiconfig translations
Change-Id: I54bf71bdd7e088ab5c11234ec31963817a314006
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index c5b4e90..0fe8d04 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -149,7 +149,7 @@ sub get_lang_files
find_lang_files($files_hash_ref, $lang);
if ( !keys %$files_hash_ref ) {
-print_error(can't find any lang config files in '$files_path', 3);
+print_message(can't find any lang config files in '$files_path', 3);
}
return wantarray ? @main::file_list : \@main::file_list;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6-4]: resolved fdo#56278 broadcast deletion to dependent formula c...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1081 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/1081/1 resolved fdo#56278 broadcast deletion to dependent formula cells Consolidated changes for fdo#56278 fdo#54074 fdo#53364 fdo#55059 (and earlier i#99844 and i#101869). The replacement cell for the broadcaster to inform listeners, if any, is transferred the broadcaster and owns it, the remembered formula cell never does. When broadcasting the change use the replacement cell instead of the remembered formula cell. Don't fiddle around with ReleaseBroadcaster() at the remembered cell, we don't delete twice and now also don't leak. (cherry picked from commit 8165bfa2afbe828caf37df57b83cb31bef2559cb) Reviewed-on: https://gerrit.libreoffice.org/1069 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com (cherry picked from commit a6e622029b8f1c450b9d535e94212bf0acf3) Change-Id: I63351bfcd9d25cdb2c8618b2dbf45a9430e97daf --- M sc/source/core/data/column3.cxx 1 file changed, 34 insertions(+), 31 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1081 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63351bfcd9d25cdb2c8618b2dbf45a9430e97daf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-4 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] ooo.lst: add also tarballs needed for build platform
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1082 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/1082/1 ooo.lst: add also tarballs needed for build platform Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3 --- M configure.ac M ooo.lst.in 2 files changed, 7 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1082 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
Hi *, On Thu, Nov 15, 2012 at 11:02 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Wed, Nov 14, 2012 at 09:00:05PM -0800, Joel Madero wrote: Open invite to anyone wanting to join QA call. Approximately 1 hour long If I'm missing any items please reply, feel free to edit wiki as well. One addition to the agenda: AFIAK we have already meetbot/supybot running on IRC. QA might decide to use it to generate agendas and minutes: http://meetbot.debian.net/Manual.html Two quick sample sessions: http://pastie.org/5382759 http://pastie.org/5382746 ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
On 11/15/2012 07:07 AM, Christian Lohmaier wrote: Hi *, On Thu, Nov 15, 2012 at 11:02 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Wed, Nov 14, 2012 at 09:00:05PM -0800, Joel Madero wrote: Open invite to anyone wanting to join QA call. Approximately 1 hour long If I'm missing any items please reply, feel free to edit wiki as well. One addition to the agenda: AFIAK we have already meetbot/supybot running on IRC. QA might decide to use it to generate agendas and minutes: http://meetbot.debian.net/Manual.html Two quick sample sessions: http://pastie.org/5382759 http://pastie.org/5382746 ciao Christian My bad for not including you on the list Christian, you going to be joining us tomorrow? Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac ooo.lst.in
configure.ac |6 ++ ooo.lst.in |1 + 2 files changed, 7 insertions(+) New commits: commit c06e51aa4384fc5f10f1f9b09c097465881b42cd Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Nov 15 14:11:35 2012 +0100 ooo.lst: add also tarballs needed for build platform Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3 Reviewed-on: https://gerrit.libreoffice.org/1082 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/configure.ac b/configure.ac index 4219d95..91b151c 100644 --- a/configure.ac +++ b/configure.ac @@ -12484,6 +12484,12 @@ fi AC_SUBST(LO_PATH) +# We need at least berkeleydb for build platform in ooo.lst +if test $CROSS_COMPILING = YES ; then + BUILD_TARBALLS=d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +fi +AC_SUBST(BUILD_TARBALLS) + # make sure config.guess is +x; we execute config.guess, so it has to be so chmod +x ./config.guess diff --git a/ooo.lst.in b/ooo.lst.in index b052712..89228f0 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,4 +1,5 @@ http://dev-www.libreoffice.org/src +@BUILD_TARBALLS@ 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/AllLangResTarget.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 94c50851dde2c0750d589f92448e87d5f61689d7 Author: David Tardon dtar...@redhat.com Date: Thu Nov 15 16:07:39 2012 +0100 use gb_WITH_LANG consistently Change-Id: I50f5b8c95d82781029f3ae3dda1865dea9b336d5 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 7247b18..477ec83 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -132,7 +132,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_ $$(call gb_Helper_abbreviate_dirs,\ mkdir -p $$(dir $$@) \ cp $$ $$@) -ifneq ($(strip $(WITH_LANG)),) +ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true)) endif @@ -165,13 +165,13 @@ endef # How it works: # We let _get_target depend on _get_update_target, so after they are # done, _get_target is newer than _get_update_target. If -# WITH_LANG changes (from nonempty to empty or the other way around), +# gb_WITH_LANG changes (from nonempty to empty or the other way around), # _get_target and _get_update_target are switched, therefore _get_target # is now _older_ than _get_update_target and must be regenerated :-) gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged_last gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged_last -ifeq ($(strip $(WITH_LANG)),) +ifeq ($(strip $(gb_WITH_LANG)),) gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1)) gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1)) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 3.6.4 RC1 test builds available
Hi *, for the upcoming new version 3.6.4, the RC1 builds now start to be available on pre-releases. This build is slated to be first release candidate build on the way towards 3.6.4, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#3.6_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 3.6.3 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-4-release-3.6.4.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] ooo.lst: add also tarballs needed for build platform
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1082 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1082 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[libreoffice-dev] - novice question about scalc and C++ uno objects
Hi , I posted this to users list but now I think this is more of a developers questions. Please correct me if this is not the right forum. I am trying to convert scalc.java to c++. Scalc.java comes with libreoffice and I am able to build and run it using the makefile provided. I am also able to build and run remoteclient.cxx. I need to convert scalc.java to c++. After a bit of googling, and some advise on users list, I am able to compile my version of scalc.cxx as scalc.uno.so. http://wiki.openoffice.org/wiki/Calc/Add-In/CompleteAddIn I am not sure if that is the right way to compile and also how to run it. The java version is invoked as a jar and remoteclient is invoked using uno. As I am currently building .so, I would guess I run it using uno. Any links/googlable key words would be appreciated. Thanks Neeraj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
Unfortunately my first response is NO. ACK. Different users prefer differnt browsers, so why adding yet another one that many people wouldn't like anyways ? Maybe there are some options for improving browser integration, but that's a whole different topic, IMHO. Instead, in an other way, I'd rather to put such an effort in improving Libreoffice by put it into a browser, What would be the practical benefit of that ? Or are you talking about making lo an web application ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build failure, undefined symbols XML_...
On Thu, 2012-11-15 at 10:09 +, Michael Meeks wrote: Hi Terry, On Wed, 2012-11-14 at 11:25 -0800, Terrence Enger wrote: Sigh. My Linux machine is without internet access. I have not succeeded in building git on the Windows machine at my local library. Just trying to make do. Ah - that is annoying; if you could get git working on windows (under cygwin it should be easy to install I'd hope), then it should make your incremental updates significantly quicker [ if you can get the git protocol port open I suppose ]. I have net access again. Have pulled updates and the build has been running for about ten hours and has prceded past the step expat deliver, so I have high hopes. The build of git on Windows proceeded for about three hours before failing for missing `propmt`. Until my next connectivity problem, I no longer care. I am not sure why the ftp port is a security exposure, but that restriction cut me off from documents I have stored out there. Oh-oh, that reminds me of more stuff that I want to catch up on. (BTW, I do not know whether this response will make it to the list. Nabble has drastically truncated my messages in the past, and not it warns me that I am not subscribed to the list, even though I think I am. Double sigh.) You shouldn't need to be subscribed to post to this list: which should be a feature ! :-) Indeed. But even messages mailed from my subscribed address are sometimes held for moderation. Oh, well ... So sorry for the pain building; due to the 4.0 feature-freeze being only ~2 weeks away, people are currently pushing quite a lot of features they had stored up - and trying to finish other pieces and ... unfortunately the effect is a tad de-stabilising for the build :-) That is expected to improve markedly post branch. Sorry for the noise, but restoration of connectivity had been promised soon for most of the time I was disconnected. Maybe I will be able to get a bug report filed to make life even a bit busier grin /. Thanks, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
i wonder why people say that an office suite needs to have an email client: is that only because Microsoft Office includes one? Actually, I wonder the same thing. Similar on the mozilla front: why should a browser include an calendar ? I, personally, one tool for one job - simple and small - and then integrating them together via generic interfaces (so the individual tools can be easily replaced). surely nobody actually wants to embed a mail client into a Writer document as an OLE object? Hah, that would be a funny thing ;-) By the way: do we already have an integrated tetris and solitare ? ;-) cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [tdf-discuss] Adding the browser to Libreoffice
Hi, +1 to Tim below. IMHO if we're on the topic of adding another program to LibreOffice - Project Management (PM) should be considered over adding yet another open source Browser. I'm reasonably certain there are not enough resources at the moment to do this - at least not without partnering/forking one of the existing open source PM projects. Which featureset would you like to see in such an extension ? Wouldn't it be easier to just pick some existing solution (eg. we're using Redmine) instead ? From what I see in the industry (mid- and large-size enterprises), the big trend is going to web-based applications. Several of our customers even dropped their local MUA's (in that case: Outlook) completely after we've replaced their Exchange by Zimbra. So, it seems that business customers tend to prefer web applications (possibly with customer-specific integrations to 3rdparty systems) over local applications. In general, I'd point out two argumentation lines against adding fundamentally new functionalily of such kind: a) featureset and choice Different users have different requirements (the ugliest of all is ERP world, where everybody seems to have its own or at least heavily cutomized system). Therefore we should give people the choice and instead add some optional integrations via generic interfaces. (eg. people that like to use lo as a dashboard, they could use some extension that display interesting informations like ticket lists, timelines, etc from an prjm-system, or a list of new mails in some kind of lo-integrated xbiff counterpart) b) economical Developing such new functionality from start up would essentially duplicate existing applications, require a lot of resources and expertise, which is most likely is not availble to lo project. By the way: in case you're going to work on some integration to systems like redmine, plone, openerp, zimbra, just let me know, I'd like to join in. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fixed java classpath parameter (required for gcj)
By the way, Enrico, could you please send the list a blanket license statement that you provide your patches under the LGPL3 and MPL2 license? (Otherwise we will have to revert them.) Something like: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. All of my past and future contributions to LibreOffice, uploaded to gerrit.libreoffice.org, may be licensed under the MPL/LGPLv3+ dual license. Contributions to 3rdparty packages bundled in LibreOffice are licensed under the license terms of the according package. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build environment for official win32 builds
Hi folks, I'd like to setup an win32 build environment which reproduces the official win32 builds for verifying my patches. What do I need for that ? thx -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Platform ports vs. multiplatform
Hi folks, I'm currently working on an downstream fork (means: regularily rebased) for an GNU/Linux-only version. The idea is: make it trivial to build/install on common GNU/Linux distros, so no additional magic is required for packaging. Major points: * drop all bundled libraries that are already available on mainline distros * simplify the import logic (eg. use pkg-config whereever possible) * drop all specific logic for other platforms * drop EPM stuff Once that's working, I'd like to extend it to other platforms (eg. win32). Yet to be explored: can/should cygwin,ming32,android be treated as GNU favours or be separated platforms. If anyone's interested in this, just let me know. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, 2012-11-15 at 01:47 -0800, Olivier R. wrote: Michael Meeks-2 wrote + upgrade bundled python to 3.0 3.0 ? I assume there is a typo here. Yes - certainly a typo :-) We'll go for the best 3.x based python we By the way: will pyton-3.2/3.3 be an requirement or will 2.x still work ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
removing unused functions
Hi folks, I'm currently working on removing unused functions (mentioned in unused.easy). Should I do it one by one with separate commits or in one big commit ? An big commit would make it easier/quicker for me (as I dont need so many rebuilds), but perhaps could make review a bit harder. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] ==== SUBMITTED ====
I have submitted a patch for review: https://gerrit.libreoffice.org/1079 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1079/1 SUBMITTED Change-Id: Ia47e4b1959d9c8fdb8f6b0a82038c7ddee3b938b --- 0 files changed, 0 insertions(+), 0 deletions(-) sorry, that was an accident ;-o can I drop it from gerrit somehow ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57046, which changed state. Bug 57046 Summary: No WINDOWS daily Master builds available for QA https://bugs.freedesktop.org/show_bug.cgi?id=57046 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
dropped obsolete test code
Michael Meeks has abandoned this change. Change subject: dropped obsolete test code .. Patch Set 2: Abandoned If the calc maintainers want these - we should keep them around of course even if they're not used. Sorry for the wasted time Enrico - in general we're eager to get (and enable) ever more unit tests - so they're one sort of cruft we tolerate :-) -- To view, visit https://gerrit.libreoffice.org/1077 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2ec5c4b9c281c0afde2fdeb899418c2f9d199607 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Platform ports vs. multiplatform
On Thu, Nov 15, 2012 at 5:14 AM, Enrico Weigelt enrico.weig...@vnc.biz wrote: * drop all bundled libraries that are already available on mainline distros note that most of that can be handled by a proper file in ./distro-config/. * simplify the import logic (eg. use pkg-config whereever possible) * drop all specific logic for other platforms what is the benefit of that, except creating busy work for you ? * drop EPM stuff --disable-epm ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] ==== SUBMITTED ====
Hi Enrico, On Thursday, 2012-11-15 14:08:27 +0100, Enrico Weigelt wrote: https://gerrit.libreoffice.org/1079 sorry, that was an accident ;-o can I drop it from gerrit somehow ? Sure, login to gerrit, pick your change and click the Abandon Change button in the patch set. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpa8YPE2mRjF.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/packconfig
postprocess/packconfig/packconfig.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14f56cff838d351b3286f4ec473d742443631e5a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Nov 15 17:13:32 2012 +0100
Revert Don't bail out when you don't find uiconfig translations
The can is only kicked further and it fails in packaging
of languagepacks, so revert and investigate more
This reverts commit c7be4968e8f7f8b3c9c88d0cccfca6cff8e44e14.
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index 0fe8d04..c5b4e90 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -149,7 +149,7 @@ sub get_lang_files
find_lang_files($files_hash_ref, $lang);
if ( !keys %$files_hash_ref ) {
-print_message(can't find any lang config files in '$files_path', 3);
+print_error(can't find any lang config files in '$files_path', 3);
}
return wantarray ? @main::file_list : \@main::file_list;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: removing unused functions
On Thu, Nov 15, 2012 at 5:24 AM, Enrico Weigelt enrico.weig...@vnc.biz wrote: Hi folks, I'm currently working on removing unused functions (mentioned in unused.easy). Should I do it one by one with separate commits or in one big commit ? An big commit would make it easier/quicker for me (as I dont need so many rebuilds), but perhaps could make review a bit harder. and increase the odd that the patch would get rejected for removing something that _is_ really used (albeit not on linux) the unused.easy thing is parsing a linux build... so there may be some false positive there... SO I would suggest smaller patch (rebuilding should not be that painfull, if you stay on the same position on master and just do incremental build... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] ==== SUBMITTED ====
On Thu, Nov 15, 2012 at 7:08 AM, Enrico Weigelt enrico.weig...@vnc.biz wrote: sorry, that was an accident ;-o can I drop it from gerrit somehow ? yes. as the author you can: go in gerrit, on that patch's page, and click 'Abandon Change' (next ot the 'Review' button) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/xmlimp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 42782fddff98eeab5c8249918e9ba000f08c22e8
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 15 18:28:24 2012 +0200
WaE: 'const' type qualifier on return type has no effect
Change-Id: I06cc8b77e49ec2a22534e1f45d93dfa0d0a0689f
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 922fe8a..d6e29df 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -203,7 +203,7 @@ namespace
~DocumentInfo()
{}
-const sal_uInt16 getGeneratorVersion() const
+sal_uInt16 getGeneratorVersion() const
{
return mnGeneratorVersion;
}
@@ -265,7 +265,7 @@ public:
DestroyFontToSubsFontConverter( hMathFontConv );
}
-const sal_uInt16 getGeneratorVersion( const SvXMLImport rImport )
+sal_uInt16 getGeneratorVersion( const SvXMLImport rImport )
{
if ( !mpDocumentInfo.get() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present + Stephan, Bjoern, David, Joel, Eike, Kendy, Astron, Norbert, Andras, Ahmad, Petr, Michael M, Cedric, Kohei, Michael S, Tibby * Completed Action Items + bump versions sooner than later, to find hard-coded '3's (Petr) + font bundling and gerrit fun with Astron (Andras) + poke Astron / Alexander / Mirek wrt. ESC UI seat (Kendy) + poke board for new ESC compoosition (+Joel,+Tibby,+Ahmad,+Mirek) (Michael) + updated: http://wiki.documentfoundation.org/Development/ESC + provide a new palette based on Tango + punted until new color selector is in place ? + setup call for designs for FOSDEM T-shirts (Astron) + posted, awaiting input + review unity-menus branch as/when it's re-based (Michael) + code looks cool * Pending Action Items + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + minimal triage for good mentors for proposed easy hacks (Bjoern) + poke UX advise wrt. how to improve color management UI team (Markus) + issues to look into if we can + fdo#55360 - mac specific text issue (Thorsten) + grok the list of contributors for suitable certified hackers (Kendy) + work on mail to encourage them to get certified (Kendy/Stephan/Bjoern) + disable Rhino / Beanshell unless in experimental mode (Michael) * Release Engineering update (Petr) + 3.6.4 rc1 status + built, up-loaded, for announce @ weekend + deadline for rc2 - the week after: Nov 26th + triple review until then. + 3.7 timeline: Dec 3rd - week 47 + feature-freeze ~2 weeks out. + Alpha 0 build planned beforehand to test build / pkg * UX input (Astron) + improving the standard shape colors Alex's question on dev list + help appreciated. + T-shirt design challenge is running: + one promised as a prize + color picker prototype coming along nicely + http://michel.renon.free.fr/libreoffice/colorpicker_20121112/ + help cleaning up new dialogs in glade much appreciated + install a master snapshot - look for '.ui' files + can be edited live. + should we just default disable the rulers ? (cf. gerrit patch) AI: + consensus of UI team is to re-enable them by default (Kendy) + document recovery dialog changes ? + Kendy's initial thought - easy to fix quickly. + if able to split it into easy-hacks: good too. + not a real offer to spend too much time. * Hack-fest next weekend: 23rd-25th ... + http://wiki.documentfoundation.org/Hackfest/Munich2012 + hope to see you there... + if people need travel subsidy to be there please contact Thorsten. * FOSDEM dev-room: + http://wiki.documentfoundation.org/Marketing/Events/Fosdem2013 + travel subsidy available + talks much appreciated, sign up early. * CUPS - switching back to PDF output by default + discussion on the lists - decide next time. * Certification Committee update (Kendy/Stephan/Bjoern) + no new people yet - building list for next week. + announcement received well * 4.0 completed tasks: + binfilter - removed completely (Norbert) + removes legacy StarOffice 1.0-5.0 binary filters + leaves .sxw .sxi etc. zip formats + dropped migrationAnalysis (Norbert) + obsolete, not-built, code removed now + not removing Lotus Word Pro filter + no good technical reasons to. + should we switch to native gtk+/print for 4.0 ? + no: not complete for some features yet (Dtardon) * 4.0 pending tasks + upgrade bundled python to 3.3 (Michael S) + compiling delivering nicely on Linux + unbelievable complexity in delivering being fixed. + 40k lines of patches removed. AI: + work ongoing, testing help appreciated for Mac (Norbert) + Mac / 10.4 / PPC dropping (Norbert) + need to drop it at some point; drop now with deprecation ? + decided: deprecate 10.4/5 and raise base-line to 10.6 + expect to drop PPC mac for 4.1 + user migration path thought / testing (Petr) + simple linux migration works for release config. = can't be tested easily with daily builds + issues around dropping old user-install info wrt. berkleydb (Stephan) = need to hack some more code in there. + drop legacy / STLport in 4.0 outright ? (Stephan) + keep it
[Libreoffice-commits] .: expat/Module_expat.mk expat/README expat/StaticLibrary_expat_utf16.mk expat/StaticLibrary_expat_x64.mk expat/UnpackedTarball_expat.mk RepositoryExternal.mk shell/inc shell/Lib
RepositoryExternal.mk | 14 - expat/Module_expat.mk |4 - expat/README | 36 - expat/StaticLibrary_expat_utf16.mk | 55 - expat/StaticLibrary_expat_x64.mk |1 expat/UnpackedTarball_expat.mk | 17 ++ shell/Library_ooofilt.mk |2 shell/Library_ooofilt_x64.mk |2 shell/Library_propertyhdl.mk |2 shell/Library_propertyhdl_x64.mk |2 shell/Library_recentfile.mk|8 --- shell/Library_shlxthdl.mk |2 shell/Library_shlxthdl_x64.mk |2 shell/StaticLibrary_shlxthandler_common.mk |2 shell/StaticLibrary_shlxthandler_common_x64.mk |2 shell/StaticLibrary_xmlparser.mk |8 --- shell/StaticLibrary_xmlparser_x64.mk |2 shell/inc/internal/i_xml_parser_event_handler.hxx |2 shell/inc/internal/utilities.hxx |6 ++ shell/source/all/xml_parser.cxx| 40 --- shell/source/win32/shlxthandler/util/utilities.cxx | 42 +++- 21 files changed, 88 insertions(+), 163 deletions(-) New commits: commit d8edf07ed9e7a3e2f2ab43ffd2935b93326f2caa Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 15 17:55:05 2012 +0200 Bin use of UTF-16 expat variant in the Windows shell extension Thus we can drop that variant completely. Change-Id: I11a8e40436921219bd6dd4afad4c7907ccb6b84c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6712055..d4281c9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -287,7 +287,6 @@ else # !SYSTEM_EXPAT $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ expat \ - expat_utf16 \ expat_x64 \ )) @@ -299,11 +298,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(if $(filter expat_utf16,$(2)),\ - $(call gb_LinkTarget_add_defs,$(1),\ - -DXML_UNICODE \ -)) - $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ ) @@ -312,18 +306,12 @@ endef endif # SYSTEM_EXPAT -# now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 $(call gb_LinkTarget__use_expat,$(1),expat) endef -define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_utf16) - -endef - -define gb_LinkTarget__use_expat_utf16_x64 +define gb_LinkTarget__use_expat_utf8_x64 $(call gb_LinkTarget__use_expat,$(1),expat_x64) endef diff --git a/expat/Module_expat.mk b/expat/Module_expat.mk index 9366538..8c7d8d0 100644 --- a/expat/Module_expat.mk +++ b/expat/Module_expat.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_targets,expat,\ ExternalPackage_expat \ UnpackedTarball_expat \ StaticLibrary_expat \ - StaticLibrary_expat_utf16 \ )) # Actually it wasn't that clear if we should @@ -32,9 +31,6 @@ $(eval $(call gb_Module_add_targets,expat,\ endif # X64 stuff special - -# use UNICODE only because shell/shlxthandler -# doesn't link against ascii_expat_xmlparse -#- ifeq ($(BUILD_X64),TRUE) $(eval $(call gb_Module_add_targets,expat,\ StaticLibrary_expat_x64 \ diff --git a/expat/README b/expat/README index d7ce682..579d3d3 100644 --- a/expat/README +++ b/expat/README @@ -1,40 +1,4 @@ Simple SAX parser library with added UTF-16 support. -When we build expat internally (bundled), we build two variants: One -that has an ASCII (actually UTF-8) API, another that has a Unicode -(meaning UTF-16) API. Additionally, expat is split into two parts, -expat_xmlparse and expat_xmltok. It's the former which has the two -variants, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16). - -Code that uses expat then declares in its .mk file which one it wants -to use. See the magic in ../RepositoryExternal.mk, where in the -expat_utf16 case -DXML_UNICODE is passed when compiling source code -that wants to use the UTF-16 variant. - -Now, this sounds fairly clear so far. - -But wait. LO can also be conigured to use a *system* expat -library. The System expat library is only available as one variant, -the ASCII one. (But the library is still called just libexpat, no -ascii in the name, that is just LO/OO's convention.) So how does -this work then, how can the code that wants to use the UTF-16 expat -API then actually use the ASCII (UTF-8) expat API? Well, in the -SYSTEM_EXPAT case no -DXML_UNICODE is used, so the code needs to check -that and adapt. So in the system libexpat case, mentioning expat_utf16 -in a .mk file doesn't mean any UTF-16-using libexpat would actually be -used. -
[Libreoffice-commits] .: postprocess/packconfig
postprocess/packconfig/packconfig.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8cd76e0fd8de4ee3173f819d690efc47b43f8c38
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Nov 15 17:35:49 2012 +0100
Fix packconfig.pl when WITH_LANG=ALL
Change-Id: Id293760fdc60d79790380d0cbee259b5b1cdd2da
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index c5b4e90..372ba5e 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -47,7 +47,7 @@ my $current_lang;# big fat global because
File::Find is a pig
parse_options();
#pack the .ui translations
-my @langs = split(/\s+/, $ENV{WITH_LANG});
+my @langs = split(/\s+/, $ENV{WITH_LANG_LIST});
foreach (@langs) {
next if ($_ eq en-US);
my %files_hash;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/all/xml_parser.cxx | 22 --
1 file changed, 22 deletions(-)
New commits:
commit f1dfc1f23f83f410172170d7b80d8f987f04635a
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 15 18:38:16 2012 +0200
Bin leftover debugging printout
Change-Id: I9ff9f53cedb34ff896104b39322edab91aa5cbdc
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 23e43d5..e88abf6 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -123,8 +123,6 @@ static void xml_end_element_handler(void* UserData, const
XML_Char* name)
static void xml_character_data_handler(void* UserData, const XML_Char* s, int
len)
{
-static int count = 0;
-
assert(UserData);
xml_parser* pImpl = get_parser_instance(UserData);
@@ -136,26 +134,6 @@ static void xml_character_data_handler(void* UserData,
const XML_Char* s, int le
else
pDocHdl-characters(UTF8ToWString(std::string(reinterpret_castconst char*(s),
len)));
}
-#if 0
-if (count 5) {
-char buf[1000];
-sprintf(buf,
-%s: len=%d\n
-s=%.10s\n
-pDocHdl=%p has_only_whitespaces()=%d\n
-string=%S,
-xml_character_data_handler,
-len,
-s,
-pDocHdl,
-has_only_whitespaces(s,len),
-UTF8ToWString(std::string(reinterpret_castconst char*(s),
len)).c_str()
-);
-
-MessageBoxA(NULL, buf, xml_character_data_handler, MB_OK);
-count++;
-}
-#endif
}
static void xml_comment_handler(void* UserData, const XML_Char* Data)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 2c1555a5504162ec36704cc0156f3c0f2b0bc59b
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Nov 15 17:36:28 2012 +0100
Fix linkoo to work with MinGW again.
Change-Id: I26bcc8f2026872729f5f4658c46c3226df3749f7
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3e2d08f..96abfa6 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -61,6 +61,7 @@ my $TARGET;
my $LIBVER;
my $OOO_BUILD;
my $OOO_INSTALL;
+my $SOLARVER;
if ($ENV{'OS'} eq 'MACOSX') {
print FIXME: linkoo currently does not work on Mac OS X\n;
@@ -108,8 +109,15 @@ File::Spec-file_name_is_absolute($OOO_BUILD) || die
linkoo requires absolute p
($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+$SOLARVER = $OOO_BUILD/solver;
+
if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntmsci[0-9]+/) {
$windows = 1;
+}
+
+if ($TARGET =~ /^wntmsci[0-9]+/) {
+# wntgcci means are cross-compiling can symlink, so copy only on real
+# Windows
$copy = 1;
}
@@ -329,7 +337,7 @@ sub scan_and_link_files($$$)
}
# Now scan the solver
-scan_one_dir ($installed_files, \%build_files, $ENV{'SOLARVER'}/$target,
1);
+scan_one_dir ($installed_files, \%build_files, $SOLARVER/$target, 1);
for my $file (keys %build_files) {
my $src = $build_files{$file};
@@ -393,7 +401,7 @@ sub link_gdb_py()
my $dirh;
my @basis;
my @ure;
-my $src = $ENV{'SOLARVER'}/$TARGET/lib;
+my $src = $SOLARVER/$TARGET/lib;
opendir ($dirh, $src) || die can't open solver: $src: $!;
while (my $dent = readdir ($dirh)) {
$dent =~ /^\./ next;
@@ -423,7 +431,7 @@ sub link_pagein_files()
return if ($windows);
print pagein case:;
-my $src = $ENV{'SOLARVER'}/$TARGET/bin;
+my $src = $SOLARVER/$TARGET/bin;
my $dest = $OOO_INSTALL/ . $brand_program_dir;
for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
do_link ($src, $dest, pagein-$c, pagein-$c);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - vcl/source
vcl/source/components/display.cxx |2 --
vcl/source/edit/textdata.cxx |4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 91029b7a1781c42ea70902be724accc9d70d2a21
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Nov 16 01:30:26 2012 +0900
Drop unused #include
Change-Id: Ibbeb1e154b2d4829b853dc4c47ef6bf5b6955470
diff --git a/vcl/source/components/display.cxx
b/vcl/source/components/display.cxx
index 4145143..f1862bc 100644
--- a/vcl/source/components/display.cxx
+++ b/vcl/source/components/display.cxx
@@ -29,8 +29,6 @@
#include cppuhelper/implbase3.hxx
#include cppuhelper/implbase4.hxx
-#include vector
-
using ::rtl::OUString;
using namespace ::com::sun::star::uno;
commit 87dbf96874f223921722945ad4d7937f95d742c8
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Nov 16 01:27:25 2012 +0900
Delete array
Change-Id: Ia02e936ace65e576f9df086d4608e514f3b0001e
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index a468327..f713947 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -320,14 +320,14 @@ TEIMEInfos::~TEIMEInfos()
void TEIMEInfos::CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL )
{
nLen = nL;
-delete pAttribs;
+delete[] pAttribs;
pAttribs = new sal_uInt16[ nL ];
memcpy( pAttribs, pA, nL*sizeof(sal_uInt16) );
}
void TEIMEInfos::DestroyAttribs()
{
-delete pAttribs;
+delete[] pAttribs;
pAttribs = NULL;
nLen = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/unodraw/shapeimpl.hxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit ad5a7fbf8eb3be526a2c235fb41aba5792d806ec Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 15 18:05:21 2012 +0100 -Werror=overloaded-virtual Change-Id: Ic444c979d4975198d9818d7257c85cd44639fda7 diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 3b9f1c8..ab09263 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -57,6 +57,8 @@ public: virtual ~SvxPluginShape() throw(); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString aPropertyName, const ::com::sun::star::uno::Any aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); +using SvxUnoTextRangeBase::setPropertyValue; + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence ::rtl::OUString aPropertyNames, const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); @@ -78,6 +80,8 @@ public: virtual ~SvxAppletShape() throw(); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString aPropertyName, const ::com::sun::star::uno::Any aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); +using SvxUnoTextRangeBase::setPropertyValue; + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence ::rtl::OUString aPropertyNames, const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); @@ -99,6 +103,8 @@ public: virtual ~SvxFrameShape() throw(); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString aPropertyName, const ::com::sun::star::uno::Any aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); +using SvxUnoTextRangeBase::setPropertyValue; + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence ::rtl::OUString aPropertyNames, const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: removing unused functions
Hi Enrico, On Thursday, 2012-11-15 12:24:08 +0100, Enrico Weigelt wrote: I'm currently working on removing unused functions (mentioned in unused.easy). Should I do it one by one with separate commits or in one big commit ? An big commit would make it easier/quicker for me (as I dont need so many rebuilds), but perhaps could make review a bit harder. Much preferred to split them up instead of having one large patch that's diffcult to review. Maybe a good chunk size would be per module patches. This also helps to find a reviewer who is familiar with the code in question. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpzjsdRpR4dG.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc
sal/inc/osl/interlck.h |4 sal/inc/sal/config.h |2 -- 2 files changed, 6 deletions(-) New commits: commit 6adc24cd861cdde45d8f55943a836246470fa72c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 15 18:07:06 2012 +0100 Revert use intrinsict to inline InterlockCount() on Windows too This reverts commit 5ae27819974e3492b6f4d33fa51ef2a9d77b5ce5. The commit breaks smoketest on Windows, for reasons unknown: C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/smoketest/smoketest.cxx(197) : error : Assertion Test name: `anonymous namespace'::Test::test assertion failed - Expression: connection_.isStillAlive() I can't see why the commit should matter, given that the functions should be equivalent according to my reading of the docs. And debugging this on Windows is pain squared, so I can't even figure out what is going wrong where. Feel free to try your luck. Note that when debugging this, the code triggering this seems to be run only if SOLAR_JAVA and JAVA_HOME are set, so 'make verbose=t' and running just the command without this hides the problem. diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h index 22ff985..792ea55 100644 --- a/sal/inc/osl/interlck.h +++ b/sal/inc/osl/interlck.h @@ -67,8 +67,6 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte */ #if defined( HAVE_GCC_BUILTIN_ATOMIC ) #define osl_atomic_increment(p) __sync_add_and_fetch((p), 1) -#elif defined( _MSC_VER ) -#define osl_atomic_increment(p) _InterlockedIncrement((p)) #else #define osl_atomic_increment(p) osl_incrementInterlockedCount((p)) #endif @@ -86,8 +84,6 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte */ #if defined( HAVE_GCC_BUILTIN_ATOMIC ) #define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1) -#elif defined( _MSC_VER ) -#define osl_atomic_decrement(p) _InterlockedDecrement((p)) #else #define osl_atomic_decrement(p) osl_decrementInterlockedCount((p)) #endif diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index e81250a..aee8e82 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -44,8 +44,6 @@ #ifdef _MSC_VER -#include Intrin.h // define intrinsic functions supported by the compiler - #ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES // needed by Visual C++ for math constants #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.ac extensions/Executable_pluginapp.bin.mk extensions/Library_npsoplugin.mk extensions/Library_pl.mk extensions/source extensions/Static
RepositoryExternal.mk| 14 - config_host.mk.in|4 configure.ac | 38 ++--- extensions/Executable_pluginapp.bin.mk |2 extensions/Library_npsoplugin.mk |2 extensions/Library_pl.mk |2 extensions/StaticLibrary_plugcon.mk |2 extensions/source/plugin/inc/plugin/unx/mediator.hxx | 20 -- extensions/source/plugin/unx/mediator.cxx| 49 -- extensions/source/plugin/unx/npnapi.cxx | 139 --- extensions/source/plugin/unx/nppapi.cxx | 17 +- extensions/source/plugin/unx/npwrap.cxx | 53 +++ extensions/source/plugin/unx/plugcon.cxx |4 np_sdk/Module_np_sdk.mk |4 np_sdk/Package_mozilla_inc.mk| 35 np_sdk/Package_npapi.mk | 35 np_sdk/StaticLibrary_nputils.mk |2 sal/inc/sal/log-areas.dox|1 18 files changed, 237 insertions(+), 186 deletions(-) New commits: commit 13ef9dcc206d30ebd4d63afb186d379dc849b36c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 15 18:09:55 2012 +0100 Rename Mozilla headers to NPAPI headers (incl. configure option name) ...to avoid confusion what that is actually about. (Especially, it is completely unrelated to --enable-mozilla.) ATTENTION: This renames the configure option --with-system-mozilla-headers to --with-system-npapi-headers. Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d4281c9..20c9ca6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -51,20 +51,20 @@ endef endif -ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) +ifeq ($(SYSTEM_NPAPI_HEADERS),YES) -define gb_LinkTarget__use_mozilla_headers +define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_set_include,$(1),\ - $(MOZILLA_HEADERS_CFLAGS) \ + $(NPAPI_HEADERS_CFLAGS) \ $$(INCLUDE) \ ) endef -else #!SYSTEM_MOZILLA_HEADERS +else #!SYSTEM_NPAPI_HEADERS -define gb_LinkTarget__use_mozilla_headers -$(call gb_LinkTarget_use_package,$(1),mozilla_inc) +define gb_LinkTarget__use_npapi_headers +$(call gb_LinkTarget_use_package,$(1),npapi) $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/external/npsdk \ $$(INCLUDE) \ @@ -72,7 +72,7 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -endif #SYSTEM_MOZILLA_HEADERS +endif #SYSTEM_NPAPI_HEADERS ifeq ($(SYSTEM_ODBC_HEADERS),YES) diff --git a/config_host.mk.in b/config_host.mk.in index d473422..d099160 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -429,7 +429,7 @@ export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ export MOC=@MOC@ export MOZILLABUILD=@MOZILLABUILD@ -export MOZILLA_HEADERS_CFLAGS=$(gb_SPACE)@MOZILLA_HEADERS_CFLAGS@ +export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@ export MOZILLA_VERSION=@MOZILLA_VERSION@ export MOZ_FLAVOUR=@MOZ_FLAVOUR@ export MOZ_INC=@MOZ_INC@ @@ -618,7 +618,7 @@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@ -export SYSTEM_MOZILLA_HEADERS=@SYSTEM_MOZILLA_HEADERS@ +export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ export SYSTEM_MYSQL=@SYSTEM_MYSQL@ export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ export SYSTEM_MYTHES=@SYSTEM_MYTHES@ diff --git a/configure.ac b/configure.ac index 91b151c..0127214 100644 --- a/configure.ac +++ b/configure.ac @@ -1676,11 +1676,11 @@ AC_ARG_WITH(system-mozilla, WITH_SYSTEM_MOZILLA=$withval , WITH_SYSTEM_MOZILLA=no) -AC_ARG_WITH(system-mozilla-headers, -AS_HELP_STRING([--with-system-mozilla-headers], -[Use mozilla headers provided by system instead of bundled ones. Used in - nsplugin]),, -[with_system_mozilla_headers=$with_system_headers] +AC_ARG_WITH(system-npapi-headers, +AS_HELP_STRING([--with-system-npapi-headers], +[Use NPAPI headers provided by system instead of bundled ones. Used in + extensions/source/nsplugin and extensions/source/plugin]),, +[with_system_npapi_headers=$with_system_headers] ) AC_ARG_WITH(system-libpng, @@ -8336,19 +8336,19 @@ dnl === dnl Check for system mozilla headers dnl === HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION= -AC_MSG_CHECKING([which Mozilla headers to use]) +AC_MSG_CHECKING([which NPAPI headers to use]) -if test $with_system_mozilla_headers = yes; then +if test $with_system_npapi_headers = yes; then AC_MSG_RESULT([external]) -SYSTEM_MOZILLA_HEADERS=YES +SYSTEM_NPAPI_HEADERS=YES #
--with-system-mozilla-headers - --with-system-npapi-headers
Attention please, as http://cgit.freedesktop.org/libreoffice/core/commit/?id=13ef9dcc206d30ebd4d63afb186d379dc849b36c Rename 'Mozilla headers' to 'NPAPI headers' (incl. configure option name) just renamed a configure option, for better or worse. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 18ad2ef60ec192089dd5ac9a01e0ccefc8207c7d
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Nov 15 18:48:52 2012 +0100
Windows: Draw the horizontal line between the toolbar and view shell again.
This is necessary after I have removed the 'special' border of the view
shell.
Change-Id: Ie29d60fbff0c6c38ed285ba30eb948ef83c43827
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index abb6f48..f61ba64 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -456,12 +456,13 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
const long GRADIENT_HEIGHT = 32;
long gradient_break = rc.top;
+long gradient_bottom = rc.bottom - 1;
GRADIENT_RECT g_rect[1] = { { 0, 1 } };
// very slow gradient at the top (if we have space for that)
-if ( rc.bottom - rc.top GRADIENT_HEIGHT )
+if ( gradient_bottom - rc.top GRADIENT_HEIGHT )
{
-gradient_break = rc.bottom - GRADIENT_HEIGHT;
+gradient_break = gradient_bottom - GRADIENT_HEIGHT;
TRIVERTEX vert[2] = {
{ rc.left, rc.top, 0xff00, 0xff00, 0xff00, 0xff00 },
@@ -472,10 +473,19 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
// gradient at the bottom
TRIVERTEX vert[2] = {
-{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
+{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
+{ rc.right, gradient_bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
};
GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
+
+// and a darker horizontal line under that
+HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+SelectObject( hDC, hpen );
+
+MoveToEx( hDC, rc.left, gradient_bottom, NULL );
+LineTo( hDC, rc.right, gradient_bottom );
+
+DeleteObject( hpen );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Winfried,
Long overdue, but better late than never..
This needed some detailed review, which is why I postponed it
originally.
On Friday, 2012-10-05 12:25:57 +0200, Winfried Donkers wrote:
Attached patch modifies the calc functions WEEKNUM and WEEKNUM_ADD to
respectively ISOWEEKNUM and WEEKNUM. These latter functions comply
with ODFF1.2
Generally the patch works, but there are some things that need
consideration and more work.
While this
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -317,7 +317,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
-String SC_OPCODE_WEEK { Text = ISOWEEKNUM ; };
+String SC_OPCODE_ISOWEEKNUM { Text = ISOWEEKNUM ; };
changing only the identifier is fine, this
@@ -650,7 +650,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
-String SC_OPCODE_WEEK { Text = WEEKNUM ; };
+String SC_OPCODE_ISOWEEKNUM { Text = ISOWEEKNUM ; };
changing the string WEEKNUM to ISOWEEKNUM does not work, as these
resources are also used to save/load in ODF 1.0/1.1 and compile formulas
set via API. So saving in ODF 1.0/1.1 and reading in an older release
will fail and vice versa.
For connected reason, this
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -35,7 +35,7 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] =
-{ WEEKNUM, WEEKNUM_ADD, false,
com.sun.star.sheet.addin.Analysis.getWeeknum, COM.SUN.STAR.SHEET.ADDIN.ANALYS
+{ WEEKNUM, WEEKNUM, false,
com.sun.star.sheet.addin.Analysis.getWeeknum,
COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.G
would not work if the above change is not done as there would be two
WEEKNUM in the English map.
Not changing the strings on the other hand would leave them unchanged in
the use English function names case, which would be confusing for the
user as then we'd have ISOWEEKNUM and WEEKNUM vs. WEEKNUM and
WEEKNUM_ADD with WEEKNUM meaning two different things. I think we could
get around this by patching the generated symbol table for the English
case in the compiler, instead of duplicating
RID_STRLIST_FUNCTION_NAMES_ENGLISH, and add another field in AddInMap,
I could take a look later. For now just don't rename the functions.
Not renaming WEEKNUM_ADD to WEEKNUM also obsoletes this change
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -48,7 +48,7 @@ const FuncDataBase pFuncDatas[] =
-FUNCDATA( Weeknum, DOUBLE, INTPAR, 2,
FDCat_DateTime ),
+FUNCDATA( Weeknum, UNIQUE, INTPAR, 2,
FDCat_DateTime ),
The link to the help files has been broken, i.e. WEEKNUM now points to
the (partially out of date) help text for WEEKNUM_ADD, but ISOWEEKNUM
does not point to a help text.
The latter because of
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -396,7 +396,7 @@
-#define HID_FUNC_KALENDERWOCHE
SC_HID_FUNC_KALENDERWOCHE
+#define HID_FUNC_ISOWEEKNUM
SC_HID_FUNC_ISOWEEKNUM
SC_HID_FUNC_KALENDERWOCHE is used in
helpcontent2/source/text/scalc/01/func_weeknum.xhp:bookmark xml-lang=en-US
branch=hid/SC_HID_FUNC_KALENDERWOCHE id=bm_id3158403
localize=false/paragraph role=heading id=hd_id3159161 xml-lang=en-US
level=2 l10n=U oldref=54variable id=weeknumlink
href=text/scalc/01/func_weeknum.xhpWEEKNUM/link
that should be adapted. The WEEKNUM_ADD help is in
helpcontent2/source/text/scalc/01/func_weeknumadd.xhp
One important matter is still open:
When opening calc-documents that use the 'old' functions, they are not
always computed correctly. The 'new' functions differ in paramter
count.
I do not know where to add code for backward compatibility when
opening these documents, but with some help/hints I might be able to
fix that.
There are three cases to be considered:
1. reading ODF 1.2 (ODFF)
2. writing ODF 1.0/1.1 (PODF)
3. reading ODF 1.0/1.1 (PODF)
1. Even if ODFF defines number of parameters and whether optional or
not, older releases wrote the WEEKNUM internal function as ISOWEEKNUM
with 2 parameters instead of 1.
* could be checked in formula/source/core/api/FormulaCompiler.cxx
FormulaCompiler::Factor()
if (eOp == ocIsoWeeknum mxSymbols-isODFF())
and if it has 2 parameters put a token for the WEEKNUM Add-In
instead. This would need some poking to mess around with the actual
function token, a simple pFacToken-NewOpCode(...) would not do as
a FormulaExternalToken is needed instead.
2. ISOWEEKNUM needs to be written as WEEKNUM again.
* parameter could be added in formula/source/core/api/token.cxx
MissingConvention::isRewriteNeeded()
FormulaMissingContext::AddMoreArgs()
* not having changed the function name in the resources should
actually write the correct name, to be verified.
3. Very similar to #1, but instead the condition would be
if (eOp == ocIsoWeeknum mxSymbols-isPODF())
So it may
Re: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Winfried,
On Tuesday, 2012-11-13 11:08:07 +0100, Winfried Donkers wrote:
Would it be an idea if I submit the patch via gerrit? Not to hurry you, but
to prevent it from getting burried accidentally ;)
It's just buried in my mail folder ;-)
Now that I wrote the review we don't need it in gerrit (anymore).
(same goes for IFERROR() and IFNA() patches)
If you have something ready for those you can submit it to gerrit,
that's fine.
By the way, any suggestions/preferences for the next ODFF1.2 formulas to
start working on?
NUMBERVALUE would be good, to have a locale-independent (as opposed to
VALUE) function to convert text to numeric values. Note that some
fragments are already in the code base, but not implemented yet:
grep -r NUMBERVALUE formula/{inc,source} sc/{inc,source}
Btw, in sc/source/ui/src/scfuncs.src the function lacks the parameter
for group separators.
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
pgpECuaKOzHzg.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --with-system-mozilla-headers - --with-system-npapi-headers
On 11/15/2012 07:28 PM, Enrico Weigelt wrote: By the way: what's the --enable-mozilla option actuall for ? see http://lists.freedesktop.org/archives/libreoffice/2012-November/041107.html Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
==== SUBMITTED ====
Enrico Weigelt, metux IT service has abandoned this change. Change subject: SUBMITTED .. Patch Set 1: Abandoned accidentially pushed a local hacking branch ;-o -- To view, visit https://gerrit.libreoffice.org/1079 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia47e4b1959d9c8fdb8f6b0a82038c7ddee3b938b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Christian Lohmaier lohmaier+libreoff...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] unusedcode exclude file: symbols known to be required
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1084 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/1084/1 unusedcode exclude file: symbols known to be required The file unused.easy contains a lot of symbols which are known to be required, even they're currently not referenced by anyone. Change-Id: I048c1656b240f7d601e4c99b8d9c4969b3954c87 --- M unusedcode.README A unusedcode.exclude 2 files changed, 28 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1084 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I048c1656b240f7d601e4c99b8d9c4969b3954c87 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
updated .gitignore
Enrico Weigelt, metux IT service has abandoned this change. Change subject: updated .gitignore .. Patch Set 2: Abandoned not required at all, had just artifacts from submodule migration. -- To view, visit https://gerrit.libreoffice.org/1062 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iad05efb16a0299b8e794bf93107b0e5e6396a6c0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - smoketest/smoketest.cxx vcl/inc
smoketest/smoketest.cxx|3 +++ vcl/inc/unx/gtk/gtksalmenu.hxx |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 2bcae2745eac9a66913152fd1cda27aaf094624d Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 15 21:41:38 2012 +0200 There is no GLIB_AVAILABLE_IN_2_28 in GLib 2.28 Change-Id: Ief126965cf02283cdb7b5f65ccf9fca28b4f9a40 diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 822d3a1..a5c9973 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -26,7 +26,7 @@ # ifndef GLIB_AVAILABLE_IN_2_32 typedef void GMenuModel; # endif -# ifndef GLIB_AVAILABLE_IN_2_28 +# if !GLIB_CHECK_VERSION(2,28,0) typedef void GActionGroup; # endif #endif commit 07b6dc8610785026860f6dfcf6aab1c4ad1f45f2 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 15 21:18:52 2012 +0200 WaE: unused parameter 'argc' and 'argv' Change-Id: Idb3c4e4be025b78288fb6c705181d7f7a88c2c9f diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 67257ea..8cfa28e 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -204,6 +204,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } +#define argc +#define argv + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Platform ports vs. multiplatform
Hi, * drop all bundled libraries that are already available on mainline distros note that most of that can be handled by a proper file in ./distro-config/. yes, but at least according to debian/ubuntu build rules, that doenst seem to be enough. (debian's rule file is over 3k LOC) * simplify the import logic (eg. use pkg-config whereever possible) * drop all specific logic for other platforms what is the benefit of that, except creating busy work for you ? For now, at least some hacking fun, learning a bit more about the lo internals and maybe in the end a much simpler build system. The whole operation gets more intersting when done for multiple platforms. I'll start w/ win32 once i'm done w/ gnu/linux. * drop EPM stuff --disable-epm ? I'm talking about dropping it completely in my branch. By the way: what is this actually used for ? Not sure about the other distros, but Debian+friends dont seem to use it. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e1c579f3ba822af3f4449d16a39c5fa4a1f2093 Author: Andras Timar ati...@suse.com Date: Thu Nov 15 21:20:50 2012 +0100 Updated core Project: help fa665d0f817d7446b290a16434411d6af0ad6f91 typo fix diff --git a/helpcontent2 b/helpcontent2 index ff39701..fa665d0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ff39701b0e841035089929ab7811c7431ab9b39b +Subproject commit fa665d0f817d7446b290a16434411d6af0ad6f91 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/sbasic/shared/03090101.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa665d0f817d7446b290a16434411d6af0ad6f91 Author: Andras Timar ati...@suse.com Date: Thu Nov 15 21:20:50 2012 +0100 typo fix diff --git a/source/text/sbasic/shared/03090101.xhp b/source/text/sbasic/shared/03090101.xhp index 991409b..34b0680 100644 --- a/source/text/sbasic/shared/03090101.xhp +++ b/source/text/sbasic/shared/03090101.xhp @@ -50,7 +50,7 @@ bascode paragraph role=bascode id=par_id3153126 xml-lang=en-US oldref=4If condition=true Then Statement block [ElseIf condition=true Then] Statement block [Else] Statement block EndIf/paragraph /bascode -paragraph role=paragraph id_par_id3123476 xml-lang=en-USInstead of Else If you can write ElseIf, instead of End If you can write EndIf./paragraph +paragraph role=paragraph id=par_id3123476 xml-lang=en-USInstead of Else If you can write ElseIf, instead of End If you can write EndIf./paragraph paragraph role=heading id=hd_id3155419 xml-lang=en-US level=2 l10n=U oldref=5Parameters:/paragraph paragraph role=paragraph id=par_id3153062 xml-lang=en-US l10n=U oldref=6The emphIf...Then/emph statement executes program blocks depending on given conditions. When $[officename] Basic encounters an emphIf/emph statement, the condition is tested. If the condition is True, all subsequent statements up to the next emphElse/emph or emphElseIf/emph statement are executed. If the condition is False, and an emphElseIf/emph statement follows, $[officename] Basic tests the next condition and executes the following statements if the condition is True. If False, the program continues either with the next emphElseIf/emph or emphElse/emph statement. Statements following emphElse/emph are executed only if none of the previously tested conditions were True. After all conditions are evaluated, and the corresponding statements executed, the program continues with the statement following emphEndIf/emph./paragraph paragraph role=paragraph id=par_id3153192 xml-lang=en-US l10n=U oldref=7You can nest multiple emphIf...Then/emph statements./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: --with-system-mozilla-headers - --with-system-npapi-headers
Hi, Attention please, as http://cgit.freedesktop.org/libreoffice/core/commit/?id=13ef9dcc206d30ebd4d63afb186d379dc849b36c Rename 'Mozilla headers' to 'NPAPI headers' (incl. configure option name) just renamed a configure option, for better or worse. great thing, makes it a little bit more clear. By the way: what's the --enable-mozilla option actuall for ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: dropped obsolete test code
If the calc maintainers want these - we should keep them around of course even if they're not used. Okay. can we exclude them from the unused.easy file ? -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 4ef4b2848181b482f011f56fc3610eef2a8a282c
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Nov 15 17:44:09 2012 +0530
n#782833: Rotated text in emf images looks thicker.
Any rotated text in an emf image (image size != original size),
has thicker fonts.
This is kind of a regression caused by commit
8c2902ecbf135fae070ea032fa10a59bb76ec1b0
So, partially reverted it.
The code was kind of a workaround/copy-paste, so I am assuming
it is safe to revert.
Side-effects: The dotted borders (in calc) look a
little lighter and not so very visible in the page-preview.
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index c554eb8..e58bb5e 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -834,10 +834,6 @@ namespace drawinglayer
}
else
{
-// remember that we enter a PolygonStrokePrimitive2D
decomposition,
-// used for AA thick line drawing
-mnPolygonStrokePrimitive2D++;
-
mpOutputDevice-DrawPolyPolygon(aLocalPolyPolygon);
if(mnPolygonStrokePrimitive2D
@@ -855,9 +851,6 @@ namespace drawinglayer
mpOutputDevice-DrawPolyLine(aLocalPolyPolygon.getB2DPolygon(a), 0.0);
}
}
-
-// leave PolygonStrokePrimitive2D
-mnPolygonStrokePrimitive2D--;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source dbaccess/source sc/source svtools/inc svtools/source svx/source sw/source
cui/source/options/fontsubs.cxx |4 cui/source/options/optfltr.cxx|8 cui/source/options/optlingu.cxx |2 cui/source/tabpages/autocdlg.cxx |4 cui/source/tabpages/macroass.cxx |2 dbaccess/source/ui/browser/dsEntriesNoExp.cxx |2 dbaccess/source/ui/browser/unodatbr.cxx |4 dbaccess/source/ui/control/listviewitems.cxx |4 dbaccess/source/ui/control/tabletree.cxx |2 dbaccess/source/ui/inc/listviewitems.hxx |2 sc/source/ui/miscdlgs/acredlin.cxx|4 sc/source/ui/miscdlgs/solveroptions.cxx |4 svtools/inc/svtools/svlbitm.hxx |8 svtools/inc/svtools/treelistbox.hxx |6 svtools/inc/svtools/treelistentry.hxx | 20 + svtools/source/contnr/svimpbox.cxx|6 svtools/source/contnr/svlbitm.cxx |8 svtools/source/contnr/svtabbx.cxx | 34 +- svtools/source/contnr/treelistbox.cxx | 12 - svtools/source/contnr/treelistentry.cxx | 114 +- svx/source/dialog/checklbx.cxx|2 svx/source/dialog/simptabl.cxx|4 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |4 sw/source/ui/index/cnttab.cxx |2 sw/source/ui/utlui/content.cxx|2 sw/source/ui/utlui/glbltree.cxx |2 26 files changed, 145 insertions(+), 121 deletions(-) New commits: commit cc0c8e56436d35e726efe7f8d06cf403fcaf827e Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Thu Nov 15 15:59:48 2012 -0500 Store tree list entry items in ptr_vector const correct-ness. Change-Id: I0e02b9ceb98f26a2b130ec978a992fcf889e718a diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a0484e5..3c3279f 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3476,8 +3476,8 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa return COMPARE_EQUAL; } -SvLBoxString* pLeftTextItem = static_castSvLBoxString*(pLHS-GetFirstItem(SV_ITEM_ID_LBOXSTRING)); -SvLBoxString* pRightTextItem = static_castSvLBoxString*(pRHS-GetFirstItem(SV_ITEM_ID_LBOXSTRING)); +const SvLBoxString* pLeftTextItem = static_castconst SvLBoxString*(pLHS-GetFirstItem(SV_ITEM_ID_LBOXSTRING)); +const SvLBoxString* pRightTextItem = static_castconst SvLBoxString*(pRHS-GetFirstItem(SV_ITEM_ID_LBOXSTRING)); OSL_ENSURE(pLeftTextItem pRightTextItem, SbaTableQueryBrowser::OnTreeEntryCompare: invalid text items!); String sLeftText = pLeftTextItem-GetText(); diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index ce4bba1..8ec235d 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -835,7 +835,7 @@ inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvTreeListEntry* pEntry, (SvViewDataEntry*)SvListView::GetViewData(pEntry); DBG_ASSERT(pEntryData,Entry not in View); DBG_ASSERT(pEntryData-pItemData,No ItemData); -sal_uInt16 nItemPos = ((SvTreeListEntry*)pEntry)-GetPos( pItem ); +sal_uInt16 nItemPos = pEntry-GetPos(pItem); return (pEntryData-pItemData+nItemPos); } diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx index 37a0ba1..7eb015c 100644 --- a/svtools/inc/svtools/treelistentry.hxx +++ b/svtools/inc/svtools/treelistentry.hxx @@ -32,7 +32,6 @@ #include svtdllapi.h #include tools/solar.h -#include vector #include boost/ptr_container/ptr_vector.hpp // Flags, die am Model haengen @@ -58,11 +57,13 @@ class SVT_DLLPUBLIC SvTreeListEntry friend class SvListView; friend class SvTreeListBox; +typedef boost::ptr_vectorSvLBoxItem ItemsType; + SvTreeListEntry*pParent; SvTreeListEntries maChildren; sal_uLong nAbsPos; sal_uLong nListPos; -std::vectorSvLBoxItem* aItems; +ItemsType maItems; void*pUserData; sal_uInt16 nEntryFlags; @@ -70,9 +71,10 @@ private: void ClearChildren(); void SetListPositions(); void InvalidateChildrensListPositions(); -void DeleteItems_Impl(); public:
Calc / Kerning
Hi,
(this is my first commit here so please be patient ...)
I'am missing the kerning feature for cells showing the result of a formula.
The attached git diff gives an idea about what I want.
It compiles for me, shows the tab Font Position at the right place but does
not do the kerning.
Any idea how to proceeed?
BTW 1)
The kerning feature (Font Position) is available for pure text in a cell via
clicking input line, format-charakter-font position as you can see in
libreoffice/core/sc/source/ui/src/textdlgs.src
libreoffice/core/cui/source/tabpages/chardlg.cxx (line 2978)
BTW 2)
Applying fromat-cell for a text cell resets kerning which was selected before
by format-character.
This can be considered as a bug, solved by implementing this idea here.
BTW 3)
libreoffice/core/cui/source/dialogs/sdrcelldlg.cxx
does have a very similar dialog. Is there some overlap?
TIA!
Bernhard
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx
b/sc/source/ui/attrdlg/attrdlg.cxx
index 2e22761..87e95be 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -68,6 +68,8 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
AddTabPage( TP_FONT, pFact-GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME
), 0 );
OSL_ENSURE(pFact-GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ),
GetTabPageCreatorFunc fail!);
AddTabPage( TP_FONTEFF, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_EFFECTS ), 0 );
+OSL_ENSURE(pFact-GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ),
GetTabPageCreatorFunc fail!);
+AddTabPage( TP_FONTPOS, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), 0 );
OSL_ENSURE(pFact-GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ),
GetTabPageCreatorFunc fail!);
AddTabPage( TP_ALIGNMENT, pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_ALIGNMENT ),0 );
diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc
index 4c36756..7dd5273 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.hrc
@@ -26,6 +26,7 @@
#define TP_PROTECTION 6
#define TP_FONTEFF 7
#define TP_ASIAN8
+#define TP_FONTPOS 9
//
// Protected cell TabPage:
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index a96bad9..da87300 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -65,6 +65,12 @@ TabDialog RID_SCDLG_ATTR
};
PageItem
{
+Identifier = TP_FONTPOS ;
+PageResID = 264 ;
+Text [ en-US ] = Font Position;
+};
+PageItem
+{
Identifier = TP_ALIGNMENT ;
PageResID = 258 ;
Text [ en-US ] = Alignment ;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] renamed --enable-packagekit to --enable-font-autoinstall
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1085 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/1085/1 renamed --enable-packagekit to --enable-font-autoinstall The configure option --enable-packagekit is quite a bit misleading, doesn't tell what it's actually for. Therefore renaming the option. Also, semantics have changed: * when omitted (=auto), it's automatically enabled when dbus is activated. * when enabled explicitly, but dbus is disabled (or not available on the target platform), bail out with error message Change-Id: Idb951032a0de33d712cb1551a5696d88ebd29373 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac M vcl/generic/fontmanager/fontconfig.cxx 4 files changed, 43 insertions(+), 27 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1085 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb951032a0de33d712cb1551a5696d88ebd29373 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc
vcl/inc/unx/gtk/gtksalmenu.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 6b6783b50cb36ea607a36e6497cf4a7d5f96d989 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 15 22:48:55 2012 +0100 Fix GLIB_MAJOR/MINOR_VERSION checks Change-Id: Iae16aad5adef480c941846dc9fb298b3a6dd9582 diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7c16bb6..5dad085 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -17,16 +17,16 @@ #include unx/gtk/gtkframe.hxx #if defined(ENABLE_DBUS) defined(ENABLE_GIO) -# if GLIB_MAJOR_VERSION 2 GLIB_MINOR_VERSION = 32 +# if GLIB_MAJOR_VERSION 2 || GLIB_MINOR_VERSION = 32 #define ENABLE_GMENU_INTEGRATION # endif # include unx/gtk/glomenu.h # include unx/gtk/gloactiongroup.h #else -# if GLIB_MAJOR_VERSION 2 GLIB_MINOR_VERSION = 32 +# if !(GLIB_MAJOR_VERSION 2 || GLIB_MINOR_VERSION = 32) typedef void GMenuModel; # endif -# if GLIB_MAJOR_VERSION 2 GLIB_MINOR_VERSION = 28 +# if !(GLIB_MAJOR_VERSION 2 || GLIB_MINOR_VERSION = 28) typedef void GActionGroup; # endif #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Adding icons to the template manager
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Kendy, Hope that helps - and that this will get you further! It does, thanks a lot :) I pushed the icons already and now tried to compile it with your changes. The earlier issues are gone, but now the compiler is complaining about missing icon files: [build RES] sfxen-US f268: Error: The image(s) actionview026 actionview010 actionview025 actionview028 actionaction012 actionaction013 actiontemplates015 actiontemplates016 actiontemplates019 actiontemplates017 actiontemplates020 actiontemplates018 could not be found. Terminating compiler make[2]: *** [/home/alexander/libo/workdir/unxlngx6.pro/ResTarget/sfxen-US.res] Fehler 1 What's a bit strange are the high indexes like 026 etc. Do you know whether there's some documentation on how one is supposed to name the files? I tried to find something via Google, but to no avail :/ Thanks Alex -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQEcBAEBAgAGBQJQpWxKAAoJECO1/tAiWGrNq4cH/3ONYJ0c94DnRcFjPFlYQGxU 7q0QupwUn9pqdyLLDTiQAdkpKePUP7hcKP7ty+YZvugoCPMxK+aNaqEIwo3+SAgz txFZgCLZSFFMtHalGHHWmQuNhip0FVbnP1RdJEYhsx4HI41bQmU8UzzL943RmviO 7tdPSMV8+zQJl4qXJHzjFHlNjHGrNcply4Vaxr0dkyXrBYITbyHrWXs/LYDWdwCi qWZx+NxMHvL3n8cs57buBfnsrpkAs8KO6HT6PKEaXIJe2LUX0Ce7JWjLtxqlek4K JweBZMICaPNbDa/jJDjAlqWlQ2r4MIHe/OZ7D5XHUY5IFqDjjB5Bl0aY4nzhMMM= =66Gw -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding icons to the template manager
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 - -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Kendy, Hope that helps - and that this will get you further! It does, thanks a lot :) I pushed the icons already and now tried to compile it with your changes. The earlier issues are gone, but now the compiler is complaining about missing icon files: [build RES] sfxen-US f268: Error: The image(s) actionview026 actionview010 actionview025 actionview028 actionaction012 actionaction013 actiontemplates015 actiontemplates016 actiontemplates019 actiontemplates017 actiontemplates020 actiontemplates018 could not be found. Terminating compiler make[2]: *** [/home/alexander/libo/workdir/unxlngx6.pro/ResTarget/sfxen-US.res] Fehler 1 What's a bit strange are the high indexes like 026 etc. Do you know whether there's some documentation on how one is supposed to name the files? I tried to find something via Google, but to no avail :/ Thanks Alex - -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQEcBAEBAgAGBQJQpWxKAAoJECO1/tAiWGrNq4cH/3ONYJ0c94DnRcFjPFlYQGxU 7q0QupwUn9pqdyLLDTiQAdkpKePUP7hcKP7ty+YZvugoCPMxK+aNaqEIwo3+SAgz txFZgCLZSFFMtHalGHHWmQuNhip0FVbnP1RdJEYhsx4HI41bQmU8UzzL943RmviO 7tdPSMV8+zQJl4qXJHzjFHlNjHGrNcply4Vaxr0dkyXrBYITbyHrWXs/LYDWdwCi qWZx+NxMHvL3n8cs57buBfnsrpkAs8KO6HT6PKEaXIJe2LUX0Ce7JWjLtxqlek4K JweBZMICaPNbDa/jJDjAlqWlQ2r4MIHe/OZ7D5XHUY5IFqDjjB5Bl0aY4nzhMMM= =66Gw - -END PGP SIGNATURE- -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQEcBAEBAgAGBQJQpWx7AAoJECO1/tAiWGrNyF4IALF1MAVA+dtqa+uUIBi7sUct Io2ZThDi/iHjsQltk6E0IEOZCwWbF1SQ91TusdAP05iLReMdJmNyVhdeN+epqofM lLhSqzmXg56gK+V2Dz4VIWITlvY9KSc4zFOVj/BAzzz0KEfJrzcIh88P5xW5zTVq +LbaoA7HeshqIT29JHbCa13sLuK1EkB3QsMbtRFoebKVcVmJxrBHWIpw6i5vTbkd P1TfLVHMkZFQ5l4zFuZuPxk4t0hvwjC/TNmi1BONRATUls5oQ1iQd/ETBmgsamhA 4RfUMkoW0CLVOzpFZFDKtOcGoD+k3G9o0Fqgt4030asn9u0q5k1dNrLaQVtnRRs= =w3gM -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - sc/inc sc/source
sc/inc/conditio.hxx| 77 +--
sc/inc/globstr.hrc |5
sc/source/core/data/conditio.cxx | 173 -
sc/source/filter/oox/condformatbuffer.cxx | 82 ++-
sc/source/ui/condformat/condformatdlg.cxx | 12 +
sc/source/ui/condformat/condformatdlgentry.cxx | 145 +---
sc/source/ui/condformat/condformathelper.cxx |5
sc/source/ui/inc/condformatdlg.hrc |2
sc/source/ui/inc/condformatdlgentry.hxx| 27 +++
sc/source/ui/inc/condformathelper.hxx |3
sc/source/ui/src/condformatdlg.src | 25 +++
sc/source/ui/src/globstr.src |4
12 files changed, 451 insertions(+), 109 deletions(-)
New commits:
commit 29206b09ca6bf2dfc5596b91fc80a0c1b62dcd6b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Nov 15 23:37:42 2012 +0100
ui part for conditional date formats
Change-Id: I96893aaa016e6947d354aac4d7bc88da693095da
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index ea2d870..4fc17bd 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -612,9 +612,10 @@
#define STR_COND_ENDS_WITH 487
#define STR_COND_CONTAINS 488
#define STR_COND_NOT_CONTAINS 489
+#define STR_COND_DATE 490
-#define STR_ERR_CONDFORMAT_PROTECTED 490
+#define STR_ERR_CONDFORMAT_PROTECTED 491
-#define STR_COUNT 491
+#define STR_COUNT 492
#endif
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 8ef887c..5212f62 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -91,6 +91,9 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const
ResId rResId, ScDocum
break;
case condformat::ICONSET:
break;
+case condformat::DATE:
+maEntries.push_back(new ScDateFrmtEntry( this, mpDoc,
static_castconst ScCondDateFormatEntry*( pEntry ) ) );
+break;
}
}
}
@@ -249,6 +252,7 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox)
{
case condformat::entry::FORMULA:
case condformat::entry::CONDITION:
+case condformat::entry::DATE:
break;
case condformat::entry::COLORSCALE2:
case condformat::entry::COLORSCALE3:
@@ -275,6 +279,14 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox)
static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
itr-SetActive();
break;
+case 3:
+if(itr-GetType() == condformat::entry::DATE)
+return 0;
+
+maEntries.replace( itr, new ScDateFrmtEntry( this, mpDoc ));
+static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+itr-SetActive();
+break;
}
RecalcAll();
return 0;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 817da0b..05e9335 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -254,7 +254,6 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window*
pParent, ScDocument* pDoc, c
void ScConditionFrmtEntry::Init()
{
-maLbStyle.SetSeparatorPos(0);
maEdVal1.SetGetFocusHdl( LINK( GetParent()-GetParent(), ScCondFormatDlg,
RangeGetFocusHdl ) );
maEdVal2.SetGetFocusHdl( LINK( GetParent()-GetParent(), ScCondFormatDlg,
RangeGetFocusHdl ) );
maEdVal1.SetLoseFocusHdl( LINK( GetParent()-GetParent(), ScCondFormatDlg,
RangeLoseFocusHdl ) );
@@ -266,6 +265,7 @@ void ScConditionFrmtEntry::Init()
maEdVal1.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) );
maEdVal2.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) );
+maLbStyle.SetSeparatorPos(0);
SfxStyleSheetIterator aStyleIter( mpDoc-GetStyleSheetPool(),
SFX_STYLE_FAMILY_PARA );
for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle =
aStyleIter.Next() )
{
@@ -402,9 +402,11 @@ void ScConditionFrmtEntry::SetInactive()
Deselect();
}
-IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl)
+namespace {
+
+void StyleSelect( ListBox rLbStyle, ScDocument* pDoc, SvxFontPrevWindow
rWdPreview )
{
-if(maLbStyle.GetSelectEntryPos() == 0)
+if(rLbStyle.GetSelectEntryPos() == 0)
{
// call new style dialog
SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA );
@@ -430,26 +432,32 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl)
// Find the new style and add it into the style list boxes
rtl::OUString aNewStyle;
-SfxStyleSheetIterator aStyleIter(
[Libreoffice-commits] .: svtools/inc svtools/source
svtools/inc/svtools/treelist.hxx |5 -
svtools/inc/svtools/treelistbox.hxx |3 ++-
svtools/source/contnr/treelist.cxx| 14 +++---
svtools/source/contnr/treelistbox.cxx |5 +
4 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit 9210b95bcfd65ae558f445666d9b880e794d4c74
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 15 16:31:49 2012 -0500
Make GetParent() const-correct.
const method should return const pointer if it points to an object held
internally prefer taking const pointer as a method argument if possible.
Change-Id: I4dc8c31d55aa0054ea6db521be9ad45fefef8d07
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 467dda9..79fbc1b 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -256,7 +256,10 @@ public:
SvTreeListEntry*GetEntry( SvTreeListEntry* pParent, sal_uLong nPos
) const;
SvTreeListEntry*GetEntry( sal_uLong nRootPos ) const;
SvTreeListEntry*GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
-SvTreeListEntry*GetParent( SvTreeListEntry* pEntry ) const;
+
+const SvTreeListEntry* GetParent( const SvTreeListEntry* pEntry ) const;
+SvTreeListEntry* GetParent( SvTreeListEntry* pEntry );
+
SvTreeListEntry*GetRootLevelParent( SvTreeListEntry* pEntry )
const;
const SvTreeListEntries GetChildList( SvTreeListEntry* pParent ) const;
SvTreeListEntries GetChildList( SvTreeListEntry* pParent );
diff --git a/svtools/inc/svtools/treelistbox.hxx
b/svtools/inc/svtools/treelistbox.hxx
index 8ec235d..a7e05d3 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -399,7 +399,8 @@ public:
voidFillEntryPath( SvTreeListEntry* pEntry, ::std::deque
sal_Int32 _rPath ) const;
using Window::GetParent;
-SvTreeListEntry*GetParent( SvTreeListEntry* pEntry ) const;
+const SvTreeListEntry* GetParent( const SvTreeListEntry* pEntry ) const;
+SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const;
SvTreeListEntry*GetRootLevelParent(SvTreeListEntry* pEntry ) const;
using Window::GetChildCount;
diff --git a/svtools/source/contnr/treelist.cxx
b/svtools/source/contnr/treelist.cxx
index 675c019..ed278f1 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1855,11 +1855,19 @@ SvTreeListEntries SvTreeList::GetChildList(
SvTreeListEntry* pParent )
return pParent-maChildren;
}
-SvTreeListEntry* SvTreeList::GetParent( SvTreeListEntry* pEntry ) const
+const SvTreeListEntry* SvTreeList::GetParent( const SvTreeListEntry* pEntry )
const
+{
+const SvTreeListEntry* pParent = pEntry-pParent;
+if (pParent == pRootItem)
+pParent = NULL;
+return pParent;
+}
+
+SvTreeListEntry* SvTreeList::GetParent( SvTreeListEntry* pEntry )
{
SvTreeListEntry* pParent = pEntry-pParent;
-if ( pParent==pRootItem )
-pParent = 0;
+if (pParent == pRootItem)
+pParent = NULL;
return pParent;
}
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index 5cdff0c..167035b 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -938,6 +938,11 @@ void SvTreeListBox::FillEntryPath( SvTreeListEntry*
pEntry, ::std::deque sal_In
}
}
+const SvTreeListEntry* SvTreeListBox::GetParent( const SvTreeListEntry* pEntry
) const
+{
+return pModel-GetParent(pEntry);
+}
+
SvTreeListEntry* SvTreeListBox::GetParent( SvTreeListEntry* pEntry ) const
{
return pModel-GetParent(pEntry);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 4 commits - cui/source dbaccess/source sc/source svtools/inc svtools/source svx/source sw/source
cui/source/options/fontsubs.cxx |4
cui/source/options/optfltr.cxx|8
cui/source/options/optlingu.cxx |2
cui/source/tabpages/autocdlg.cxx |4
cui/source/tabpages/macroass.cxx |2
dbaccess/source/ui/browser/dsEntriesNoExp.cxx |2
dbaccess/source/ui/browser/unodatbr.cxx |4
dbaccess/source/ui/control/listviewitems.cxx |4
dbaccess/source/ui/control/tabletree.cxx |2
dbaccess/source/ui/inc/listviewitems.hxx |2
sc/source/ui/miscdlgs/acredlin.cxx|4
sc/source/ui/miscdlgs/solveroptions.cxx |4
sc/source/ui/xmlsource/xmlsourcedlg.cxx |2
svtools/inc/svtools/svlbitm.hxx |8
svtools/inc/svtools/treelist.hxx |5
svtools/inc/svtools/treelistbox.hxx |9
svtools/inc/svtools/treelistentry.hxx | 20 +
svtools/source/contnr/svimpbox.cxx|6
svtools/source/contnr/svlbitm.cxx |8
svtools/source/contnr/svtabbx.cxx | 34 +-
svtools/source/contnr/treelist.cxx| 14 -
svtools/source/contnr/treelistbox.cxx | 17 -
svtools/source/contnr/treelistentry.cxx | 114
+-
svx/source/dialog/checklbx.cxx|2
svx/source/dialog/simptabl.cxx|4
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |4
sw/source/ui/index/cnttab.cxx |2
sw/source/ui/utlui/content.cxx|2
sw/source/ui/utlui/glbltree.cxx |2
29 files changed, 168 insertions(+), 127 deletions(-)
New commits:
commit a37c287ebe3a51d2deb99551d3aeeefead625373
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 15 19:28:23 2012 -0500
Now I can remove this ugly const_cast.
Change-Id: Ifc4d0028d334bd6fa9dfdea86543b5eaf25313e0
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 08cf7cc..fa85970 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -42,7 +42,7 @@ bool isAttribute(const SvTreeListEntry rEntry)
OUString getXPath(const SvTreeListBox rTree, const SvTreeListEntry rEntry)
{
OUStringBuffer aBuf;
-for (SvTreeListEntry* p = const_castSvTreeListEntry*(rEntry); p; p =
rTree.GetParent(p))
+for (const SvTreeListEntry* p = rEntry; p; p = rTree.GetParent(p))
{
const SvLBoxItem* pItem = p-GetFirstItem(SV_ITEM_ID_LBOXSTRING);
if (!pItem)
commit 4c9b9b964066a166eb81bb86f02378b4c7dbb50b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 15 16:31:49 2012 -0500
Make GetParent() const-correct.
const method should return const pointer if it points to an object held
internally prefer taking const pointer as a method argument if possible.
Change-Id: I4dc8c31d55aa0054ea6db521be9ad45fefef8d07
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 467dda9..79fbc1b 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -256,7 +256,10 @@ public:
SvTreeListEntry*GetEntry( SvTreeListEntry* pParent, sal_uLong nPos
) const;
SvTreeListEntry*GetEntry( sal_uLong nRootPos ) const;
SvTreeListEntry*GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
-SvTreeListEntry*GetParent( SvTreeListEntry* pEntry ) const;
+
+const SvTreeListEntry* GetParent( const SvTreeListEntry* pEntry ) const;
+SvTreeListEntry* GetParent( SvTreeListEntry* pEntry );
+
SvTreeListEntry*GetRootLevelParent( SvTreeListEntry* pEntry )
const;
const SvTreeListEntries GetChildList( SvTreeListEntry* pParent ) const;
SvTreeListEntries GetChildList( SvTreeListEntry* pParent );
diff --git a/svtools/inc/svtools/treelistbox.hxx
b/svtools/inc/svtools/treelistbox.hxx
index 8ec235d..a7e05d3 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -399,7 +399,8 @@ public:
voidFillEntryPath( SvTreeListEntry* pEntry, ::std::deque
sal_Int32 _rPath ) const;
using Window::GetParent;
-SvTreeListEntry*GetParent( SvTreeListEntry* pEntry ) const;
+const
[PATCH] renamed --enable-bluetooth to --enable-sdremote-bluetooth
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1086 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1086/1 renamed --enable-bluetooth to --enable-sdremote-bluetooth The current configure option --enable-bluetooth is a bit misleading, it doesn't really tell what it's actually for. Therefore renamed it, so it's more clear that it's an sdremote backend using bluetooth. Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa --- M config_host.mk.in M configure.ac M sd/Library_sd.mk M sd/Library_sdui.mk M sd/source/ui/dlg/RemoteDialog.cxx M sd/source/ui/remotecontrol/Server.cxx 6 files changed, 21 insertions(+), 21 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1086 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bug 46808
Hi, Everybody!
I'm analizing some things new to do and I started to do this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=46808
Well, When I was working in some sources I found something like this:
published service PropertySet
{
interface com::sun::star::beans::XPropertySet;
[optional] interface com::sun::star::beans::XFastPropertySet;
[optional] interface com::sun::star::beans::XMultiPropertySet;
[optional] interface com::sun::star::beans::XPropertyAccess;
[optional] interface com::sun::star::beans::XPropertyState;
};
The bug's description guides to do something like that:
service Foo { interface XBar; };
Transform for:
service Foo: XBar;
In this case, what I do with [optional] when transform for new style? Where
could I find more documentation of .idl files?
Thanks!!!
--
Att. José Guilherme Vanz
Se você é capaz de tremer de indignação cada vez que se comete uma
injustiça no mundo, então somos companheiros - Che Guevara
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 759f5b317837183e40353e2d5dd0700f6ebb6f3c Author: Andras Timar ati...@suse.com Date: Thu Nov 15 11:10:24 2012 +0100 Updated core Project: help ff39701b0e841035089929ab7811c7431ab9b39b format Basic code examples diff --git a/helpcontent2 b/helpcontent2 index 23d7515..ff39701 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 23d7515757534fca7d50e1201745586adde4b8f6 +Subproject commit ff39701b0e841035089929ab7811c7431ab9b39b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
