[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #12 from Roman Eisele b...@eikota.de --- Adding bug 55524 - “UI: Hang when accessing ‘Insert Manual Break...’”. Endless hang, at least on Mac OS X. Introduced between 27th and 30th September. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||55524 -- 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
[PATCH] gbuildification of beanshell
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/745 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/745/1 gbuildification of beanshell Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7 --- M Makefile.top M Module_tail_build.mk A beanshell/ExternalProject_beanshell.mk A beanshell/Makefile A beanshell/Module_beanshell.mk A beanshell/Package_beanshell.mk A beanshell/UnpackedTarball_beanshell.mk M beanshell/prj/build.lst D beanshell/prj/dmake M config_host.mk.in M configure.in M tail_build/prj/build.lst 12 files changed, 104 insertions(+), 5 deletions(-) -- To view, visit https://gerrit.libreoffice.org/745 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/kill-saxon'
New branch 'feature/kill-saxon' available with the following commits: commit d0931457167ae306ddfe42d79574bcd4edec05bf Author: David Tardon dtar...@redhat.com Date: Thu Sep 20 10:28:56 2012 +0200 rework selection of transformer for an XSLT filter Change-Id: I765762f11813c6b612416a8db2707bf94114c876 commit 1e0be7ca8b9e15bd6248b0f4431adcc10f6b2fdc Author: David Tardon dtar...@redhat.com Date: Wed Sep 19 12:54:24 2012 +0200 convert java XSL transformer into extension Change-Id: Ided6c480969764073056830722c8996e0df52285 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx import: set table above/bottom spacing to 0
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/713 -- To view, visit https://gerrit.libreoffice.org/713 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/n779941.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 25 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |5 +++
3 files changed, 30 insertions(+)
New commits:
commit e33a9181c76309d31f2ace01b924e404906da28c
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Wed Sep 26 15:25:39 2012 +0200
docx import: set table above/bottom spacing to 0
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06
diff --git a/sw/qa/extras/ooxmlimport/data/n779941.docx
b/sw/qa/extras/ooxmlimport/data/n779941.docx
new file mode 100644
index 000..9889d81
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n779941.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c545a89..1267eac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -92,6 +92,7 @@ public:
void testInk();
void testN779834();
void testN779627();
+void testN779941();
void testFdo55187();
void testN780563();
void testN780853();
@@ -136,6 +137,7 @@ public:
CPPUNIT_TEST(testInk);
CPPUNIT_TEST(testN779834);
CPPUNIT_TEST(testN779627);
+CPPUNIT_TEST(testN779941);
CPPUNIT_TEST(testFdo55187);
CPPUNIT_TEST(testN780563);
CPPUNIT_TEST(testN780853);
@@ -1006,6 +1008,29 @@ void Test::testN782345()
CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE,
getPropertystyle::BreakType(getParagraph(2), BreakType));
}
+void Test::testN779941()
+{
+/*
+ * Make sure top/bottom margins of tables are set to 0 (problem was:
bottom margin set to 0.35cm)
+ */
+load(n779941.docx);
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xTableProperties(xTables-getByIndex(0), uno::UNO_QUERY);
+{
+uno::Any aValue = xTableProperties-getPropertyValue(TopMargin);
+sal_Int32 nTopMargin;
+aValue = nTopMargin;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nTopMargin);
+}
+{
+uno::Any aValue = xTableProperties-getPropertyValue(BottomMargin);
+sal_Int32 nBottomMargin;
+aValue = nBottomMargin;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nBottomMargin);
+}
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index dce337d..e710a13 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -391,6 +391,11 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties-Insert( PROP_TABLE_BORDER_DISTANCES, false,
uno::makeAny( aDistances ) );
+// Set table above/bottom spacing to 0.
+// TODO: handle 'Around' text wrapping mode
+m_aTableProperties-Insert( PropertyIds::PROP_TOP_MARGIN, true,
uno::makeAny( 0 ) );
+m_aTableProperties-Insert( PropertyIds::PROP_BOTTOM_MARGIN, true,
uno::makeAny( 0 ) );
+
//table border settings
table::TableBorder aTableBorder;
table::BorderLine2 aBorderLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 27 ++-
1 file changed, 11 insertions(+), 16 deletions(-)
New commits:
commit 3cb619bd15a6017f253891f4c377fc790d8aae82
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Sep 27 10:15:58 2012 +0200
docx import: properly import table position
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc
Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
Reviewed-on: https://gerrit.libreoffice.org/714
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index e710a13..2690105 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -398,7 +398,7 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
//table border settings
table::TableBorder aTableBorder;
-table::BorderLine2 aBorderLine;
+table::BorderLine2 aBorderLine, aLeftBorder;
if (lcl_extractTableBorderProperty(m_aTableProperties,
PROP_TOP_BORDER, rInfo, aBorderLine))
{
@@ -410,10 +410,11 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
aTableBorder.BottomLine = aBorderLine;
aTableBorder.IsBottomLineValid = sal_True;
}
-if (lcl_extractTableBorderProperty(m_aTableProperties,
PROP_LEFT_BORDER, rInfo, aBorderLine))
+if (lcl_extractTableBorderProperty(m_aTableProperties,
PROP_LEFT_BORDER, rInfo, aLeftBorder))
{
-aTableBorder.LeftLine = aBorderLine;
+aTableBorder.LeftLine = aLeftBorder;
aTableBorder.IsLeftLineValid = sal_True;
+rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
}
if (lcl_extractTableBorderProperty(m_aTableProperties,
PROP_RIGHT_BORDER, rInfo, aBorderLine))
{
@@ -440,23 +441,17 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
lcl_debug_TableBorder(aTableBorder);
#endif
-// Mimic Office behavior : if tlbInd is defined, use it place table.
-// Otherwise, top-level table's position depends w:tblCellMar
attribute (but not nested tables)
-if (nLeftMargin)
+// Table position in Office is computed in 2 different ways :
+// - top level tables: the goal is to have in-cell text starting at
table indent pos (tblInd),
+// so table's position depends on table's cells margin
+// - nested tables: the goal is to have left-most border starting at
table_indent pos
+if (rInfo.nNestLevel 1)
{
-m_aTableProperties-Insert( PROP_LEFT_MARGIN, false, uno::makeAny(
nLeftMargin - nGapHalf));
+m_aTableProperties-Insert( PROP_LEFT_MARGIN, false, uno::makeAny(
nLeftMargin - nGapHalf ));
}
else
{
-// TODO: top-level position depends on w:tblCellMar attribute, not
w:cellMar
-if (rInfo.nNestLevel 1)
-{
-m_aTableProperties-Insert( PROP_LEFT_MARGIN, false,
uno::makeAny( - nGapHalf));
-}
-else
-{
-m_aTableProperties-Insert( PROP_LEFT_MARGIN, false,
uno::makeAny( - nGapHalf - rInfo.nLeftBorderDistance));
-}
+m_aTableProperties-Insert( PROP_LEFT_MARGIN, false, uno::makeAny(
nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance ));
}
m_aTableProperties-getValue( TablePropertyMap::TABLE_WIDTH,
nTableWidth );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx import: properly import table position
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/714 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/714 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - forms/source forms/util fpicker/source io/source
forms/source/misc/services.cxx |2 +-
forms/util/frm.component |2 +-
fpicker/source/aqua/FPentry.mm |2 +-
fpicker/source/aqua/fps_aqua.component |2 +-
fpicker/source/generic/fpicker.component |2 +-
fpicker/source/generic/fpicker.cxx |2 +-
fpicker/source/office/fps_office.component |2 +-
fpicker/source/office/fps_office.cxx |2 +-
fpicker/source/win32/filepicker/FPentry.cxx|2 +-
fpicker/source/win32/fps.component |2 +-
io/source/TextInputStream/TextInputStream.cxx |2 +-
io/source/TextInputStream/textinstream.component |2 +-
io/source/TextOutputStream/TextOutputStream.cxx|2 +-
io/source/TextOutputStream/textoutstream.component |2 +-
io/source/acceptor/acceptor.component |2 +-
io/source/acceptor/acceptor.cxx|2 +-
io/source/connector/connector.component|2 +-
io/source/connector/connector.cxx |2 +-
io/source/stm/factreg.cxx |2 +-
io/source/stm/streams.component|2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 3cba672351b2736e35fcaba1b4b465da5b4ecc9a
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 11:19:05 2012 +0300
Use prefix
Change-Id: I84ec9d6eed209eb429f5b5d4a667d3450a1435e1
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 8015c3b..5e87cf6 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -493,7 +493,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/TextInputStream/textinstream.component
b/io/source/TextInputStream/textinstream.component
index 8c02149..5d543a1 100644
--- a/io/source/TextInputStream/textinstream.component
+++ b/io/source/TextInputStream/textinstream.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=textinstream
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.io.TextInputStream
service name=com.sun.star.io.TextInputStream/
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index da32f34..beabc01 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -292,7 +292,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(
TimeValue *pTime )
}
//==
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/io/source/TextOutputStream/textoutstream.component
b/io/source/TextOutputStream/textoutstream.component
index f498f5a..807489c 100644
--- a/io/source/TextOutputStream/textoutstream.component
+++ b/io/source/TextOutputStream/textoutstream.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=textoutstream
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.io.TextOutputStream
service name=com.sun.star.io.TextOutputStream/
diff --git a/io/source/acceptor/acceptor.component
b/io/source/acceptor/acceptor.component
index 1fcb6ab..0b4877b 100644
--- a/io/source/acceptor/acceptor.component
+++ b/io/source/acceptor/acceptor.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=acceptor
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.io.Acceptor
service name=com.sun.star.connection.Acceptor/
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 145 ---
sw/source/filter/ww8/docxattributeoutput.hxx |4
2 files changed, 115 insertions(+), 34 deletions(-)
New commits:
commit 9751056ba806ba9614392f3c70ada3cbd1251814
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Sep 27 17:00:08 2012 +0200
docx export: export default table cell margins, based on 1st cell
Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e
Reviewed-on: https://gerrit.libreoffice.org/716
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 29aafd2..cf6f43e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1460,7 +1460,7 @@ static void impl_borderLine( FSHelperPtr pSerializer,
sal_Int32 elementToken, co
pSerializer-singleElementNS( XML_w, elementToken, xAttrs );
}
-static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem rBox,
bool bUseStartEnd = false )
+static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem rBox,
sal_Int32 tag, bool bUseStartEnd = false, bool bWriteTag = true, const
SvxBoxItem* pDefaultBorders = 0)
{
static const sal_uInt16 aBorders[] =
{
@@ -1474,12 +1474,91 @@ static void impl_pageBorders( FSHelperPtr pSerializer,
const SvxBoxItem rBox, b
XML_bottom,
bUseStartEnd ? XML_end : XML_right
};
+bool tagWritten = false;
const sal_uInt16* pBrd = aBorders;
for( int i = 0; i 4; ++i, ++pBrd )
{
const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
if ( pLn )
+{
+if ( pDefaultBorders )
+{
+const SvxBorderLine* pRefLn = pDefaultBorders-GetLine( *pBrd
);
+
+// If border is equal to default border: do not output
+if ( pRefLn *pLn == *pRefLn) {
+continue;
+}
+}
+
+if (!tagWritten bWriteTag) {
+pSerializer-startElementNS( XML_w, tag, FSEND );
+tagWritten = true;
+}
+
impl_borderLine( pSerializer, aXmlElements[i], pLn, 0 );
+
+// When exporting default borders, we need to export these 2 attr
+if ( pDefaultBorders == 0 ) {
+if ( i == 2 )
+impl_borderLine( pSerializer, XML_insideH, pLn, 0 );
+else if ( i == 3 )
+impl_borderLine( pSerializer, XML_insideV, pLn, 0 );
+}
+}
+}
+if (tagWritten bWriteTag) {
+pSerializer-endElementNS( XML_w, tag );
+}
+}
+
+static void impl_cellMargins( FSHelperPtr pSerializer, const SvxBoxItem rBox,
sal_Int32 tag, bool bUseStartEnd = false, const SvxBoxItem* pDefaultMargins = 0)
+{
+static const sal_uInt16 aBorders[] =
+{
+BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT
+};
+
+const sal_Int32 aXmlElements[] =
+{
+XML_top,
+bUseStartEnd ? XML_start : XML_left,
+XML_bottom,
+bUseStartEnd ? XML_end : XML_right
+};
+bool tagWritten = false;
+const sal_uInt16* pBrd = aBorders;
+for( int i = 0; i 4; ++i, ++pBrd )
+{
+sal_Int32 nDist = sal_Int32( rBox.GetDistance( *pBrd ) );
+
+if ( aBorders[i] == BOX_LINE_LEFT ) {
+// Office's cell margin is measured from the right of the border.
+// While LO's cell spacing is measured from the center of the
border.
+// So we add half left-border width to tblIndent value
+const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
+if (pLn)
+nDist -= pLn-GetWidth() * 0.5;
+}
+
+if (pDefaultMargins)
+{
+// Skip output if cell margin == table default margin
+if (sal_Int32( pDefaultMargins-GetDistance( *pBrd ) ) == nDist)
+continue;
+}
+
+if (!tagWritten) {
+pSerializer-startElementNS( XML_w, tag, FSEND );
+tagWritten = true;
+}
+pSerializer-singleElementNS( XML_w, aXmlElements[i],
+ FSNS( XML_w, XML_w ), OString::valueOf( nDist ).getStr( ),
+ FSNS( XML_w, XML_type ), dxa,
+ FSEND );
+}
+if (tagWritten) {
+pSerializer-endElementNS( XML_w, tag );
}
}
@@ -1526,41 +1605,20 @@ void DocxAttributeOutput::TableCellProperties(
ww8::WW8TableNodeInfoInner::Point
FSEND );
}
-// The cell borders
-m_pSerializer-startElementNS( XML_w, XML_tcBorders, FSEND );
-SwFrmFmt *pFmt = pTblBox-GetFrmFmt( );
-impl_pageBorders( m_pSerializer, pFmt-GetBox( ), !bEcma );
-m_pSerializer-endElementNS( XML_w, XML_tcBorders );
+const SvxBoxItem rBox = pTblBox-GetFrmFmt( )-GetBox( );
+
[PUSHED] docx export: export default table cell margins, based on 1st...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/716 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/716 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 49 +++
1 file changed, 49 insertions(+)
New commits:
commit 9a5eb5f51d29b3af4e2d23653508196cc68c0b87
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Sep 27 17:00:37 2012 +0200
docx export: add unit test for 9751056
Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c3d7fc4..6f8689a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -30,6 +30,13 @@
#include com/sun/star/frame/XStorable.hpp
#include com/sun/star/style/TabStop.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
+#include com/sun/star/text/XTextFrame.hpp
+#include com/sun/star/text/XTextTable.hpp
+#include com/sun/star/text/XTextFramesSupplier.hpp
+#include com/sun/star/text/XTextViewCursorSupplier.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
+#include com/sun/star/view/XSelectionSupplier.hpp
+#include com/sun/star/table/BorderLine2.hpp
#include unotools/tempfile.hxx
@@ -55,6 +62,7 @@ public:
void testMathRad();
void testMathSubscripts();
void testMathVerticalStacks();
+void testTablePosition();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -77,6 +85,7 @@ public:
CPPUNIT_TEST(testMathRad);
CPPUNIT_TEST(testMathSubscripts);
CPPUNIT_TEST(testMathVerticalStacks);
+CPPUNIT_TEST(testTablePosition);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -348,6 +357,46 @@ void Test::testMathVerticalStacks()
//CHECK_FORMULA( binom {a} {binom {b} {c}}, getFormula( getRun(
getParagraph( 4 ), 1 )));
}
+void Test::testTablePosition()
+{
+// This is the reverse test of n779957 from ooxmlimport
+// We want to verify that a full round-trip does not break formatting
+// Of course if import code is wrong, this tests will fail regardless of
export code.
+roundtrip( ../../ooxmlimport/data/n779957.docx );
+
+sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 };
+sal_Int32 cellLeftMarginFromOffice[] = { 250, 100, 0, 0 };
+
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+
+for (int i=0; i4; i++) {
+uno::Referencetext::XTextTable xTable1 (xTables-getByIndex(i),
uno::UNO_QUERY);
+// Verify X coord
+uno::Referenceview::XSelectionSupplier
xCtrl(xModel-getCurrentController(), uno::UNO_QUERY);
+xCtrl-select(uno::makeAny(xTable1));
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xCtrl, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+awt::Point pos = xCursor-getPosition();
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(Incorrect X coord computed from
docx,
+xCoordsFromOffice[i], pos.X, 1);
+
+// Verify left margin of 1st cell :
+// * Office left margins are measured relative to the right of the
border
+// * LO left spacing is measured from the center of the border
+uno::Referencetable::XCell xCell = xTable1-getCellByName(A1);
+uno::Reference beans::XPropertySet xPropSet(xCell,
uno::UNO_QUERY_THROW);
+sal_Int32 aLeftMargin = -1;
+xPropSet-getPropertyValue(LeftBorderDistance) = aLeftMargin;
+uno::Any aLeftBorder = xPropSet-getPropertyValue(LeftBorder);
+table::BorderLine2 aLeftBorderLine;
+aLeftBorder = aLeftBorderLine;
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(Incorrect left spacing computed
from docx cell margin,
+cellLeftMarginFromOffice[i], aLeftMargin - 0.5 *
aLeftBorderLine.LineWidth, 1);
+}
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit 559a1a5d28d94e915150f94d5267a4f720d175b0 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Fri Sep 28 09:58:44 2012 +0200 docx export: always write tblInd attribute (even when equal to 0) Otherwise when opening the docx in Office table may get misplaced. Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a Reviewed-on: https://gerrit.libreoffice.org/718 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index cf6f43e..bce14c8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1813,12 +1813,11 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t TableBidi( pTableTextNodeInfoInner ); -// Table indent -if ( nIndent != 0 ) -m_pSerializer-singleElementNS( XML_w, XML_tblInd, -FSNS( XML_w, XML_w ), OString::valueOf( nIndent ).getStr( ), -FSNS( XML_w, XML_type ), dxa, -FSEND ); +// Table indent (need to get written even if == 0) +m_pSerializer-singleElementNS( XML_w, XML_tblInd, +FSNS( XML_w, XML_w ), OString::valueOf( nIndent ).getStr( ), +FSNS( XML_w, XML_type ), dxa, +FSEND ); // Merge the marks for the ordered elements m_pSerializer-mergeTopMarks( ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx export: add unit test for 9751056
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/717 -- To view, visit https://gerrit.libreoffice.org/717 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] docx export: always write tblInd attribute (even when equal ...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/718 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/718 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - lingucomponent/source oox/source oox/util pyuno/source remotebridges/source scripting/source scripting/util
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component |2 +-
lingucomponent/source/spellcheck/macosxspell/macreg.mm |2 +-
oox/source/core/services.cxx |2 +-
oox/util/oox.component |2 +-
pyuno/source/loader/pythonloader.component |2 +-
pyuno/source/loader/pyuno_loader.cxx |2 +-
remotebridges/source/unourl_resolver/unourl_resolver.cxx |4 ++--
remotebridges/source/unourl_resolver/uuresolver.component |2 +-
scripting/source/basprov/basprov.component |2 +-
scripting/source/basprov/basprov.cxx |2 +-
scripting/source/dlgprov/dlgprov.component |2 +-
scripting/source/dlgprov/dlgprov.cxx |2 +-
scripting/source/protocolhandler/protocolhandler.component |2 +-
scripting/source/protocolhandler/scripthandler.cxx |2 +-
scripting/source/provider/MasterScriptProvider.cxx |2 +-
scripting/source/stringresource/stringresource.component |2 +-
scripting/source/stringresource/stringresource.cxx |2 +-
scripting/source/vbaevents/service.cxx |2 +-
scripting/source/vbaevents/vbaevents.component |2 +-
scripting/util/scriptframe.component |2 +-
20 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 671746f57cd3337ba49a0be512080dd5b69e3d40
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 11:45:48 2012 +0300
Use prefix
Change-Id: Id1ac9a800b58595771be22097d77d3a7c5a8862c
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 16d1e5f..aec6559 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -65,7 +65,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL oox_component_getFactory( const
char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey, spServices );
}
diff --git a/oox/util/oox.component b/oox/util/oox.component
index 0c3157f..54f4655 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=oox
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.oox.core.FastTokenHandler
service name=com.sun.star.xml.sax.FastTokenHandler/
commit 1b075ea2cbeef67bf556cade80f2fcf8130be571
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 11:45:11 2012 +0300
Use prefix
Change-Id: I0323e3eb9446c4f2b18f84f5ed33909a877163c8
diff --git a/scripting/source/basprov/basprov.component
b/scripting/source/basprov/basprov.component
index 5268cfe..09ed542 100644
--- a/scripting/source/basprov/basprov.component
+++ b/scripting/source/basprov/basprov.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=basprov
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.scripting.ScriptProviderForBasic
service name=com.sun.star.script.browse.BrowseNode/
diff --git a/scripting/source/basprov/basprov.cxx
b/scripting/source/basprov/basprov.cxx
index 06675e8..bf4a449 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -586,7 +586,7 @@ namespace basprov
extern C
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/scripting/source/dlgprov/dlgprov.component
b/scripting/source/dlgprov/dlgprov.component
index dffc48e..66dd111 100644
--- a/scripting/source/dlgprov/dlgprov.component
+++ b/scripting/source/dlgprov/dlgprov.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=dlgprov
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.scripting.DialogProvider
service name=com.sun.star.awt.ContainerWindowProvider/
diff
Re: [PUSHED] [PATCH 2/3] fdo#51304: Remove @author annotation and commented code
On 10/01/2012 08:03 PM, Thorsten Behrens wrote: I also did not apply your printStackTrace() logging calls, I think at least some of them report on exceptions that were seemingly previously ignored on purpose? Stephan, or anyone else more up-to-date with contemporary java idiom, any opinions here? I have not much of an opinion there. The wizards code being what it is, it is probably tedious and pointless to try and determine whether individual exception-swallowing catch-blocks were really meant that way or were just incompetent coding. So I'd personally be fine both with keeping the blocks empty and with adding printStackTrace calls wholesale. (Just one nit, System.err is the default target for printStackTrace, so it can be omitted from calls.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/Library_PptImporter.mk filter/source
filter/Library_PptImporter.mk|1
filter/source/msfilter/powerpoint/pptimporteruno.cxx | 63 +++
2 files changed, 64 insertions(+)
New commits:
commit 1a28e705322463f2ed25acace19c8edc33466eeb
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Oct 2 12:04:00 2012 +0300
Revert As far as I can see the PptImporter library is not a UNO component
I don't trust myself.
This reverts commit 2726f7f4ca5cde91565203ef055561558ea66e7d.
diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index 8fee1bd..f1d172a 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\
$(eval $(call gb_Library_add_exception_objects,PptImporter,\
filter/source/msfilter/powerpoint/pptimporter \
+ filter/source/msfilter/powerpoint/pptimporteruno \
filter/source/msfilter/powerpoint/ppttoxml \
))
diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx
b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
new file mode 100644
index 000..be0b49e
--- /dev/null
+++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+
+#include pptimporter.hxx
+
+#include cppuhelper/factory.hxx
+#include uno/mapping.hxx
+
+static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF(
NMSP_LANG::XMultiServiceFactory ) rxFact )
+{
+return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) );
+}
+
+extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
+void* pRet = 0;
+
+if( rtl_str_compare( pImplName, com.sun.star.presentation.PptImporter )
== 0 )
+{
+const NMSP_RTL::OUString aServiceName( B2UCONST(
com.sun.star.presentation.PptImporter ) );
+
+xFactory = REF( NMSP_LANG::XSingleServiceFactory )(
NMSP_CPPU::createSingleFactory(
+reinterpret_cast NMSP_LANG::XMultiServiceFactory* (
pServiceManager ),
+B2UCONST( com.sun.star.presentation.PptImporter ),
+create_PptImporter, SEQ( NMSP_RTL::OUString )(
aServiceName, 1 ) ) );
+}
+if( xFactory.is() )
+{
+xFactory-acquire();
+pRet = xFactory.get();
+}
+
+return pRet;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sdext/source shell/source
sdext/source/minimizer/minimizer.component |3 ++-
sdext/source/minimizer/pppoptimizeruno.cxx |2 +-
sdext/source/pdfimport/pdfimport.component |3 ++-
sdext/source/pdfimport/services.cxx |2 +-
sdext/source/presenter/PresenterComponent.cxx|4 ++--
sdext/source/presenter/presenter.component |3 ++-
shell/source/backends/gconfbe/gconfbackend.cxx |2 +-
shell/source/backends/gconfbe/gconfbe1.component |2 +-
shell/source/backends/kde4be/kde4backend.cxx |2 +-
shell/source/backends/kde4be/kde4be1.component |2 +-
shell/source/backends/kdebe/kdebackend.cxx |2 +-
shell/source/backends/kdebe/kdebe1.component |2 +-
shell/source/backends/macbe/macbe1.component |2 +-
shell/source/backends/macbe/macbecdef.cxx|2 +-
shell/source/backends/wininetbe/wininetbe1.component |2 +-
shell/source/backends/wininetbe/wininetbecdef.cxx|2 +-
shell/source/cmdmail/cmdmail.component |2 +-
shell/source/cmdmail/cmdmailentry.cxx|2 +-
shell/source/unix/exec/shellexecentry.cxx|2 +-
shell/source/unix/exec/syssh.component |2 +-
shell/source/win32/SysShentry.cxx|2 +-
shell/source/win32/simplemail/smplmail.component |2 +-
shell/source/win32/simplemail/smplmailentry.cxx |2 +-
shell/source/win32/syssh.component |2 +-
24 files changed, 28 insertions(+), 25 deletions(-)
New commits:
commit 565acfef761e37a0172154aae0bdace1ce3c
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 12:04:10 2012 +0300
Use prefix
Change-Id: Ife93e37f8b24f3ce96b55c5a221f0f929b789f60
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx
b/shell/source/backends/gconfbe/gconfbackend.cxx
index 82ea9fe..263fa7d 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -217,7 +217,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL gconfbe1_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/shell/source/backends/gconfbe/gconfbe1.component
b/shell/source/backends/gconfbe/gconfbe1.component
index 7638e05..b48806c 100644
--- a/shell/source/backends/gconfbe/gconfbe1.component
+++ b/shell/source/backends/gconfbe/gconfbe1.component
@@ -26,7 +26,7 @@
*
**--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=gconfbe1
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.configuration.backend.GconfBackend
service name=com.sun.star.configuration.backend.GconfBackend/
diff --git a/shell/source/backends/kde4be/kde4backend.cxx
b/shell/source/backends/kde4be/kde4backend.cxx
index 1c87c48..314cd5a 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL kde4be1_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/shell/source/backends/kde4be/kde4be1.component
b/shell/source/backends/kde4be/kde4be1.component
index 8ea7ae1..9bceccc 100644
--- a/shell/source/backends/kde4be/kde4be1.component
+++ b/shell/source/backends/kde4be/kde4be1.component
@@ -26,7 +26,7 @@
*
**--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=kde4be1
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.configuration.backend.KDE4Backend
service name=com.sun.star.configuration.backend.KDE4Backend/
diff --git a/shell/source/backends/kdebe/kdebackend.cxx
b/shell/source/backends/kdebe/kdebackend.cxx
index 4faf911..ad82efc 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL kdebe1_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/shell/source/backends/kdebe/kdebe1.component
[Libreoffice-commits] .: 2 commits - cpputools/source stoc/source
cpputools/source/registercomponent/registercomponent.cxx |6 ++-
cpputools/source/unoexe/unoexe.cxx | 28 ++-
stoc/source/javaloader/javaloader.component |2 -
stoc/source/javaloader/javaloader.cxx|2 -
stoc/source/javavm/javavm.component |2 -
stoc/source/javavm/javavm.cxx|2 -
6 files changed, 20 insertions(+), 22 deletions(-)
New commits:
commit d50f3c5922411304b4291953a4cc9f07f4730892
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Oct 2 11:01:23 2012 +0200
stoc: prefix more libs; only bootstrap is remaining
Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9
diff --git a/cpputools/source/registercomponent/registercomponent.cxx
b/cpputools/source/registercomponent/registercomponent.cxx
index 06c38f5..950952b 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -722,13 +722,15 @@ static void bootstrap(
OUString(),
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.stoc.JavaVirtualMachine)),
xSMgr,
-Reference XRegistryKey () );
+Reference XRegistryKey (),
+javavm );
Reference XInterface r2 = loadSharedLibComponentFactory(
OUString(RTL_CONSTASCII_USTRINGPARAM(javaloader.uno
SAL_DLLEXTENSION)),
OUString(),
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.stoc.JavaComponentLoader)),
xSMgr,
-Reference XRegistryKey () );
+Reference XRegistryKey (),
+javaloader );
Reference XSet xSet( xSMgr, UNO_QUERY );
if( r.is() r2.is() xSet.is() )
{
diff --git a/stoc/source/javaloader/javaloader.component
b/stoc/source/javaloader/javaloader.component
index bb2ea0f..5fd7d86 100644
--- a/stoc/source/javaloader/javaloader.component
+++ b/stoc/source/javaloader/javaloader.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=javaloader
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.stoc.JavaComponentLoader
service name=com.sun.star.loader.Java/
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index 7bfe440..cb48b6c 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -435,7 +435,7 @@ static struct ImplementationEntry g_entries[] =
extern C
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL javaloader_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
diff --git a/stoc/source/javavm/javavm.component
b/stoc/source/javavm/javavm.component
index 1394b5b..570ce4c 100644
--- a/stoc/source/javavm/javavm.component
+++ b/stoc/source/javavm/javavm.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=javavm
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.stoc.JavaVirtualMachine
service name=com.sun.star.java.JavaVirtualMachine/
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index fbb1c89..4667fee 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -598,7 +598,7 @@ private:
}
-extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char
const * pImplName,
+extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL
javavm_component_getFactory(sal_Char const * pImplName,
void * pServiceManager,
void * pRegistryKey)
{
commit 95630ef04b9df092653fb2f68d91a7e6100f7a4e
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Oct 2 10:57:38 2012 +0200
these libs are now prefixed
Change-Id: Ida3cc87ef2ef6fdb40b03d0401fbefa5e7cd7c92
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index d9a92e3..db3e63b 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -257,29 +257,25 @@ void createInstance(
Reference XMultiServiceFactory xSF( xMgr, UNO_QUERY );
// acceptor
xSet-insert( makeAny( loadSharedLibComponentFactory(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- acceptor.uno SAL_DLLEXTENSION) ),
+
Error while building LO on Windows
Hello, I am trying to build Libre Office on Windows, as described in http://wiki.documentfoundation.org/Development/BuildingOnWindowsWithCygwinAndMSVCExpress. During instsetoo_native I get the error: : ## : Packaging process : ## : Performance Info: Execute packaging startMon Oct 1 15:28:24 2012 (02:21 min.) : chdir: E:/LibreOfficeBuild/libreoffice-lhm/core/instsetoo_native/wntmsci12.pro/LibreOffice/native/logging/en-US_de/ : chdir: /tmp/ooopackaging/i_2001349097963/wntmsci12.pro : Systemcall: makecab.exe /V3 /F E:/LibreOfficeBuild/libreoffice-lhm/core/instsetoo_native/wntmsci12.pro/LibreOffice/native/ddf/en-US_de/libreoffice1.ddf 21 | : makecab_error (Try 1): makecab.exe /V3 /F E:/LibreOfficeBuild/libreoffice-lhm/core/instsetoo_native/wntmsci12.pro/LibreOffice/native/ddf/en-US_de/libreoffice1.ddf 21 | : !makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp I suppose this is because the ddf-file libreoffice1.ddf contains the lines: LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\caption\com.sun.PresenterScreen-windows_x86%2Fpresenter.xhp com2.sun.PresenterScreen_windows_x86%2Fpresenter.xhp LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\content\com.sun.PresenterScreen-windows_x86%2Fpresenter.xhp com3.sun.PresenterScreen_windows_x86%2Fpresenter.xhp But only for that file, presenter.xhp. All other entries are without %2F, for example: LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\help.db_ help1.db_ LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\help.ht_ help1.ht_ Any hints, what's wrong? Many thanks, Ulrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bug Confirmation Triage Event (Doodle)
Hi All, Trying to find a time that works for as many people as possible, 1 hour event, doodle can be found here: http://doodle.com/3tfr888ma5cgkww4 If another time works better, propose it and we'll see what we can get to. I can't go any earlier than the time listed on Weekdays (that's 5am here). Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: OUString is mutable?
In the WinRT APIs (not to be confused with the Windows RT on Atom) introduced with Windows 8, strings are immutable. I suspect that hardware features may be exploited to ensure that they stay that way. I haven't got my head around how that works with the still-supported BSTR at the native level. There can be some simple testing to see if access violations are triggered even when the data structure is accessed internally via native code. In addition to the considerations already listed, there are also security considerations applicable to strings, having to do with their use in native code exploits to access other heap or code storage by addressing beyond or before the string location. I suppose that genuinely-immutable strings might provide some safeguard against exploits of that nature. Regarding the mention that the latest Java VM is using UTF8 internally instead of unsigned short arrays is rather daunting. There is an easy way to test it -- see if char values that are not admissible UTF16 codes can be used in construction of a string and then extracted correctly. If they can, there is no way that transformation to and from UTF8 occurred. If they can't, it is an interesting breaking change in Java. With regard to string literals, it would be interesting to see what can be introduced into those via escape codes too. - Dennis -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Michael Stahl Sent: Monday, October 01, 2012 06:51 To: libreoffice@lists.freedesktop.org Subject: Re: OUString is mutable? [ ... ] it appears that there are people who do see good reasons for immutable strings :) [ ... ] from what i can see the advantages of immutable strings include: - somebody reading the code can rely on the fact that the buffer in the string is not mutated - immutable data types are much less error prone as hashtable/map keys (you don't want to modify a key after it has been inserted, because that is practically guaranteed to violate container's invariants) - the buffer can be shared across threads (but not the string wrapper itself, which makes this .. less of an advantage) - there are potential space and allocation savings with sharing sub-string representations (though OUString doesn't do that) - it allows for caching the hash value, though OUString doesn't do that (and i don't know if space overhead is worth it...) [ ... ] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 12c220ae8e55a033ab6aeca27c0e26a643d2001a Author: Miklos Vajna vmik...@suse.cz Date: Tue Oct 2 12:25:41 2012 +0300 Make Clang happy Change-Id: I69c886d0a1875ec674f40c2422dc1490418c1da3 diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 2690105..f8786c9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -393,8 +393,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // Set table above/bottom spacing to 0. // TODO: handle 'Around' text wrapping mode -m_aTableProperties-Insert( PropertyIds::PROP_TOP_MARGIN, true, uno::makeAny( 0 ) ); -m_aTableProperties-Insert( PropertyIds::PROP_BOTTOM_MARGIN, true, uno::makeAny( 0 ) ); +m_aTableProperties-Insert( PROP_TOP_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); +m_aTableProperties-Insert( PROP_BOTTOM_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); //table border settings table::TableBorder aTableBorder; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/Library_PptImporter.mk filter/Module_filter.mk filter/source Repository.mk
Repository.mk|1 filter/Library_PptImporter.mk| 42 - filter/Module_filter.mk |1 filter/source/msfilter/powerpoint/pptcom.hxx | 62 --- filter/source/msfilter/powerpoint/pptimporter.cxx| 148 --- filter/source/msfilter/powerpoint/pptimporter.hxx| 85 -- filter/source/msfilter/powerpoint/pptimporteruno.cxx | 63 filter/source/msfilter/powerpoint/ppttoxml.cxx | 83 -- filter/source/msfilter/powerpoint/ppttoxml.hxx | 41 - 9 files changed, 526 deletions(-) New commits: commit 4ea8ddb05b3e5f65ee8cf73ae87500d066c13ea5 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 2 11:29:48 2012 +0200 PptImporter is unused; it was also missing in scp2 Change-Id: I87c8d46d791525e3e5b6866edc6423e92cbcca81 diff --git a/Repository.mk b/Repository.mk index fdc4ce6..a4daa93 100644 --- a/Repository.mk +++ b/Repository.mk @@ -217,7 +217,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ -PptImporter \ abp \ acc \ adabas \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk deleted file mode 100644 index f1d172a..000 --- a/filter/Library_PptImporter.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Library_Library,PptImporter)) - -$(eval $(call gb_Library_use_sdk_api,PptImporter)) - -$(eval $(call gb_Library_set_include,PptImporter,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_use_libraries,PptImporter,\ - sot \ - tl \ - cppuhelper \ - cppu \ - sal \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,PptImporter,\ - filter/source/msfilter/powerpoint/pptimporter \ - filter/source/msfilter/powerpoint/pptimporteruno \ - filter/source/msfilter/powerpoint/ppttoxml \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index b3ec2a3..99bebb5 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ - Library_PptImporter \ Library_egi \ Library_eme \ Library_epb \ diff --git a/filter/source/msfilter/powerpoint/pptcom.hxx b/filter/source/msfilter/powerpoint/pptcom.hxx deleted file mode 100644 index f25e6ad..000 --- a/filter/source/msfilter/powerpoint/pptcom.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _PPTCOM_HXX -#define _PPTCOM_HXX - -#include rtl/ustring.hxx - -#include com/sun/star/uno/Reference.h -#include com/sun/star/uno/RuntimeException.hpp -#include com/sun/star/lang/XMultiServiceFactory.hpp -#include com/sun/star/lang/XComponent.hpp -#include com/sun/star/registry/XRegistryKey.hpp -#include com/sun/star/io/XInputStream.hpp -#include com/sun/star/xml/sax/XDocumentHandler.hpp -#include xmloff/xmlexp.hxx -#include xmloff/nmspmap.hxx -#include cppuhelper/implbase1.hxx -#include cppuhelper/implbase4.hxx -#include com/sun/star/document/XFilter.hpp -#include
[Libreoffice-commits] .: sw/source
sw/source/ui/app/applab.cxx | 77 +---
1 file changed, 23 insertions(+), 54 deletions(-)
New commits:
commit 2f3b4edc414b30a149db336ef1d3d8bf716698f0
Author: Winfried Donkers o...@dci-electronics.nl
Date: Fri Sep 28 12:15:11 2012 +0200
fdo#52673 fix for layout problems with version 3.6 and up
Change-Id: I626ec5bce931005dccbc8f4d235e8208ae98f9a5
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 55989b8..1ed815e 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -91,21 +91,19 @@ const char MASTER_LABEL[] = MasterLabel;
const SwFrmFmt *lcl_InsertBCText( SwWrtShell rSh, const SwLabItem rItem,
SwFrmFmt rFmt,
-sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bPage)
+sal_uInt16 nCol, sal_uInt16 nRow )
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT, 0 );
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
-aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum));
-if (!bPage)
-{
-aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist,
-
text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
-
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-}
+//anchor frame to page
+aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist,
+ text::HoriOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
+aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
+ text::VertOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, rFmt ); // Insert
Fly
OSL_ENSURE( pFmt, Fly not inserted );
@@ -130,21 +128,19 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell rSh, const
SwLabItem rItem,
const SwFrmFmt *lcl_InsertLabText( SwWrtShell rSh, const SwLabItem rItem,
SwFrmFmt rFmt, SwFldMgr rFldMgr,
-sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast,
sal_Bool bPage)
+sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast )
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT, 0 );
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
-aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum));
-if (!bPage)
-{
-aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist,
-
text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
-
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-}
+//anchor frame to page
+aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist,
+ text::HoriOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
+aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
+ text::VertOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, rFmt ); // Insert
Fly
OSL_ENSURE( pFmt, Fly not inserted );
@@ -300,26 +296,11 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool
bLabel)
SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, iWidth, iHeight );
pFmt-SetFmtAttr( aFrmSize );
-SwFrmFmt* pFmtEORow = new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOCol = new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOColEORow = new SwFrmFmt (*pFmt);
-
-SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist -
rItem.lHeight),
-RES_UL_SPACE );
+//frame represents label itself, no border space
SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE );
-
-SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist -
rItem.lWidth),
-0, 0, RES_LR_SPACE );
SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE );
-
-pFmt-SetFmtAttr(aFrmULSpace);
-pFmt-SetFmtAttr(aFrmLRSpace);
-pFmtEORow-SetFmtAttr(aFrmULSpace);
-pFmtEORow-SetFmtAttr(aFrmNoLRSpace);
-pFmtEOCol-SetFmtAttr(aFrmNoULSpace);
-
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/ui/app/applab.cxx | 77 +---
1 file changed, 23 insertions(+), 54 deletions(-)
New commits:
commit 4bbcf581ad7a478387491058b38e6dd8a344af44
Author: Winfried Donkers o...@dci-electronics.nl
Date: Fri Sep 28 12:15:11 2012 +0200
fdo#53673 fix for layout problems with version 3.6 and up
Change-Id: I626ec5bce931005dccbc8f4d235e8208ae98f9a5
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 4159f18..fe2dd11 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -91,21 +91,19 @@ const char MASTER_LABEL[] = MasterLabel;
const SwFrmFmt *lcl_InsertBCText( SwWrtShell rSh, const SwLabItem rItem,
SwFrmFmt rFmt,
-sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bPage)
+sal_uInt16 nCol, sal_uInt16 nRow )
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT, 0 );
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
-aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum));
-if (!bPage)
-{
-aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist,
-
text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
-
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-}
+//anchor frame to page
+aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist,
+ text::HoriOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
+aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
+ text::VertOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, rFmt ); // Insert
Fly
OSL_ENSURE( pFmt, Fly not inserted );
@@ -130,21 +128,19 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell rSh, const
SwLabItem rItem,
const SwFrmFmt *lcl_InsertLabText( SwWrtShell rSh, const SwLabItem rItem,
SwFrmFmt rFmt, SwFldMgr rFldMgr,
-sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast,
sal_Bool bPage)
+sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast )
{
SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT,
RES_HORI_ORIENT, 0 );
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
-aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum));
-if (!bPage)
-{
-aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist,
-
text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
-
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-}
+//anchor frame to page
+aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist,
+ text::HoriOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
+aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
+ text::VertOrientation::NONE,
text::RelOrientation::PAGE_FRAME ) );
const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, rFmt ); // Insert
Fly
OSL_ENSURE( pFmt, Fly not inserted );
@@ -300,26 +296,11 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool
bLabel)
SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, iWidth, iHeight );
pFmt-SetFmtAttr( aFrmSize );
-SwFrmFmt* pFmtEORow = new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOCol = new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOColEORow = new SwFrmFmt (*pFmt);
-
-SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist -
rItem.lHeight),
-RES_UL_SPACE );
+//frame represents label itself, no border space
SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE );
-
-SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist -
rItem.lWidth),
-0, 0, RES_LR_SPACE );
SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE );
-
-pFmt-SetFmtAttr(aFrmULSpace);
-pFmt-SetFmtAttr(aFrmLRSpace);
-pFmtEORow-SetFmtAttr(aFrmULSpace);
-pFmtEORow-SetFmtAttr(aFrmNoLRSpace);
-pFmtEOCol-SetFmtAttr(aFrmNoULSpace);
-
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/localedata/data/hu_HU.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 29bd9606cf7c915a61f31418cf187de8f5aa84e9 Author: László Németh nem...@numbertext.org Date: Sat Sep 29 00:05:34 2012 +0200 Add back compatible Hungarian date format acceptance Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd Reviewed-on: https://gerrit.libreoffice.org/720 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com Signed-off-by: Andras Timar ati...@suse.com diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index dc3be12..8ad831e 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -35,6 +35,8 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternM-D/DateAcceptancePattern +DateAcceptancePatternM.D/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error while building LO on Windows
On 10/01/2012 04:02 PM, Ulrich Kitzinger wrote: : !makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp : makecab_error: Missing % after variable name: %2Fpresenter.xhp I suppose this is because the ddf-file libreoffice1.ddf contains the lines: LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\caption\com.sun.PresenterScreen-windows_x86%2Fpresenter.xhp com2.sun.PresenterScreen_windows_x86%2Fpresenter.xhp LibreOffice\native\zip\en-US_de\00\presenter-screen_oxt\help\en-US\content\com.sun.PresenterScreen-windows_x86%2Fpresenter.xhp com3.sun.PresenterScreen_windows_x86%2Fpresenter.xhp That should long since have been addressed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=a297372210396260da57f34da3790f76682603cc Quote .ddf content (potentially containing stuff like %2F). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - vbahelper/source vbahelper/util writerfilter/source writerfilter/util
vbahelper/source/msforms/service.cxx|2 +-
vbahelper/util/msforms.component|2 +-
writerfilter/source/filter/WriterFilter.cxx |2 +-
writerfilter/util/writerfilter.component|2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9da34c09bfd27ba0b1c423ebb558d997b5213018
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 12:59:32 2012 +0300
Use prefix
Change-Id: Ic63d4b6403438fee2d6c70e329ee33d2cde7426b
diff --git a/vbahelper/source/msforms/service.cxx
b/vbahelper/source/msforms/service.cxx
index 7a32b49..9bc7953 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -42,7 +42,7 @@ extern sdecl::ServiceDecl const serviceDecl;
extern C
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component
index 5e4c28b..f4fc168 100644
--- a/vbahelper/util/msforms.component
+++ b/vbahelper/util/msforms.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=msforms
xmlns=http://openoffice.org/2010/uno-components;
implementation name=ControlProviderImpl
service name=ooo.vba.ControlProvider/
commit 13ec17ce63dcba161169e8f6d351e92be1e5647e
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 12:54:32 2012 +0300
Use prefix
Change-Id: I128623b27bd88795e21de13d7a6fc960de3b6ea8
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index 68550cf..7e139c5 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -51,7 +51,7 @@ static struct ::cppu::ImplementationEntry s_component_entries
[] =
{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const *
implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr,
::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
writerfilter_component_getFactory(sal_Char const * implName,
::com::sun::star::lang::XMultiServiceFactory * xMgr,
::com::sun::star::registry::XRegistryKey * xRegistry )
{
return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry,
s_component_entries );
}
diff --git a/writerfilter/util/writerfilter.component
b/writerfilter/util/writerfilter.component
index 0101ea0..b5deea5 100644
--- a/writerfilter/util/writerfilter.component
+++ b/writerfilter/util/writerfilter.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=writerfilter
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.Writer.WriterFilter
service name=com.sun.star.document.ExportFilter/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#51304: Remove @author annotation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/746 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/746/1 fdo#51304: Remove @author annotation This patch remove @author annotation in java source files.It's cleanup Change-Id: I934db56ea4d1afdc533deb8a7003a58b29b51777 Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M reportbuilder/java/com/sun/star/report/DataRow.java M reportbuilder/java/com/sun/star/report/DataSource.java M reportbuilder/java/com/sun/star/report/DataSourceException.java M reportbuilder/java/com/sun/star/report/DataSourceFactory.java M reportbuilder/java/com/sun/star/report/ImageService.java M reportbuilder/java/com/sun/star/report/InputRepository.java M reportbuilder/java/com/sun/star/report/JobDefinitionException.java M reportbuilder/java/com/sun/star/report/JobProgressIndicator.java M reportbuilder/java/com/sun/star/report/OfficeToken.java M reportbuilder/java/com/sun/star/report/OutputRepository.java M reportbuilder/java/com/sun/star/report/ReportEngine.java M reportbuilder/java/com/sun/star/report/ReportJob.java M reportbuilder/java/com/sun/star/report/ReportJobDefinition.java M reportbuilder/java/com/sun/star/report/ReportJobFactory.java M reportbuilder/java/com/sun/star/report/SOImageService.java M reportbuilder/java/com/sun/star/report/StorageRepository.java M reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java M reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java M reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java M reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java M reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java M reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java M reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java M reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java M reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java M reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java M
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 9 commits - android/experimental cpputools/source oox/source oox/util sdext/source shell/source starmath/source stoc/source vbahelper/sou
android/experimental/DocumentLoader/Makefile |2 +
android/experimental/DocumentLoader/native-code.cxx |8
cpputools/source/registercomponent/registercomponent.cxx |6 ++-
cpputools/source/unoexe/unoexe.cxx | 28 ++-
oox/source/core/services.cxx |2 -
oox/util/oox.component |2 -
sdext/source/minimizer/minimizer.component |3 +
sdext/source/minimizer/pppoptimizeruno.cxx |2 -
sdext/source/pdfimport/pdfimport.component |3 +
sdext/source/pdfimport/services.cxx |2 -
sdext/source/presenter/PresenterComponent.cxx|4 +-
sdext/source/presenter/presenter.component |3 +
shell/source/backends/gconfbe/gconfbackend.cxx |2 -
shell/source/backends/gconfbe/gconfbe1.component |2 -
shell/source/backends/kde4be/kde4backend.cxx |2 -
shell/source/backends/kde4be/kde4be1.component |2 -
shell/source/backends/kdebe/kdebackend.cxx |2 -
shell/source/backends/kdebe/kdebe1.component |2 -
shell/source/backends/macbe/macbe1.component |2 -
shell/source/backends/macbe/macbecdef.cxx|2 -
shell/source/backends/wininetbe/wininetbe1.component |2 -
shell/source/backends/wininetbe/wininetbecdef.cxx|2 -
shell/source/cmdmail/cmdmail.component |2 -
shell/source/cmdmail/cmdmailentry.cxx|2 -
shell/source/unix/exec/shellexecentry.cxx|2 -
shell/source/unix/exec/syssh.component |2 -
shell/source/win32/SysShentry.cxx|2 -
shell/source/win32/simplemail/smplmail.component |2 -
shell/source/win32/simplemail/smplmailentry.cxx |2 -
shell/source/win32/syssh.component |2 -
starmath/source/accessibility.cxx|2 -
stoc/source/javaloader/javaloader.component |2 -
stoc/source/javaloader/javaloader.cxx|2 -
stoc/source/javavm/javavm.component |2 -
stoc/source/javavm/javavm.cxx|2 -
vbahelper/source/msforms/service.cxx |2 -
vbahelper/util/msforms.component |2 -
writerfilter/source/filter/WriterFilter.cxx |2 -
writerfilter/util/writerfilter.component |2 -
39 files changed, 65 insertions(+), 54 deletions(-)
New commits:
commit 115c492e85206fce18b39405f1f82a5e4e39cd38
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 12:59:32 2012 +0300
Use prefix
Change-Id: Ic63d4b6403438fee2d6c70e329ee33d2cde7426b
diff --git a/vbahelper/source/msforms/service.cxx
b/vbahelper/source/msforms/service.cxx
index 7a32b49..9bc7953 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -42,7 +42,7 @@ extern sdecl::ServiceDecl const serviceDecl;
extern C
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component
index 5e4c28b..f4fc168 100644
--- a/vbahelper/util/msforms.component
+++ b/vbahelper/util/msforms.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=msforms
xmlns=http://openoffice.org/2010/uno-components;
implementation name=ControlProviderImpl
service name=ooo.vba.ControlProvider/
commit c14ba0883e0caa23570f25f6aa57a27acbf273cb
Author: Tor Lillqvist t...@iki.fi
Date: Tue Oct 2 12:54:32 2012 +0300
Use prefix
Change-Id: I128623b27bd88795e21de13d7a6fc960de3b6ea8
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index 68550cf..7e139c5 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -51,7 +51,7 @@ static struct ::cppu::ImplementationEntry s_component_entries
[] =
{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const *
implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr,
::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
writerfilter_component_getFactory(sal_Char const * implName,
::com::sun::star::lang::XMultiServiceFactory * xMgr,
::com::sun::star::registry::XRegistryKey * xRegistry )
{
return
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/ww8par2.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 55fe92fb396ebcfffe30831ebb460bfb3e6274aa Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 1 23:57:06 2012 +0100 Resolves: fdo#54862 extra ++n causing merged cells to be skipped commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f but didn't revert the ++n of that commit, leading to merge groups getting skipped Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f (cherry picked from commit b966a09c2da9441961c93c44be556399575db849) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 1b5bd75..679f116 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2751,7 +2751,6 @@ void WW8TabDesc::FinishSwTable() nRowSpan : ((-1) * (nRowSpan - n)); pCurrentBox-setRowSpan( nRowSpanSet ); -++n; } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED][3-6] Re: [REVIEW 3-6] fdo#54862 .doc merged cells import regression fix
On 02/10/12 01:14, Caolán McNamara wrote: As https://bugs.freedesktop.org/show_bug.cgi?id=54862 fix http://cgit.freedesktop.org/libreoffice/core/commit/?id=b966a09c2da9441961c93c44be556399575db849 commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f but didn't revert the ++n of that commit, leading to merge groups getting skipped. Quite likely a bunch of .doc table complaints lead back to this. pushed to libreoffice-3-6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Easy Hack -- fdo #44718 Add Unicode 2034 (Triple Prime) to OpenSymbol
On Mon, 2012-10-01 at 11:03 +0100, Michael Meeks wrote: On Sun, 2012-09-30 at 20:04 -0700, Joel Madero wrote: Can someone take a look at it real quick and see if you can point to the right files and throw a comment in there? I added some pointers. I'll keep looking for more easy hacks. https://bugs.freedesktop.org/show_bug.cgi?id=44718 Be nice if someone can work out what Topic / Skills are right (basically font editing) - and annotate it to turn it into an EasyHack. Olivier and Julien were our last two people to add symbols to that font and keywords/aliases for the symbol to starmath. So they may be able to help or to add some practical advice to the bug. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OUString is mutable?
On 10/01/2012 06:05 PM, Dennis E. Hamilton wrote: Regarding the mention that the latest Java VM is using UTF8 internally instead of unsigned short arrays is rather daunting. There is an easy way to test it -- see if char values that are not admissible UTF16 codes can be used in construction of a string and then extracted correctly. If they can, there is no way that transformation to and from UTF8 occurred. If they can't, it is an interesting breaking change in Java. With regard to string literals, it would be interesting to see what can be introduced into those via escape codes too. Note that the JVM traditionally also makes use of a modified form of UTF-8 (encoding surrogate code points individually, and encoding \u as 0xC0 0x80), see the JNI spec. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] [PATCH 2/3] fdo#51304: Remove @author annotation and commented code
Hi! I unterstood... Thanks for comment! I'll do more and better next time :-) 2012/10/1 Thorsten Behrens t...@documentfoundation.org guilherme@gmail.com wrote: This patch removes '@author' annotation, code in comments and adjust some empty catches. It's cleanup patch Hi José Guilherme, partially pushed - I left the hunks commenting empty methods as FIXME instead of removing them straight away unapplied. If the method is pointless, why not remove them in one go? I also did not apply your printStackTrace() logging calls, I think at least some of them report on exceptions that were seemingly previously ignored on purpose? Stephan, or anyone else more up-to-date with contemporary java idiom, any opinions here? Thanks for the nice cleanup anyways! :) Cheers, -- Thorsten -- 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] .: beanshell/ExternalProject_beanshell.mk beanshell/Makefile beanshell/Module_beanshell.mk beanshell/Package_beanshell.mk beanshell/prj beanshell/UnpackedTarball_beanshell.mk con
Makefile.top |2 +- Module_tail_build.mk |1 + beanshell/ExternalProject_beanshell.mk | 33 + beanshell/Makefile |7 +++ beanshell/Module_beanshell.mk | 22 ++ beanshell/Package_beanshell.mk | 16 beanshell/UnpackedTarball_beanshell.mk | 18 ++ beanshell/prj/build.lst|5 ++--- config_host.mk.in |1 + configure.in |2 ++ tail_build/prj/build.lst |2 +- 11 files changed, 104 insertions(+), 5 deletions(-) New commits: commit 02e400865cb9a51b623a3d866d3236f0d6c899ca Author: David Ostrovsky da...@ostrovsky.org Date: Tue Oct 2 09:31:35 2012 +0200 gbuildification of beanshell Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7 Reviewed-on: https://gerrit.libreoffice.org/745 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/Makefile.top b/Makefile.top index e188cdc..de91f56 100644 --- a/Makefile.top +++ b/Makefile.top @@ -44,6 +44,7 @@ basebmp\ basegfx\ basic\ bean\ +beanshell\ binaryurp\ bluez_bluetooth\ boost\ @@ -196,7 +197,6 @@ xmlsecurity\ xsltml\ dmake_modules:=\ -beanshell\ berkeleydb\ binfilter \ cairo\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a0c958b..86a9c11 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ basegfx \ basic \ bean \ + $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ bridges \ diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk new file mode 100644 index 000..b1bfa9f --- /dev/null +++ b/beanshell/ExternalProject_beanshell.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,beanshell)) + +$(eval $(call gb_ExternalProject_use_unpacked,beanshell,beanshell)) + +$(eval $(call gb_ExternalProject_register_targets,beanshell,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,beanshell,build) : + cd $(call gb_UnpackedTarball_get_dir,beanshell) \ + ANT_OPTS=$$ANT_OPTS -Dfile.encoding=ISO-8859-1 \ + $(ANT) \ + -q \ + -f build.xml \ + -Dbuild.label=build-libreoffice \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug=on) \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Makefile b/beanshell/Makefile new file mode 100644 index 000..ccb1c85 --- /dev/null +++ b/beanshell/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk new file mode 100644 index 000..e739b36 --- /dev/null +++ b/beanshell/Module_beanshell.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,beanshell)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter BSH,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,beanshell,\ + ExternalProject_beanshell \ + Package_beanshell \ + UnpackedTarball_beanshell \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Package_beanshell.mk b/beanshell/Package_beanshell.mk new file mode 100644 index 000..983c1fc --- /dev/null +++ b/beanshell/Package_beanshell.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call
Re: [PUSHED][PATCH] Update French spelling dictionary
On Mon, 2012-10-01 at 02:28 -0700, Olivier R. wrote: Hello *, Here is a patch to update the French spelling dictionary. Pushed now to master, thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] soltools conversion to gbuild
2012/9/27 David Ostrovsky david.ostrov...@gmx.de: i submitted gerrit patch that convert soltools to gbuild: https://gerrit.libreoffice.org/#/c/698 I don't know why tinderboxes do not complain, but for me unistd.h is not delivered to solver/wntmsci12.pro/inc, and build fails early. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf
distro-configs/LibreOfficeWin32.conf |1 - distro-configs/LibreOfficeWin64.conf |1 - 2 files changed, 2 deletions(-) New commits: commit 59e6d18bea73417b2b5cd044d0489f882e847df6 Author: Andras Timar ati...@suse.com Date: Tue Oct 2 14:39:54 2012 +0200 remove deprecated configure switch --disable-activex-component Change-Id: I3a5b19ac9f7c09a7bb5c919b3a9bc18ab646fd76 diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 1a34632..7273ed4 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -6,7 +6,6 @@ --without-agfa-monotype-fonts --enable-extension-integration --with-java-target-version=1.5 ---disable-activex-component --disable-gtk --enable-binfilter --enable-ext-scripting-beanshell diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 2c0b022..344551e 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -2,7 +2,6 @@ --without-agfa-monotype-fonts --with-java-target-version=1.5 --enable-cl-x64 ---disable-activex-component --disable-gtk --enable-ext-scripting-beanshell --enable-ext-scripting-javascript ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Drop support for Java 5?
On 02/10/12 14:37, d.ostrov...@idaia.de wrote: Hi Christian, Zitat von Christian Lohmaier lohmaier+libreoff...@googlemail.com: Hi David, *, On Tue, Oct 2, 2012 at 1:27 PM, d.ostrov...@idaia.de wrote: Java 7 is today the current version, Java 6 is the old one and Java 5 is the ancient one. Does it still make sense to support it in LO 3.7 or even in LO 4.0? Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? that is on the LO4 todo list :) it's a bit annoying for users to bump platform requirements in a minor release, so LO4 sounds like the better target, and isn't that far off. doesn't make sense to support an OS release that the OS vendor hasn't been supporting for years. same goes for Windows 2000. iirc JRE5 is also no longer supported by Oracle. a more difficult question is, should we require OS X 10.6 and thereby drop support for OS X on PPC altogether? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 8 commits - chart2/source drawinglayer/source svl/inc svl/source xmloff/source
chart2/source/controller/dialogs/res_DataLabel.cxx |4
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 10 +-
svl/inc/svl/ctloptions.hxx | 20 ++--
svl/inc/svl/imageitm.hxx|4
svl/inc/svl/zformat.hxx | 10 +-
svl/source/config/ctloptions.cxx| 74
svl/source/fsstor/oinputstreamcontainer.cxx |6 -
svl/source/fsstor/oinputstreamcontainer.hxx |5 -
svl/source/fsstor/ostreamcontainer.cxx | 16 +--
svl/source/fsstor/ostreamcontainer.hxx |6 -
svl/source/inc/passwordcontainer.hxx| 58 ++--
svl/source/items/imageitm.cxx |8 -
svl/source/numbers/zforfind.cxx |2
svl/source/numbers/zformat.cxx | 66 +++---
svl/source/passwordcontainer/passwordcontainer.cxx | 24 ++---
xmloff/source/style/xmlnumfe.cxx| 28 +++---
16 files changed, 170 insertions(+), 171 deletions(-)
New commits:
commit 5d8c2eddead8c9144e337d64a559e1621d36da43
Author: Noel Grandin n...@peralex.com
Date: Mon Oct 1 12:54:52 2012 +0200
String-OUString in svl::ImpSvNumberformatInfo
Change-Id: Iff00b06a1e4e7c485e70ef0537fdea07ce3d42e5
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 0418fca..1a35282 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -65,7 +65,7 @@ enum NfHackConversion
struct ImpSvNumberformatInfo// Struct for FormatInfo
{
-String* sStrArray; // Array of symbols
+OUString* sStrArray;// Array of symbols
short* nTypeArray; // Array of infos
sal_uInt16 nThousand; // Count of group separator sequences
sal_uInt16 nCntPre; // Count of digits before decimal point
@@ -281,7 +281,7 @@ public:
// Substring of a subformat code nNumFor (0..3)
// nPos == 0x = last substring
// bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
-const String* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
+const OUString* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
bool bString = false ) const;
// Subtype of a subformat code nNumFor (0..3)
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fb5bbe3..69d6761 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2466,7 +2466,7 @@ bool ImpSvNumberInputScan::ScanStringNumFor(
if ( !pFormat )
return false;
const ::utl::TransliterationWrapper* pTransliteration =
pFormatter-GetTransliteration();
-const String* pStr;
+const OUString* pStr;
rtl::OUString aString( rString );
bool bFound = false;
bool bFirst = true;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5cf224b..5c4c31c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -353,7 +353,7 @@ void ImpSvNumFor::Enlarge(sal_uInt16 nAnz)
if ( nAnz )
{
aI.nTypeArray = new short[nAnz];
-aI.sStrArray = new String[nAnz];
+aI.sStrArray = new OUString[nAnz];
}
else
{
@@ -2051,13 +2051,13 @@ bool SvNumberformat::GetOutputString(String sString,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
-OutString += rInfo.sStrArray[i].GetChar(1);
+OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
-rInfo.sStrArray[i].GetChar(1) );
+rInfo.sStrArray[i][1] );
break;
case NF_KEY_GENERAL : // #77026# General is the same as @
case NF_SYMBOLTYPE_DEL :
@@ -2319,13 +2319,13 @@ bool SvNumberformat::GetOutputString(double fNumber,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
-OutString += rInfo.sStrArray[i].GetChar(1);
+OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
-rInfo.sStrArray[i].GetChar(1) );
+rInfo.sStrArray[i][1] );
break;
Re: [PATCH] sal_bool and String conversions
On 02/10/12 08:33, Noel Grandin wrote:
Hi
The first 4 patches perform sal_Bool-bool conversions in the SVL module.
The next 8 patches perform UniString-OUString conversions.
pushed about 8 of those.
Patch 7 and 11 need careful checking because they add methods to
OUStringBuffer and OUString.
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 5b4982e..1595c0f 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1500,7 +1500,7 @@ SAL_DLLPUBLIC void SAL_CALL
rtl_uString_newReplaceFirstAsciiLAsciiL(
*/
SAL_DLLPUBLIC void SAL_CALL rtl_uString_newReplaceAll(
rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from,
-rtl_uString const * to) SAL_THROW_EXTERN_C();
+rtl_uString const * to, sal_Int32 fromIndex) SAL_THROW_EXTERN_C();
/** Create a new string by replacing all occurrences of a given substring
with
another substring.
that is not ABI compatible.
-OUString replaceAll(OUString const from, OUString const to) const {
+OUString replaceAll(OUString const from, OUString const to, int
fromIndex = 0) const {
this should be source and binary compatible i think, since it's inline
function?
am unsure about this:
+OUStringBuffer operator+=( const OUString str )
+{
+return append( str.getStr(), str.getLength() );
+}
+
+/**
+Appends the string representation of the codechar/code array
+argument to this string buffer.
+
+The characters of the array argument are appended, in order, to
+the contents of this string buffer. The length of this string
+buffer increases by the length of the argument.
+
+@param str the characters to be appended.
+@return this string buffer.
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=( const sal_Unicode * str )
+{
+return append( str, rtl_ustr_getLength( str ) );
+}
/**
+Appends the string representation of the ASCII codechar/code
+argument to this string buffer.
+
+The argument is appended to the contents of this string buffer.
+The length of this string buffer increases by code1/code.
+
+@param c an ASCII codechar/code.
+@return this string buffer.
+
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=(char c)
+{
+return append(c);
+}
hmmm... do we really want to have 2 sets of methods append() and
operator+= that do the same thing, possibly with different overloads?
perhaps we should deprecate the append methods... but those often have
addition radix etc, parameters... and is it possible to chain += like
append() in a single statement?
didn't push the 2 patches that depend on the sal changes.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
On Tue, 2012-10-02 at 14:53 +0200, Michael Stahl wrote: Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? that is on the LO4 todo list :) Worth adding to the wiki page so we don't forget I imagine: http://wiki.documentfoundation.org/Development/LibreOffice4 ATB, 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] .: config_host.mk.in configure.in desktop/source scp2/source solenv/bin
config_host.mk.in |2 + configure.in| 22 +++ desktop/source/splash/splash.cxx| 46 ++-- scp2/source/ooo/common_brand.scp| 18 solenv/bin/modules/installer/ziplist.pm |2 + 5 files changed, 88 insertions(+), 2 deletions(-) New commits: commit b14073218ea28a5bf05cd639e30215787d67114c Author: Ivan Timofeev timofeev@gmail.com Date: Sat Sep 29 20:03:12 2012 +0400 fdo#52268: splash: change color and position of messages Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc diff --git a/config_host.mk.in b/config_host.mk.in index d6f5f16..48b470e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -465,6 +465,8 @@ export PRODUCTNAME=@PRODUCTNAME@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@ export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@ +export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@ +export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@ export PROGRESSPOSITION=@PROGRESSPOSITION@ export PROGRESSSIZE=@PROGRESSSIZE@ export PROEXT=@PROEXT@ diff --git a/configure.in b/configure.in index 93b828d..34dfce7 100644 --- a/configure.in +++ b/configure.in @@ -12053,6 +12053,28 @@ else fi AC_SUBST(PROGRESSFRAMECOLOR) +AC_MSG_CHECKING([for custom 'intro' progress text color]) +PROGRESSTEXTCOLOR= +if test -z $with_intro_progressbar_text_color; then + PROGRESSTEXTCOLOR=255,255,255 + AC_MSG_RESULT([none]) +else + PROGRESSTEXTCOLOR=$with_intro_progressbar_text_color + AC_MSG_RESULT([$PROGRESSTEXTCOLOR]) +fi +AC_SUBST(PROGRESSTEXTCOLOR) + +AC_MSG_CHECKING([for custom 'intro' progress text baseline]) +PROGRESSTEXTBASELINE= +if test -z $with_intro_progressbar_text_baseline; then + PROGRESSTEXTBASELINE=287 + AC_MSG_RESULT([none]) +else + PROGRESSTEXTBASELINE=$with_intro_progressbar_text_baseline + AC_MSG_RESULT([$PROGRESSTEXTBASELINE]) +fi +AC_SUBST(PROGRESSTEXTBASELINE) + AC_MSG_CHECKING([for alternative branding images directory]) INTRO_BITMAP= ABOUT_BACKGROUND_SVG= diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 38de2eb..e55b5b2 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -86,6 +86,7 @@ private: BitmapEx_aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; +Color _cProgressTextColor; bool_bNativeProgress; OUString_sAppName; OUString_sProgressText; @@ -101,7 +102,7 @@ private: sal_Bool_bFullScreenSplash; sal_Bool_bProgressEnd; long _height, _width, _tlx, _tly, _barwidth; -long _barheight, _barspace; +long _barheight, _barspace, _textBaseline; double _fXPos, _fYPos; double _fWidth, _fHeight; const long _xoffset, _yoffset; @@ -130,6 +131,7 @@ SplashScreen::SplashScreen() , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast ColorData (NOT_LOADED)) , _cProgressBarColor(sal::static_int_cast ColorData (NOT_LOADED)) +, _cProgressTextColor(sal::static_int_cast ColorData (NOT_LOADED)) , _bNativeProgress(true) , _iMax(100) , _iProgress(0) @@ -144,6 +146,7 @@ SplashScreen::SplashScreen() , _barwidth(NOT_LOADED) , _barheight(NOT_LOADED) , _barspace(2) +, _textBaseline(NOT_LOADED) , _fXPos(-1.0) , _fYPos(-1.0) , _fWidth(-1.0) @@ -297,6 +300,9 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence ::com::sun::sta } } +if ( NOT_LOADED == _textBaseline ) +_textBaseline = _height; + if ( sal::static_int_cast ColorData (NOT_LOADED) == _cProgressFrameColor.GetColor() ) _cProgressFrameColor = Color( COL_LIGHTGRAY ); @@ -311,6 +317,10 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence ::com::sun::sta _cProgressBarColor = Color( COL_BLUE ); } +if ( sal::static_int_cast ColorData (NOT_LOADED) == + _cProgressTextColor.GetColor() ) +_cProgressTextColor = Color( COL_BLACK ); + Application::AddEventListener( LINK( this, SplashScreen, AppEventListenerHdl ) ); @@ -363,6 +373,10 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressFrameColor ) ) ); OUString sProgressBarColor = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressBarColor ) ) ); +OUString sProgressTextColor = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressTextColor ) ) ); +OUString sProgressTextBaseline = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressTextBaseline ) ) ); OUString sSize = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressSize ) ) ); OUString sPosition =
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - config_host.mk.in configure.in desktop/source scp2/source solenv/bin
config_host.mk.in |2 + configure.in| 22 +++ desktop/source/splash/splash.cxx| 46 ++-- scp2/source/ooo/common_brand.scp| 18 solenv/bin/modules/installer/ziplist.pm |2 + 5 files changed, 88 insertions(+), 2 deletions(-) New commits: commit 71b584680e4527283ccc4fa14169bc7d28d32344 Author: Ivan Timofeev timofeev@gmail.com Date: Sat Sep 29 20:03:12 2012 +0400 fdo#52268: splash: change color and position of messages Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/config_host.mk.in b/config_host.mk.in index 96635db..4fb80d1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -413,6 +413,8 @@ export PRODUCTNAME=@PRODUCTNAME@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@ export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@ +export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@ +export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@ export PROGRESSPOSITION=@PROGRESSPOSITION@ export PROGRESSSIZE=@PROGRESSSIZE@ export PROEXT=@PROEXT@ diff --git a/configure.in b/configure.in index 11e20a0..651963a 100644 --- a/configure.in +++ b/configure.in @@ -11310,6 +11310,28 @@ else fi AC_SUBST(PROGRESSFRAMECOLOR) +AC_MSG_CHECKING([for custom 'intro' progress text color]) +PROGRESSTEXTCOLOR= +if test -z $with_intro_progressbar_text_color; then + PROGRESSTEXTCOLOR=255,255,255 + AC_MSG_RESULT([none]) +else + PROGRESSTEXTCOLOR=$with_intro_progressbar_text_color + AC_MSG_RESULT([$PROGRESSTEXTCOLOR]) +fi +AC_SUBST(PROGRESSTEXTCOLOR) + +AC_MSG_CHECKING([for custom 'intro' progress text baseline]) +PROGRESSTEXTBASELINE= +if test -z $with_intro_progressbar_text_baseline; then + PROGRESSTEXTBASELINE=287 + AC_MSG_RESULT([none]) +else + PROGRESSTEXTBASELINE=$with_intro_progressbar_text_baseline + AC_MSG_RESULT([$PROGRESSTEXTBASELINE]) +fi +AC_SUBST(PROGRESSTEXTBASELINE) + AC_MSG_CHECKING([for alternative branding images directory]) INTRO_BITMAP= ABOUT_BACKGROUND_SVG= diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 0ef211a..6678aa8 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -88,6 +88,7 @@ private: BitmapEx_aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; +Color _cProgressTextColor; bool_bNativeProgress; OUString_sAppName; OUString_sProgressText; @@ -103,7 +104,7 @@ private: sal_Bool_bFullScreenSplash; sal_Bool_bProgressEnd; long _height, _width, _tlx, _tly, _barwidth; -long _barheight, _barspace; +long _barheight, _barspace, _textBaseline; double _fXPos, _fYPos; double _fWidth, _fHeight; const long _xoffset, _yoffset; @@ -132,6 +133,7 @@ SplashScreen::SplashScreen() , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast ColorData (NOT_LOADED)) , _cProgressBarColor(sal::static_int_cast ColorData (NOT_LOADED)) +, _cProgressTextColor(sal::static_int_cast ColorData (NOT_LOADED)) , _bNativeProgress(true) , _iMax(100) , _iProgress(0) @@ -146,6 +148,7 @@ SplashScreen::SplashScreen() , _barwidth(NOT_LOADED) , _barheight(NOT_LOADED) , _barspace(2) +, _textBaseline(NOT_LOADED) , _fXPos(-1.0) , _fYPos(-1.0) , _fWidth(-1.0) @@ -299,6 +302,9 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence ::com::sun::sta } } +if ( NOT_LOADED == _textBaseline ) +_textBaseline = _height; + if ( sal::static_int_cast ColorData (NOT_LOADED) == _cProgressFrameColor.GetColor() ) _cProgressFrameColor = Color( COL_LIGHTGRAY ); @@ -313,6 +319,10 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence ::com::sun::sta _cProgressBarColor = Color( COL_BLUE ); } +if ( sal::static_int_cast ColorData (NOT_LOADED) == + _cProgressTextColor.GetColor() ) +_cProgressTextColor = Color( COL_BLACK ); + Application::AddEventListener( LINK( this, SplashScreen, AppEventListenerHdl ) ); @@ -365,6 +375,10 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressFrameColor ) ) ); OUString sProgressBarColor = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressBarColor ) ) ); +OUString sProgressTextColor = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressTextColor ) ) ); +OUString sProgressTextBaseline = implReadBootstrapKey( +OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressTextBaseline ) ) ); OUString sSize = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( ProgressSize ) )
[PATCH] Remove dead code
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/747 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/747/1 Remove dead code SW_CRSR_TIMER was undefined Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3 --- M sw/inc/crsrsh.hxx M sw/inc/viscrs.hxx M sw/source/core/crsr/viscrs.cxx M sw/source/core/layout/layact.cxx M sw/source/ui/docvw/edtwin.cxx 5 files changed, 0 insertions(+), 100 deletions(-) -- To view, visit https://gerrit.libreoffice.org/747 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Takeshi Abe t...@fixedpoint.jp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][REVIEW 3-6] fdo#52268: splash: change color and position of messages
Hi Ivan, Ivan Timofeev píše v So 29. 09. 2012 v 21:52 +0400: this patch fixes bug 52268: https://bugs.freedesktop.org/show_bug.cgi?id=52268 Splash Screen: Messages on first start displayed in wrong colour in the wrong place Thanks f or that! :-) Pushed that both to master and libreoffice-3-6. I'll notify the package maintainers in a separate mail - if they use different graphics, they might need to change the defaults. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
Hi Michael, Zitat von Michael Meeks michael.me...@suse.com: On Tue, 2012-10-02 at 14:53 +0200, Michael Stahl wrote: Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? that is on the LO4 todo list :) Worth adding to the wiki page so we don't forget I imagine: http://wiki.documentfoundation.org/Development/LibreOffice4 done: https://wiki.documentfoundation.org/Development/LibreOffice4#Discontinued_support_for_obsolete_platforms_and_libraries Ciao David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
Hi David, *, On Tue, Oct 2, 2012 at 2:37 PM, d.ostrov...@idaia.de wrote: Zitat von Christian Lohmaier lohmaier+libreoff...@googlemail.com: On Tue, Oct 2, 2012 at 1:27 PM, d.ostrov...@idaia.de wrote: Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? Needless to say that I won't be happy abount it. As dropping 10.4 won't bring any benefits in terms of Mac OSX features to be used, this almost automatically means also dropping 10.5, and that in turn means dropping PPC support. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
Hi, On Tue, Oct 02, 2012 at 01:27:21PM +0200, d.ostrov...@idaia.de wrote: Hi, [...] Java 7 is today the current version, Java 6 is the old one and Java 5 is the ancient one. Does it still make sense to support it in LO 3.7 or even in LO 4.0? Would it be an option to drop Java 1.5 support (upgrading configure.in and all other places) and as the consequence drop stax module? There's platforms who don't have a JDK (yet) available and *still* need to use gcj-jdk. Which only can do 1.5.: http://www.debian.org/ports/kfreebsd-gnu/ (But that one will get openjdk when wheezy is installed on the Debian builds - so I am told...) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
On 2012-10-02 15:53, Christian Lohmaier wrote: Hi David, *, On Tue, Oct 2, 2012 at 2:37 PM, d.ostrov...@idaia.de wrote: Zitat von Christian Lohmaier lohmaier+libreoff...@googlemail.com: On Tue, Oct 2, 2012 at 1:27 PM, d.ostrov...@idaia.de wrote: Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? Needless to say that I won't be happy abount it. As dropping 10.4 won't bring any benefits in terms of Mac OSX features to be used, this almost automatically means also dropping 10.5, and that in turn means dropping PPC support. At some point in time, we have to balance the amount of development resources we have against the number of people running a particular platform. People on that platform, are, of course, welcome to maintain a fork that supports that platform. Git makes this particularly easy. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - desktop/scripts sw/source
desktop/scripts/gdbtrace |1 +
sw/source/filter/html/wrthtml.cxx | 24
2 files changed, 25 insertions(+)
New commits:
commit 3751efff81a9bc1e53c8cbee74770bbed6d4f8de
Author: Michael Meeks michael.me...@suse.com
Date: Mon Oct 1 16:26:54 2012 +0100
initialize various fields in constructor.
Change-Id: Ib2165121786353062a52e6dd65cca6dab8584e60
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 131c04e..0ebd737 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -99,6 +99,30 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t;
SwHTMLWriter::SwHTMLWriter( const String rBaseURL )
+, bCfgOutStyles( sal_False )
+, bCfgPreferStyles( sal_False )
+, bCfgFormFeed( sal_False )
+, bCfgStarBasic( sal_False )
+, bCfgCpyLinkedGrfs( sal_False )
+, bFirstLine( sal_False )
+, bTagOn( sal_False )
+, bTxtAttr( sal_False )
+, bOutOpts( sal_False )
+, bOutTable( sal_False )
+, bOutHeader( sal_False )
+, bOutFooter( sal_False )
+, bOutFlyFrame( sal_False )
+, bFirstCSS1Rule( sal_False )
+, bFirstCSS1Property( sal_False )
+, bPoolCollTextModified( sal_False )
+, bCSS1IgnoreFirstPageDesc( sal_False )
+, bNoAlign( sal_False )
+, bClearLeft( sal_False )
+, bClearRight( sal_False )
+, bLFPossible( sal_False )
+, bPreserveForm( sal_False )
+, bCfgNetscape4( sal_False )
+
{
SetBaseURL( rBaseURL );
bFirstLine = sal_True;
commit 0ee9572db3934aa4e739c424765d4fd36a59a291
Author: Michael Meeks michael.me...@suse.com
Date: Mon Oct 1 16:26:35 2012 +0100
ignore various unhelpful signals in our --backtrace gdb setup.
Change-Id: I8ede40ebf5954e0492e790ce148c9b7f1f1e62df
diff --git a/desktop/scripts/gdbtrace b/desktop/scripts/gdbtrace
index 548ffe6..f5fbf63 100644
--- a/desktop/scripts/gdbtrace
+++ b/desktop/scripts/gdbtrace
@@ -1,5 +1,6 @@
set pagination off
echo log will be saved as gdbtrace.log, this will take some time, patience...\n
+handle SIGPIPE SIGXCPU SIG33 SIG35 SIGPWR nostop noprint
set logging redirect on
set logging file gdbtrace.log
set logging on
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] sal_bool and String conversions
On 10/02/2012 03:01 PM, Michael Stahl wrote:
On 02/10/12 08:33, Noel Grandin wrote:
Patch 7 and 11 need careful checking because they add methods to
OUStringBuffer and OUString.
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 5b4982e..1595c0f 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1500,7 +1500,7 @@ SAL_DLLPUBLIC void SAL_CALL
rtl_uString_newReplaceFirstAsciiLAsciiL(
*/
SAL_DLLPUBLIC void SAL_CALL rtl_uString_newReplaceAll(
rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from,
-rtl_uString const * to) SAL_THROW_EXTERN_C();
+rtl_uString const * to, sal_Int32 fromIndex) SAL_THROW_EXTERN_C();
/** Create a new string by replacing all occurrences of a given substring with
another substring.
that is not ABI compatible.
-OUString replaceAll(OUString const from, OUString const to) const {
+OUString replaceAll(OUString const from, OUString const to, int
fromIndex = 0) const {
this should be source and binary compatible i think, since it's inline
function?
Yes, changing the parameter list should be safe. (Though the changes to
the function's body are not, see above.)
am unsure about this:
+OUStringBuffer operator+=( const OUString str )
+{
+return append( str.getStr(), str.getLength() );
+}
+
+/**
+Appends the string representation of the codechar/code array
+argument to this string buffer.
+
+The characters of the array argument are appended, in order, to
+the contents of this string buffer. The length of this string
+buffer increases by the length of the argument.
+
+@param str the characters to be appended.
+@return this string buffer.
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=( const sal_Unicode * str )
+{
+return append( str, rtl_ustr_getLength( str ) );
+}
/**
+Appends the string representation of the ASCII codechar/code
+argument to this string buffer.
+
+The argument is appended to the contents of this string buffer.
+The length of this string buffer increases by code1/code.
+
+@param c an ASCII codechar/code.
+@return this string buffer.
+
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=(char c)
+{
+return append(c);
+}
hmmm... do we really want to have 2 sets of methods append() and
operator+= that do the same thing, possibly with different overloads?
perhaps we should deprecate the append methods... but those often have
addition radix etc, parameters... and is it possible to chain += like
append() in a single statement?
I would just stick to append-only for OUStringBuffer.
(Also, in general, it makes sense to keep changes to oustring/oustrbuf
in sync with changes to ostring/ostrbuf.)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Warning for package maintainers: Splash screen
Hi, I have just pushed Ivan's http://cgit.freedesktop.org/libreoffice/core/commit/?id=b14073218ea28a5bf05cd639e30215787d67114c to libreoffice-3-6: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=71b584680e4527283ccc4fa14169bc7d28d32344 If you are using the default graphics, no action is needed. If you are using your own splash screen, though, you might want to adjust the baseline of the text that appears during startup using --with-intro-progressbar-text-baseline and --with-intro-progressbar-text-color. To see it on Linux, you need to run ./soffice.bin, instead of ./soffice, in order to bypass oosplash. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in | 14 ++ 1 file changed, 14 insertions(+) New commits: commit a9097843e6b2935dcab9f038b80e5a51bc5cfc94 Author: Jan Holesovsky ke...@suse.cz Date: Tue Oct 2 16:00:09 2012 +0200 Help text for newly introduced switches. Change-Id: I3f148d0dd61adc7008fdf64d077818c22a0e7d09 diff --git a/configure.in b/configure.in index 34dfce7..fb54ec3 100644 --- a/configure.in +++ b/configure.in @@ -1980,6 +1980,20 @@ AC_ARG_WITH(intro-progressbar-frame-color, Usage: --with-intro-progressbar-frame-color=207,208,211 ],,) +AC_ARG_WITH(intro-progressbar-text-color, +AS_HELP_STRING([--with-intro-progressbar-text-color], +[Set color of progress bar text on intro screen. Comma separated RGB values in decimal format.]) +[ + Usage: --with-intro-progressbar-text-color=207,208,211 +],,) + +AC_ARG_WITH(intro-progressbar-text-baseline, +AS_HELP_STRING([--with-intro-progressbar-text-baseline], +[Set horizontal position of progress bar text on intro screen. Value in decimal format.]) +[ + Usage: --with-intro-progressbar-text-baseline=250 +],,) + AC_ARG_WITH(flat-logo-svg, [ --with-flat-logo-svgAllows specification of the flat Logo SVG. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: [PATCH][REVIEW 3-6] fdo#52268: splash: change color and position of messages
Hi Ivan, Marking it pushed; and want to ask you to cherry-pick the following addition to the libreoffice-3-6 branch :-) http://cgit.freedesktop.org/libreoffice/core/commit/?id=a9097843e6b2935dcab9f038b80e5a51bc5cfc94 Thank you, Kendy Jan Holesovsky píše v Út 02. 10. 2012 v 15:46 +0200: Hi Ivan, Ivan Timofeev píše v So 29. 09. 2012 v 21:52 +0400: this patch fixes bug 52268: https://bugs.freedesktop.org/show_bug.cgi?id=52268 Splash Screen: Messages on first start displayed in wrong colour in the wrong place Thanks f or that! :-) Pushed that both to master and libreoffice-3-6. I'll notify the package maintainers in a separate mail - if they use different graphics, they might need to change the defaults. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLTextMasterPageExport.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit d92345561c998f7382cf9ef0fdcd29096f978435
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 2 14:41:59 2012 +0100
don't blow up on .odt export with !hasValue footers/headers
Change-Id: I2507c23b7b17b9172f720548d32cdfe299d4fa20
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx
b/xmloff/source/text/XMLTextMasterPageExport.cxx
index a449f92..ab7f854 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -127,20 +127,21 @@ void XMLTextMasterPageExport::exportMasterPageContent(
else
{
aAny = rPropSet-getPropertyValue( sHeaderOn );
-sal_Bool bHeader = *(sal_Bool *)aAny.getValue();
+sal_Bool bHeader = sal_False;
+aAny = bHeader;
sal_Bool bHeaderFirst = sal_False;
if( bHeader )
{
aAny = rPropSet-getPropertyValue( sFirstShareContent );
-bHeaderFirst = !*(sal_Bool *)aAny.getValue();
+aAny = bHeaderFirst;
}
sal_Bool bHeaderLeft = sal_False;
if( bHeader )
{
aAny = rPropSet-getPropertyValue( sHeaderShareContent );
-bHeaderLeft = !*(sal_Bool *)aAny.getValue();
+aAny = bHeaderLeft;
}
if( xHeaderText.is() )
@@ -174,20 +175,21 @@ void XMLTextMasterPageExport::exportMasterPageContent(
}
aAny = rPropSet-getPropertyValue( sFooterOn );
-sal_Bool bFooter = *(sal_Bool *)aAny.getValue();
+sal_Bool bFooter = sal_False;
+aAny = bFooter;
sal_Bool bFooterFirst = sal_False;
if( bFooter )
{
aAny = rPropSet-getPropertyValue( sFirstShareContent );
-bFooterFirst = !*(sal_Bool *)aAny.getValue();
+aAny = bFooterFirst;
}
sal_Bool bFooterLeft = sal_False;
if( bFooter )
{
aAny = rPropSet-getPropertyValue( sFooterShareContent );
-bFooterLeft = !*(sal_Bool *)aAny.getValue();
+aAny = bFooterLeft;
}
if( xFooterText.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/html/wrthtml.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4afd166c229e27d741b48a6f099d2f00d01b05de Author: Jan Holesovsky ke...@suse.cz Date: Tue Oct 2 16:10:46 2012 +0200 Fix build. Change-Id: I291cb5422f5338d64e6d8973c8dc863f4fb982f5 diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0ebd737..baba51c 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -99,7 +99,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t; SwHTMLWriter::SwHTMLWriter( const String rBaseURL ) -, bCfgOutStyles( sal_False ) +: bCfgOutStyles( sal_False ) , bCfgPreferStyles( sal_False ) , bCfgFormFeed( sal_False ) , bCfgStarBasic( sal_False ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ww8export tinderbox failure ?
Hi Caolan, Caolán McNamara píše v St 26. 09. 2012 v 16:55 +0100: Getting a backtrace with symbols would indeed help, I guess. Didn't help me. IIRC the crash is because a component somewhere is not loaded, leading to a NULL pointer dereference later. And the component is not loaded, because the GUID read for it from some OLE stream is rubbish. I got rather lost at that point and gave up in the hope somebody else would fix it. And I presume VALGRIND=memcheck make /local/home/tinderbox/master/workdir/unxlngx6.pro/CppunitTest/sw_subsequent_ww8export.test didn't give any hints either ? Got the attached once, but then nothing when I tried with a sw rebuilt with debug=true to get symbols; hopefully it will be of some use at least for a wild guess... All the best, Kendy ==14856== Memcheck, a memory error detector ==14856== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al. ==14856== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info ==14856== Command: /local/libreoffice/master-linux/solver/unxlngx6.pro/bin/cppunit/cppunittester /local/libreoffice/master-linux/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_sw_subsequent_ww8export.so --headless -env:LIBLANGTAG_SHARE=file:///local/libreoffice/master-linux/solver/unxlngx6.pro -env:CONFIGURATION_LAYERS=xcsxcu:file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/registry\ module:file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/registry/spool\ xcsxcu:file:///local/libreoffice/master-linux/solver/unxlngx6.pro/unittest/registry -env:UNO_TYPES=file:///local/libreoffice/master-linux/solver/unxlngx6.pro/bin/offapi.rdb\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/bin/udkapi.rdb -env:UNO_SERVICES=file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/ure/services.rdb\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/basic/util/sb.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/comphelper/util/comphelp.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/configmgr/source/configmgr.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/dbaccess/util/dba.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/fileaccess/source/fileacc.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/filter/source/config/cache/filterconfig1.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/forms/util/frm.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/framework/util/fwk.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/i18npool/util/i18npool.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/package/source/xstor/xstor.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/package/util/package2.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/sax/source/expatwrap/expwrap.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/sw/util/msword.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/sw/util/sw.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/sw/util/swd.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/sfx2/util/sfx.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/svl/source/fsstor/fsstorage.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/svtools/util/svt.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/toolkit/util/tk.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/ucb/source/core/ucb1.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/ucb/source/ucp/file/ucpfile1.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/unotools/util/utl.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/unoxml/source/service/unoxml.component\ file:///local/libreoffice/master-linux/solver/unxlngx6.pro/xml/component/xmlhelp/util/ucpchelp1.component -env:URE_INTERNAL_LIB_DIR=file:///local/libreoffice/master-linux/solver/unxlngx6.pro/lib -env:LO_LIB_DIR=file:///local/libreoffice/master-linux/solver/unxlngx6.pro/lib --protector unoexceptionprotector.so unoexceptionprotector --protector unobootstrapprotector.so unobootstrapprotector ==14856== (process:14856): LangTag-DEBUG: Loading the internal extension handler: default (process:14856): LangTag-DEBUG: Loading the internal extension handler: empty (process:14856): LangTag-DEBUG: Loading the internal extension handler: wildcard ==14856== Conditional jump or move depends on uninitialised value(s) ==14856==at
Re: [PATCH] sal_bool and String conversions
On 2012-10-02 16:00, Stephan Bergmann wrote:
am unsure about this:
+OUStringBuffer operator+=( const OUString str )
+{
+return append( str.getStr(), str.getLength() );
+}
+
+/**
+Appends the string representation of the codechar/code
array
+argument to this string buffer.
+
+The characters of the array argument are appended, in
order, to
+the contents of this string buffer. The length of this string
+buffer increases by the length of the argument.
+
+@param str the characters to be appended.
+@return this string buffer.
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=( const sal_Unicode * str )
+{
+return append( str, rtl_ustr_getLength( str ) );
+}
/**
+Appends the string representation of the ASCII
codechar/code
+argument to this string buffer.
+
+The argument is appended to the contents of this string
buffer.
+The length of this string buffer increases by code1/code.
+
+@param c an ASCII codechar/code.
+@return this string buffer.
+
+@since LibreOffice 3.7
+ */
+OUStringBuffer operator+=(char c)
+{
+return append(c);
+}
hmmm... do we really want to have 2 sets of methods append() and
operator+= that do the same thing, possibly with different overloads?
perhaps we should deprecate the append methods... but those often have
addition radix etc, parameters... and is it possible to chain += like
append() in a single statement?
I would just stick to append-only for OUStringBuffer.
(Also, in general, it makes sense to keep changes to oustring/oustrbuf
in sync with changes to ostring/ostrbuf.)
Part of my motivation for adding this, besides making String-OUString
conversion easier, was that OUString already has the operator+= methods.
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drop support for Java 5?
On 02/10/12 15:48, d.ostrov...@idaia.de wrote: Hi Michael, Zitat von Michael Meeks michael.me...@suse.com: On Tue, 2012-10-02 at 14:53 +0200, Michael Stahl wrote: Mac OSX 10.4 only comes with 1.5. what about to drop support for Mac OS X 10.4 then? that is on the LO4 todo list :) what i meant to say is that i had added this to the below wiki page some months ago... Worth adding to the wiki page so we don't forget I imagine: http://wiki.documentfoundation.org/Development/LibreOffice4 done: https://wiki.documentfoundation.org/Development/LibreOffice4#Discontinued_support_for_obsolete_platforms_and_libraries ...but apparently both of you couldn't find it on there so i guess it's and improvement that the topic now has its own header :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/submodules' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 20116cc0b1ff8a6dfe848676bc77866566e78f38 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 2 10:09:30 2012 -0500 typo in configure.in wrt the name of the helpcontent2 module Change-Id: Id0d7335872c2e2c074769bd7edc1b7301b1ebdbe diff --git a/configure.in b/configure.in index e2f1744..10e1b1d 100644 --- a/configure.in +++ b/configure.in @@ -4292,7 +4292,7 @@ if test $with_help != no -a $_os != iOS -a $_os != Android; then BUILD_TYPE=$BUILD_TYPE HELP SCPDEFS=$SCPDEFS -DWITH_HELP GIT_REPO_NAMES=$GIT_REPO_NAMES help -GIT_NEEDED_SUBMODULES=helcontent2 $GIT_NEEDED_SUBMODULES +GIT_NEEDED_SUBMODULES=helpcontent2 $GIT_NEEDED_SUBMODULES else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: FDO Font Size (Email)
Hello Joel, all, On Tue, Oct 2, 2012 at 10:05 PM, Joel Madero jmadero@gmail.com wrote: Anyone else seeing that the updated FDO font size for comments (for bugs you are CC'ed on) are tiny? Me too! :-) I just found https://bugs.freedesktop.org/userprefs.cgi, that you may set Preferred email format to Text Only. This should help, but I didn't try yet. So, could you please report back if it really helps? ;) Thanks. Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/submodules' - g
g | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 1b33fd35e6ca50dd229fa3e9af084a82b7cd8cd1
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Oct 2 10:32:45 2012 -0500
when switching to a pre-submodule point, clean-up the soft-link point
Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
diff --git a/g b/g
index d73b8a6..7c6551c 100755
--- a/g
+++ b/g
@@ -137,6 +137,7 @@ do_checkout()
local cmd
local create_branch=0
local branch
+local module
git checkout $@ || return $?
for cmd in $@ ; do
@@ -154,6 +155,11 @@ local branch
fi
else
# now that is the nasty case we moved prior to submodules
+ # delete the submodules left over if any
+ for module in $SUBMODULES_ALL ; do
+ echo clean-up submodule $module
+ rm -fr ${module}
+ done
# make sure we have the needed repo in clone
./g clone ./g -f checkout $@ || return $?
fi
@@ -167,6 +173,11 @@ do_reset()
git submodule update || return $?
else
# now that is the nasty case we moved prior to submodules
+ # delete the submodules left over if any
+ for module in $SUBMODULES_ALL ; do
+ echo clean-up submodule $module
+ rm -fr ${module}
+ done
# make sure we have the needed repo in clone
./g clone ./g -f reset $@
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - vcl/aqua vcl/inc
vcl/aqua/source/gdi/atsui/salatslayout.cxx |2 +-
vcl/aqua/source/gdi/atsui/salgdi.cxx | 29 ++---
vcl/inc/aqua/atsui/salgdi.h|1 -
3 files changed, 3 insertions(+), 29 deletions(-)
New commits:
commit da9a26f5f49ea56422bb791d4f96725283d3e8c6
Author: Sergey Farbotka z8serge...@gmail.com
Date: Tue Oct 2 17:36:09 2012 +0200
Fix fdo#55142 - use proper output offsets.
Change-Id: I76e6158f1ac64b9dd555cf8aee3ce8bdd5d035c5
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 4145dbf..5d9ad09 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -437,7 +437,7 @@ void ATSLayout::DrawText( SalGraphics rGraphics ) const
{
const SubPortion rSubPortion = *it;
// calculate sub-portion offset for rotated text
-Fixed nXOfsFixed = 0, nYOfsFixed = 0;
+Fixed nXOfsFixed = rSubPortion.mnXOffset, nYOfsFixed = 0;
if( rAquaGraphics.mnATSUIRotation != 0 )
{
const double fRadians = rAquaGraphics.mnATSUIRotation *
(M_PI/0xB4);
commit d6418f680b8861dfea1ce1be6e9358b23cfb3064
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Oct 2 17:31:56 2012 +0200
Revert Fix fdo#55142 - wrong character pos calculation on mac.
Caused fdo#55350, better fix in the next commit.
This reverts commit f1651ee579bf38a49b839dbcb28ac38c0163a3d2.
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx
b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index a57068d..5c0bff7 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -354,8 +354,6 @@ AquaSalGraphics::AquaSalGraphics()
{
// create the style object for font attributes
ATSUCreateStyle( maATSUStyle );
-
-ResetFontStyle();
}
// ---
@@ -581,29 +579,6 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
// ---
-void AquaSalGraphics::ResetFontStyle()
-{
-ATSUClearStyle(maATSUStyle);
-
-// Set justification attributes
-ATSJustPriorityWidthDeltaOverrides nPriorityJustOverrides;
-memset(nPriorityJustOverrides, 0, sizeof(nPriorityJustOverrides));
-
-nPriorityJustOverrides[kJUSTLetterPriority].growFlags =
kJUSTOverrideLimits;
-nPriorityJustOverrides[kJUSTLetterPriority].shrinkFlags =
kJUSTOverrideLimits;
-
-ATSUAttributeTagtheTag = kATSUPriorityJustOverrideTag;
-ByteCount theSize =
sizeof(ATSJustPriorityWidthDeltaOverrides);
-ATSUAttributeValuePtr thePtr = nPriorityJustOverrides;
-OSStatus eStatus = ATSUSetAttributes(maATSUStyle, 1, theTag, theSize,
thePtr);
-if (eStatus != noErr)
-{
-DBG_WARNING(AquaSalGraphics::ResetFontStyle() : Could not override
justification attributes!\n);
-}
-}
-
-// ---
-
// callbacks from ATSUGlyphGetCubicPaths() fore GetGlyphOutline()
struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon*
mpPolyPoly; };
@@ -723,7 +698,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern*
pReqFont, int /*nFallbac
{
if( !pReqFont )
{
-ResetFontStyle();
+ATSUClearStyle( maATSUStyle );
mpMacFontData = NULL;
return 0;
}
@@ -809,7 +784,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern*
pReqFont, int /*nFallbac
if( eStatus != noErr )
{
DBG_WARNING( AquaSalGraphics::SetFont() : Could not set font
attributes!\n);
-ResetFontStyle();
+ATSUClearStyle( maATSUStyle );
mpMacFontData = NULL;
return 0;
}
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index eeb7aa4..19fe1f4 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -353,7 +353,6 @@ private:
bool GetRawFontData( const PhysicalFontFace* pFontData,
std::vectorunsigned char rBuffer,
bool* pJustCFF );
-void ResetFontStyle();
};
// --- some trivial inlines
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Drop support for Java 5?
On Tue, 2012-10-02 at 15:57 +0200, Noel Grandin wrote: At some point in time, we have to balance the amount of development resources we have against the number of people running a particular platform. True - but is there any real, concrete win to dropping it - beyond not having to build a single external module, that we already build ? ;-) Clearly we need a cost/benefit on both sides. MacOS PPC is around 0.7% of total downloads, small but not insignificant - clearly many tens-of-thousands of people are using it. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55350, which changed state. Bug 55350 Summary: Letter spacing and expand single word do not work anymore on MacOSX https://bugs.freedesktop.org/show_bug.cgi?id=55350 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - nss/prj soltools/Executable_makedepend.mk
nss/prj/build.lst |2 +- soltools/Executable_makedepend.mk |4 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 9b95cd5ada9aeb92eaf29bd8a03dfa186bc79ac2 Author: Andras Timar ati...@suse.com Date: Tue Oct 2 17:47:11 2012 +0200 nss depends on soltools Change-Id: Ic532b35cf282186843d886fda578bb20845db415 diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 14963ff..2377ac2 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv NULL +ns nss : solenv soltools NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL commit 960e57178a81688fef65d3fe339afaa5e3bf2afb Author: Andras Timar ati...@suse.com Date: Tue Oct 2 17:45:35 2012 +0200 makedepend depends on unistd.h Change-Id: I02df1b67dd9470a4a7225fd8986a52bd88a86e93 diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e301a09..96a3682 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -13,6 +13,10 @@ $(eval $(call gb_Executable_add_exception_objects,makedepend,\ soltools/mkdepend/collectdircontent \ )) +$(eval $(call gb_Executable_use_package,makedepend,\ +soltools_inc \ +)) + $(eval $(call gb_Executable_add_defs,makedepend,\ -DNO_X11 \ -DXP_PC \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||46278 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FDO Font Size (Email)
Ah, the bugzilla mails are multipart/alternative plain+html now! *That's* why they suddenly started to go to spam for me! On Tue, Oct 02, 2012 at 08:40:19AM -0700, Joel Madero wrote: I like the HTML style :( But I'll try the text one, as soon as someone comments on one of the hundred(s) of bugs that I'm a CC on I'll report back with a report. Regards, Joel On Tue, Oct 2, 2012 at 8:16 AM, Korrawit Pruegsanusak detective.conan.1...@gmail.com wrote: Hello Joel, all, On Tue, Oct 2, 2012 at 10:05 PM, Joel Madero jmadero@gmail.com wrote: Anyone else seeing that the updated FDO font size for comments (for bugs you are CC'ed on) are tiny? Me too! :-) I just found https://bugs.freedesktop.org/userprefs.cgi, that you may set Preferred email format to Text Only. This should help, but I didn't try yet. So, could you please report back if it really helps? ;) Thanks. Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |3 +++ 1 file changed, 3 insertions(+) New commits: commit b31f9715ff0682b6ed4dcf230bf263da4468b00b Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Oct 2 18:21:46 2012 +0200 poppler 0.20.0 makes sdext test fail, fail already in configure But I expect this was too much work to add when the first person ran into this. Change-Id: I8cc84ddec2ffaa76b408f9fb7102ab694347099d diff --git a/configure.in b/configure.in index fb54ec3..fba3bc2 100644 --- a/configure.in +++ b/configure.in @@ -9703,6 +9703,9 @@ if test x$enable_ext_pdfimport != xno -a x$enable_extension_integration != AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler = 0.8.0 ) + # sdext test fails with 0.20.0 + PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler != 0.20.0, +, [AC_MSG_ERROR([Poppler 0.20.0 is broken, do not use --with-system-poppler or use a different version])]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove not used macros from lotusworkpro
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/749 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/749/1 Remove not used macros from lotusworkpro Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M lotuswordpro/source/filter/bentoid.hxx M lotuswordpro/source/filter/lwpdoc.hxx M lotuswordpro/source/filter/lwpfribheader.hxx M lotuswordpro/source/filter/lwpgrfobj.cxx M lotuswordpro/source/filter/lwplayout.hxx M lotuswordpro/source/filter/lwpoleobject.hxx M lotuswordpro/source/filter/xfilter/xfframe.cxx 7 files changed, 2 insertions(+), 63 deletions(-) -- To view, visit https://gerrit.libreoffice.org/749 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0 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
[WIKI] new RSS extension
Hello, in course of our wiki migration, the current SimpleFeed extension will not be available anymore. Therefore, several pages in the wiki, especially the EasyHacks page, need to be adapted. Pages can be identified as they use the feed tag. I have installed the RSS extension on the soon-to-be-new wiki, and also on the old wiki, so appropriate measures can be taken in time. As soon as the migration is done (probably this month), the old extension will not be available anymore. Please have a look at your pages, and adjust them according to the new extension: http://www.mediawiki.org/wiki/Extension:RSS#Example Thanks, Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6] 3x calc cond-format patches
On 10/01/2012 01:07 PM, Markus Mohrhard wrote: Hey, 2012/10/1 Michael Meeks michael.me...@suse.com: Hi guys, These three together (worked on by Markus myself) improve some of the ergonomics around the conditional formatting dialog, and fix a minor sizing issue. I'd love to get them into -3-6 - review/sign-off appreciated; the slightly larger fix is a squash of three from master. Patch 1 and 2 already have a sign-off from me I just forgot to push my 3-6. I'll do that in some minutes. I can't sign-off the third patch because it contains some parts of my work. You can use my sign-off for the 3rd patch if you need to. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] sal_bool and String conversions
On 10/02/2012 04:22 PM, Noel Grandin wrote: Part of my motivation for adding this, besides making String-OUString conversion easier, was that OUString already has the operator+= methods. Yes, but OUStringBuffer only has append() until now, and---as Michael already pointed out---some append() overloads take multiple parameters, so cannot map naturally to operator+=. So I see more value in keeping the append() vs. operator+= difference between OUStringBuffer and OUString, than in removing that difference but instead introducing differences between what OUStringBuffer::append() supports vs. what any new OUStringBuffer::operator+= would support. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 7 commits - configure.in desktop/source starmath/inc starmath/source
configure.in |2 -
desktop/source/splash/splash.cxx |1
starmath/inc/edit.hxx|4 +-
starmath/inc/utility.hxx | 10 +-
starmath/source/cursor.cxx |2 -
starmath/source/edit.cxx | 64 ++-
starmath/source/mathmlexport.cxx |2 -
starmath/source/mathmlimport.cxx |3 -
starmath/source/unomodel.cxx | 18 --
starmath/source/utility.cxx | 29 +
starmath/source/view.cxx | 12 +--
11 files changed, 58 insertions(+), 89 deletions(-)
New commits:
commit 2d25eea6949196d2275d8b2bd484e6dab0163a33
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Oct 2 20:53:27 2012 +0400
splash screen: fix RTL mode
Change-Id: I6a00cba8fda11351ed5340f21678c330ce028a2d
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index e55b5b2..95cdc67 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -155,6 +155,7 @@ SplashScreen::SplashScreen()
, _yoffset(18)
{
loadConfig();
+_vdev.EnableRTL(IsRTLEnabled());
}
SplashScreen::~SplashScreen()
commit 509d964e985b58ddc4c20ccc163809a6f3623d8a
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Oct 2 20:43:41 2012 +0400
correct help string: horizontal - vertical
Change-Id: Id67da9d90a8fa21b99733c448fc32e81c6f1ab46
diff --git a/configure.in b/configure.in
index fba3bc2..2974db0 100644
--- a/configure.in
+++ b/configure.in
@@ -1989,7 +1989,7 @@ AC_ARG_WITH(intro-progressbar-text-color,
AC_ARG_WITH(intro-progressbar-text-baseline,
AS_HELP_STRING([--with-intro-progressbar-text-baseline],
-[Set horizontal position of progress bar text on intro screen. Value
in decimal format.])
+[Set vertical position of progress bar text on intro screen. Value in
decimal format.])
[
Usage: --with-intro-progressbar-text-baseline=250
],,)
commit 86b9e14bc8fed823ae39ebc5fee62e98c524d3fe
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Oct 2 16:59:26 2012 +0400
String - OUString
Change-Id: I88873eec738a068152e7d7be0dc4ab86fcfe345a
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 67e6574..be7b52d 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -113,7 +113,7 @@ public:
voidPaste();
voidDelete();
voidSelectAll();
-voidInsertText(const String rText);
+voidInsertText(const OUString rText);
voidInsertCommand(sal_uInt16 nCommand);
voidMarkError(const Point rPos);
voidSelNextMark();
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index c3514ad..8ba0529 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -484,7 +484,7 @@ SmNodeList::iterator
SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList,
}
//If we need to save the selected text
if(pSelectedNodes len2 0) {
-String str = aText.copy(start2, len2);
+OUString str = aText.copy(start2, len2);
SmTextNode* pSeg2 = new SmTextNode(aToken, eFontDesc);
pSeg2-ChangeText(str);
pSelectedNodes-push_back(pSeg2);
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 1c0510a..b6d83e0 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -912,12 +912,12 @@ void SmEditWindow::Delete()
}
}
-void SmEditWindow::InsertText(const String Text)
+void SmEditWindow::InsertText(const OUString rText)
{
OSL_ENSURE( pEditView, EditView missing );
if (pEditView)
{
-pEditView-InsertText(Text);
+pEditView-InsertText(rText);
aModifyTimer.Start();
StartCursorMove();
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5707439..2f7e0a7 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1466,8 +1466,6 @@ bool SmViewShell::Insert( SfxMedium rMedium )
RTL_LOGFILE_CONTEXT( aLog, starmath: SmViewShell::Insert );
SmDocShell *pDoc = GetDoc();
-String aText( pDoc-GetText() );
-String aTemp = aText;
bool bRet = false;
uno::Reference embed::XStorage xStorage = rMedium.GetStorage();
@@ -1485,15 +1483,13 @@ bool SmViewShell::Insert( SfxMedium rMedium )
if( bRet )
{
-aText = pDoc-GetText();
+OUString aText = pDoc-GetText();
SmEditWindow *pEditWin = GetEditWindow();
if (pEditWin)
pEditWin-InsertText( aText );
else
{
OSL_FAIL( EditWindow missing );
-aTemp += aText;
-aText = aTemp;
}
pDoc-Parse();
@@ -1514,8 +1510,6 @@ bool
Re: [PUSHED] Re: [PATCH][REVIEW 3-6] fdo#52268: splash: change color and position of messages
Hi Kendy, On 02.10.2012 18:03, Jan Holesovsky wrote: Marking it pushed; and want to ask you to cherry-pick the following addition to the libreoffice-3-6 branch :-) http://cgit.freedesktop.org/libreoffice/core/commit/?id=a9097843e6b2935dcab9f038b80e5a51bc5cfc94 oh, right, I forgot about that, thanks! You have my sign-off. +AC_ARG_WITH(intro-progressbar-text-baseline, +AS_HELP_STRING([--with-intro-progressbar-text-baseline], +[Set horizontal position of progress bar text on intro screen. Value in decimal format.]) +[ + Usage: --with-intro-progressbar-text-baseline=250 +],,) It should be vertical position I believe. :) http://cgit.freedesktop.org/libreoffice/core/commit/?id=509d964e985b58ddc4c20ccc163809a6f3623d8a Horizontally the text is left-aligned to the progress bar, it is not configurable. Wait... I said left-aligned? How about RTL? Yeah, it is broken! :) http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d25eea6949196d2275d8b2bd484e6dab0163a33 Could you please cherry-pick these two commits to 3-6 as well? Thanks! Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source sc/source
oox/source/export/vmlexport.cxx |3 ++-
sc/source/filter/oox/commentsbuffer.cxx |3 +--
sc/source/filter/xcl97/xcl97rec.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ebc8ebaff65ac02d410c8e9e39c2776131955cd7
Author: Noel Power noel.po...@novell.com
Date: Tue Oct 2 18:04:55 2012 +0100
fdo#46278 - misc comment import/export fixes
detect whether note/comment is shown on import
export state of note ( shown/hidden )
parts of Change-Id: I59b446175217479ce7960287aa540df8c6b2b1e
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 62933fe..8c758b4 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -666,7 +666,8 @@ void VMLExport::Commit( EscherPropertyContainer rProps,
const Rectangle rRect
break;
case ESCHER_Prop_fHidden:
-m_pShapeStyle-append( ;visibility:hidden );
+if ( !it-nPropValue )
+m_pShapeStyle-append( ;visibility:hidden );
break;
default:
#if OSL_DEBUG_LEVEL 0
diff --git a/sc/source/filter/oox/commentsbuffer.cxx
b/sc/source/filter/oox/commentsbuffer.cxx
index 3bbf751..39d57a0 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -195,8 +195,7 @@ void Comment::finalizeImport()
// position and formatting
pNoteShape-convertFormatting( xAnnoShape );
// visibility
-const ::oox::vml::ClientData* pClientData =
pNoteShape-getClientData();
-xAnno-setIsVisible( pClientData
pClientData-mbVisible );
+bVisible = pNoteShape-getTypeModel().mbVisible;
}
}
break;
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index f1f8a40..212bb6b 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -566,7 +566,7 @@ VmlCommentExporter::VmlCommentExporter(
sax_fastparser::FSHelperPtr p, ScAddress
void VmlCommentExporter::Commit( EscherPropertyContainer rProps, const
Rectangle rRect )
{
lcl_FillProps( rProps, mpCaption, mbVisible );
-rProps.AddOpt( ESCHER_Prop_fHidden, 1 );// bool field
+rProps.AddOpt( ESCHER_Prop_fHidden, mbVisible ); // bool field
VMLExport::Commit( rProps, rRect );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 46278, which changed state. Bug 46278 Summary: FILESAVE: visibility settings of comments for cells are not saved in .xlsx format https://bugs.freedesktop.org/show_bug.cgi?id=46278 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc sal/rtl sal/util
sal/inc/rtl/string.h | 17 +
sal/inc/rtl/string.hxx | 36
sal/inc/rtl/ustring.h | 17 +
sal/inc/rtl/ustring.hxx| 36
sal/rtl/source/strtmpl.cxx | 23 +++
sal/util/sal.map |6 ++
6 files changed, 87 insertions(+), 48 deletions(-)
New commits:
commit 595ba03fd4769c069bbe0431ab878956ef1c37ad
Author: Michael Meeks michael.me...@suse.com
Date: Tue Oct 2 18:39:30 2012 +0100
update string copy semantics to be undefined in a non-crashing way.
Change-Id: I03bb4db5931932280e368012cbaee6bef2854dd6
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index c38e106..6dd4236 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -889,6 +889,23 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromStr(
rtl_String ** newStr, const s
*/
SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromStr_WithLength( rtl_String **
newStr, const sal_Char * value, sal_Int32 len ) SAL_THROW_EXTERN_C();
+/** Allocate a new string that is a substring of this string.
+
+The substring begins at the specified beginIndex and contains count
+characters. Meaningless combinations such as negative beginIndex,
+or beginIndex + count greater than the length of the string have
+undefined behaviour.
+
+@param beginIndex the beginning index, inclusive.
+@param countthe number of characters.
+@returnthe specified substring.
+
+@since LibreOffice 3.7
+ */
+SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromSubString(
+rtl_String ** newStr, const rtl_String * from,
+sal_Int32 beginIndex, sal_Int32 count ) SAL_THROW_EXTERN_C();
+
/**
@internal
@since LibreOffice 3.6
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 84ab48e..d58999b 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1024,31 +1024,27 @@ public:
/**
Returns a new string that is a substring of this string.
- The substring begins at the specified beginIndex. It is an error for
- beginIndex to be negative or to be greater than the length of this
string.
+ The substring begins at the specified beginIndex. If
+ beginIndex is negative or be greater than the length of
+ this string, behaviour is undefined.
@param beginIndex the beginning index, inclusive.
@returnthe specified substring.
*/
OString copy( sal_Int32 beginIndex ) const SAL_THROW(())
{
-assert(beginIndex = 0 beginIndex = getLength());
-if ( beginIndex == 0 )
-return *this;
-else
-{
-rtl_String* pNew = 0;
-rtl_string_newFromStr_WithLength( pNew, pData-buffer+beginIndex,
getLength()-beginIndex );
-return OString( pNew, (DO_NOT_ACQUIRE*)0 );
-}
+rtl_String *pNew = 0;
+rtl_string_newFromSubString( pNew, pData, beginIndex, getLength() -
beginIndex );
+return OString( pNew, (DO_NOT_ACQUIRE*)0 );
}
/**
Returns a new string that is a substring of this string.
The substring begins at the specified beginIndex and contains count
- characters. It is an error for either beginIndex or count to be
negative,
- or for beginIndex + count to be greater than the length of this string.
+ characters. If either beginIndex or count are negative,
+ or beginIndex + count are greater than the length of this string
+ then behaviour is undefined.
@param beginIndex the beginning index, inclusive.
@param countthe number of characters.
@@ -1056,17 +1052,9 @@ public:
*/
OString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(())
{
-assert(beginIndex = 0 beginIndex = getLength() count = 0
- sal::static_int_castsal_uInt32(count) =
- sal::static_int_castsal_uInt32(getLength() - beginIndex));
-if ( (beginIndex == 0) (count == getLength()) )
-return *this;
-else
-{
-rtl_String* pNew = 0;
-rtl_string_newFromStr_WithLength( pNew, pData-buffer+beginIndex,
count );
-return OString( pNew, (DO_NOT_ACQUIRE*)0 );
-}
+rtl_String *pNew = 0;
+rtl_string_newFromSubString( pNew, pData, beginIndex, count );
+return OString( pNew, (DO_NOT_ACQUIRE*)0 );
}
/**
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 5b4982e..231dcdc 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1226,6 +1226,23 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newFromStr(
SAL_DLLPUBLIC void SAL_CALL rtl_uString_newFromStr_WithLength(
rtl_uString ** newStr, const sal_Unicode * value, sal_Int32 len )
SAL_THROW_EXTERN_C();
+/** Allocate a new string that is a substring of this string.
+
+The substring
[Libreoffice-commits] .: Branch 'feature/submodules' - g
g | 36 ++--
1 file changed, 34 insertions(+), 2 deletions(-)
New commits:
commit ba9e29b24d2e83b522ccee8fd3dfb11bcf0d
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Oct 2 12:59:44 2012 -0500
add tag support to ./g, try to optimize pre-post submerge situation
Change-Id: I052817865da6df193c0451eccc3b8b6f507845a3
diff --git a/g b/g
index 7c6551c..f70cac1 100755
--- a/g
+++ b/g
@@ -125,6 +125,31 @@ get_configured_submodules()
fi
}
+do_shortcut_update()
+{
+local module
+local repo
+
+for module in $SUBMODULES_CONFIGURED ; do
+ if [ ! -d ${module?}/.git ] ; then
+ case ${module?} in
+ helcontent2)
+ if [ -d clone/help/.git ] ; then
+ repo=clone/help/.git
+ fi
+ ;;
+ *)
+ if [ -d clone/${module?}/.git ] ; then
+ repo=clone/${module?}/.git
+ fi
+ ;;
+ esac
+ if [ -n $repo ] ; then
+ cp -r ${repo?} ${module?}/.
+ fi
+done
+}
+
do_git_cmd()
{
echo cmd:$@
@@ -147,11 +172,13 @@ local module
create_branch=1
elif [ $create_branch = 1 ] ; then
branch=$arg
+ create_branch=0
fi
done
if [ -f .gitmodules ] ; then
+ git submodule update
if [ -n $branch ] ; then
- git submodules foreach git branch ${branch} HEAD || return $?
+ git submodules foreach git checkout -b ${branch} HEAD || return $?
fi
else
# now that is the nasty case we moved prior to submodules
@@ -189,6 +216,8 @@ do_init_modules()
local module
local configured
+do_shortcut_update
+
for module in $SUBMODULES_CONFIGURED ; do
configured=$(git config --local --get submodule.${module}.url)
if [ -z $configured ] ; then
@@ -265,7 +294,7 @@ case $COMMAND in
do_git_cmd ${COMMAND} $@
;;
checkout)
- do_checkout $@ git submodule foreach git checkout $@
+ do_checkout $@
;;
clone)
do_init_modules git submodule update refresh_all_hooks
@@ -290,6 +319,9 @@ case $COMMAND in
reset)
do_reset
;;
+tag)
+ do_git_cmd ${COMMAND} $@
+ ;;
*)
echo ./g does not support command:$COMMAND 12
exit 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/colorscale.hxx | 16 ++
sc/source/core/data/colorscale.cxx | 206 +
2 files changed, 88 insertions(+), 134 deletions(-)
New commits:
commit dde7ff4da28e754c2542191f363d8de78388e75a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 2 18:15:38 2012 +0200
simplify and speed up color format rendering
Change-Id: I7f9abc1e20ffb7d49ebae0c0f9d5e50f91b074c0
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index df3e17a..146c10b 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -189,10 +189,24 @@ public:
virtual void DataChanged(const ScRange rRange) = 0;
virtual void SetParent(ScConditionalFormat* pParent);
+virtual void startRendering();
+virtual void endRendering();
+
protected:
-void getValues( std::vectordouble rValues ) const;
+std::vectordouble getValues() const;
+
+double getMinValue() const;
+double getMaxValue() const;
ScConditionalFormat* mpParent;
+
+private:
+
+struct ScColorFormatCache
+{
+std::vectordouble maValues;
+};
+mutable boost::scoped_ptrScColorFormatCache mpCache;
};
class SC_DLLPUBLIC ScColorScaleFormat : public ScColorFormat
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index b224b51..6951e8b 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -34,6 +34,8 @@
#include iostream
#endif
+#include algorithm
+
ScColorScaleEntry::ScColorScaleEntry():
mnVal(0),
mpCell(NULL),
@@ -239,103 +241,6 @@ ScColorScaleEntryType ScColorScaleEntry::GetType() const
return meType;
}
-namespace {
-
-double getMinValue(const ScRange rRange, ScDocument* pDoc)
-{
-double aMinValue = std::numeric_limitsdouble::max();
-//iterate through columns
-SCTAB nTab = rRange.aStart.Tab();
-for(SCCOL nCol = rRange.aStart.Col(); nCol = rRange.aEnd.Col(); ++nCol)
-{
-for(SCROW nRow = rRange.aStart.Row(); nRow = rRange.aEnd.Row();
++nRow)
-{
-ScAddress aAddr(nCol, nRow, rRange.aStart.Tab());
-CellType eType = pDoc-GetCellType(aAddr);
-if(eType == CELLTYPE_VALUE)
-{
-double aVal = pDoc-GetValue(nCol, nRow, nTab);
-if( aVal aMinValue )
-aMinValue = aVal;
-}
-else if(eType == CELLTYPE_FORMULA)
-{
-
if(static_castScFormulaCell*(pDoc-GetCell(aAddr))-IsValue())
-{
-double aVal = pDoc-GetValue(nCol, nRow, nTab);
-if( aVal aMinValue )
-aMinValue = aVal;
-}
-}
-}
-}
-return aMinValue;
-}
-
-double getMaxValue(const ScRange rRange, ScDocument* pDoc)
-{
-double aMaxValue = std::numeric_limitsdouble::min();
-//iterate through columns
-SCTAB nTab = rRange.aStart.Tab();
-for(SCCOL nCol = rRange.aStart.Col(); nCol = rRange.aEnd.Col(); ++nCol)
-{
-for(SCROW nRow = rRange.aStart.Row(); nRow = rRange.aEnd.Row();
++nRow)
-{
-ScAddress aAddr(nCol, nRow, rRange.aStart.Tab());
-CellType eType = pDoc-GetCellType(aAddr);
-if(eType == CELLTYPE_VALUE)
-{
-double aVal = pDoc-GetValue(nCol, nRow, nTab);
-if( aVal aMaxValue )
-aMaxValue = aVal;
-}
-else if(eType == CELLTYPE_FORMULA)
-{
-
if(static_castScFormulaCell*(pDoc-GetCell(aAddr))-IsValue())
-{
-double aVal = pDoc-GetValue(nCol, nRow, nTab);
-if( aVal aMaxValue )
-aMaxValue = aVal;
-}
-}
-}
-}
-return aMaxValue;
-}
-
-double getMinValue(const ScRangeList rList, ScDocument* pDoc)
-{
-double aMinValue = std::numeric_limitsdouble::max();
-
-size_t n = rList.size();
-for(size_t i = 0; i n; ++i)
-{
-const ScRange* pRange = rList[i];
-double aVal = getMinValue(*pRange, pDoc);
-if( aVal aMinValue )
-aMinValue = aVal;
-}
-return aMinValue;
-}
-
-double getMaxValue(const ScRangeList rList, ScDocument* pDoc)
-{
-double aMaxVal = std::numeric_limitsdouble::min();
-
-size_t n = rList.size();
-for(size_t i = 0; i n; ++i)
-{
-const ScRange* pRange = rList[i];
-double aVal = getMaxValue(*pRange, pDoc);
-if( aVal aMaxVal )
-aMaxVal = aVal;
-}
-
-return aMaxVal;
-}
-
-}
-
double ScColorScaleFormat::GetMinValue() const
{
const_iterator itr = maColorScales.begin();
@@ -344,7 +249,7 @@ double ScColorScaleFormat::GetMinValue() const
return itr-GetValue();
else
{
-return getMinValue(GetRange(), mpDoc);
+return getMinValue();
}
}
@@ -356,7
[Libreoffice-commits] .: Branch 'feature/submodules' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b54ebb07e9610dfc3f295d000bf0ccea22c00864 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 2 13:24:09 2012 -0500 Updated core Project: translations f83717cf73f4549d9ae09bc557d59316d4165394 null add a README to the translations module Change-Id: Iccfc83d5e9ec87802e88f83da1181493630805ea Reviewed-on: https://gerrit.libreoffice.org/751 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/translations b/translations index 751ae9d..f83717c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 751ae9de9563da8b26aef8e5c0f80ad502fbfe81 +Subproject commit f83717cf73f4549d9ae09bc557d59316d4165394 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 46805, which changed state. Bug 46805 Summary: large autocorrect database make LibO freeze when start typing https://bugs.freedesktop.org/show_bug.cgi?id=46805 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: lotuswordpro/source
lotuswordpro/source/filter/bentoid.hxx | 17 -
lotuswordpro/source/filter/lwpdoc.hxx |9 -
lotuswordpro/source/filter/lwpfribheader.hxx |3 ---
lotuswordpro/source/filter/lwpgrfobj.cxx | 19 ++-
lotuswordpro/source/filter/lwplayout.hxx | 14 --
lotuswordpro/source/filter/lwpoleobject.hxx|2 --
lotuswordpro/source/filter/xfilter/xfframe.cxx |1 -
7 files changed, 2 insertions(+), 63 deletions(-)
New commits:
commit 02a7bf55603d8b1e74b83bb2b02fa86e1e31807b
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Tue Oct 2 13:29:18 2012 -0300
Remove not used macros from lotusworkpro
Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/749
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/lotuswordpro/source/filter/bentoid.hxx
b/lotuswordpro/source/filter/bentoid.hxx
index 135b190..d34cc45 100644
--- a/lotuswordpro/source/filter/bentoid.hxx
+++ b/lotuswordpro/source/filter/bentoid.hxx
@@ -61,20 +61,11 @@ namespace OpenStormBento
#define BEN_OBJID_TOC 1 // TOC object ID
#define BEN_PROPID_TOC_SEED 2 // TOC object starting seed
-#define BEN_PROPID_TOC_MIN_SEED 3 // TOC object minimum seed
-#define BEN_PROPID_TOC_OBJECT 4 // TOC object
-#define BEN_PROPID_TOC_CONTAINER 5 // TOC object entire container
-#define BEN_PROPID_TOC_DELETED 6 // TOC object amount deleted
#define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type
-#define BEN_OBJID_WRITEABLE 20 // Predefined ID's below this value will be
- // written to container TOC. Predefined IDs
- // above this are not written
#define BEN_TYPEID_7_BIT_ASCII 21 // 7-bit ASCII
#define BEN_PROPID_GLOBAL_TYPE_NAME 23 // Global type name
#define BEN_PROPID_GLOBAL_PROPERTY_NAME 24 // Global property name
#define BEN_PROPID_OBJ_REFERENCES 31 // Referenced objects from an object
-#define BEN_TYPEID_OBJ_REFERENCES_DATA 32 // Reference data
-#define BEN_OBJID_MIN_GENERAL_ID 100 // Min object ID for general std objects
#define BEN_NEW_OBJECT 1 // object + property + type
#define BEN_NEW_PROPERTY 2 // property + type
@@ -95,14 +86,6 @@ namespace OpenStormBento
#define BEN_SEGMENT_CODE_END 14
#define BEN_REFERENCE_LIST_ID 15 // references recording object ID
-#define BEN_RESERVED4B 16
-#define BEN_RESERVED4C 17
-#define BEN_RESERVED8A 18 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8B 19 // reserved for future use of 8 byte entry
-#define BEN_RESERVED8C 20 // reserved for future use of 8 byte entry
-#define BEN_RESERVED12A 21 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12B 22 // reserved for future use of 12 byte entry
-#define BEN_RESERVED12C 23 // reserved for future use of 12 byte entry
#define BEN_END_OF_BUFFER 24 // end of current buffer, go to next
#define BEN_READ_PAST_END_OF_TOC 50 // Our code
#define BEN_NOOP 0xFF
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx
b/lotuswordpro/source/filter/lwpdoc.hxx
index a920e64..0e4a737 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -98,16 +98,7 @@ private:
enum
{
DOC_PROTECTED = 0x0004UL,
-/*#define DOC_USECONTENTS 0x0008UL
-#define DOC_LOCKREVISIONS 0x0200UL
-#define DOC_LOCAL 0x0400UL
-*/
DOC_CHILDDOC = 0x0800UL
-/*#define DOC_DOPREVIEW 0x0200UL
-#define DOC_REBUILDENDNOTES 0x0400UL
-#define DOC_FILEPROTECTION 0x1000UL
-#define DOC_PERSISTENTBITS (DOC_PROTECTED | DOC_USECONTENTS |
DOC_LOCKREVISIONS | DOC_LOCAL | DOC_CHILDDOC | DOC_DOPREVIEW |
DOC_REBUILDENDNOTES | DOC_FILEPROTECTION)
-*/
};
//Code cleaning by change some members to local variables in Read()
diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx
b/lotuswordpro/source/filter/lwpfribheader.hxx
index 03757ce..143799e 100644
--- a/lotuswordpro/source/filter/lwpfribheader.hxx
+++ b/lotuswordpro/source/filter/lwpfribheader.hxx
@@ -68,10 +68,7 @@
#define FRIB_MTAG_CHARSTYLE 3
#define FRIB_MTAG_ATTRIBUTE 4
#define FRIB_MTAG_LANGUAGE 5
-#define FRIB_MTAG_CHARBORDER6
-#define FRIB_MTAG_AMIKAKE 7
#define FRIB_MTAG_CODEPAGE 8
-#define FRIB_MTAG_STXLINK 9 // SmarText; do not #ifdef out
#define FT_MAXIMUM 30
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 718d5f5..aa6fa88 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -85,9 +85,7 @@
#include osl/thread.h
#define EF_NONE 0x
-#define EF_FTP 0x0001
#define EF_ODMA 0x0002
-#define EF_NOS
[PUSHED] Remove not used macros from lotusworkpro
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/749 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/749 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/crsrsh.hxx|6 ---
sw/inc/viscrs.hxx| 14
sw/source/core/crsr/viscrs.cxx | 64 ---
sw/source/core/layout/layact.cxx |3 -
sw/source/ui/docvw/edtwin.cxx| 13 ---
5 files changed, 100 deletions(-)
New commits:
commit c2eb9698eff7412e6973e659f26e7e39eeaf2887
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Oct 2 22:36:28 2012 +0900
Remove dead code
SW_CRSR_TIMER was undefined
Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3
Reviewed-on: https://gerrit.libreoffice.org/747
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 4c7e48c..e8678e9 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -750,12 +750,6 @@ public:
// is the whole document protected/hidden (for UI...)
sal_Bool IsAllProtect() const { return bAllProtect; }
-#ifdef SW_CRSR_TIMER
-// Set flag at VisCrsr. Is it triggered by Timer (TRUE) or directly
(FALSE).
-// Default is triggert by Timer.
-sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True );
-#endif
-
sal_Bool BasicActionPend() const{ return nBasicActionCnt !=
nStartAction; }
sal_Bool GotoRegion( const String rName );
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 5b0b925..f8b274b 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -39,9 +39,6 @@ class SwShellCrsr;
// From here classes/methods for non-text cursor.
class SwVisCrsr
-#ifdef SW_CRSR_TIMER
-: private Timer
-#endif
{
friend void _InitCore();
friend void _FinitCore();
@@ -49,16 +46,9 @@ class SwVisCrsr
sal_Bool bIsVisible : 1;
sal_Bool bIsDragCrsr : 1;
-#ifdef SW_CRSR_TIMER
-sal_Bool bTimerOn : 1;
-#endif
-
Cursor aTxtCrsr;
const SwCrsrShell* pCrsrShell;
-#ifdef SW_CRSR_TIMER
-virtual void Timeout();
-#endif
void _SetPosAndShow();
public:
@@ -70,10 +60,6 @@ public:
sal_Bool IsVisible() const { return bIsVisible; }
void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; }
-
-#ifdef SW_CRSR_TIMER
-sal_Bool ChgTimerFlag( sal_Bool bTimerOn = sal_True );
-#endif
};
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 09eebb7..88d8404 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -70,22 +70,12 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
bIsVisible = aTxtCrsr.IsVisible();
bIsDragCrsr = sal_False;
aTxtCrsr.SetWidth( 0 );
-
-#ifdef SW_CRSR_TIMER
-bTimerOn = sal_True;
-SetTimeout( 50 ); // 50 millisecond delay
-#endif
}
SwVisCrsr::~SwVisCrsr()
{
-#ifdef SW_CRSR_TIMER
-if( bTimerOn )
-Stop(); // stop timer
-#endif
-
if( bIsVisible aTxtCrsr.IsVisible() )
aTxtCrsr.Hide();
@@ -103,21 +93,7 @@ void SwVisCrsr::Show()
// display at all?
if( pCrsrShell-VisArea().IsOver( pCrsrShell-aCharRect ) )
-#ifdef SW_CRSR_TIMER
-{
-if( bTimerOn )
-Start();// start timer
-else
-{
-if( IsActive() )
-Stop(); // stop timer
-
-_SetPosAndShow();
-}
-}
-#else
_SetPosAndShow();
-#endif
}
}
@@ -129,51 +105,11 @@ void SwVisCrsr::Hide()
{
bIsVisible = sal_False;
-#ifdef SW_CRSR_TIMER
-if( IsActive() )
-Stop(); // stop timer
-#endif
-
if( aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect?
aTxtCrsr.Hide();
}
}
-#ifdef SW_CRSR_TIMER
-
-void SwVisCrsr::Timeout()
-{
-OSL_ENSURE( !bIsDragCrsr, stop timer before );
-if( bIsVisible )
-{
-if ( !pCrsrShell-GetWin() ) // SwFrmFmt::GetGraphic suspends Win
temporarily!
-Start();
-else
-_SetPosAndShow();
-}
-}
-
-sal_Bool SwCrsrShell::ChgCrsrTimerFlag( sal_Bool bTimerOn )
-{
-return pVisCrsr-ChgTimerFlag( bTimerOn );
-}
-
-
-sal_Bool SwVisCrsr::ChgTimerFlag( sal_Bool bFlag )
-{
-bOld = bTimerOn;
-if( !bFlag bIsVisible IsActive() )
-{
-Stop(); // stop timer
-_SetPosAndShow();
-}
-bTimerOn = bFlag;
-return bOld;
-}
-
-#endif
-
-
void SwVisCrsr::_SetPosAndShow()
{
SwRect aRect;
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index d542238..26de885 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2330,9 +2330,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
sal_Bool bVis = sal_False;
if ( pSh-ISA(SwCrsrShell) )
{
-#ifdef SW_CRSR_TIMER
-((SwCrsrShell*)pSh)-ChgCrsrTimerFlag( sal_False );
-#endif
bVis =
((SwCrsrShell*)pSh)-GetCharRect().IsOver(pSh-VisArea());
}
[PUSHED] Remove dead code
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/747 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/747 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Takeshi Abe t...@fixedpoint.jp Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libvisio/libvisio-0.0.19.patch libvisio/UnpackedTarball_visio.mk
libvisio/UnpackedTarball_visio.mk |9 ++
libvisio/libvisio-0.0.19.patch| 116 ++
2 files changed, 125 insertions(+)
New commits:
commit 7192f0ddaa937f6c63bfffed0b35146a0f97943a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Oct 2 23:12:49 2012 +0200
Clean the path pushed to the API as much as possible
Change-Id: I5e68bc5aedc4c6e350e62b30472a1b3f0803c520
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index aa9113b..15429c5 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,4 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,0))
+
+visio_patches :=
+# Somehow draw is very picky about what is a closed path
+visio_patches += libvisio-0.0.19.patch
+
+$(eval $(call gb_UnpackedTarball_add_patches,visio,\
+ $(foreach patch,$(visio_patches),libvisio/$(patch)) \
+))
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.19.patch b/libvisio/libvisio-0.0.19.patch
new file mode 100644
index 000..ee3c17f
--- /dev/null
+++ b/libvisio/libvisio-0.0.19.patch
@@ -0,0 +1,116 @@
+--- src/lib/VSDXContentCollector.cpp
src/lib/VSDXContentCollector.cpp
+@@ -676,7 +676,6 @@ double
libvisio::VSDXContentCollector::_linePropertiesMarkerScale(unsigned marke
+
+ void libvisio::VSDXContentCollector::_flushCurrentPath()
+ {
+- WPXPropertyListVector path;
+ WPXPropertyList fillPathProps(m_styleProps);
+ fillPathProps.insert(draw:stroke, none);
+ WPXPropertyList linePathProps(m_styleProps);
+@@ -695,6 +694,7 @@ void libvisio::VSDXContentCollector::_flushCurrentPath()
+ if (needsGroup)
+ m_shapeOutputDrawing-addStartLayer(WPXPropertyList());
+
++ std::vectorWPXPropertyList tmpPath;
+ if (m_styleProps[draw:fill] m_styleProps[draw:fill]-getStr() !=
none)
+ {
+ bool firstPoint = true;
+@@ -708,39 +708,84 @@ void libvisio::VSDXContentCollector::_flushCurrentPath()
+ }
+ else if (m_currentFillGeometry[i][libwpg:path-action]-getStr() ==
M)
+ {
+-if (path.count() !wasMove)
++if (!tmpPath.empty())
+ {
+- WPXPropertyList closedPath;
+- closedPath.insert(libwpg:path-action, Z);
+- path.append(closedPath);
++ if (!wasMove)
++ {
++WPXPropertyList closedPath;
++closedPath.insert(libwpg:path-action, Z);
++tmpPath.push_back(closedPath);
++ }
++ else
++ {
++tmpPath.pop_back();
++ }
+ }
+ wasMove = true;
+ }
+ else
+ wasMove = false;
+- path.append(m_currentFillGeometry[i]);
++ tmpPath.push_back(m_currentFillGeometry[i]);
+ }
+-if (path.count() !wasMove)
++if (!tmpPath.empty())
+ {
+- WPXPropertyList closedPath;
+- closedPath.insert(libwpg:path-action, Z);
+- path.append(closedPath);
++ if (!wasMove)
++ {
++WPXPropertyList closedPath;
++closedPath.insert(libwpg:path-action, Z);
++tmpPath.push_back(closedPath);
++ }
++ else
++tmpPath.pop_back();
+ }
+-if (path.count())
++if (!tmpPath.empty())
+ {
++ WPXPropertyListVector path;
++ for (unsigned i = 0; i tmpPath.size(); ++i)
++path.append(tmpPath[i]);
+ m_shapeOutputDrawing-addStyle(fillPathProps, WPXPropertyListVector());
+ m_shapeOutputDrawing-addPath(path);
+ }
+ }
+ m_currentFillGeometry.clear();
+- path = WPXPropertyListVector();
++ tmpPath.clear();
+
+ if (m_styleProps[draw:stroke] m_styleProps[draw:stroke]-getStr() !=
none)
+ {
++bool firstPoint = true;
++bool wasMove = false;
+ for (unsigned i = 0; i m_currentLineGeometry.size(); i++)
+- path.append(m_currentLineGeometry[i]);
+-if (path.count())
+ {
++ if (firstPoint)
++ {
++firstPoint = false;
++wasMove = true;
++ }
++ else if (m_currentLineGeometry[i][libwpg:path-action]-getStr() ==
M)
++ {
++if (!tmpPath.empty())
++{
++ if (wasMove)
++ {
++tmpPath.pop_back();
++ }
++}
++wasMove = true;
++ }
++ else
++wasMove = false;
++ tmpPath.push_back(m_currentLineGeometry[i]);
++}
++if (!tmpPath.empty())
++{
++ if (wasMove)
++tmpPath.pop_back();
++}
++if (!tmpPath.empty())
++{
++ WPXPropertyListVector path;
++ for (unsigned i = 0; i tmpPath.size(); ++i)
++path.append(tmpPath[i]);
+ m_shapeOutputDrawing-addStyle(linePathProps, WPXPropertyListVector());
+ m_shapeOutputDrawing-addPath(path);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] .: wizards/Pyuno_commonwizards.mk
wizards/Pyuno_commonwizards.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 58deab04a99ab0ad49d4f33348dc801ca932c0ca Author: Xisco Fauli aniste...@gmail.com Date: Tue Oct 2 23:27:33 2012 +0200 pyfax: Add TextElement to makefile Change-Id: Iddc7ae6ce49d815e05f3f537569434489e3ccf53 diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk index fb7ac10..5653dac 100644 --- a/wizards/Pyuno_commonwizards.mk +++ b/wizards/Pyuno_commonwizards.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Pyuno_add_files,wizards,\ common/HelpIds.py \ common/NumberFormatter.py \ common/PropertySetHelper.py \ +common/TextElement.py \ document/__init__.py \ document/OfficeDocument.py \ text/__init__.py \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in Makefile.top Module_tail_build.mk RepositoryModule_ooo.mk rhino/ExternalProject_rhino.mk rhino/Makefile rhino/makefile.mk rhino/Module_rhino.mk
Makefile.top |4 - Module_tail_build.mk |1 RepositoryModule_ooo.mk|1 config_host.mk.in |1 configure.in |2 rhino/ExternalProject_rhino.mk | 37 +++ rhino/Makefile |7 ++ rhino/Module_rhino.mk | 22 ++ rhino/OfficeScriptInfo.java| 128 +++ rhino/Package_rhino.mk | 16 rhino/UnpackedTarball_rhino.mk | 24 +++ rhino/makefile.mk | 75 -- rhino/prj/build.lst|5 - rhino/prj/d.lst|1 rhino/rhino1_5R5.patch | 134 - tail_build/prj/build.lst |2 16 files changed, 244 insertions(+), 216 deletions(-) New commits: commit ae1f2f6b932d43e6770022039d9cbe3f3960ab27 Author: David Ostrovsky da...@ostrovsky.org Date: Tue Oct 2 23:22:37 2012 +0200 gbuildification of rhino Default patch level 3 was not working here and must be overriden with gb_UnpackedTarball_set_patchlevel function with 2. New java file OfficeScriptInfo.java was extracted from rhino1_5R5.patch and added with gb_UnpackedTarball_add_file. Change-Id: Iba25b2350caffd943af93f59fa2139332b009ef2 Reviewed-on: https://gerrit.libreoffice.org/752 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/Makefile.top b/Makefile.top index de91f56..bb4f73e 100644 --- a/Makefile.top +++ b/Makefile.top @@ -121,13 +121,14 @@ padmin\ psprint_config\ pyuno\ qadevOOo\ +rdbmaker\ readlicense_oo\ regexp\ registry\ remotebridges\ reportbuilder\ reportdesign\ -rdbmaker\ +rhino\ ridljar\ rsc\ sal\ @@ -245,7 +246,6 @@ postgresql\ postprocess\ python\ redland\ -rhino\ setup_native\ stax\ stlport\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 86a9c11..fa63c17 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -120,6 +120,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ remotebridges \ reportbuilder \ reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ salhelper \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index b654664..a8153e1 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -129,6 +129,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ remotebridges \ reportbuilder \ reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ sal \ diff --git a/config_host.mk.in b/config_host.mk.in index 48b470e..9052d70 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -481,6 +481,7 @@ export RANLIB=@RANLIB@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@ export REDLAND_LIBS=@REDLAND_LIBS@ export RHINO_JAR=@RHINO_JAR@ +export RHINO_TARBALL=@RHINO_TARBALL@ export RPM=@RPM@ export RTL_OS=@RTL_OS@ export RTL_ARCH=@RTL_ARCH@ diff --git a/configure.in b/configure.in index 2974db0..45c3d85 100644 --- a/configure.in +++ b/configure.in @@ -10107,6 +10107,7 @@ if test x$enable_ext_scripting_javascript = xyes -a x$enable_extension_inte else AC_MSG_RESULT([internal]) SYSTEM_RHINO=NO + RHINO_TARBALL=798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip BUILD_TYPE=$BUILD_TYPE RHINO fi else @@ -10117,6 +10118,7 @@ fi AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) AC_SUBST(RHINO_JAR) +AC_SUBST(RHINO_TARBALL) dnl Scripting provider for Python extension? dnl We always provide this unless we have disabled Python completely diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk new file mode 100644 index 000..0ca364e --- /dev/null +++ b/rhino/ExternalProject_rhino.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,rhino)) + +$(eval $(call gb_ExternalProject_use_unpacked,rhino,rhino)) + +$(eval $(call gb_ExternalProject_register_targets,rhino,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,rhino,build) : + cd $(call gb_UnpackedTarball_get_dir,rhino) \ + $(ANT) \ + -q \ + -f build.xml \ + -Dbuild.label=build-$(RSCREVISION) \ + -DTARFILE_LOCATION=$(TARFILE_LOCATION) \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ +
[PUSHED] gbuildification of rhino
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/752 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/752 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba25b2350caffd943af93f59fa2139332b009ef2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gbuildification of languagetool
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/753 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/753/1 gbuildification of languagetool It is not clear how to remove a file: REMOVE_FILES=openoffice/images/dialogh.png. Let it for now in place. Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0 --- M Makefile.top M RepositoryModule_ooo.mk M config_host.mk.in M configure.in A languagetool/ExternalProject_languagetool.mk A languagetool/Makefile A languagetool/Module_languagetool.mk A languagetool/Package_languagetool.mk A languagetool/UnpackedTarball_languagetool.mk M languagetool/prj/build.lst M languagetool/prj/d.lst D languagetool/prj/dmake 12 files changed, 103 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/753 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] [PATCH 2/3] fdo#51304: Remove @author annotation and commented code
José Guilherme Vanz wrote: 2012/10/1 Thorsten Behrens t...@documentfoundation.org partially pushed - I left the hunks commenting empty methods as FIXME instead of removing them straight away unapplied. If the method is pointless, why not remove them in one go? Hi José Guilherme, want to go ahead kill those methods you had annotated? I'll gladly merge that. Cheers, -- Thorsten pgpgcDPTPu7ql.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] gbuildification of rhino
David, to answer your question on IRC. yes the default patchlevel for gbuild is 3, because most fo the patch we had are like that... BUT, I pushed a patch some time ago so that if a patch is named *.n where n is from 0-9, then gbuild will apply that patch with the patchlevel n (regardless of the default patchlevel or even of the level set by gb_UnpackedTarball_set_patchlevel() see: http://wiki.documentfoundation.org/Development/Patching_External_Libraries I strongly recommend that we use that naming convention rather than use the api call to override the default. so the cleaner solution is just the rename the patch Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source
sc/source/filter/orcus/orcusfiltersimpl.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit f7fed308a69eeba8fae7b389f1c26a1a6f326b12
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Oct 2 19:46:47 2012 -0400
orcus from master now has a new interface.
Change-Id: I1d03d5dd2b12cdc1eab2d599199c333d49d306b8
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 7152b68..e5c5507 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -61,6 +61,9 @@ public:
virtual void set_formula_result(row_t row, col_t col, const char* p,
size_t n);
virtual void set_shared_formula(
row_t row, col_t col, formula_grammar_t grammar, size_t sindex,
+const char* p_formula, size_t n_formula);
+virtual void set_shared_formula(
+row_t row, col_t col, formula_grammar_t grammar, size_t sindex,
const char* p_formula, size_t n_formula, const char* p_range, size_t
n_range);
virtual void set_shared_formula(row_t row, col_t col, size_t sindex);
virtual void set_string(row_t row, col_t col, size_t sindex);
@@ -122,6 +125,12 @@ void ScOrcusSheet::set_formula_result(row_t /*row*/, col_t
/*col*/, const char*
void ScOrcusSheet::set_shared_formula(
row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, size_t
/*sindex*/,
+const char* /*p_formula*/, size_t /*n_formula*/)
+{
+}
+
+void ScOrcusSheet::set_shared_formula(
+row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, size_t
/*sindex*/,
const char* /*p_formula*/, size_t /*n_formula*/, const char* /*p_range*/,
size_t /*n_range*/)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/vs2012' - libwpd/ExternalProject_libwpd.mk
libwpd/ExternalProject_libwpd.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 26545fdea00953a48f1818b8ff50339503e296a8 Author: Peter Foley pefol...@verizon.net Date: Tue Oct 2 21:48:12 2012 -0400 fix libwpd for vs90 Change-Id: Ia8a21cd512ac425207eb31a194db9f4c9b10fee4 diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index f91314a..e8547ea 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -17,12 +17,12 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ ifeq ($(OS)$(COM),WNTMSC) -ifeq ($(CCNUMVER),90) +ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj Release|Win32 \ touch $@ -else ifeq ($(CCNUMVER),100) +else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ msbuild.exe libwpd.vcxproj \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/unitymenus-quantal'
New branch 'feature/unitymenus-quantal' available with the following commits: commit 767bae2cefd4cfcaa852c2c39e651bab81e4e134 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 3 00:30:40 2012 +0200 use sal/log.hxx style logging commit 6f08ada4936c4da0e551bc1219d84fa6111ceb56 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 14:01:25 2012 +0200 revoke the watch when dying commit 714d9e3b7dfb40228ed3f742f4735e5ca419fefa Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 12:35:21 2012 +0200 some moving around of casts commit 755e4d5a05f98b55cb0e52b79b66598c663a315c Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 09:43:41 2012 +0200 remove submenus in the menu model, if they are gone in the vcl menu and do the same with superfluous additional entries/sections commit d5e3b1258b23c8399035cbbe4760a5e461909031 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 08:18:11 2012 +0200 remove UpdateNativeMenu2 and clear remove submenus on updates commit b55ca3ed8b75e566972232fe70fbe8a4917a5deb Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 08:00:36 2012 +0200 move UpdateNativeMenu2 back into UpdateNativeMenu commit b3e7fc8d3b3fdf211b005d759952fa1f13765622 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 06:22:04 2012 +0200 tweak menu destruction commit 8a07525a2d732fb516b92fd0ec23c999599b56fe Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 04:55:03 2012 +0200 make UpdateNativeMenu2 and CanUpdate members commit 7b1679567ac93e4f53f314942f9282d5fba155bc Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 04:54:09 2012 +0200 refactor out dbus setup commit 3e5272191e4562a5aea9b665a270fe3c05836e77 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 03:37:52 2012 +0200 tweak on_registrar_available to just touch the window props, the menu has to take it from there commit 76a30691dbe04616df0f9b47e723a7adb34daa8c Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 03:10:51 2012 +0200 activate/deactivate do not need the solarmutex, better NULL the menu when freeing it, SetFrame should only be used on a menubar commit 08f19c7fe2a2eb17bd5e1d192e840f667962e460 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 03:01:28 2012 +0200 update when registrar is available, dont set menumodel on SetFrame, we do that on update commit cdeac1b88d4a4ede9ba6affa15dc1642a8f1aabe Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 02:24:41 2012 +0200 make UpdateNativeMenu a member commit 735cf920be6a6c4373724f5f7c85e5e66d178243 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 02:13:47 2012 +0200 remove obsolete GenerateMenu wrapper commit 73c96795c3b03f332ef0a8e7159c49b9e5835c77 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Oct 1 02:04:26 2012 +0200 grab model from frame on update commit 6a50cb83e18e319e2a0e3e68dfb44a88a089e2ef Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Sep 28 19:16:18 2012 +0200 moved dbus and menumodel ownership to frame, where it belongs commit 224642f1e46562bdf934e20d0b22315ee0e542cd Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Wed Sep 19 20:05:56 2012 +0100 Fixed a crash updating the menu after opening an application from main screen. Change-Id: If7b603dca5aa33e50a63e04fda3bce594840cc57 commit 1657cf233b8519cde3a063c157232c7a7a68b88b Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Mon Sep 17 23:37:25 2012 +0100 Removed some debug messages. Change-Id: I27d9d82d6fcd27323c86d24a675198186c185281 commit 8b9424f44827190be9ba6a32df3aff179042cbbf Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Mon Sep 17 23:35:42 2012 +0100 Memory management improvements on GLOMenu and GLOActionGroup classes. Change-Id: I1c4fb268a08c2b343ac99ee9294f536c1444f707 commit bdcf5af1b1a3767e4a411d350c44c04ec963f7d3 Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Mon Sep 17 14:43:03 2012 +0100 Improved memory management of GLOActionGroup. Change-Id: Iaeee32c2990cb6514605d3f7bc959682d87d5d38 commit 56cdbe4f8c04501e5f3204f2352513650ffd5290 Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Thu Sep 13 20:08:07 2012 +0100 Fixed a crash when opening an application from LO main screen. Change-Id: I942bcf761c7b9ba11c47bc618d55bdc85a472705 commit 2b4086d4ba993a5a0fb17e2632f0f7b3b353fcea Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Wed Sep 12 20:45:31 2012 +0100 Menus are generated on demand now, but with some issues. Change-Id: Icec9b685e720a369cff4d2bbfc5bf4ba6614e390 commit
