[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-7'
Tag 'suse-4.0-7' created by Andras Timar ati...@suse.com at 2013-07-09 07:04 -0700 suse-4.0-7 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-7'
Tag 'suse-4.0-7' created by Andras Timar ati...@suse.com at 2013-07-09 07:04 -0700 suse-4.0-7 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-7'
Tag 'suse-4.0-7' created by Andras Timar ati...@suse.com at 2013-07-09 07:04 -0700 suse-4.0-7 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-7'
Tag 'suse-4.0-7' created by Andras Timar ati...@suse.com at 2013-07-09 07:04 -0700 suse-4.0-7 Changes since libreoffice-4.0.3.2-406: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||66703 --- Comment #5 from Petr Mladek pmla...@suse.cz --- Really add the bug #66703. -- 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] buildbot.git: bin/sendEmail
bin/sendEmail |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit c5c64bc6f1be2ce04434d3119c0b9bf64b6a9d74
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jul 9 09:45:24 2013 +0200
Workaround cygwin's problem with SSL initialization.
diff --git a/bin/sendEmail b/bin/sendEmail
index a9da068..8a4fc03 100755
--- a/bin/sendEmail
+++ b/bin/sendEmail
@@ -1903,7 +1903,10 @@ else {
if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'}
=~ /^(yes|auto)$/) {
printmsg(DEBUG = Starting TLS, 2);
if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
-if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = 'SSLv3
TLSv1')) {
+my $ssl_ver = 'SSLv3 TLSv1';
+chomp(my $system = `uname -o`);
+if ($system eq 'Cygwin') { $ssl_ver = 'SSLv3'; }
+if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = $ssl_ver)) {
quit(ERROR = TLS setup failed: . IO::Socket::SSL::errstr(), 1);
}
printmsg(DEBUG = TLS: Using cipher: . $SERVER-get_cipher(), 3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 00d8a4071628a88465f13d2e860ccd87c3a85b9e Author: Miklos Vajna vmik...@suse.cz Date: Tue Jul 9 09:51:53 2013 +0200 DocxAttributeOutput::FormatSurround: missing break Change-Id: I8d767c2d92b4d5ca77e83565527b2bd1e29091ec diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f592e27..6bd05a4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4678,14 +4678,17 @@ void DocxAttributeOutput::FormatSurround( const SwFmtSurround rSurround ) case SURROUND_IDEAL: sType = square; sSide = largest; +break; case SURROUND_LEFT: sType = square; sSide = left; +break; case SURROUND_RIGHT: sType = square; sSide = right; break; case SURROUND_THROUGHT: +/* empty type and side means throught */ default: break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sc/source
include/oox/core/xmlfilterbase.hxx |3 +++
oox/source/drawingml/shape.cxx | 15 +++
sc/source/filter/inc/excelfilter.hxx|1 +
sc/source/filter/inc/workbookhelper.hxx |4 +++-
sc/source/filter/oox/excelfilter.cxx|5 +
sc/source/filter/oox/workbookhelper.cxx | 21 ++---
6 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit 7da06efd74be6500895bab6e5e8ed485914ff45e
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Jul 9 13:31:16 2013 +0530
n#819822: XLSX Chart import with internal data table.
When the import with xlsx ranges fail - try with
internal data table.
diff --git a/include/oox/core/xmlfilterbase.hxx
b/include/oox/core/xmlfilterbase.hxx
index 4b5c1e0..5bddea4 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -90,6 +90,9 @@ public:
converter object, that should be global per imported document. */
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() = 0;
+/** Helper to switch chart data table - specifically for xlsx imports */
+ virtual void useInternalChartDataTable( bool /*bInternal*/ ) { }
+
/** Has to be implemented by each filter to return the table style list. */
virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles()
= 0;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0d3a286..96a67d6 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -52,6 +52,7 @@
#include basegfx/polygon/b2dpolygon.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include com/sun/star/document/XActionLockable.hpp
+#include com/sun/star/chart2/data/XDataReceiver.hpp
using namespace ::oox::core;
using namespace ::com::sun::star;
@@ -711,7 +712,21 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const
Reference XShapes
if( !mxChartShapeInfo-mbEmbedShapes )
xExternalPage = rxShapes;
if( rFilter.getChartConverter() )
+{
rFilter.getChartConverter()-convertFromModel( rFilter,
aModel, xChartDoc, xExternalPage, mxShape-getPosition(), mxShape-getSize() );
+if( !xChartDoc-hasInternalDataProvider() )
+{
+Reference chart2::data::XDataReceiver xDataRec(
xChartDoc, UNO_QUERY );
+Reference chart2::data::XDataSource xData(
xDataRec-getUsedData(), UNO_QUERY );
+if(
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+{
+rFilter.useInternalChartDataTable( true );
+rFilter.getChartConverter()-convertFromModel(
rFilter, aModel, xChartDoc, xExternalPage, mxShape-getPosition(),
mxShape-getSize() );
+rFilter.useInternalChartDataTable( false );
+}
+}
+
+}
}
catch( Exception )
{
diff --git a/sc/source/filter/inc/excelfilter.hxx
b/sc/source/filter/inc/excelfilter.hxx
index 5aa3310..c368792 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -48,6 +48,7 @@ public:
virtual ::oox::vml::Drawing* getVmlDrawing();
virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles();
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
+virtual void useInternalChartDataTable( bool bInternal );
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue rDescriptor ) throw(
::com::sun::star::uno::RuntimeException );
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index fa1ce19..f4ce1cc 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -23,6 +23,7 @@
#include boost/shared_ptr.hpp
#include rtl/ref.hxx
#include oox/helper/storagebase.hxx
+#include oox/drawingml/chart/chartconverter.hxx
#include biffhelper.hxx
#include rangenam.hxx
@@ -144,6 +145,7 @@ public:
voidsetCurrentSheetIndex( sal_Int16 nSheet );
/** Final conversion after importing the workbook. */
voidfinalizeWorkbookImport();
+voiduseInternalChartDataTable( bool bInternal );
// document model -
ScDocument getScDocument() const;
@@ -248,7 +250,7 @@ public:
/** Returns the converter for string to cell address/range conversion. */
AddressConverter getAddressConverter() const;
/** Returns the chart object converter. */
-ExcelChartConverter* getChartConverter() const;
+oox::drawingml::chart::ChartConverter* getChartConverter() const;
/** Returns the page and print
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/bridge vcl/source
accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java | 12 +++
accessibility/bridge/org/openoffice/java/accessibility/Dialog.java | 39
+++---
accessibility/bridge/org/openoffice/java/accessibility/Frame.java| 23
+
accessibility/bridge/org/openoffice/java/accessibility/Window.java | 23
+
vcl/source/gdi/base14.cxx|4 -
5 files changed, 91 insertions(+), 10 deletions(-)
New commits:
commit 3c07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9
Author: Jürgen Schmidt j...@apache.org
Date: Tue Jul 9 07:55:12 2013 +
#121510# apply patch to handle new focus check in Java 7
Patch By: David Ostrovsky
Reviewed By: jsc
diff --git
a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
index 59d980b..8fd3270 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
@@ -110,4 +110,16 @@ public class ComboBox extends Container {
return 1;
}
}
+
+/**
+ * Returns whether this Component can be focused.
+ *
+ * @return codetrue/code if this Component is focusable;
+ * codefalse/code otherwise.
+ * @see #setFocusable
+ * @since 1.4
+ */
+public boolean isFocusable() {
+return true;
+}
}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
index ac657de..2de886a 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
@@ -118,20 +118,41 @@ public class Dialog extends java.awt.Dialog implements
javax.accessibility.Acces
public void removeNotify() {
}
-/**
- * Determines if the object is visible. Note: this means that the
- * object intends to be visible; however, it may not in fact be
- * showing on the screen because one of the objects that this object
- * is contained by is not visible. To determine if an object is
- * showing on the screen, use codeisShowing/code.
- *
- * @return true if object is visible; otherwise, false
- */
+/**
+ * Determines if the object is visible. Note: this means that the
+ * object intends to be visible; however, it may not in fact be
+ * showing on the screen because one of the objects that this object
+ * is contained by is not visible. To determine if an object is
+ * showing on the screen, use codeisShowing/code.
+ *
+ * @return true if object is visible; otherwise, false
+ */
public boolean isVisible(){
return visible;
}
/**
+ * Determines whether this component is displayable. A component is
+ * displayable when it is connected to a native screen resource.
+ * p
+ * A component is made displayable either when it is added to
+ * a displayable containment hierarchy or when its containment
+ * hierarchy is made displayable.
+ * A containment hierarchy is made displayable when its ancestor
+ * window is either packed or made visible.
+ * p
+ * A component is made undisplayable either when it is removed from
+ * a displayable containment hierarchy or when its containment hierarchy
+ * is made undisplayable. A containment hierarchy is made
+ * undisplayable when its ancestor window is disposed.
+ *
+ * @return codetrue/code if the component is displayable
+ */
+public boolean isDisplayable() {
+return true;
+}
+
+/**
* Shows or hides this component depending on the value of parameter
* codeb/code.
* @param b if codetrue/code, shows this component;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index ad437a0..8196d6f 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -638,5 +638,28 @@ public class Frame extends java.awt.Frame implements
javax.accessibility.Accessi
unoAccessibleComponent.grabFocus();
}
}
+
+/**
+ * Determines whether this component is displayable. A component is
+ * displayable when it is connected to a native screen resource.
+ * p
+ * A component is made displayable either when it is added to
+ * a displayable containment hierarchy or when its containment
+ * hierarchy is made displayable.
+ * A containment hierarchy is made displayable when its ancestor
+ * window is either packed or made visible.
+ * p
+ * A component is made undisplayable either when it is removed from
+ * a displayable
[Libreoffice-commits] core.git: starmath/qa
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 42
1 file changed, 42 insertions(+)
New commits:
commit 48d696e2049e771ebc797b7a7694e02de89b6020
Author: Frédéric Wang fred.w...@free.fr
Date: Fri Jul 5 21:28:47 2013 +0200
Tests for fdo#55853, i#11752, fdo#66081
Change-Id: Ifb1fc23c416f47c6618e7ef22a53b1744ff0e2bc
Reviewed-on: https://gerrit.libreoffice.org/4748
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 6ce2e5d..4409d97 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -75,6 +75,7 @@ public:
void testBinVerInUnary();
void testBinHorInSubSup();
void testUnaryInMixedNumberAsNumerator();
+void testMiscEquivalent();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(SimpleUnaryOp);
@@ -93,6 +94,7 @@ public:
CPPUNIT_TEST(testBinVerInUnary);
CPPUNIT_TEST(testBinHorInSubSup);
CPPUNIT_TEST(testUnaryInMixedNumberAsNumerator);
+CPPUNIT_TEST(testMiscEquivalent);
CPPUNIT_TEST_SUITE_END();
private:
@@ -100,6 +102,7 @@ private:
SmDocShellRef xDocShRef;
void parseandparseagain(const char *input, const char *test_name);
void ParseAndCheck(const char *input, const char *expected, const char
*test_name);
+void ParseAndCompare(const char *formula1, const char *formula2, const
char *test_name);
};
void Test::setUp()
@@ -490,6 +493,30 @@ void Test::ParseAndCheck(const char *formula, const char *
expected, const char
delete pNode;
}
+// Parse two formula commands and verify that they give the same output
+void Test::ParseAndCompare(const char *formula1, const char *formula2, const
char *test_name)
+{
+OUString sOutput1, sOutput2;
+SmNode *pNode1, *pNode2;
+
+// parse formula1
+OUString sInput1 = OUString::createFromAscii(formula1);
+pNode1 = SmParser().ParseExpression(sInput1);
+pNode1-Prepare(xDocShRef-GetFormat(), *xDocShRef);
+SmNodeToTextVisitor(pNode1, sOutput1);
+
+// parse formula2
+OUString sInput2 = OUString::createFromAscii(formula2);
+pNode2 = SmParser().ParseExpression(sInput2);
+pNode2-Prepare(xDocShRef-GetFormat(), *xDocShRef);
+SmNodeToTextVisitor(pNode2, sOutput2);
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE(test_name, sOutput1, sOutput2);
+
+delete pNode1;
+delete pNode2;
+}
+
void Test::testBinomInBinHor()
{
String sInput, sExpected;
@@ -627,6 +654,21 @@ void Test::testUnaryInMixedNumberAsNumerator()
delete pTree;
}
+void Test::testMiscEquivalent()
+{
+// fdo#55853
+ParseAndCompare(2x, 2 x, Number times variable);
+ParseAndCompare(3x^2, 3 x^2, Number times power);
+
+// i#11752 and fdo#55853
+ParseAndCompare(x_2n, x_{2 n}, Number times variable in subscript);
+ParseAndCompare(x^2n, x^{2 n}, Number times variable in supscript);
+
+// fdo#66081
+ParseAndCompare({x}, x, Variable in brace);
+ParseAndCompare({{x+{{y, x+y, Nested braces);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/globals.hrc |1
sw/source/ui/config/optdlg.hrc | 33 -
sw/source/ui/config/optdlg.src | 239 -
sw/source/ui/config/optpage.cxx| 178 --
sw/source/ui/dialog/swdlgfact.cxx |1
sw/source/ui/inc/optpage.hxx | 57 +--
sw/uiconfig/swriter/ui/opttablepage.ui | 583 +
8 files changed, 684 insertions(+), 409 deletions(-)
New commits:
commit f39885181180e960be80155a91f60906132b414a
Author: Csikós Tamás csks.t...@gmail.com
Date: Sun Jul 7 15:35:37 2013 +0200
modern .ui widgetlayout for optpage
Change-Id: I257f4c5878caabd5394bb2641ebf6d82a833e5f1
Reviewed-on: https://gerrit.libreoffice.org/4756
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dd533a7..58abfe1 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
+ sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 8411ebf..60cb591 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -168,7 +168,6 @@
#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
-#define TP_OPTTABLE_PAGE(RC_GLOBALS_BEGIN + 56)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index ffe8233..4dd3868 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -73,37 +73,4 @@
#define LB_LABEL_SIZE 111
#define LB_INDEX_SIZE 112
-//Tabpage Table
-#define CB_HEADER 101
-#define CB_REPEAT_HEADER102
-#define CB_DONT_SPLIT 103
-#define CB_BORDER 104
-#define CB_NUMFORMATTING105
-#define CB_NUMALIGNMENT 106
-#define FL_TABLE107
-#define FL_TABLE_INSERT 108
-#define CB_NUMFMT_FORMATTING109
-#define FL_MOVE 110
-#define FT_ROWMOVE 111
-#define MF_ROWMOVE 112
-#define FT_COLMOVE 113
-#define MF_COLMOVE 114
-#define FT_INSERT 115
-#define FT_ROWINSERT116
-#define MF_ROWINSERT117
-#define FT_COLINSERT118
-#define MF_COLINSERT119
-#define FT_HANDLING 120
-#define RB_FIX 121
-#define RB_FIXPROP 122
-#define RB_VAR 123
-#define FT_FIX 124
-#define FT_FIXPROP 125
-#define FT_VAR 126
-
-#define FT_MOVE 128
-#define FT_COMMENT 133
-#define FL_TABLE_SEPARATOR 139
-#define CB_PROSPECT_RTL140
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 4635874..93b6033 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -195,245 +195,6 @@ TabPage TP_STD_FONT
};
};
-TabPage TP_OPTTABLE_PAGE
-{
-HelpID = HID_OPTTABLE_PAGE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_TABLE
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 113 , 8 ) ;
-Text [ en-US ] = Default;
-};
-CheckBox CB_HEADER
-{
-HelpID = sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = H~eading;
-};
-CheckBox CB_REPEAT_HEADER
-{
-HelpID = sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER;
-Pos = MAP_APPFONT ( 21 , 27 ) ;
-Size = MAP_APPFONT ( 99 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = Re~peat on each page;
-};
-CheckBox CB_DONT_SPLIT
-{
-HelpID = sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT;
-Pos = MAP_APPFONT ( 12 , 40 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = Do not split;
-};
-CheckBox CB_BORDER
-{
-HelpID = sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER;
-Pos = MAP_APPFONT ( 12 , 53 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = B~order;
-};
-FixedLine FL_TABLE_SEPARATOR
-{
-Pos
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/helpid.h|1
sw/source/ui/config/optpage.cxx| 13 -
sw/uiconfig/swriter/ui/opttablepage.ui | 389 +
3 files changed, 212 insertions(+), 191 deletions(-)
New commits:
commit 04ffb8ba6bdf746e09c63f1d0f32c60875204974
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 09:20:02 2013 +0100
remove now unnecessary manual SetPosPixel layout workarounds
Change-Id: Id25c562620ee1bdf6cdf1182b7342067c70c5479
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1bd27a4..b503b96 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -155,7 +155,6 @@
#define HID_STD_FONT
SW_HID_STD_FONT
#define HID_COND_COLL
SW_HID_COND_COLL
#define HID_FRM_ADD
SW_HID_FRM_ADD
-#define HID_OPTTABLE_PAGE
SW_HID_OPTTABLE_PAGE
#define HID_FLD_DB SW_HID_FLD_DB
#define HID_FLD_DOKINF
SW_HID_FLD_DOKINF
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index bd6a6e5..41f5327 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1225,18 +1225,6 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet
rSet)
{
pRepeatHeaderCB-Hide();
pDontSplitCB-Hide();
-
-long nMoveUpBy =
-pRepeatHeaderCB-LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
-
-Point aPos = pRepeatHeaderCB-GetPosPixel();
-pRepeatHeaderCB-SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy )
);
-
-nMoveUpBy +=
-pDontSplitCB-LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
-
-aPos = pBorderCB-GetPosPixel();
-pBorderCB-SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
}
SwInsertTableOptions aInsOpts = pModOpt-GetInsTblFlags(bHTMLMode);
@@ -1326,7 +1314,6 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage(
Window* pParent,
m_pCharHiddenCB-Hide();
m_pFldHiddenCB-Hide();
m_pFldHiddenParaCB-Hide();
-m_pBreakCB-SetPosPixel(m_pTabCB-GetPosPixel());
m_pDirectCursorFrame-Hide();
m_pOnOffCB-Hide();
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui
b/sw/uiconfig/swriter/ui/opttablepage.ui
index 40ada4c..de5db4a 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -10,6 +10,7 @@
object class=GtkBox id=OptTablePage
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=border_width6/property
property name=orientationvertical/property
property name=spacing12/property
child
@@ -17,14 +18,12 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
-property name=vexpandTrue/property
property name=spacing12/property
child
object class=GtkFrame id=frame1
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
-property name=vexpandTrue/property
property name=label_xalign0/property
property name=shadow_typenone/property
child
@@ -32,7 +31,6 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
-property name=vexpandTrue/property
property name=top_padding6/property
property name=left_padding12/property
child
@@ -137,7 +135,6 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
-property name=vexpandTrue/property
property name=label_xalign0/property
property name=shadow_typenone/property
child
@@ -145,7 +142,6 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
-property name=vexpandTrue/property
property name=top_padding6/property
property name=left_padding12/property
child
@@ -258,182 +254,11 @@
property name=row_spacing12/property
property name=column_spacing12/property
child
- object class=GtkGrid id=grid4
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=row_spacing6/property
-property name=column_spacing12/property
-property
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da4ec594da45210a1f97d31ecb3e7f9c127954e5
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Jul 9 14:00:21 2013 +0530
n#819822: Crash fix, check validity.
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 96a67d6..1a1a1e1 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -718,7 +718,7 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const
Reference XShapes
{
Reference chart2::data::XDataReceiver xDataRec(
xChartDoc, UNO_QUERY );
Reference chart2::data::XDataSource xData(
xDataRec-getUsedData(), UNO_QUERY );
-if(
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+if( xData-getDataSequences().getLength() = 0 ||
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
{
rFilter.useInternalChartDataTable( true );
rFilter.getChartConverter()-convertFromModel(
rFilter, aModel, xChartDoc, xExternalPage, mxShape-getPosition(),
mxShape-getSize() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3c/07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9
3c/07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9 |1 + 1 file changed, 1 insertion(+) New commits: commit 9b0ddc5bb37a8489ae6d48c681daec092c992dfb Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 09:23:21 2013 +0100 Notes added by 'git notes add' diff --git a/3c/07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9 b/3c/07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9 new file mode 100644 index 000..4ec5e73 --- /dev/null +++ b/3c/07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9 @@ -0,0 +1 @@ +prefer: 9dfe00c74f384886cc3cf336061c6b35f25babd6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/n822175.odt|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 43 +++
sw/source/filter/ww8/docxattributeoutput.hxx |1
4 files changed, 56 insertions(+)
New commits:
commit deb07d0f4d54dbbd65194bd533499706dea0d8b8
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 8 12:48:26 2013 +0200
bnc#822175 DOCX filter: export wrapping of text frames
(cherry picked from commits 3a87ba9725ef7e1e9a15c5b7abda87d36c9dc614 and
00d8a4071628a88465f13d2e860ccd87c3a85b9e)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I5c5128686e96a97570b8cdf109dd75976a071ca8
Reviewed-on: https://gerrit.libreoffice.org/4772
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/qa/extras/ooxmlexport/data/n822175.odt
b/sw/qa/extras/ooxmlexport/data/n822175.odt
new file mode 100644
index 000..d49a591
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/n822175.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8dc69f2..dc5b215 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -24,6 +24,7 @@
#include com/sun/star/awt/FontWeight.hpp
#include com/sun/star/awt/FontUnderline.hpp
#include com/sun/star/awt/FontSlant.hpp
+#include com/sun/star/text/WrapTextMode.hpp
#include unotools/tempfile.hxx
#include unotools/ucbstreamhelper.hxx
@@ -69,6 +70,7 @@ public:
void testMathLiteral();
void testFdo48557();
void testI120928();
+void testN822175();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -116,6 +118,7 @@ void Test::run()
{math-literal.docx, Test::testMathLiteral},
{fdo48557.odt, Test::testFdo48557},
{i120928.docx, Test::testI120928},
+{n822175.odt, Test::testN822175},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -672,6 +675,15 @@ void Test::testI120928()
CPPUNIT_ASSERT_EQUAL(true, bIsGraphic);
}
+void Test::testN822175()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xFrame(xDraws-getByIndex(0),
uno::UNO_QUERY);
+// Was text::WrapTextMode_THROUGH, due to missing Surround handling in the
exporter.
+CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL,
getPropertytext::WrapTextMode(xFrame, Surround));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 66c003e..803fe03 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -338,6 +338,14 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
m_rExport.WriteText( );
m_pSerializer-endElementNS( XML_w, XML_txbxContent );
m_pSerializer-endElementNS( XML_v, XML_textbox );
+
+if (m_pFlyWrapAttrList)
+{
+XFastAttributeListRef xFlyWrapAttrList(m_pFlyWrapAttrList);
+m_pFlyWrapAttrList = NULL;
+m_pSerializer-singleElementNS(XML_w10, XML_wrap,
xFlyWrapAttrList);
+}
+
m_pSerializer-endElementNS( XML_v, XML_rect );
m_pSerializer-endElementNS( XML_w, XML_pict );
m_pSerializer-endElementNS( XML_w, XML_r );
@@ -4463,6 +4471,40 @@ void DocxAttributeOutput::FormatSurround( const
SwFmtSurround rSurround )
{
if (m_bTextFrameSyntax)
{
+OString sType, sSide;
+switch (rSurround.GetSurround())
+{
+case SURROUND_NONE:
+sType = topAndBottom;
+break;
+case SURROUND_PARALLEL:
+sType = square;
+break;
+case SURROUND_IDEAL:
+sType = square;
+sSide = largest;
+break;
+case SURROUND_LEFT:
+sType = square;
+sSide = left;
+break;
+case SURROUND_RIGHT:
+sType = square;
+sSide = right;
+break;
+case SURROUND_THROUGHT:
+/* empty type and side means throught */
+default:
+break;
+}
+if (!sType.isEmpty() || !sSide.isEmpty())
+{
+m_pFlyWrapAttrList = m_pSerializer-createAttrList();
+if (!sType.isEmpty())
+m_pFlyWrapAttrList-add(XML_type, sType);
+if (!sSide.isEmpty())
+
[Libreoffice-commits] buildbot.git: tb/tb_send_email
tb/tb_send_email |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7fed43a1b7b7ef26eee628e1681e8acc619b58e8
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jul 9 09:45:24 2013 +0200
Workaround cygwin's problem with SSL initialization in tb_send_email too.
diff --git a/tb/tb_send_email b/tb/tb_send_email
index a9da068..8a4fc03 100755
--- a/tb/tb_send_email
+++ b/tb/tb_send_email
@@ -1903,7 +1903,10 @@ else {
if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'}
=~ /^(yes|auto)$/) {
printmsg(DEBUG = Starting TLS, 2);
if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
-if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = 'SSLv3
TLSv1')) {
+my $ssl_ver = 'SSLv3 TLSv1';
+chomp(my $system = `uname -o`);
+if ($system eq 'Cygwin') { $ssl_ver = 'SSLv3'; }
+if (! IO::Socket::SSL-start_SSL($SERVER, SSL_version = $ssl_ver)) {
quit(ERROR = TLS setup failed: . IO::Socket::SSL::errstr(), 1);
}
printmsg(DEBUG = TLS: Using cipher: . $SERVER-get_cipher(), 3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/base14.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2142eb79bd3b0b9545642305a700653cb83c347c
Author: Herbert Dürr h...@apache.org
Date: Tue Jul 9 07:13:09 2013 +
Resolves: #i121127# use PDF base14's symbol font only if explicitly
requested
(cherry picked from commit df03a043e531182080d26449899fabe0b7078b81)
Change-Id: Ic50da57748c86de7a87de905c97d9162afde8ed6
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 7f91652..0092b30 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -583,7 +583,9 @@ const PDFWriterImpl::BuiltinFont
PDFWriterImpl::m_aBuiltinFonts[ 14 ] = {
}
},
-{ Symbol, // family name
+// The font name Symbol is too generic and causes plenty of trouble.
+// To ensure WYSIWIG the PDF-Base14 variant gets a not-confusable name
+{ PDF_Base14_Symbol, // family name
Normal, // style
Symbol, // PSName
1010, -293, // ascend, descend
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - df/03a043e531182080d26449899fabe0b7078b81
df/03a043e531182080d26449899fabe0b7078b81 |1 + 1 file changed, 1 insertion(+) New commits: commit 0a25d8e4bbaa3c5538a292d2a33d7eca3f72223a Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 09:30:01 2013 +0100 Notes added by 'git notes add' diff --git a/df/03a043e531182080d26449899fabe0b7078b81 b/df/03a043e531182080d26449899fabe0b7078b81 new file mode 100644 index 000..7af23f5 --- /dev/null +++ b/df/03a043e531182080d26449899fabe0b7078b81 @@ -0,0 +1 @@ +merged as: 2142eb79bd3b0b9545642305a700653cb83c347c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sw/source vcl/source
sw/source/core/txtnode/fntcache.cxx |4 ++--
sw/source/core/txtnode/fntcap.cxx |9 -
vcl/source/gdi/outdev3.cxx | 10 +++---
3 files changed, 13 insertions(+), 10 deletions(-)
New commits:
commit aa690363c51c43a281b06953627d335c31a0111d
Author: Michael Stahl mst...@redhat.com
Date: Sun Jul 7 11:58:42 2013 +0200
fdo#66478: sw: un-break hyphenation
The main problem is calling SetHyphPos with a stack pointer.
Converting STRING_LEN - -1 can't hurt though.
(regression from a2f6402b1fe769a430019042e14e63c9414715dc)
Change-Id: I59a4e3b16b418082de468c7d7f7f38a9b0bccd01
(cherry picked from commit 6fa07d2d608646004bc45261275c4ebabb578a09)
Reviewed-on: https://gerrit.libreoffice.org/4757
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
(cherry picked from commit 4d268e8302d13b81494305eab68e60ab6d0ef264)
Reviewed-on: https://gerrit.libreoffice.org/4767
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 8398159..80b2ea8 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2444,8 +2444,8 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo rInf,
long nTextWidth )
nTxtBreak = rInf.GetOut().GetTextBreak( sTmpText, nTextWidth,
static_castsal_Unicode('-'), nHyphPos,
nTmpIdx2, nTmpLen2, nKern );
-xub_StrLen nTmpHyphPos = static_castxub_StrLen(nHyphPos);
-rInf.SetHyphPos(nTmpHyphPos);
+*rInf.GetHyphPos() = (nHyphPos == -1)
+? STRING_LEN : static_castxub_StrLen(nHyphPos);
}
else
nTxtBreak = rInf.GetOut().GetTextBreak( sTmpText, nTextWidth,
diff --git a/sw/source/core/txtnode/fntcap.cxx
b/sw/source/core/txtnode/fntcap.cxx
index 1868698..9735b2c 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -209,26 +209,25 @@ void SwDoGetCapitalBreak::Do()
{
xub_StrLen nEnd = rInf.GetEnd();
OUString sText(rInf.GetText()); // only needed until
rInf.GetText() returns OUString
-long nTxtWidth2 = nTxtWidth;// only needed until variables are
migrated to sal_Int32
sal_Int32 nIdx2 = rInf.GetIdx(); // ditto
sal_Int32 nLen2 = rInf.GetLen(); // ditto
if( pExtraPos )
{
sal_Int32 nExtraPos = *pExtraPos; // ditto
-nBreak = GetOut().GetTextBreak( sText, nTxtWidth2,
static_castsal_Unicode('-'),
+nBreak = GetOut().GetTextBreak( sText, nTxtWidth,
+static_castsal_Unicode('-'),
nExtraPos, nIdx2, nLen2, rInf.GetKern() );
if( nExtraPos nEnd )
nExtraPos = nEnd;
-*pExtraPos = nExtraPos;
+*pExtraPos = (nExtraPos == -1) ? STRING_LEN : nExtraPos;
}
else
-nBreak = GetOut().GetTextBreak( sText, nTxtWidth2,
+nBreak = GetOut().GetTextBreak( sText, nTxtWidth,
nIdx2, nLen2, rInf.GetKern() );
rInf.SetText(sText); // ditto
rInf.SetIdx(nIdx2); // ditto
rInf.SetLen(nLen2); // ditto
-nTxtWidth = nTxtWidth2; // ditto
if( nBreak nEnd )
nBreak = nEnd;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 3b8e3c5..8304746 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6156,10 +6156,14 @@ xub_StrLen OutputDevice::GetTextBreak( const OUString
rStr, long nTextWidth,
if( nExtraPixelWidth 0 )
nTextPixelWidth -= nExtraPixelWidth;
-rHyphenatorPos =
sal::static_int_castsal_Int32(pSalLayout-GetTextBreak( nTextPixelWidth,
nExtraPixelWidth, nSubPixelFactor ));
+// why does this return int and use STRING_LEN for errors???
+xub_StrLen nTmp = sal::static_int_castxub_StrLen(
+pSalLayout-GetTextBreak(nTextPixelWidth, nExtraPixelWidth,
nSubPixelFactor));
-if( rHyphenatorPos nRetVal )
-rHyphenatorPos = nRetVal;
+nTmp = std::min(nTmp, nRetVal);
+
+// TODO: remove nTmp when GetTextBreak sal_Int32
+rHyphenatorPos = (nTmp == STRING_LEN) ? -1 : nTmp;
}
pSalLayout-Release();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a1c764a05e4cbe4d2dd803df8f2db02833cbe87 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 09:38:18 2013 +0100 Updated core Project: help 5292910b0bef2d577fe0a834e59634a327d516c3 diff --git a/helpcontent2 b/helpcontent2 index 043eb47..5292910 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 043eb476b407398dc323b8aeb6c52489ce8fa3cf +Subproject commit 5292910b0bef2d577fe0a834e59634a327d516c3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 15 --- source/text/shared/optionen/01040500.xhp | 61 +++ 2 files changed, 30 insertions(+), 46 deletions(-) New commits: commit 5292910b0bef2d577fe0a834e59634a327d516c3 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 09:38:18 2013 +0100 update help ids for writer table .ui conversion Change-Id: I06db0ed5cfcba80aef17c84ba8dca4a736b6747c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 44e3670..c1ccbb5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2659,7 +2659,6 @@ HID_OPTRECEIVERDATABASE,41144, HID_OPTRECEIVERPLACEHOLDER,41143, HID_OPTSENDERDEFINE,41136, HID_OPTSENDERPLACEHOLDER,41135, -HID_OPTTABLE_PAGE,53199, HID_OUTLINE_FORM,54851, HID_PAGEPREVIEW,52835, HID_PAGE_CONNECTION,33857, @@ -7861,13 +7860,6 @@ sw_CheckBox_TP_OPTSHDWCRSR_CB_SHDWCRSONOFF,878806018, sw_CheckBox_TP_OPTSHDWCRSR_CB_SHYPH,878806025, sw_CheckBox_TP_OPTSHDWCRSR_CB_SPACE,878806023, sw_CheckBox_TP_OPTSHDWCRSR_CB_TAB,878806022, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_BORDER,878576744, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_DONT_SPLIT,878576743, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_HEADER,878576741, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_NUMALIGNMENT,878576746, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_NUMFMT_FORMATTING,878576749, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_NUMFORMATTING,878576745, -sw_CheckBox_TP_OPTTABLE_PAGE_CB_REPEAT_HEADER,878576742, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_AT_TXTEND,879248387, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM,879248388, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM_FMT,879248396, @@ -8201,10 +8193,6 @@ sw_MetricField_TP_LAB_FMT_FLD_UPPER,909711885, sw_MetricField_TP_LAB_FMT_FLD_VDIST,909711877, sw_MetricField_TP_LAB_FMT_FLD_WIDTH,909711879, sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577, -sw_MetricField_TP_OPTTABLE_PAGE_MF_COLINSERT,878582391, -sw_MetricField_TP_OPTTABLE_PAGE_MF_COLMOVE,878582386, -sw_MetricField_TP_OPTTABLE_PAGE_MF_ROWINSERT,878582389, -sw_MetricField_TP_OPTTABLE_PAGE_MF_ROWMOVE,878582384, sw_MetricField_TP_SECTION_INDENTS_MF_AFTER,879335941, sw_MetricField_TP_SECTION_INDENTS_MF_BEFORE,879335939, sw_MetricField_TP_TABLE_COLUMN_COL_MF_1,888494700, @@ -8417,9 +8405,6 @@ sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLINDENT,878805510, sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLMARGIN,878805509, sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLSPACE,878805512, sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLTAB,878805511, -sw_RadioButton_TP_OPTTABLE_PAGE_RB_FIX,878576249, -sw_RadioButton_TP_OPTTABLE_PAGE_RB_FIXPROP,878576250, -sw_RadioButton_TP_OPTTABLE_PAGE_RB_VAR,878576251, sw_RadioButton_TP_TABLE_TEXTFLOW_RB_BREAKCOLUMN,878510725, sw_RadioButton_TP_TABLE_TEXTFLOW_RB_BREAKPAGE,878510724, sw_RadioButton_TP_TABLE_TEXTFLOW_RB_PAGEBREAKAFTER,878510727, diff --git a/source/text/shared/optionen/01040500.xhp b/source/text/shared/optionen/01040500.xhp index facb9ca..7a2826f 100644 --- a/source/text/shared/optionen/01040500.xhp +++ b/source/text/shared/optionen/01040500.xhp @@ -37,9 +37,9 @@ bookmark_valuealigning;tables in text/bookmark_value bookmark_valuenumber formats; recognition in text tables/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/SW_HID_OPTTABLE_PAGE id=bm_id3148685 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/opttablepage/OptTablePage id=bm_id3148685 localize=false/ paragraph role=heading id=hd_id3153087 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01040500.xhp name=TableTable/link/paragraph -paragraph role=paragraph id=par_id3145674 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_OPTTABLE_PAGEDefines the attributes of tables in text documents./ahelp/paragraph +paragraph role=paragraph id=par_id3145674 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/swriter/ui/opttablepage/OptTablePageDefines the attributes of tables in text documents./ahelp/paragraph /section paragraph role=paragraph id=par_id3145609 xml-lang=en-US l10n=U oldref=26Specifies the default settings for columns and rows and the table mode. Also specifies the standard values for moving and inserting columns and rows. For further information see switchinline select=applcaseinline select=WRITERlink href=text/swriter/01/05090201.xhp name=Editing Tables Using the KeyboardEditing Tables Using the Keyboard/link /caseinlinedefaultinline in the $[officename] Writer Help/defaultinline/switchinline./paragraph @@ -51,72 +51,71 @@ paragraph role=paragraph id=par_id3148797 xml-lang=en-US l10n=U oldref=28Defines the defaults for all newly created text tables in text documents./paragraph /section section id=opttabb -bookmark xml-lang=en-US branch=hid/sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER id=bm_id3154123 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/opttablepage/header id=bm_id3154123 localize=false/ paragraph role=heading id=hd_id3152922 xml-lang=en-US level=3 l10n=U
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6e2815a0ffdb5811f220978734354b1033801927
Author: David Tardon dtar...@redhat.com
Date: Tue Jul 9 10:40:21 2013 +0200
fdo#66582 avoid crash because of missing model
The SdrObject is still under construction at this point, so it does not
make sense to broadcast changes, because there are not any listeners
anyway.
Change-Id: Ib05e30843b4b0e125d5cae18a481e16fb7e21ba1
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index b2b6d66..3353843 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -150,7 +150,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference
report::XReportCompon
{
sal_Bool bOpaque = sal_False;
_xComponent-getPropertyValue(PROPERTY_OPAQUE) = bOpaque;
-pNewObj-SetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
+pNewObj-NbcSetLayer(bOpaque ? RPT_LAYER_FRONT :
RPT_LAYER_BACK);
}
catch(const uno::Exception)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 22 ++---
1 file changed, 19 insertions(+), 3 deletions(-)
New commits:
commit fb2edd686c8b8ba4318e957f7cf23060ffd3e2c3
Author: Frédéric Wang fred.w...@free.fr
Date: Sat Jul 6 15:57:42 2013 +0200
fdo#66645 XHTML export: ignore incorrect style on math objects
Change-Id: Ied09a189184380aa3eba30261c7517f6bccf6d09
Reviewed-on: https://gerrit.libreoffice.org/4751
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index e83195c..2dada31 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1068,6 +1068,23 @@
xsl:value-of select=$elem-name/' is a draw:frame.
/xsl:comment
xsl:element name={$elem-name}
+ xsl:choose
+ xsl:when test=draw:object/math:math
+ !-- draw:frame elements contain many data that are not
+ relevant for mathematical formulas and that may
+ cause incorrect rendering. Let's ignore the
+ replacement image and keep only the id attribute.
+ See fdo#66645 --
+ xsl:apply-templates select=@draw:name/
+ xsl:text /xsl:text
+ xsl:apply-templates select=draw:object[1]/
+ !-- TODO: do not always add a space after the formula,
+ for example when it is followed by a comma, period,
+ dash etc This will probably require using regexp
+ features like xsl:analyze-string --
+ xsl:text /xsl:text
+ /xsl:when
+ xsl:otherwise
xsl:attribute name=style
xsl:call-template name=widthAndHeight/
xsl:text padding:0; /xsl:text
@@ -1090,6 +1107,8 @@
xsl:apply-templates select=node()
xsl:with-param name=globalData
select=$globalData/
/xsl:apply-templates
+ /xsl:otherwise
+ /xsl:choose
/xsl:element
/xsl:template
@@ -2969,7 +2988,4 @@
xsl:apply-templates select=*[1] mode=math/
/xsl:template
- !-- Ignore the replacement image --
- xsl:template
match=draw:frame/draw:image[preceding-sibling::*[1]/math:math]/
-
/xsl:stylesheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/globals.hrc |4
sw/source/ui/config/optdlg.hrc | 25 --
sw/source/ui/config/optdlg.src | 178 --
sw/source/ui/config/optpage.cxx | 277 ++
sw/source/ui/inc/optpage.hxx | 42 +--
sw/uiconfig/swriter/ui/optfonttabpage.ui | 381 +++
7 files changed, 540 insertions(+), 368 deletions(-)
New commits:
commit 5c7570be6c987f4a406b7320599bc81197d68885
Author: Csikós Tamás csks.t...@gmail.com
Date: Mon Jul 8 14:31:53 2013 +0200
.ui layout for optpage/fonttabpage
Change-Id: Ib41ac1b5febbb288f7a05f3823dee6ff32feb315
Reviewed-on: https://gerrit.libreoffice.org/4771
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 58abfe1..f09c26b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/numberingnamedialog \
sw/uiconfig/swriter/ui/optcomparison \
+ sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttablepage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 60cb591..152b894d3 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -35,6 +35,10 @@
#define STR_PAGE(RC_GLOBALS_BEGIN + 14)
#define STR_PRINTOPTUI (RC_GLOBALS_BEGIN + 15)
+#define ST_SCRIPT_WESTERN (RC_GLOBALS_BEGIN + 105)
+#define ST_SCRIPT_ASIAN (RC_GLOBALS_BEGIN + 106)
+#define ST_SCRIPT_CTL (RC_GLOBALS_BEGIN + 107)
+
//EventStrings
#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 17 )
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 4dd3868..cd5f366 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -48,29 +48,4 @@
#define RB_END 82
#define RB_PAGEEND 83
-// Tabpage Basic Fonts
-#define FT_STANDARD 90
-#define LB_STANDARD 91
-#define FT_TITLE92
-#define LB_TITLE93
-#define FT_LIST 94
-#define LB_LIST 95
-#define FT_LABEL96
-#define LB_LABEL97
-#define FT_IDX 98
-#define LB_IDX 99
-#define FL_STDCHR 100
-#define PB_STANDARD101
-#define CB_DOCONLY 102
-#define ST_SCRIPT_WESTERN 103
-#define ST_SCRIPT_ASIAN104
-#define ST_SCRIPT_CTL 105
-#define FT_TYPE106
-#define FT_SIZE107
-#define LB_STANDARD_SIZE 108
-#define LB_TITLE_SIZE 109
-#define LB_LIST_SIZE 110
-#define LB_LABEL_SIZE 111
-#define LB_INDEX_SIZE 112
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 93b6033..748560a 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -24,175 +24,17 @@
#include optdlg.hrc
#include helpid.h
-TabPage TP_STD_FONT
+String ST_SCRIPT_ASIAN
{
-HelpID = HID_STD_FONT ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_STDCHR
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = Basic fonts (%1);
-};
-FixedText FT_TYPE
-{
-Pos = MAP_APPFONT ( 63 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 8 ) ;
-Text [ en-US ] = Font;
-};
-FixedText FT_SIZE
-{
-Pos = MAP_APPFONT ( 204 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 8 ) ;
-Text [ en-US ] = Size;
-};
-MetricBox LB_STANDARD_SIZE
-{
-HelpID = sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE;
-Pos = MAP_APPFONT ( 204 , 25 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_TITLE_SIZE
-{
-HelpID = sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE;
-Pos = MAP_APPFONT ( 204 , 42 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_LIST_SIZE
-{
-HelpID = sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE;
-Pos = MAP_APPFONT ( 204 , 59 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_LABEL_SIZE
-{
-HelpID =
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/helpid.h |1 -
sw/source/ui/config/optpage.cxx |5 +
sw/uiconfig/swriter/ui/optfonttabpage.ui | 21 +++--
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 06292e619370f9e54e859f051a743b6bacb2a2cd
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 10:04:28 2013 +0100
set font boxes to be sorted
Change-Id: Iebd6ce2c210ccc56a72d6a59171015b9729e9b73
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index b503b96..ad7704f 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -152,7 +152,6 @@
#define HID_ENV_ENV
SW_HID_ENV_ENV
#define HID_ENV_FMT
SW_HID_ENV_FMT
#define HID_FRM_URL
SW_HID_FRM_URL
-#define HID_STD_FONT
SW_HID_STD_FONT
#define HID_COND_COLL
SW_HID_COND_COLL
#define HID_FRM_ADD
SW_HID_FRM_ADD
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7ae6cf3..c1782d4 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -536,14 +536,19 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
{
get(pLabelFT,label1);
get(pStandardBox,standardbox);
+pStandardBox-SetStyle(pStandardBox-GetStyle() | WB_SORT);
get(pStandardHeightLB,standardheight);
get(pTitleBox,titlebox);
+pTitleBox-SetStyle(pTitleBox-GetStyle() | WB_SORT);
get(pTitleHeightLB,titleheight);
get(pListBox,listbox);
+pListBox-SetStyle(pListBox-GetStyle() | WB_SORT);
get(pListHeightLB,listheight);
get(pLabelBox,labelbox);
+pLabelBox-SetStyle(pLabelBox-GetStyle() | WB_SORT);
get(pLabelHeightLB,labelheight);
get(pIdxBox,idxbox);
+pIdxBox-SetStyle(pIdxBox-GetStyle() | WB_SORT);
get(pIndexHeightLB,indexheight);
get(pDocOnlyCB,doconly);
diff --git a/sw/uiconfig/swriter/ui/optfonttabpage.ui
b/sw/uiconfig/swriter/ui/optfonttabpage.ui
index 6155efc..bd9e4cb 100644
--- a/sw/uiconfig/swriter/ui/optfonttabpage.ui
+++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui
@@ -1,9 +1,13 @@
?xml version=1.0 encoding=UTF-8?
interface
!-- interface-requires gtk+ 3.0 --
+ !-- interface-requires LibreOffice 1.0 --
object class=GtkBox id=OptFontTabPage
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
property name=orientationvertical/property
property name=spacing12/property
child
@@ -93,6 +97,7 @@
object class=GtkLabel id=font_label
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=hexpandTrue/property
property name=xalign0/property
property name=label translatable=yesFont/property
/object
@@ -206,7 +211,6 @@
property name=can_focusTrue/property
property name=receives_defaultFalse/property
property name=margin_left12/property
-property name=hexpandTrue/property
property name=use_underlineTrue/property
property name=xalign0/property
property name=draw_indicatorTrue/property
@@ -222,13 +226,14 @@
object class=GtkComboBoxText id=standardbox
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=hexpandTrue/property
property name=has_entryTrue/property
property name=entry_text_column0/property
property name=id_column1/property
child internal-child=entry
object class=GtkEntry id=standardbox-entry
property name=can_focusFalse/property
-property name=invisible_char���/property
+property name=invisible_char�/property
/object
/child
/object
@@ -243,13 +248,14 @@
object class=GtkComboBoxText id=titlebox
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=hexpandTrue/property
property name=has_entryTrue/property
property name=entry_text_column0/property
property name=id_column1/property
child internal-child=entry
object class=GtkEntry id=titlebox-entry
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlexport.cxx | 34 +++---
1 file changed, 23 insertions(+), 11 deletions(-)
New commits:
commit 89bb6fd1918f342886bd1c6f4e4824a6e87743d4
Author: Frédéric Wang fred.w...@free.fr
Date: Sun Jul 7 08:31:56 2013 +0200
fdo#66277 - fix alignment for binom and stack too.
Change-Id: Id4c104bb22cb7fc3c4811b3ea417229af01de02b
Reviewed-on: https://gerrit.libreoffice.org/4752
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index b35753f..6c9aab2 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -889,18 +889,30 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int
nLevel)
if (pTable)
{
pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
XML_MTR, sal_True, sal_True);
-if (pTemp-GetNumSubNodes() 0)
+SmTokenType eAlign = TALIGNC;
+if (pTemp-GetType() == NALIGN)
{
- const SmNode *pFirstChild = pTemp-GetSubNode(0);
- if (pFirstChild-GetType() == NALIGN
- pFirstChild-GetToken().eType != TALIGNC)
- {
- // If a left or right alignment is specified on this
line,
- // attach the corresponding columnalign attribute.
- AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN,
- pFirstChild-GetToken().eType == TALIGNL ?
- XML_LEFT : XML_RIGHT);
- }
+// For Binom() and Stack() constructions, the NALIGN nodes
+// are direct children.
+// binom{alignl ...}{alignr ...} and
+// stack{alignl ... ## alignr ... ## ...}
+eAlign = pTemp-GetToken().eType;
+}
+else if (pTemp-GetType() == NLINE
+ pTemp-GetNumSubNodes() == 1
+ pTemp-GetSubNode(0)-GetType() == NALIGN)
+{
+// For the Table() construction, the NALIGN node is a child
+// of an NLINE node.
+// alignl ... newline alignr ... newline ...
+eAlign = pTemp-GetSubNode(0)-GetToken().eType;
+}
+if (eAlign != TALIGNC)
+{
+// If a left or right alignment is specified on this line,
+// attach the corresponding columnalign attribute.
+AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN,
+eAlign == TALIGNL ? XML_LEFT : XML_RIGHT);
}
pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
XML_MTD, sal_True, sal_True);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sfx2/source
sfx2/source/doc/guisaveas.cxx|5 +++--
sfx2/source/doc/sfxbasemodel.cxx |4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 3d34cb44ec61b9840415bb08c3bf38513409e254
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 8 18:26:47 2013 +0200
fdo#65055: sfx: fix automatic version on close
The parameter FailOnWarning is passed around better now, so it arrives
in SfxBaseModel::storeSelf() which considers it illegal.
(regression from e2799d253b1dc62967693aa5bccd7360a9520967)
Change-Id: I2a51a2ecc24e6de506e1840bd28cbe157a8ad6a5
(cherry picked from commit 969bc572441ef8fd43cd7d350a533ffd715b74d3)
Reviewed-on: https://gerrit.libreoffice.org/4773
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 6eb2fdb168c6e6da6c30b71eb80c759c553f1770)
Reviewed-on: https://gerrit.libreoffice.org/4775
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index a270154..b6c995c 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1456,9 +1456,10 @@ sal_Bool SfxStoringHelper::GUIStoreModel(
uno::Reference frame::XModel xModel
{
aModelData.GetStorable2()-storeSelf(
aModelData.GetMediaDescr().getAsConstPropertyValueList() );
}
-catch( const lang::IllegalArgumentException )
+catch (const lang::IllegalArgumentException e)
{
-OSL_FAIL( ModelData didn't handle illegal parameters, all the
parameters are ignored!\n );
+SAL_WARN(sfx, Ignoring parameters!
+ModelData considers this illegal:e.Message);
aModelData.GetStorable()-store();
}
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index d5d5814..6fc3521 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1572,7 +1572,9 @@ void SAL_CALL SfxBaseModel::storeSelf( constSequence
beans::PropertyValue
// check that only acceptable parameters are provided here
if ( aSeqArgs[nInd].Name != VersionComment
aSeqArgs[nInd].Name != Author
aSeqArgs[nInd].Name != InteractionHandler
aSeqArgs[nInd].Name != StatusIndicator
- aSeqArgs[nInd].Name != VersionMajor aSeqArgs[nInd].Name
!= CheckIn )
+ aSeqArgs[nInd].Name != VersionMajor
+ aSeqArgs[nInd].Name != FailOnWarning
+ aSeqArgs[nInd].Name != CheckIn )
{
m_pData-m_pObjectShell-AddLog( OUString( OSL_LOG_PREFIX
unexpected parameter for storeSelf, might be no problem if SaveAs is
executed. ) );
m_pData-m_pObjectShell-StoreLog();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 13 -- source/text/shared/optionen/01040300.xhp | 38 +++ 2 files changed, 19 insertions(+), 32 deletions(-) New commits: commit d4d1cb52a2d1e66b0514e3d2ab5e12e6969aa1bc Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 10:10:16 2013 +0100 update help ids for writer fonts tab page .ui conversion Change-Id: I06a1671e7361b731c5186d0dd5943d95896663b6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c1ccbb5..b75f354 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3729,7 +3729,6 @@ HID_SQLERROR_EXCHAIN_TEXT,38910, HID_STATUSBAR,40370, HID_STATUSINDICATOR_PROGRESS,33316, HID_STATUSINDICATOR_TEXT,33315, -HID_STD_FONT,53193, HID_STYLE_LISTBOX,33900, HID_STYLIST_DELETE,33178, HID_STYLIST_EDIT,33177, @@ -7866,7 +7865,6 @@ sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM_FMT,879248396, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_AT_TXTEND,879248390, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM,879248391, sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM_FMT,879248395, -sw_CheckBox_TP_STD_FONT_CB_DOCONLY,878429286, sw_CheckBox_TP_TABLE_COLUMN_CB_MOD_TBL,888489082, sw_CheckBox_TP_TABLE_COLUMN_CB_PROP,888489083, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_HEADLINE,878511144, @@ -7901,11 +7899,6 @@ sw_ComboBox_TP_FRM_URL_CB_FRAME,878350432, sw_ComboBox_TP_INSERT_SECTION_ED_RNAME,879054868, sw_ComboBox_TP_INSERT_SECTION_LB_SUBREG,879054886, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, -sw_ComboBox_TP_STD_FONT_LB_IDX,878432355, -sw_ComboBox_TP_STD_FONT_LB_LABEL,878432353, -sw_ComboBox_TP_STD_FONT_LB_LIST,878432351, -sw_ComboBox_TP_STD_FONT_LB_STANDARD,878432347, -sw_ComboBox_TP_STD_FONT_LB_TITLE,878432349, sw_ComboBox_TP_TOX_ENTRY_CB_FILLCHAR,879153198, sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626, sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700, @@ -8147,11 +8140,6 @@ sw_MenuButton_TP_ENV_FMT_BTN_ADDR_EDIT,909668370, sw_MenuButton_TP_ENV_FMT_BTN_SEND_EDIT,909668380, sw_MenuButton_TP_TOX_SELECT_MB_AUTOMARK,879144989, sw_Menu_TP_TOX_SELECT_MB_AUTOMARK,537346048, -sw_MetricBox_TP_STD_FONT_LB_INDEX_SIZE,878438000, -sw_MetricBox_TP_STD_FONT_LB_LABEL_SIZE,878437999, -sw_MetricBox_TP_STD_FONT_LB_LIST_SIZE,878437998, -sw_MetricBox_TP_STD_FONT_LB_STANDARD_SIZE,878437996, -sw_MetricBox_TP_STD_FONT_LB_TITLE_SIZE,878437997, sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT,898505220, sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP,898505222, sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_BMARGIN,1411291667, @@ -8321,7 +8309,6 @@ sw_PushButton_TP_MAILCONFIG_PB_AUTHENTICATION,879366672, sw_PushButton_TP_MAILCONFIG_PB_TEST,879366677, sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288, sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287, -sw_PushButton_TP_STD_FONT_PB_STANDARD,878432869, sw_PushButton_TP_TOX_ENTRY_PB_ALL_LEVELS,879153732, sw_PushButton_TP_TOX_ENTRY_PB_AUTHINSERT,879153784, sw_PushButton_TP_TOX_ENTRY_PB_AUTHREMOVE,879153785, diff --git a/source/text/shared/optionen/01040300.xhp b/source/text/shared/optionen/01040300.xhp index fab2ecc..a85a14f 100644 --- a/source/text/shared/optionen/01040300.xhp +++ b/source/text/shared/optionen/01040300.xhp @@ -40,9 +40,9 @@ bookmark_valuetemplates;changing basic fonts/bookmark_value bookmark_valueparagraph styles;modifying basic fonts/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/SW_HID_STD_FONT id=bm_id3154894 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/optfonttabpage/OptFontTabPage id=bm_id3154894 localize=false/ paragraph role=heading id=hd_id3151299 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01040300.xhp name=Basic FontsBasic Fonts/link/paragraph -paragraph role=paragraph id=par_id3149786 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_STD_FONTSpecifies the settings for the basic fonts in your documents./ahelp/paragraph +paragraph role=paragraph id=par_id3149786 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/swriter/ui/optfonttabpage/OptFontTabPageSpecifies the settings for the basic fonts in your documents./ahelp/paragraph /section paragraph role=paragraph id=par_id3152349 xml-lang=en-US l10n=CHG oldref=19You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in emphswitchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - Language Settings - Languages/emph./paragraph paragraph role=paragraph id=par_id3145609 xml-lang=en-US l10n=U oldref=18These settings define the basic fonts for the predefined templates. You can also modify or customize the link href=text/shared/optionen/01040301.xhp name=default text templatesdefault text templates/link./paragraph @@ -50,34 +50,34 @@ embed href=text/shared/00/0406.xhp#grundschriften/ /section paragraph role=heading id=hd_id3152811 xml-lang=en-US level=2 l10n=U
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d37df8a7e1212560e896620b6fb5abb9db250306 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 10:10:16 2013 +0100 Updated core Project: help d4d1cb52a2d1e66b0514e3d2ab5e12e6969aa1bc diff --git a/helpcontent2 b/helpcontent2 index 5292910..d4d1cb5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5292910b0bef2d577fe0a834e59634a327d516c3 +Subproject commit d4d1cb52a2d1e66b0514e3d2ab5e12e6969aa1bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-3.6.7.2'
Tag 'libreoffice-3.6.7.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-09 10:12 -0700 Tag libreoffice-3.6.7.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR29PkAAoJEPQ0oe+v7q6jrUAP/AtjFnAYv0QewKhMioPKaWDC nGD8UzNjGNaBNHIAjJQ37shpTgVoeHYU0MLadDG+xH9T8HuHkB/wBuqZbWwmrKO2 bBmWJkvJc+ZcLTE/BHuDelwlEeDVbTYjiPvaTP6FFWQRWBReBk9BuNdudD2F5nnl ITWqkh/ktJQugXfU8CZQm+cZKKnjUL1/TPtojdYC/WGA7YqOZmH9n1obKp2IuMA9 RfXbf9NMZGPBIvtU5LURenbfhfCf79xo3c9QaECsVrdrpcYqmpjQcZ9wBGfY/pog eSNrEbL+QQaielDClQ7+cIW2tBtGIU6oFQZg2usuff3cEhA97Cgq6V2M3U+N6iGD wWXmzMDt5q5NsAnP09VQvw2qy8YRgWyVwEnaxBe8/XqscGdNVkD2VeN6iWlyv+5H KGB3w7jgyIEhL4y+h50HU+NzB8EnenrDgN1+opIe18GKVD9LlcUr4MLa7Knrh6iY 9ZRkcH7w2MWDAEkBTs/lu+y/w285gog40pzhjIxV3aMjtU3ID9FZQHbuuyRYPw2G sYcCDwFMM7CQ/HKCN/xuCcWsWnyK5uOqpShTsck28RATyw7W4ViyH0pYGq4arXhj 3ipyGy5lR9h1pekZBrD7hf+E+wNBS83oMC4G5Mf2iF7180Cq/N4Ajyc18gRU/GUn kgRAbv3SNYmLdzpFroYl =kdKu -END PGP SIGNATURE- Changes since libreoffice-3.6.7.1: Christian Lohmaier (1): Version 3.6.7.2, tag libreoffice-3.6.7.2 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-3.6.7.2'
Tag 'libreoffice-3.6.7.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-09 10:12 -0700 Tag libreoffice-3.6.7.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR29PlAAoJEPQ0oe+v7q6jakgP/1AIXCCxgeI/b1sBp1dFZ9Ng DIANXLdtDF/BNYeQuy/MS4A5q+LNH8fTHn0UIcSMfbPnh3haH4JWllVNjNWBLD0i o/LvbY22n26JswkngVpWm3lja3945L7+NczUs7zJ/S4C31zRakEs/aZYSeYJB4Os LOPXPG147ICKHsCV7SQBPajp/Qr2FM41BjhmoK+28YqNWhtxP9VvFs2W6PV/rsC7 ICOQq+t76hqyG2vxwTCma1wXbGvckl8U+KfXbQhD+BsHauG/MUGOZAHBuf7cOzsN eLIWNb+hLeQ8P1MasIQ/ePXubDxvtlZyG5izfZQDsmBlCy9izYsvqiKrBCMI2D8u 6Hu4ukiswnnfYY5xoNvefwAcmAnw6sefwneGEMoVXPcuUI8TXTIOfVVHSjshQuEN XgOaOqbf7e+AZzvhjudFuUTB9tPNEoBP8zx8FAwC8ZZ1j2/PSmva5aM7RCriyK4e gSMlQPHujpCIMBxnf/mXnOecXhV6j56mdcmgAH3k+ArfW6EgWYmTQTdvlEzMusxb t7TLabzCeZUr4q3OYQUFSdn0e7jBczjBHn7RmAMRZD34mSxthg3Cu8a/E5hDzk9O S0XQDEo8oPppsVEZgYdDQr7Rwg+8dN8pQ7R2IEtkrCCovltTackh1VqlPmrcOGEl 0OSv6Y8leJR3QL6A8AxI =LShH -END PGP SIGNATURE- Changes since libreoffice-3.6.7.1: Christian Lohmaier (1): Version 3.6.7.2, tag libreoffice-3.6.7.2 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-3.6.7.2'
Tag 'libreoffice-3.6.7.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-09 10:12 -0700 Tag libreoffice-3.6.7.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR29PhAAoJEPQ0oe+v7q6jS4gP/0IM8zz0LJ3KTuOGHUTstDmC 2Yf4dtFRVJNfX3Ep2S4KgSmBRR/dAmkqbcUNqlAN+vl54f7ob0uXQzOOteG2/29S N5YrwUFwkg7eN/brvN6FBuWH5sHfSvNa8tGi4/gI45Ze/PCBdlPEahP1/F2UFyvE iT8co5aKsJlRqq6wWEKJpFZEfNmo/niCab9OsSXa6Kg0d4oeB4kjYGaz6D/mRqY0 XMUoc2yV5Fw8i2jckMe82cJToV0NNy0B0RaNm/imX9sSHt4aasnw50VKVkqIMcqj UtUXW5vMCxauWKfD/rQqfWgbqAS10NJR8f0eh6AEGkcJkQDF5lGv7mfI9Z5mvHgR xtqQWsKYPKcE9wK3jLDdFoT0evdou/B9nJaOOIwrmnSi7I3AN9L7pLsyZhQQMEP0 yGKEmkABa4ZH8G98643hd2821hAPEL++ydL454Id+DtL/NmldR+f5mwHjLs6Al9U gEamN7XlfQOVcbrsWdSPxMoRFUrBjbinrH2sXfZDTCQvKCGH8sQqCJ7yn7QSORwV Be8dA4HmIOHaPUUwfypun1E1XzFzap5gp2WAZpYt5fk58ieV0oVMzFspYTw7yQXU 4J0d7BpNVbYVFVO3OlV3wvexxqJ+TIgls9fz44ePLuAwz0bY3lLd8cX6RGs4/Ber WRv8sGjR7zJEKu+8oLsk =aiML -END PGP SIGNATURE- Changes since libreoffice-3.6.7.1-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.7.2'
Tag 'libreoffice-3.6.7.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-09 10:12 -0700 Tag libreoffice-3.6.7.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR29PjAAoJEPQ0oe+v7q6jZFoQANKsR0wNFdQB2sqJP3mQTRkk hZfpZa7sRmiclPeQ/yDIOQ9evpxzNnFMQ7Hf5DqZgpVGmdE1rTUFSWwOYJVhxEGj URvPWyM7JfGl7kZkAoWb9nCm93CmZpUtZF6oL8zjDT6CnQ13QLAgII29B6pd+nmh UP7bqUiMCmXrcL0vjgOKQFkAJbW0dsrY/wq8lHW0gBPrRF2q4STmZLtT1Jxs8DVL v9nRj2ngsa/2mUG1Og4gJ4/QD0yENULm2zwUFJTG/fBdwYw68b/Nf0GNLYjGbuZy cZgeVPm84vviQHZSCkkOTrvNQE50m386pilsy+DGx9QunkawTR/0VAs2OiGr/rwj 0+TWNoH0yo35LgRyfi/47HOtVRcTNcyFRS28v8E20xo55XoZ80CCUoxVqSXX+LGx PQqBlhwv595HLO7n1RyRbNLnsfWJOnUK89iWzfPvHVmf3k8SVGoIhdGl5ARfTYBo ei8XpfgswfIhBb8ndCyhlfLBOMSfBG0+2ep0mbEzzVueuuz+ZcibS0RFCTUpfgA/ 6usoJo2CQXMZjOgwhGAGSlNnpz8bIZNDWv2dfzcSONDNTW1de7/mtHNhpF/xAzgB VEYTZ2Jb0lNIJGIGYWnMxBuZHXXJI0BtmupP7gVAsCehzK12aW8rEcKLYA7+DFsY P9/HBFrXOJqqUghc0mTI =KCrK -END PGP SIGNATURE- Changes since libreoffice-3.6.7.1: Christian Lohmaier (1): Version 3.6.7.2, tag libreoffice-3.6.7.2 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-3.6.7.2'
Tag 'libreoffice-3.6.7.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-09 10:12 -0700 Tag libreoffice-3.6.7.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR29PnAAoJEPQ0oe+v7q6jt6sQAJlxpKL0fY/Vynv5H9f3ZnsW Dyj4EHlVLrTY7B+a0Kh5pKNFFc9rprHHG/vSJEXWOZ4XezO12vRqv1YEdI/oC6uR d0ryxxakjJqpcdxqyHQvqflOJ56keOgcV/ZdtY8nXdokgMfqIDLVPkSgIzlPsGUr zbh0RCpD8WiWxiYgXuhS93pZ1LGK8ydBROjP0xnP/N0ku1gOCbLT62iNPAQQGEFF /eNXPp/F/oSWvWbm4yq3M3xoFSKbwzMdQkWF9YMwX3ae5CXR56z3zIAA+UJx967j kP3tHlxVTE9hAdgzYeqSxfmjTVrrYpW7vzVwoV7PMEWlk/TGfQHHUF33/THw2wY2 4VUMIQ5/+IuHQYR3Ua6rOLmnZK1Y+836l+IOspKwXzmZxVLMeO0NwlyH7MVUvvtm miLO8hTWqsHx5dYIvoYhGvrXOMFeFosNhBEdr8zdlFtigZO8ledTvZ9wQfKbT2tB FiANTeTk6N+wK0HreT4qtZHMgNWLqJHpwm6KBpdTpMRUKIV9ZLOuLla3TUDN9zrM 3HpSzsDshWtcFwyvdoDV0btKUmie42fdXPbV2Eix5DYxkE7qCO1Z2sEtvanZB+i1 CPeBNFPWYTD3M363eK/I+nqD/Ay/7efD1VFMm78zKW3glPZgydiFe168tN85UxHU UAU8yD4c9BRbr55CUdsT =1AeL -END PGP SIGNATURE- Changes since libreoffice-3.6.7.1: Christian Lohmaier (1): Version 3.6.7.2, tag libreoffice-3.6.7.2 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: Windows Build faild me
Dear All, I am writing this a note for documentation and people having similar issues. Previously, I was unable to build LO4.1 on Winx64 due to missing WiLangId.vbs. The full build log is http://pastebin.ca/2416045. The specific failing point is Input Error: Can not find script file C:\PROGRA~2\MIA713~1\Windows\v7.0A\Samples\SysMgmt\Msi\scripts\WiLangId.vbs. Based on advice from Fridrich below, I checked for the file in Windows SDK and found the file at C:\Program Files\Microsoft SDKs\Windows\v7.0\Samples\sysmgmt\msi\scripts\WiLangId.vbs. The realproblem was that the short path C:\PROGRA~2\MIA713~1\ refers to C:\Program Files (x86)\Microsoft SDKs\ NOT C:\Program Files\Microsoft SDKs\. I resolved the problem by copying the entire Samples folder to C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A. Additionally, can the build script look for such cases, esp on x64 Win? Regards, -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello, Your packaging is failing to run the Visual Basic script that we use for windows language manipulation, WiLangId.vbs. Normally, it comes with the Windows installer SDK, but I found that it is also committed to git in this repository https://github.com/ynkdir/vim-installer/blob/master/msiscripts/WiLangId.vbs Just put it somewhere in the path of your SDK and it should be ok. Cheers Fridrich On 04/07/13 08:25, Michael Meeks wrote: Hi Tadele, On Wed, 2013-07-03 at 22:07 +0300, Tadele Assefa wrote: I have successfully built LO4.1 on Ubuntu and happy with it. Great :-) When i tried it on windows, i failed to get it done That's a pain. My system Win7 x64 (dual boot Ubuntu 12.10). I tried various wiki guides and everything i can find in nabble. The entire build message is at http://pastebin.ca/2416045 Sadly I'm not on-line. The last part says: Setting Root Module: gid_Module_Root : Using spellchecker file: D:/lo/build/win/git/libowin/solver/ wntmsci13.pro/bin/spellchecker_selection.txt : Collected spellchecker languages for spellchecker: en,es,fr : : * : ERROR: ERROR: Found an error in the logfile. Packaging failed. at D:/lo/build/win/git/libowin/solenv/bin/modules/installer/worker.pm line 164 : * Usually there is an ERROR: much earlier in this sequence - a load of SUCCESS: followed by one. You'd prolly do best to dig back in the log to find that - and then try to unwind what is going on there. It's hard to be more specific than that - also; it's really best to CC the developers list on this sort of thing: that will get you the best response, and no need to subscribe: libreoffice@lists.freedesktop.org HTH, Michael. - -- Please avoid sending me Word, Excel or PowerPoint attachments. See http://www.gnu.org/philosophy/no-word-attachments.html -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlHVexMACgkQu9a1imXPdA+k5ACfaPMtDKOu7Qe8ZjERlGzHYx4b gpsAn1fxg5+gcFT5ZpfQTF+t6IfovlBU =prt1 -END PGP SIGNATURE- -- Regards,* ___ Tadele Assefa Managing Director* * Cell: +25-911-84-13-84* *Think Green – Please do not print this email unless you really need to* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66695, which changed state. Bug 66695 Summary: [Crash] impress crashing when use increase/reduce font on table https://bugs.freedesktop.org/show_bug.cgi?id=66695 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b69f10db70c10e9f24646e218a13a437faf64cda
Author: David Tardon dtar...@redhat.com
Date: Tue Jul 9 10:40:21 2013 +0200
fdo#66582 avoid crash because of missing model
The SdrObject is still under construction at this point, so it does not
make sense to broadcast changes, because there are not any listeners
anyway.
Change-Id: Ib05e30843b4b0e125d5cae18a481e16fb7e21ba1
(cherry picked from commit 6e2815a0ffdb5811f220978734354b1033801927)
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4781
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index ad81cdc..ad3b0c2 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -150,7 +150,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference
report::XReportCompon
{
sal_Bool bOpaque = sal_False;
_xComponent-getPropertyValue(PROPERTY_OPAQUE) = bOpaque;
-pNewObj-SetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
+pNewObj-NbcSetLayer(bOpaque ? RPT_LAYER_FRONT :
RPT_LAYER_BACK);
}
catch(const uno::Exception)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source oox/source sc/source sdext/source sd/source slideshow/source stoc/source store/source svx/source sw/source vcl/source vcl/unx
connectivity/source/drivers/mork/MResultSet.cxx |4 ++--
oox/source/drawingml/diagram/diagram.cxx|4 ++--
sc/source/core/tool/compiler.cxx|2 +-
sc/source/ui/vba/vbaeventshelper.cxx|4 ++--
sd/source/ui/sidebar/PanelBase.cxx | 10 +-
sd/source/ui/slidesorter/model/SlideSorterModel.cxx |4 ++--
sdext/source/presenter/PresenterWindowManager.cxx |2 +-
slideshow/source/engine/shapes/viewshape.cxx|6 +++---
stoc/source/javaloader/javaloader.cxx |2 +-
store/source/storcach.cxx |4 ++--
svx/source/accessibility/AccessibleTextHelper.cxx |6 +++---
sw/source/core/unocore/unocoll.cxx |2 +-
sw/source/ui/vba/service.cxx|2 +-
vcl/source/gdi/gdimtf.cxx |2 +-
vcl/source/gdi/pngread.cxx |2 +-
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx|8
16 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 1a44cf5f6d5a8da224a2e10febaf5b9c989eb9f3
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sun Jul 7 10:52:38 2013 +0200
Remove warning by using the right printf commands
Change-Id: Id476a0eb1f5965098c8cc2e2847547b1d23387eb
Reviewed-on: https://gerrit.libreoffice.org/4753
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx
b/connectivity/source/drivers/mork/MResultSet.cxx
index 40dfc49..044cf02 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -906,7 +906,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*
parseT
( pAtom-getChild(0) pAtom-getChild(0)-getNodeType() ==
SQL_NODE_STRING )
) )
{
-OSL_TRACE(analyseSQL : pAtom-count() = %d, pAtom-count() );
+OSL_TRACE(analyseSQL : pAtom-count() = %zu, pAtom-count() );
m_pStatement-getOwnConnection()-throwSQLException(
STR_QUERY_INVALID_LIKE_STRING, *this );
}
@@ -1262,7 +1262,7 @@ void SAL_CALL OResultSet::executeQuery() throw(
::com::sun::star::sdbc::SQLExcep
m_pSortIndex = new
OSortIndex(eKeyType,m_aOrderbyAscending);
-OSL_TRACE(OrderbyColumnNumber-size() =
%d,m_aOrderbyColumnNumber.size());
+OSL_TRACE(OrderbyColumnNumber-size() =
%zu,m_aOrderbyColumnNumber.size());
#if OSL_DEBUG_LEVEL 0
for ( ::std::vectorsal_Int32::size_type i = 0; i
m_aColMapping.size(); i++ )
OSL_TRACE(Mapped: %d - %d, i, m_aColMapping[i] );
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 0b7ab560..a7bc286 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -77,10 +77,10 @@ DiagramData::DiagramData()
void DiagramData::dump()
{
-OSL_TRACE(Dgm: DiagramData # of cnx: %d, maConnections.size() );
+OSL_TRACE(Dgm: DiagramData # of cnx: %zu, maConnections.size() );
std::for_each( maConnections.begin(), maConnections.end(),
boost::bind( dgm::Connection::dump, _1 ) );
-OSL_TRACE(Dgm: DiagramData # of pt: %d, maPoints.size() );
+OSL_TRACE(Dgm: DiagramData # of pt: %zu, maPoints.size() );
std::for_each( maPoints.begin(), maPoints.end(),
boost::bind( dgm::Point::dump, _1 ) );
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 442d995..6b5a59c 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -991,7 +991,7 @@ struct ConventionOOO_A1 : public Convention_A1
pRefMgr-getAllCachedTableNames(nFileId, aTabNames);
if (aTabNames.empty())
{
-OSL_TRACE( ConventionOOO_A1::makeExternalRefStrImpl: no
sheet names for document ID %s, nFileId);
+OSL_TRACE( ConventionOOO_A1::makeExternalRefStrImpl: no
sheet names for document ID %d, nFileId);
}
if (!lcl_getLastTabName(aLastTabName, rTabName, aTabNames,
aRef))
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx
b/sc/source/ui/vba/vbaeventshelper.cxx
index d072d04..31d4bed 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -282,7 +282,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const
lang::EventObject rEve
{
uno::Reference awt::XWindow xWindow( rEvent.Source, uno::UNO_QUERY
);
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-OSL_TRACE( ScVbaEventListener::windowActivated - pWindow = 0x%x,
mpActiveWindow = 0x%x, pWindow, mpActiveWindow );
+OSL_TRACE(
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4cf80bd8b2a61d154172fa602aeb0fecbe7a2f67
Author: Mark Wielaard m...@klomp.org
Date: Sun Jul 7 22:18:12 2013 +0200
Fix memory leak in SvxMSDffManager::ImportShape.
When a new DffPropertyReader is created and assigned to pSecPropSet
make sure the old one is deleted first.
Change-Id: Idd14fdf4e3a03a625a10a89dde71ad66cbdba792
Reviewed-on: https://gerrit.libreoffice.org/4761
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index a580c43..e6d8d1e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4141,6 +4141,7 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader rHd, SvStream r
if ( aObjData.bOpt2 )
{
maShapeRecords.Current()-SeekToBegOfRecord( rSt );
+delete pSecPropSet;
pSecPropSet = new DffPropertyReader( *this );
pSecPropSet-ReadPropSet( rSt, NULL );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] libreoffice-3.6.7.2 tag (AKA final RC for 3.6.7) created
Hi *, The tag libreoffice-3.6.7.2 (AKA RC2, the final RC for 3.6.7) has been created. The corresponding official builds will be available within next few days. 3.6.7 will be the last release in the 3.6.x line. See the attached files for the list of changes against 3.6.7.1. To switch your tree to it, use: ./g fetch --tags ./g checkout -b tag-libreoffice-3.6.7.2 libreoffice-3.6.7.2 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also http://wiki.documentfoundation.org/ReleasePlan/3.6#3.6.7_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Christian bugs-tag-libreoffice-3.6.7.2-release-3.6.7.2.log Description: Binary data bugs-tag-libreoffice-3.6.7.2-release-3.6.7.2.wiki Description: Binary data commits-tag-libreoffice-3.6.7.2-release-3.6.7.2.log Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag
i18nlangtag/source/languagetag/languagetag.cxx | 15 +--
include/i18nlangtag/languagetag.hxx| 14 ++
2 files changed, 19 insertions(+), 10 deletions(-)
New commits:
commit a72ca75e33c351b00801869aec570a277aaa646a
Author: Eike Rathke er...@redhat.com
Date: Tue Jul 9 12:24:45 2013 +0200
publish the qlt reserved code in header file
Change-Id: Idb0bfa61655aa2f2d4b73661bce8166121727922
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index f0333b8..673960f 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -35,11 +35,6 @@ using namespace com::sun::star;
#define LANGTAGCAST(p) (reinterpret_castlt_tag_t*(p))
#define MPLANGTAG LANGTAGCAST(mpImplLangtag)
-/** Convention to signal presence of BCP 47 language tag in a Locale's Variant
-field. The Locale's Language field then will contain this ISO 639-2
-reserved for local use code. */
-#define ISO639_LANGUAGE_TAG qlt
-
// Helper to ensure lt_error_t is free'd
struct myLtError
@@ -474,7 +469,7 @@ bool LanguageTag::canonicalize()
}
else
{
-maLocale.Language = ISO639_LANGUAGE_TAG;
+maLocale.Language = I18NLANGTAG_QLT;
maLocale.Country = aCountry;
maLocale.Variant = maBcp47;
}
@@ -574,7 +569,7 @@ void LanguageTag::convertLocaleToBcp47()
if (mbSystemLocale !mbInitializedLocale)
convertLangToLocale();
-if (maLocale.Language == ISO639_LANGUAGE_TAG)
+if (maLocale.Language == I18NLANGTAG_QLT)
{
maBcp47 = maLocale.Variant;
meIsIsoLocale = DECISION_NO;
@@ -607,7 +602,7 @@ void LanguageTag::convertLocaleToLang()
{
/* FIXME: this is temporary until code base is converted to not use
* MsLangId::convert...() anymore. After that, proper new method has to
- * be implemented to allow ISO639_LANGUAGE_TAG and sript tag and such.
*/
+ * be implemented to allow I18NLANGTAG_QLT and sript tag and such. */
mnLangID = MsLangId::Conversion::convertLocaleToLanguage( maLocale);
}
mbInitializedLangID = true;
@@ -625,7 +620,7 @@ void LanguageTag::convertBcp47ToLocale()
}
else
{
-maLocale.Language = ISO639_LANGUAGE_TAG;
+maLocale.Language = I18NLANGTAG_QLT;
maLocale.Country = getCountry();
maLocale.Variant = maBcp47;
}
@@ -661,7 +656,7 @@ void LanguageTag::convertLangToLocale()
}
/* FIXME: this is temporary until code base is converted to not use
* MsLangId::convert...() anymore. After that, proper new method has to be
- * implemented to allow ISO639_LANGUAGE_TAG and script tag and such. */
+ * implemented to allow I18NLANGTAG_QLT and script tag and such. */
// Resolve system here!
maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID, true);
mbInitializedLocale = true;
diff --git a/include/i18nlangtag/languagetag.hxx
b/include/i18nlangtag/languagetag.hxx
index 1a9f499..7fa9b96 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -21,6 +21,20 @@
typedef struct _rtl_Locale rtl_Locale; // as in rtl/locale.h
+/** The ISO 639-2 code reserved for local use used to indicate that a
+com::sun::star::Locale contains a BCP 47 string in its Variant field. The
+Locale's Language field then will contain this language code.
+
+@see LanguageTag::getLocale()
+
+Avoid use, only needed internally or if conversion from Locale to
+LanguageTag is not wanted, i.e. during ODF import. To check whether a
+LanguageTag contains a plain language/country combination or a more
+detailed BCP 47 language tag use LanguageTag::isIsoLocale() instead.
+ */
+#define I18NLANGTAG_QLT qlt
+
+
/** Wrapper for liblangtag BCP 47 language tags, MS-LangIDs, locales and
conversions in between.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - 5 commits - editeng/source sw/source vcl/unx writerfilter/source
editeng/source/editeng/impedit3.cxx|8 ++
sw/source/core/unocore/unosett.cxx |6 --
sw/source/core/view/viewsh.cxx | 74 +
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +
5 files changed, 59 insertions(+), 41 deletions(-)
New commits:
commit b059b034753ecaf611ed761591a0d6c5ea16fef1
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 1 23:48:59 2013 +0200
fdo#65650: fix Writer ODF import of list style with bullets and color
For such lists xmloff tries to set a BulletColor property but
SwXNumberingRules::SetNumberingRuleByIndex() throws a RuntimeException
and does not set any of the list properties on the NumRule.
(regression from abf18610998aa8330f8330f1d769508e47ef5b20)
Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21
(cherry picked from commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68)
Reviewed-on: https://gerrit.libreoffice.org/4666
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index 2b312a3..ed7a5c9 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1670,8 +1670,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
const sal_uInt16 NotInChapterLast = 23;
const sal_uInt16 InChapterFirst = 24;
const sal_uInt16 InChapterLast = 24;
-const sal_uInt16 IgnoredFirst = 25;
-const sal_uInt16 IgnoredLast = 26;
const beans::PropertyValue* pPropArray = rProperties.getConstArray();
PropValDataArr aPropertyValues;
@@ -1682,8 +1680,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
bExcept = sal_True;
for(sal_uInt16 j = 0; j SAL_N_ELEMENTS( aNumPropertyNames ); j++)
{
-if( j = IgnoredFirst j = IgnoredLast )
-continue;
if( pDocShell j = NotInChapterFirst j = NotInChapterLast )
continue;
if( !pDocShell j = InChapterFirst j = InChapterLast )
@@ -2102,7 +2098,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
break;
case 25: // BulletRelSize - unsupported - only available in
Impress
break;
-case 26: // ignored too
+case 26: // BulletColor - ignored too
break;
}
}
commit 27fc11754c9dc24e4b695a2b53bcd4f010c2be65
Author: Abdulaziz A Alayed aala...@kacst.edu.sa
Date: Fri May 24 13:11:31 2013 +0300
fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab
opened with LTR UI.
Reviewed-on: https://gerrit.libreoffice.org/4024
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 898a3e84807bccbb876e3f5583728f6d24e05e9a)
Conflicts:
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811
Reviewed-on: https://gerrit.libreoffice.org/4540
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-by: Faisal al-otaibi fmalota...@kacst.edu.sa
Tested-by: Faisal al-otaibi fmalota...@kacst.edu.sa
Reviewed-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
old mode 100644
new mode 100755
index 9623555..c0d9740
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1027,7 +1027,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-returnVal = sal_True;
+//fdo#63254 horizontal scrool bar isn't displayed in RTL tab
+// with LTR UI in calc
+returnVal =Application::GetSettings().GetLayoutRTL();
+
+//See fdo#44582, Horizontal scrollbar in navigator window is broken
+if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT)
Application::GetSettings().GetLayoutRTL())
+returnVal = false;
}
if( (nType == CTRL_MENUBAR) (nPart == PART_ENTIRE_CONTROL) )
{
commit 29a2c9e208facd1956fa2dd03d66c7ad8ae5deee
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Feb 2 15:29:24 2013 +0100
fdo#58646 fix import of RTF_PAGE in cont section when having titlepg
(cherry picked from commit
[Libreoffice-commits] core.git: 2 commits - epm/epm-3.7.patch sc/qa
epm/epm-3.7.patch |9 +
sc/qa/unit/helper/qahelper.cxx |2 ++
2 files changed, 11 insertions(+)
New commits:
commit 2b62198dfcfd3fe738382207235a68cdc9b40d30
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 9 12:46:37 2013 +0200
Fix EPMs deb Depends syntax
...that it is broken at least in our bundled EPM 3.7 became evident with
d07cbe86f34ca6dfc6580b63879235c339831a5e fdo#65541: Proper EPM %requires
dependencies, at least for Linux failing for --with-package-format=deb now.
I cannot verify whether this is a known/fixed problem in upstream EPM
(which is
at version 4.2 by now), as the download links at
http://freecode.com/projects/epm point at a (temporarily, at least)
unavailable ftp.easysw.com server.
Change-Id: Idad1cdfc55d870200ccb24ea94a2fe7c0ed2c9e8
diff --git a/epm/epm-3.7.patch b/epm/epm-3.7.patch
index 02835bc..869c141 100644
--- a/epm/epm-3.7.patch
+++ b/epm/epm-3.7.patch
@@ -260,6 +260,15 @@ diff -urN epm-3.7-old//deb.c epm-3.7/deb.c
else
fprintf(fp, Architecture: %s\n, platform-machine);
+@@ -139,7 +192,7 @@
+ else
+ {
+ if (d-vernumber[1] INT_MAX)
+-fprintf(fp, (= %s, = %s), d-version[0], d-version[1]);
++fprintf(fp, (= %s), %s (= %s), d-version[0], d-product,
d-version[1]);
+ else
+ fprintf(fp, (= %s), d-version[0]);
+ }
@@ -148,9 +193,9 @@
putc('\n', fp);
}
commit 13cddb12ff8c7357a2c8e54d603b840ce7b29737
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 9 11:57:41 2013 +0200
-Werror=unused-macros
Change-Id: I31cee3db3dbba577289ea73b9366efc5ee79
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index ee806bc..14cd6dd 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -9,7 +9,9 @@
#include qahelper.hxx
+#if defined _WIN32 || defined __CYGWIN__
#define __ORCUS_STATIC_LIB
+#endif
#include orcus/csv_parser.hpp
#include fstream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo66565.rtf | 35 +
sw/qa/extras/rtfimport/rtfimport.cxx | 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 ++-
3 files changed, 50 insertions(+), 2 deletions(-)
New commits:
commit f6a00c88482ec30b61855cb6a95a5ad240b7a517
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 9 11:29:33 2013 +0200
fdo#66565 RTF import: don't produce cell widths smaller than MINLAY
In case we have a table of a given width and the second (or later) row
has fewer cells, we have to add a fake cell to such a row. However, it
doesn't make sense to do this when the difference is only a few twips:
we can't create such a small frame inside the cell later anyway.
Regression from c3b0f13546b30e5db3aecd311c7178e4e0933208.
Change-Id: Ibc0f02d4184b58bd423c3405e786e1ec25b9dd13
diff --git a/sw/qa/extras/rtfimport/data/fdo66565.rtf
b/sw/qa/extras/rtfimport/data/fdo66565.rtf
new file mode 100644
index 000..2169dc3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo66565.rtf
@@ -0,0 +1,35 @@
+{\rtf1\ansi\ansicpg1251\deflang1033
+\sectd\lndscpsxn\pgwsxn16840\pghsxn11907\marglsxn1133\margrsxn850\margtsxn850\margbsxn850\linex0\headery709\footery709\colsx709\endnhere\sectdefaultcl
+{\trowd\trql\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5039\clbrdrt\brdrdb\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx7420\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx8162\clbrdrt\brdrdb\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13717\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx14227\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrdb\brdrw10\cellx14850
+\intbl
+{\b\f0\fs16 A1 \cell}
+{\b\f0\fs16 B1 \cell}
+{\b\f0\fs16 C1 \cell}
+{\b\f0\fs16 D1 \cell}
+{\b\f0\fs16 E1 \cell}
+{\b\f0\fs16 F1 \cell}
+{\b\f0\fs16 G1 \cell}
+{\row}
+\trowd\trql\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5039\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5832\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx6625\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx7418\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx8160\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx9123\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx9633\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx10143\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx10653\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdr
l\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx11163\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx11673\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx12183\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx12693\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13203\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13713\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx14223\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrdb\brdrw10\cellx14846
+\intbl
+{\b\f0\fs16 A2 \cell}
+{\b\f0\fs16 B2 \cell}
+{\b\f0\fs16 C2 \cell}
+{\b\f0\fs16 D2 \cell}
+{\b\f0\fs16 E2 \cell}
+{\b\f0\fs16 F2 \cell}
+{\b\f0\fs16 G2 \cell}
+{\b\f0\fs16 H2 \cell}
+{\b\f0\fs16 I2 \cell}
+{\b\f0\fs16 J2 \cell}
+{\b\f0\fs16 K2 \cell}
+{\b\f0\fs16 L2 \cell}
+{\b\f0\fs16 M2 \cell}
+{\b\f0\fs16 N2 \cell}
+{\b\f0\fs16 O2 \cell}
+{\b\f0\fs16 P2 \cell}
+{\b\f0\fs16 Q2 \cell}
+{\b\f0\fs16 R2 \cell}
+{\row}
+\pard}
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3aa8d19..bc8c7fc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -152,6 +152,7 @@ public:
void testFdo47802();
void testFdo39001();
void testGroupshape();
+void testFdo66565();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -289,6 +290,7 @@ void Test::run()
{fdo47802.rtf, Test::testFdo47802},
{fdo39001.rtf, Test::testFdo39001},
{groupshape.rtf, Test::testGroupshape},
+{fdo66565.rtf, Test::testFdo66565},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1407,6 +1409,16 @@ void Test::testGroupshape()
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/opencl/openclwrapper.cxx |9 +++--
sc/source/core/opencl/openclwrapper.hxx |3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit d037078fcd86527171f674cfd036a71c928d3721
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jul 9 12:02:43 2013 +0100
better opencl error reporting / diagnostics.
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 0c83d94..6132ae3 100755
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2134,6 +2134,7 @@ double *OclCalc::OclSimpleDeltaOperation(OpCode eOp,
const double *pOpArray,
size_t global_work_size[1];
kEnv.mpkKernel = clCreateKernel(kEnv.mpkProgram,kernelName, clStatus);
+CHECK_OPENCL(clStatus);
// Ugh - horrible redundant copying ...
cl_mem valuesCl = allocateDoubleBuffer(kEnv, pOpArray, nElements,
clStatus);
@@ -2150,12 +2151,16 @@ double *OclCalc::OclSimpleDeltaOperation(OpCode eOp,
const double *pOpArray,
clStatus = clSetKernelArg(kEnv.mpkKernel, 0, sizeof(cl_mem),
(void *)valuesCl);
+CHECK_OPENCL(clStatus);
clStatus = clSetKernelArg(kEnv.mpkKernel, 1, sizeof(cl_mem),
(void *)subtractCl);
-clStatus = clSetKernelArg(kEnv.mpkKernel, 2, sizeof(cl_mem),
+CHECK_OPENCL(clStatus);
+clStatus = clSetKernelArg(kEnv.mpkKernel, 2, sizeof(cl_int),
(void *)start);
-clStatus = clSetKernelArg(kEnv.mpkKernel, 3, sizeof(cl_mem),
+CHECK_OPENCL(clStatus);
+clStatus = clSetKernelArg(kEnv.mpkKernel, 3, sizeof(cl_int),
(void *)end);
+CHECK_OPENCL(clStatus);
clStatus = clSetKernelArg(kEnv.mpkKernel, 4, sizeof(cl_mem),
(void *)outputCl);
CHECK_OPENCL(clStatus);
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 3405925..90c92ac 100755
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -12,6 +12,7 @@
#include config_features.h
#include formula/opcode.hxx
+#include sal/detail/log.h
#include cassert
#include CL/cl.h
@@ -59,7 +60,7 @@ typedef int (*cl_kernel_function)(void **userdata, KernelEnv
*kenv);
#define CHECK_OPENCL(status) \
if(status != CL_SUCCESS) \
{ \
-printf (error code is %d.\n,status);\
+printf (OpenCL error code is %d at SAL_DETAIL_WHERE \n, status);\
return 0;\
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/uiconfig vcl/source
sw/uiconfig/swriter/ui/opttablepage.ui |3 +--
vcl/source/window/layout.cxx |8 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 95e394a62e0fe0c780850367c83d0b54e89239d1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 12:11:04 2013 +0100
we don't really want homogeneous spin fields and labels
Change-Id: Ic97254e338cdac63fd08ee59daf401e92f656f1b
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui
b/sw/uiconfig/swriter/ui/opttablepage.ui
index de5db4a..48a7f3c 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -389,6 +389,7 @@
property name=can_focusFalse/property
property name=hexpandTrue/property
property name=spacing12/property
+property name=homogeneousTrue/property
child
object class=GtkGrid id=grid4
property name=visibleTrue/property
@@ -398,7 +399,6 @@
property name=orientationvertical/property
property name=row_spacing6/property
property name=column_spacing12/property
-property name=column_homogeneousTrue/property
child
object class=GtkLabel id=label4
property name=visibleTrue/property
@@ -495,7 +495,6 @@
property name=orientationvertical/property
property name=row_spacing6/property
property name=column_spacing12/property
-property name=column_homogeneousTrue/property
child
object class=GtkSpinButton id=rowinsert:0.00cm
property name=visibleTrue/property
commit c01780b84939c5bdaee84a6b5b4628d515b4f364
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 12:10:41 2013 +0100
counting fence posts not fence sections
Change-Id: Ic97a766efdbd5e169923b9e7875b16b8ebd88deb
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 0cdf84c..2f1d404 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1041,7 +1041,9 @@ void VclGrid::setAllocation(const Size rAllocation)
calcMaxs(A, aWidths, aHeights);
}
-long nAvailableWidth = rAllocation.Width() - (get_column_spacing() *
nMaxX);
+long nAvailableWidth = rAllocation.Width();
+if (nMaxX)
+nAvailableWidth -= get_column_spacing() * (nMaxX - 1);
if (get_column_homogeneous())
{
for (sal_Int32 x = 0; x nMaxX; ++x)
@@ -1071,7 +1073,9 @@ void VclGrid::setAllocation(const Size rAllocation)
}
}
-long nAvailableHeight = rAllocation.Height() - (get_row_spacing() * nMaxY);
+long nAvailableHeight = rAllocation.Height();
+if (nMaxY)
+nAvailableHeight -= get_row_spacing() * (nMaxY - 1);
if (get_row_homogeneous())
{
for (sal_Int32 y = 0; y nMaxY; ++y)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source sw/source
svtools/source/control/ctrltool.cxx |3 +--
sw/source/ui/config/optpage.cxx | 12 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 40df5fc0e30c0aa32157c645db8b5256dc8afcc3
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 12:34:12 2013 +0100
mem leaks in writer font options tabpage
Change-Id: I7378f1a230fc55a97bc06d154939502f6ddcc792
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index 9119102..0684d9b 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -382,8 +382,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice*
pDevice2, sal_Bool bAll
FontList::~FontList()
{
// Gegebenenfalls SizeArray loeschen
-if ( mpSizeAry )
-delete[] mpSizeAry;
+delete[] mpSizeAry;
// FontInfos loeschen
ImplFontListFontInfo *pTemp, *pInfo;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index c1782d4..4aef2e1 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -578,8 +578,11 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
SwStdFontTabPage::~SwStdFontTabPage()
{
-if(bDeletePrinter)
+delete pFontList;
+if (bDeletePrinter)
+{
delete pPrt;
+}
}
SfxTabPage* SwStdFontTabPage::Create( Window* pParent,
@@ -760,6 +763,11 @@ void SwStdFontTabPage::Reset( const SfxItemSet rSet)
const SfxPoolItem* pItem;
+if (bDeletePrinter)
+{
+delete pPrt;
+}
+
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, sal_False, pItem))
{
pPrt = (SfxPrinter*)((const SwPtrItem*)pItem)-GetValue();
@@ -771,8 +779,8 @@ void SwStdFontTabPage::Reset( const SfxItemSet rSet)
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0 );
pPrt = new SfxPrinter(pPrinterSet);
-bDeletePrinter = sal_True;
}
+delete pFontList;
pFontList = new FontList( pPrt );
// #i94536# prevent duplication of font entries when 'reset' button is
pressed
if( !pStandardBox-GetEntryCount() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appserv.cxx |4 ++--
sfx2/source/control/bindings.cxx |4 ++--
sfx2/source/control/dispatch.cxx |2 +-
sfx2/source/control/shell.cxx |4 ++--
sfx2/source/dialog/filedlghelper.cxx |6 +++---
sfx2/source/dialog/filtergrouping.cxx |2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 5e06877f8929f375c9fd293aeca5c8e0c7569e8f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Jul 9 13:49:58 2013 +0200
fix the sfx2-sfx log area rename
These were missing from d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46.
Change-Id: I50b2f7a2ec1ff5848802fc6c08e7a6e8e7ccb7f7
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1d04f64..1df307f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -147,7 +147,7 @@ namespace
catch (Exception e)
{
SAL_INFO(
-sfx2.appl,
+sfx.appl,
assuming Base to be missing; caught e.Message);
return false;
}
@@ -174,7 +174,7 @@ namespace
catch (const Exception e)
{
SAL_INFO(
-sfx2.appl,
+sfx.appl,
trying to install LibreOffice Base, caught
e.Message);
}
return;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 5735738..f88aae2 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1721,7 +1721,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
{
SAL_INFO(
-sfx2.control,
+sfx.control,
std::setw(std::min(nRegLevel, sal_uInt16(8))) ' ' this =
this
Level = nRegLevel SfxBindings::EnterRegistrations
(pFile
@@ -1820,7 +1820,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel,
const char *pFile, int
}
SAL_INFO(
-sfx2.control,
+sfx.control,
std::setw(std::min(nRegLevel, sal_uInt16(8))) ' ' this =
this
Level = nRegLevel SfxBindings::LeaveRegistrations
(pFile
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b7573a1..fdaf369 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -437,7 +437,7 @@ void SfxDispatcher::Pop
SfxApplication *pSfxApp = SFX_APP();
SAL_INFO(
-sfx2.control,
+sfx.control,
-SfxDispatcher( this (bPush ? )::Push( : )::Pop()
(rShell.GetInterface()
? rShell.GetInterface()-GetClassName() : SAL_STREAM(rShell))
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 810e0ed..5542998 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -556,7 +556,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame,
sal_Bool bMDI )
return;
#endif
SAL_INFO(
-sfx2.control,
+sfx.control,
SfxShell::DoActivate() this GetInterface()-GetName()
bMDI (bMDI ? MDI : ));
@@ -592,7 +592,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame,
sal_Bool bMDI )
return;
#endif
SAL_INFO(
-sfx2.control,
+sfx.control,
SfxShell::DoDeactivate() this GetInterface()-GetName()
bMDI (bMDI ? MDI : ));
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 8fb374a..e0ce50b 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1668,7 +1668,7 @@ void FileDialogHelper_Impl::verifyPath()
url.GetMainURL(INetURLObject::NO_DECODE), sysPathU);
if (e != osl::FileBase::E_None) {
SAL_WARN(
-sfx2.dialog,
+sfx.dialog,
getSystemPathFromFileURL(
url.GetMainURL(INetURLObject::NO_DECODE) ) failed with
+e);
@@ -1681,7 +1681,7 @@ void FileDialogHelper_Impl::verifyPath()
| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
SAL_WARN(
-sfx2.dialog,
+sfx.dialog,
convertToString( sysPathU ) failed for encoding
+osl_getThreadTextEncoding());
return;
@@ -1689,7 +1689,7 @@ void FileDialogHelper_Impl::verifyPath()
struct stat aFileStat;
if (stat(sysPathC.getStr(), aFileStat) == -1) {
SAL_WARN(
-sfx2.dialog,
+sfx.dialog,
stat( sysPathC.getStr() ) failed with errno errno);
return;
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index eef5bed..6fc6901 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -357,7
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/helper/qahelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ab8b183e2662b3bc76dbcd354c776ff093aef3c0 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jul 9 13:50:19 2013 +0200 Fix condition Change-Id: I710eea69e992fe9a85d9eed86cf8023d5ed356df diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 14cd6dd..d16d33d 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -9,7 +9,7 @@ #include qahelper.hxx -#if defined _WIN32 || defined __CYGWIN__ +#if defined WNT #define __ORCUS_STATIC_LIB #endif #include orcus/csv_parser.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'poppler'
New branch 'poppler' available with the following commits: commit 3efeb27a83c8d90f1e951f673bae438a8508a0e3 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Jul 9 06:32:39 2013 -0500 poppler: make it build on Mac. Change-Id: Ie74632a6bd5d43a094fa5ea696c099bb537a7e6e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: poppler/ExternalProject_poppler.mk poppler/poppler-mac-fake.patch.1 poppler/UnpackedTarball_poppler.mk sdext/Executable_xpdfimport.mk
poppler/ExternalProject_poppler.mk |2 +-
poppler/UnpackedTarball_poppler.mk |1 +
poppler/poppler-mac-fake.patch.1 | 13 +
sdext/Executable_xpdfimport.mk |2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 3efeb27a83c8d90f1e951f673bae438a8508a0e3
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Jul 9 06:32:39 2013 -0500
poppler: make it build on Mac.
Change-Id: Ie74632a6bd5d43a094fa5ea696c099bb537a7e6e
diff --git a/poppler/ExternalProject_poppler.mk
b/poppler/ExternalProject_poppler.mk
index 42d4ea7..d1cfde8 100644
--- a/poppler/ExternalProject_poppler.mk
+++ b/poppler/ExternalProject_poppler.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
--disable-gtk-test \
--disable-utils \
--disable-cms \
- $(if $(filter
WNT,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig)
\
+ $(if $(filter WNT
MACOSX,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig)
\
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(MAKE) \
)
diff --git a/poppler/UnpackedTarball_poppler.mk
b/poppler/UnpackedTarball_poppler.mk
index c7ee468..9e756acc 100644
--- a/poppler/UnpackedTarball_poppler.mk
+++ b/poppler/UnpackedTarball_poppler.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
poppler/poppler-notests.patch.1 \
poppler/poppler-snprintf.patch.1 \
+ poppler/poppler-mac-fake.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/poppler/poppler-mac-fake.patch.1 b/poppler/poppler-mac-fake.patch.1
new file mode 100644
index 000..d0b1936
--- /dev/null
+++ b/poppler/poppler-mac-fake.patch.1
@@ -0,0 +1,13 @@
+diff -ur poppler.org/poppler/GlobalParams.cc poppler/poppler/GlobalParams.cc
+--- poppler.org/poppler/GlobalParams.cc2013-07-09 06:24:38.0
-0500
poppler/poppler/GlobalParams.cc2013-07-09 06:25:18.0 -0500
+@@ -1327,7 +1327,7 @@
+ return path;
+ }
+
+-#elif WITH_FONTCONFIGURATION_WIN32
++#elif WITH_FONTCONFIGURATION_WIN32 defined(_WIN32)
+ #include GlobalParamsWin.cc
+
+ GooString *GlobalParams::findBase14FontFile(GooString *base14Name, GfxFont
*font) {
+
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index 9161f1c..6589f78 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Executable_Executable,xpdfimport))
$(eval $(call gb_Executable_use_externals,xpdfimport,\
boost_headers \
poppler \
-$(if $(filter-out WNT,$(OS)),fontconfig) \
+$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
zlib \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'poppler' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sfx2/source slideshow/source svx/source wizards/com
sfx2/source/sidebar/Theme.cxx| 14 +-
slideshow/source/engine/slideshowimpl.cxx| 12
svx/source/sidebar/text/TextPropertyPanel.hrc|2 +-
wizards/com/sun/star/wizards/common/NumberFormatter.java |3 ++-
4 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit f6159d52f0423808eaddc9b5f3906cfc3e6baa0b
Author: Andre Fischer a...@apache.org
Date: Tue Jul 9 09:45:08 2013 +
122707: Show a frame around toolbars in sidebar panels.
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index cce2663..f9d5132 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -424,28 +424,32 @@ void Theme::UpdateTheme (void)
*/
// Gradient style
+Color aGradientStop2 (aBaseBackgroundColor);
+aGradientStop2.IncreaseLuminance(17);
+Color aToolBoxBorderColor (aBaseBackgroundColor);
+aToolBoxBorderColor.DecreaseLuminance(12);
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBackground],
Any(Tools::VclToAwtGradient(Gradient(
GRADIENT_LINEAR,
-Color(0xf2f2f2),
-Color(0xfefefe)
+aBaseBackgroundColor.GetRGBColor(),
+aGradientStop2.GetRGBColor()
;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
-: Any(util::Color(sal_uInt32(0xf2f2f2;
+: Any(util::Color(aToolBoxBorderColor.GetRGBColor(;
setPropertyValue(
maPropertyIdToNameMap[Rect_ToolBoxPadding],
Any(awt::Rectangle(2,2,2,2)));
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc
b/svx/source/sidebar/text/TextPropertyPanel.hrc
index e07f6dd..49834ad 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -45,7 +45,7 @@
#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
#define X1 SECTIONPAGE_MARGIN_HORIZONTAL + 1 +
TOOLBOX_ITEM_WIDTH * 2 + 4
#define X2 (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
-#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 2)
+#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 3)
#define FIRST_LINE_YSECTIONPAGE_MARGIN_VERTICAL_TOP
#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL + 1
commit 58eca806173ea9ede4efda89a96996d147227473
Author: Armin Le Grand a...@apache.org
Date: Tue Jul 9 09:29:13 2013 +
i118671 take emergency exit when local slideshow is disposed from executing
macros
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index 5876b6b..e3c317c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2051,6 +2051,18 @@ sal_Bool SlideShowImpl::update( double nNextTimeout )
// process queues
maEventQueue.process();
+
+// #118671# the call above may execute a macro bound to an object.
In
+// that case this macro may have destroyed this local sliseshow so
that it
+// is disposed (see bugdoc at task). In that case, detect this and
exit
+// gently from this slideshow. Do not forget to disable the scoped
+// call to mpPresTimer, this will be deleted if we are disposed.
+if (isDisposed())
+{
+scopeGuard.dismiss();
+return false;
+}
+
maActivitiesQueue.process();
// commit frame to screen
commit 4ddd844cc1f7d8c76f48bd5c434eeda7d5fe1704
Author: Herbert Dürr h...@apache.org
Date: Tue Jul 9 08:48:59 2013 +
#i122603# fix database wizard's use of the Numberformatter
Patch by: Tsutomu Uchino hanya.r...@gmail.com
Review by: Herbert Durr h...@apache.org
When the setNumberFormat method is called from
DBColumn::initializeNumberFormat
method the number formatter is the document's one and the passed arguments
[Libreoffice-commits] core.git: sc/inc
sc/inc/mtvelements.hxx | 18
sc/inc/nameuno.hxx | 52 -
sc/inc/notesuno.hxx| 12 +--
sc/inc/rangeutl.hxx| 20 +-
sc/inc/refdata.hxx | 29 ++-
5 files changed, 66 insertions(+), 65 deletions(-)
New commits:
commit f77c986fb36a9b57465c93e6c9693ed973008985
Author: Nourah.AlShoeibi nourah.alshoe...@gmail.com
Date: Mon Jul 8 13:34:25 2013 +0300
Modifying comments to meet Doxygen standards
Change-Id: I9c498c8c2147a19c5f97e48bc8a0e149e6858e23
Reviewed-on: https://gerrit.libreoffice.org/4769
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index ad65418..443eb6a 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -44,7 +44,7 @@ struct CellTextAttr
CellTextAttr(sal_uInt16 nTextWidth, sal_uInt8 nScriptType);
};
-// Custom element type IDs for multi_type_vector.
+/// Custom element type IDs for multi_type_vector.
const mdds::mtv::element_t element_type_broadcaster =
mdds::mtv::element_type_user_start;
const mdds::mtv::element_t element_type_celltextattr =
mdds::mtv::element_type_user_start + 1;
@@ -53,11 +53,11 @@ const mdds::mtv::element_t element_type_string =
mdds::mtv::element_type_user_st
const mdds::mtv::element_t element_type_edittext =
mdds::mtv::element_type_user_start + 3;
const mdds::mtv::element_t element_type_formula =
mdds::mtv::element_type_user_start + 4;
-// Mapped standard element types (for convenience).
+/// Mapped standard element types (for convenience).
const mdds::mtv::element_t element_type_numeric =
mdds::mtv::element_type_numeric;
const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
-// Custom element blocks.
+/// Custom element blocks.
typedef mdds::mtv::noncopyable_managed_element_blockelement_type_broadcaster,
SvtBroadcaster broadcaster_block;
typedef mdds::mtv::default_element_blockelement_type_celltextattr,
CellTextAttr celltextattr_block;
@@ -65,15 +65,15 @@ typedef
mdds::mtv::default_element_blockelement_type_string, rtl::OUString str
typedef mdds::mtv::noncopyable_managed_element_blockelement_type_edittext,
EditTextObject edittext_block;
typedef mdds::mtv::noncopyable_managed_element_blockelement_type_formula,
ScFormulaCell formula_block;
-// Mapped standard element blocks (for convenience).
+/// Mapped standard element blocks (for convenience).
typedef mdds::mtv::numeric_element_block numeric_block;
-// This needs to be in the same namespace as CellTextAttr.
+/// This needs to be in the same namespace as CellTextAttr.
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr,
CellTextAttr(), celltextattr_block)
}
-// These need to be in global namespace just like their respective types are.
+/// These need to be in global namespace just like their respective types are.
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(SvtBroadcaster,
sc::element_type_broadcaster, NULL, sc::broadcaster_block)
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScFormulaCell, sc::element_type_formula,
NULL, sc::formula_block)
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(EditTextObject,
sc::element_type_edittext, NULL, sc::edittext_block)
@@ -86,15 +86,15 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString,
sc::element_type_string, OUString(),
namespace sc {
-// Broadcaster storage container
+/// Broadcaster storage container
typedef mdds::mtv::custom_block_func1sc::broadcaster_block BCBlkFunc;
typedef mdds::multi_type_vectorBCBlkFunc BroadcasterStoreType;
-// Cell text attribute container.
+/// Cell text attribute container.
typedef mdds::mtv::custom_block_func1sc::celltextattr_block CTAttrFunc;
typedef mdds::multi_type_vectorCTAttrFunc CellTextAttrStoreType;
-// Cell container
+/// Cell container
typedef mdds::mtv::custom_block_func3sc::string_block, sc::edittext_block,
sc::formula_block CellFunc;
typedef mdds::multi_type_vectorCellFunc CellStoreType;
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 0536271..7a5c619 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -79,7 +79,7 @@ public:
virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint
);
-// XNamedRange
+/// XNamedRange
virtual OUString SAL_CALL getContent()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setContent( const OUString aContent )
throw(::com::sun::star::uno::RuntimeException);
@@ -91,23 +91,23 @@ public:
virtual sal_Int32 SAL_CALL getType()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setType( sal_Int32 nType )
throw(::com::sun::star::uno::RuntimeException);
-// XFormulaTokens
+/// XFormulaTokens
virtual
[Libreoffice-commits] core.git: sc/Library_scqahelper.mk
sc/Library_scqahelper.mk |1 + 1 file changed, 1 insertion(+) New commits: commit e8eda4e656d16b6de2d2ec33a297012a1c224f38 Author: Jan Holesovsky ke...@suse.cz Date: Tue Jul 9 14:23:27 2013 +0200 Blind attempt to fix Windows tinderboxes. Change-Id: I5b25f1405201024dea94d790566bf1ce349f6593 diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk index 94ba7c6..97958f6 100644 --- a/sc/Library_scqahelper.mk +++ b/sc/Library_scqahelper.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\ utl \ sc \ ucbhelper \ + unotest \ $(gb_UWINAPI) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Depends on||66703 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Depends on|66703 | -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #46 from Lionel Elie Mamane lio...@mamane.lu --- bug 66703: previously in mab4.2, reproduced on 4.1.0.2 (rc2). -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Noel Power nopo...@novell.com changed: What|Removed |Added Depends on||66718 --- Comment #47 from Noel Power nopo...@novell.com --- bug 66718 - Clipboard API has lost functionality seems this affects some extensions so moving to MAB -- 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
solaris brands processors in configure
Hi, I just noticed Solaris can't check how many processors to use during configure, the case switch just resolves to * doing /proc/cupinfo, not working on Solaris. This may be the Solaris switch: psrinfo -v | grep on-line | wc -l Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 942501b6e49c6c9e19556d9ec132a458e5fef6c3
Author: Noel Power noel.po...@suse.com
Date: Tue Jul 9 13:58:19 2013 +0100
fix for fdo#66718, access correct clipboard
Changes to use SystemClipboard::createUnix break some subtle behaviour
( or is it even misbehaviour ) that users of the service
com.sun.star.datatransfer.clipboard.SystemClipboard depend on.
When creating the SystemClipboard the arguments passed to
X11SalInstance::CreateClipboard(...) are used to access cached
instances. Previously the window clipboard was created with 'no'
params and then initialised ( via XInitialisation ) later
This ensured users creating the css.datatransfer.clipboard.SystemClipboard
with no paramaters immediately get that same clipboard. Note: creating
the SystemClipboard with no param seesm a sensible thing from an scripters
point of view as the params that would be required to match the correct
Clipboard seem rather difficult to access in an uno only world
Change-Id: Ib71d6744086d354025de4db62039b9a98f230eca
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9ad12cf..42e7af0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8481,11 +8481,19 @@ uno::Reference XClipboard Window::GetClipboard()
try
{
uno::Reference XComponentContext xContext(
comphelper::getProcessComponentContext() );
-ReferenceXSystemClipboard xSystemClipboard;
+ReferenceXSystemClipboard xSystemClipboard =
SystemClipboard::createDefault(xContext);
#if defined(UNX) !defined(MACOSX) // unix clipboard needs to be
initialized
-xSystemClipboard = SystemClipboard::createUnix( xContext,
Application::GetDisplayConnection(), CLIPBOARD, vcl::createBmpConverter() );
-#else
-xSystemClipboard = SystemClipboard::createDefault(xContext);
+uno::Reference XInitialization xInit = uno::Reference
XInitialization ( xSystemClipboard, UNO_QUERY );
+
+if( xInit.is() )
+{
+Sequence Any aArgumentList( 3 );
+aArgumentList[ 0 ] = makeAny(
Application::GetDisplayConnection() );
+aArgumentList[ 1 ] = makeAny( OUString(CLIPBOARD) );
+aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
+
+xInit-initialize( aArgumentList );
+}
#endif
mpWindowImpl-mpFrameData-mxClipboard.set( xSystemClipboard,
UNO_QUERY );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddd9d8f5f853c88d7753fda890de5b3f52589f4d
Author: David Tardon dtar...@redhat.com
Date: Tue Jul 9 10:40:21 2013 +0200
fdo#66582 avoid crash because of missing model
The SdrObject is still under construction at this point, so it does not
make sense to broadcast changes, because there are not any listeners
anyway.
Change-Id: Ib05e30843b4b0e125d5cae18a481e16fb7e21ba1
(cherry picked from commit 6e2815a0ffdb5811f220978734354b1033801927)
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4781
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index d6b20c7..278664c 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -150,7 +150,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference
report::XReportCompon
{
sal_Bool bOpaque = sal_False;
_xComponent-getPropertyValue(PROPERTY_OPAQUE) = bOpaque;
-pNewObj-SetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
+pNewObj-NbcSetLayer(bOpaque ? RPT_LAYER_FRONT :
RPT_LAYER_BACK);
}
catch(const uno::Exception)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field.cxx | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit c7e7160fa7d2afe6db1c11e200949d83f7187c36
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 14:45:47 2013 +0100
Calc optimal size of *dropdown* metricboxes similar to normal dropdowns
Change-Id: I6f79594cb01d9577c66ec5897459c37513cd35f3
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bf81a41..2a4a30a 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1005,7 +1005,16 @@ NumericBox::NumericBox( Window* pParent, const ResId
rResId ) :
Size NumericBox::CalcMinimumSize() const
{
-return calcMinimumSize(*this, *this);
+Size aRet(calcMinimumSize(*this, *this));
+
+if (IsDropDownBox())
+{
+Size aComboSugg(ComboBox::CalcMinimumSize());
+aRet.Width() = std::max(aRet.Width(), aComboSugg.Width());
+aRet.Height() = std::max(aRet.Height(), aComboSugg.Height());
+}
+
+return aRet;
}
// ---
@@ -1948,7 +1957,16 @@ MetricBox::MetricBox( Window* pParent, const ResId
rResId ) :
Size MetricBox::CalcMinimumSize() const
{
-return calcMinimumSize(*this, *this);
+Size aRet(calcMinimumSize(*this, *this));
+
+if (IsDropDownBox())
+{
+Size aComboSugg(ComboBox::CalcMinimumSize());
+aRet.Width() = std::max(aRet.Width(), aComboSugg.Width());
+aRet.Height() = std::max(aRet.Height(), aComboSugg.Height());
+}
+
+return aRet;
}
// ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/dd844cc1f7d8c76f48bd5c434eeda7d5fe1704
4d/dd844cc1f7d8c76f48bd5c434eeda7d5fe1704 |1 + 1 file changed, 1 insertion(+) New commits: commit 0ddbf12a9fb17ee73864134de45cc7da070b7b5e Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 14:48:11 2013 +0100 Notes added by 'git notes add' diff --git a/4d/dd844cc1f7d8c76f48bd5c434eeda7d5fe1704 b/4d/dd844cc1f7d8c76f48bd5c434eeda7d5fe1704 new file mode 100644 index 000..9186d2b --- /dev/null +++ b/4d/dd844cc1f7d8c76f48bd5c434eeda7d5fe1704 @@ -0,0 +1 @@ +prefer: b86f2147e496e3b7ca5a085b302f6144f338aa82 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - 4 commits - boost/boost_1_44_0-gcc4.8.patch sc/inc sc/source
boost/boost_1_44_0-gcc4.8.patch | 209
sc/inc/dbdata.hxx |1
sc/source/core/tool/dbdata.cxx |5
sc/source/filter/oox/stylesbuffer.cxx | 32 +++-
sc/source/filter/oox/tablebuffer.cxx| 10 +
sc/source/filter/oox/workbookhelper.cxx |6
6 files changed, 245 insertions(+), 18 deletions(-)
New commits:
commit 95fb57ec625a186a3b21c95f0eed63528e098b15
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 9 15:43:48 2013 +0200
not every db range contains db formattings
Change-Id: I13a54110bfa625d6495bcef36e93aa76d11fb99c
diff --git a/sc/source/filter/oox/tablebuffer.cxx
b/sc/source/filter/oox/tablebuffer.cxx
index 0fa9e03..b2c437e 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -110,9 +110,15 @@ void Table::finalizeImport()
maAutoFilters.finalizeImport( xDatabaseRange );
//Setting the ScDBDataFormatting (Table style) attribute.
-ScDBDataFormatting aTableFormatting = getStyles().getTableStyle(
maModel.maTableStyleName )-getTableFormatting(); //May fail in cases of
malformed corrupt table/table#.xml where the maTableStyleName is messed up
+TableStyleRef pTableStyle = getStyles().getTableStyle(
maModel.maTableStyleName );
+if(!pTableStyle)
+{
+SAL_WARN(sc, did not find Table style for:
maModel.maTableStyleName);
+return;
+}
+
+ScDBDataFormatting aTableFormatting =
pTableStyle-getTableFormatting();
-//can mess up if aTableFormatting is nothing. Need to handle that
aTableFormatting.SetBandedRows( maModel.mbShowRowStripes );
aTableFormatting.SetBandedColumns( maModel.mbShowColumnStripes );
addDatabaseFormatting( maDBRangeName, aTableFormatting );
commit 41b3dd9ba318f80c5cf6c345f49e376ad3a8c0d3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Jul 8 21:59:27 2013 +0200
use a functor and standard algorithms
Change-Id: I0cb7b603b4495d78e217153fb0339a5ba2b71157
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 502ceb7..b2870e7 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -77,6 +77,8 @@
#include globstr.hrc
#include xlconst.hxx
+#include algorithm
+
using ::com::sun::star::table::BorderLine2;
namespace oox {
namespace xls {
@@ -3454,19 +3456,35 @@ void StylesBuffer::writeStyleXfToPropertySet(
PropertySet rPropSet, sal_Int32 n
pXf-writeToPropertySet( rPropSet );
}
-TableStyleRef StylesBuffer::getTableStyle( OUString rTableStyleName )
+namespace {
+
+struct FindTableStyleByName
{
-for( ::std::vector TableStyleRef ::iterator i = maTableStyles.begin(); i
maTableStyles.end(); ++i)
+FindTableStyleByName( const OUString rName ):
+mrName(rName) {}
+
+bool operator()(const TableStyleRef pStyle)
{
-if( ((*i)-getTableStyleName() ).equals(rTableStyleName) )
-{
-return(*i);
-}
+return mrName == pStyle-getTableStyleName();
}
+
+private:
+const OUString mrName;
+};
+
+}
+
+TableStyleRef StylesBuffer::getTableStyle( OUString rTableStyleName )
+{
+std::vector TableStyleRef ::const_iterator itr = std::find_if(
+maTableStyles.begin(), maTableStyles.end(),
FindTableStyleByName(rTableStyleName));
+
+if(itr != maTableStyles.end())
+return *itr;
+
return 0;
}
-//
} // namespace xls
} // namespace oox
commit 8e1de4067e69d67713094dcc80343c8559c1184b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Jul 8 21:45:05 2013 +0200
we don't need this function
actually the code was a bit wrong and was internally using the upper
case search without converting the name to uppercase
Change-Id: I3d7252cfc5022458be860613881bbeb9771a16cb
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 4c410bb..a16e11f 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -237,7 +237,6 @@ public:
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
-ScDBData* GetDBByName( const OUString rName );
voidDeleteOnTab( SCTAB nTab );
voidUpdateReference(UpdateRefMode eUpdateRefMode,
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 0190237..33aece7 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -923,11 +923,6 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL
nCol1, SCROW nRow1, SCCO
return NULL;
}
-ScDBData* ScDBCollection::GetDBByName( const OUString rName
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/slideshowimpl.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit cc7a301dad831f8113cc3d737e2f4d23061a65ac
Author: Armin Le Grand a...@apache.org
Date: Tue Jul 9 09:29:13 2013 +
Resolves: #i118671# take emergency exit when local slideshow...
is disposed from executing macros
(cherry picked from commit 58eca806173ea9ede4efda89a96996d147227473)
Change-Id: Ifd07faa0a4bb051dea7b57b775eaf8818a7ce6d3
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index a37cdbc..f9e8ed8 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2010,6 +2010,18 @@ sal_Bool SlideShowImpl::update( double nNextTimeout )
// process queues
maEventQueue.process();
+
+// #i118671# the call above may execute a macro bound to an
object. In
+// that case this macro may have destroyed this local sliseshow so
that it
+// is disposed (see bugdoc at task). In that case, detect this and
exit
+// gently from this slideshow. Do not forget to disable the scoped
+// call to mpPresTimer, this will be deleted if we are disposed.
+if (isDisposed())
+{
+scopeGuard.dismiss();
+return false;
+}
+
maActivitiesQueue.process();
// commit frame to screen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/eca806173ea9ede4efda89a96996d147227473
58/eca806173ea9ede4efda89a96996d147227473 |1 + 1 file changed, 1 insertion(+) New commits: commit 538a9fb61a99df65d4afff336008f9f57efadefd Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 14:51:25 2013 +0100 Notes added by 'git notes add' diff --git a/58/eca806173ea9ede4efda89a96996d147227473 b/58/eca806173ea9ede4efda89a96996d147227473 new file mode 100644 index 000..e4c4a1c --- /dev/null +++ b/58/eca806173ea9ede4efda89a96996d147227473 @@ -0,0 +1 @@ +merged as: cc7a301dad831f8113cc3d737e2f4d23061a65ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f6/159d52f0423808eaddc9b5f3906cfc3e6baa0b
f6/159d52f0423808eaddc9b5f3906cfc3e6baa0b |1 + 1 file changed, 1 insertion(+) New commits: commit 86baca755641f2071772164a82e98a1db5ead3f5 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 14:55:50 2013 +0100 Notes added by 'git notes add' diff --git a/f6/159d52f0423808eaddc9b5f3906cfc3e6baa0b b/f6/159d52f0423808eaddc9b5f3906cfc3e6baa0b new file mode 100644 index 000..1bc684b --- /dev/null +++ b/f6/159d52f0423808eaddc9b5f3906cfc3e6baa0b @@ -0,0 +1 @@ +merged as: f4c9a29d62a6572a0932d5c8e014b7c960131217 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/Theme.cxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit f4c9a29d62a6572a0932d5c8e014b7c960131217 Author: Andre Fischer a...@apache.org Date: Tue Jul 9 09:45:08 2013 + Resolves: #122707# Show a frame around toolbars in sidebar panels. (cherry picked from commit f6159d52f0423808eaddc9b5f3906cfc3e6baa0b) Conflicts: sfx2/source/sidebar/Theme.cxx svx/source/sidebar/text/TextPropertyPanel.hrc Change-Id: I0163d3766923a5a333214f09db4837435590d753 diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 5bad8dc..abc4315 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -399,28 +399,32 @@ void Theme::UpdateTheme (void) */ // Gradient style +Color aGradientStop2 (aBaseBackgroundColor); +aGradientStop2.IncreaseLuminance(17); +Color aToolBoxBorderColor (aBaseBackgroundColor); +aToolBoxBorderColor.DecreaseLuminance(12); setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBackground], Any(Tools::VclToAwtGradient(Gradient( GradientStyle_LINEAR, -Color(0xf2f2f2), -Color(0xfefefe) +aBaseBackgroundColor.GetRGBColor(), +aGradientStop2.GetRGBColor() ; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight], mbIsHighContrastMode ? Any(util::Color(sal_uInt32(0x00ff00))) -: Any(util::Color(sal_uInt32(0xf2f2f2; +: Any(util::Color(aToolBoxBorderColor.GetRGBColor(; setPropertyValue( maPropertyIdToNameMap[Rect_ToolBoxPadding], Any(awt::Rectangle(2,2,2,2))); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/ure.scp |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit e83ce4d1495db41cb68142da771c10e61cda0fd9 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jul 9 15:39:56 2013 +0200 fdo#66703: Missing libjava_uno.jnilib symlink Regression introduced with c9c963d3e6991d0dd73a95fc9734e38683d5be9c autoinstall ure private libraries. Change-Id: I8ea597e8d5108e925e982d7b37fa9e1d3af8d1aa diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index b160218..417b376 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -248,11 +248,12 @@ End #endif #if defined SOLAR_JAVA defined MACOSX -Shortcut gid_Shortcut_Dl_JavaUno -FileID = gid_File_Dl_JavaUno; +Unixlink gid_Unixlink_Dl_JavaUno +BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = libjava_uno.jnilib; -Styles = (RELATIVE); +Target = libjava_uno.dylib; +Styles = (); End #endif @@ -655,6 +656,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Misc_ServicesRdb, gid_File_Misc_JavavendorsXml); Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs, + gid_Unixlink_Dl_JavaUno, gid_Unixlink_File_Dl_Sal, gid_Unixlink_File_Dl_Salhelper, gid_Unixlink_File_Dl_Cppu, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_scqahelper.mk
sc/Library_scqahelper.mk |4 1 file changed, 4 insertions(+) New commits: commit 36e0cd5d0bbba02b6a2348d4b76dd2ee784e0029 Author: Jan Holesovsky ke...@suse.cz Date: Tue Jul 9 15:59:24 2013 +0200 Additional blind fix to get the Windows visibility right. Change-Id: Ia1d3bc04443b30e87e320aa311d3417285ea80c3 diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk index 97958f6..d2370b0 100644 --- a/sc/Library_scqahelper.mk +++ b/sc/Library_scqahelper.mk @@ -23,6 +23,10 @@ $(eval $(call gb_Library_use_externals,scqahelper, \ cppunit \ )) +$(eval $(call gb_Library_add_defs,scqahelper,\ + -DSC_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_use_sdk_api,scqahelper)) $(eval $(call gb_Library_use_libraries,scqahelper,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_filters_test.mk sw/qa
sw/CppunitTest_sw_filters_test.mk |1 sw/qa/core/data/html/pass/fdo65932.html | 45 sw/qa/core/filters-test.cxx |4 ++ 3 files changed, 50 insertions(+) New commits: commit 311a80e05c9f712f49e4f3a989abef4dabd5fdbc Author: Miklos Vajna vmik...@suse.cz Date: Tue Jul 9 15:53:39 2013 +0200 fdo#65932 testcase Change-Id: I7105b85f063be801caa3cd397fcdfa24e74caa28 diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index df13402..7eea51e 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -62,6 +62,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ + linguistic/source/lng \ oox/util/oox \ package/source/xstor/xstor \ package/util/package2 \ diff --git a/sw/qa/core/data/html/pass/fdo65932.html b/sw/qa/core/data/html/pass/fdo65932.html new file mode 100644 index 000..d17936d --- /dev/null +++ b/sw/qa/core/data/html/pass/fdo65932.html @@ -0,0 +1,45 @@ +html lang=en xmlns=http://www.w3.org/1999/xhtml; + body class=en file-preview-body shmodel-body deferred-resources pdf-preview-pdf-embedded +div id=outer-frame + div id=page-content +div class=nav-header + + + div class=buttons +a id=create-an-account-button href=/register?signup_tag=shmodel target=_blank class=freshbutton-lightblueSign up for Dropbox/a + /div +/div +div style=display: none; id=c2d-modal + div id=create-account-content +div + form novalidate=novalidate id=c2d-register-form method=post +input type=hidden name=signup_tag value=copy_to_dropbox / +input type=hidden name=dl_redir value=1 / + /form +/div + /div + div style=display:none; id=login-account-content +div style=display: none; id=c2d-twofactor-login + form novalidate=novalidate id=c2d-twofactor-login-form method=post +div id=c2d-twofactor-error class=error-message/div +div class=sick-input + label for=email6-digit code/label + input autocomplete=off type=text id=c2d-twofactor-code name=twofactor_code tabindex=13 / +/div +input name=twofactor_login_submit value=Submit code class=freshbutton-blue type=submit id=twofactor_login_submit tabindex=15 / +p class=resend-code + a id=c2d-resend-linkDidn't receive one?/a +/p + /form +/div + /div +/div + noscript +p class=centerThe Dropbox website requires JavaScript./p + /noscript +/div +div style=position: absolute; top: 0; left: 0; font-family: Courier id=ieconsole/div +div style=position:absolute; top:-1px;width:0px; height:0px; left: 0; id=FB_HiddenContainer/div +div style=display:none; id=notice-container class=clearfix/div + /body +/html diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index e5ba36b..14678a4 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -117,6 +117,10 @@ void SwFiltersTest::testCVEs() getURLFromSrc(/sw/qa/core/data/rtf/), OUString(), SFX_FILTER_STARONEFILTER); + +testDir(OUString(HTML), +getURLFromSrc(/sw/qa/core/data/html/), +OUString(sHTML)); } void SwFiltersTest::setUp() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source
scp2/source/ooo/ure.scp |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit b08fbd0fddcfca82153af9d29dc145f4396f9a45 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jul 9 15:39:56 2013 +0200 fdo#66703: Missing libjava_uno.jnilib symlink Regression introduced with c9c963d3e6991d0dd73a95fc9734e38683d5be9c autoinstall ure private libraries. Change-Id: I8ea597e8d5108e925e982d7b37fa9e1d3af8d1aa (cherry picked from commit e83ce4d1495db41cb68142da771c10e61cda0fd9) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index d127ab6..6c775b9 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -294,11 +294,12 @@ End #endif #if defined SOLAR_JAVA defined MACOSX -Shortcut gid_Shortcut_Dl_JavaUno -FileID = gid_File_Dl_JavaUno; +Unixlink gid_Unixlink_Dl_JavaUno +BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = libjava_uno.jnilib; -Styles = (RELATIVE); +Target = libjava_uno.dylib; +Styles = (); End #endif @@ -706,6 +707,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Misc_ServicesRdb, gid_File_Misc_JavavendorsXml); Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs, + gid_Unixlink_Dl_JavaUno, gid_Unixlink_File_Dl_Sal, gid_Unixlink_File_Dl_Salhelper, gid_Unixlink_File_Dl_Cppu, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/paragrph.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 3d7ff1e907713d8ed53a1e193641a2f16de3c38b Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 1 18:22:03 2013 +0200 reset min/max values in paragraph dialog before setting the actual value SvxRelativeField sets max to (twips?), but a call to SetFieldUnit() converts that to 0.18cm, and that would limit the actual value set. Change-Id: Ia36e9f840dc0c5bce9c599010d78eac0321c18b3 diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a0844d4..f9ab85f 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -446,6 +446,8 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet ) SetFieldUnit( *m_pLineDistAtMetricBox, eFUnit ); } +ELRLoseFocusHdl( NULL ); // reset min/max values + sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxItemState eItemState = rSet.GetItemState( _nWhich ); @@ -604,7 +606,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet ) } } -ELRLoseFocusHdl( NULL ); m_pAutoCB-SaveValue(); m_pContextualCB-SaveValue(); m_pLineDist-SaveValue(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/accessibility.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit c62c3fd05b4d7721d65c2d1bd371e2f5153ff5d2
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 9 15:06:20 2013 +0100
ditch last XubString in starmath
Change-Id: I5092bad1d56ecb302fff611546196a8ab439b52b
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index d5dc93e..6aa86f5 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1113,11 +1113,8 @@ sal_Bool SmTextForwarder::IsValid() const
OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem rField,
sal_Int32 nPara, sal_uInt16 nPos, Color* rpTxtColor, Color* rpFldColor )
{
-XubString aTxt;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
-if (pEditEngine)
-aTxt = pEditEngine-CalcFieldValue( rField, nPara, nPos, rpTxtColor,
rpFldColor );
-return aTxt;
+return pEditEngine ? pEditEngine-CalcFieldValue(rField, nPara, nPos,
rpTxtColor, rpFldColor) : OUString();
}
void SmTextForwarder::FieldClicked(const SvxFieldItem, sal_Int32, sal_uInt16)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66703, which changed state. Bug 66703 Summary: REPORTBUILDER - report design wizard does not start on click (missing libjava_uno.jnilib symlink) https://bugs.freedesktop.org/show_bug.cgi?id=66703 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
0 files changed New commits: commit ad11a121e322da1036e3dfa9c98d0e9d027c Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 15:26:23 2013 +0100 add fail and indeterminate dirs Change-Id: I12a1d09e474389f98eca24db57a944ad740cbf85 diff --git a/sw/qa/core/data/html/fail/.gitignore b/sw/qa/core/data/html/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/sw/qa/core/data/html/indeterminate/.gitignore b/sw/qa/core/data/html/indeterminate/.gitignore new file mode 100644 index 000..e69de29 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_filters_test.mk sw/qa
sw/CppunitTest_sw_filters_test.mk |1 + sw/qa/core/data/html/pass/CVE-2005-4720-1.html |2 ++ sw/qa/core/data/html/pass/EDB-14503-1.html |binary 3 files changed, 3 insertions(+) New commits: commit e35482d7f099ac313b0d77ca687daccd5fced18d Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 15:41:03 2013 +0100 add some nasty html testcases Change-Id: Icc3f40475415433955a3735b7a8228a9fcc1a7a0 diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 7eea51e..b47f4af 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -57,6 +57,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ +embeddedobj/util/embobj \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ forms/util/frm \ diff --git a/sw/qa/core/data/html/pass/CVE-2005-4720-1.html b/sw/qa/core/data/html/pass/CVE-2005-4720-1.html new file mode 100644 index 000..4d2275d --- /dev/null +++ b/sw/qa/core/data/html/pass/CVE-2005-4720-1.html @@ -0,0 +1,2 @@ +u þo +=JÃ9ÕhVØý£*MxÓ \ No newline at end of file diff --git a/sw/qa/core/data/html/pass/EDB-14503-1.html b/sw/qa/core/data/html/pass/EDB-14503-1.html new file mode 100644 index 000..e4de15a Binary files /dev/null and b/sw/qa/core/data/html/pass/EDB-14503-1.html differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC]Use Widget Layout for the Start Center Weekly Update 03
Hi all! Since my last update I have: - Finally managed to convert the Start Center to use .ui, with help from Caolan (thanks again). There are still some details to be worked out though, like how the three smaller icons on the bottom should remain as a toolbar, or be just regular buttons. Comments in the code seem to indicate that they were put in a toolbar as workaround for rendering them correctly. Adding them as regular PushButtons seem the right way, since that's more unified. (https://gerrit.libreoffice.org/#/c/4502/) - Started looking at the problem of adding thumbnails for recent docs. I found thumbnail loading code that has been copied and pasted 2 times already, so instead of copying it for a 3rd time I refactored a bit. ( https://gerrit.libreoffice.org/#/c/4779/) This week I'm planning to start adding thumbnails for the recently used docs. All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: 2 commits - src/lib
src/lib/VSDContentCollector.cpp | 320 +++-
src/lib/VSDContentCollector.h |8 +
src/lib/libvisio_utils.cpp |2
3 files changed, 290 insertions(+), 40 deletions(-)
New commits:
commit 29d671d0cd7a1b777d9c5172c5794d59b8048402
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 9 17:15:18 2013 +0200
Handling in a special ways uniform NURBS of degree 2 and 3
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 4c53118..0217597 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -1311,45 +1311,230 @@ void
libvisio::VSDContentCollector::collectArcTo(unsigned /* id */, unsigned lev
}
}
-#define VSD_NUM_POLYLINES_PER_NURBS 200
-
-void libvisio::VSDContentCollector::collectNURBSTo(unsigned /* id */, unsigned
level, double x2, double y2, unsigned char xType, unsigned char yType, unsigned
degree, std::vectorstd::pairdouble, double controlPoints,
std::vectordouble knotVector, std::vectordouble weights)
+void libvisio::VSDContentCollector::_generateCubicBeziersFromNURBS(const
std::vectorstd::pairdouble, double controlPoints,
+const std::vectordouble knotVector)
{
- _handleLevelChange(level);
-
- if (knotVector.empty() || controlPoints.empty() || weights.empty())
-// Here, maybe we should just draw line to (x2,y2)
+ if (controlPoints.empty() || knotVector.empty())
return;
- // Fill in end knots
- while (knotVector.size() (controlPoints.size() + degree + 2))
- {
-double tmpBack = knotVector.back();
-knotVector.push_back(tmpBack);
+ WPXPropertyList node;
+
+ node.insert(libwpg:path-action, M);
+ double x = controlPoints[0].first;
+ double y = controlPoints[0].second;
+ transformPoint(x,y);
+ node.insert(svg:x, m_scale*x);
+ node.insert(svg:y, m_scale*y);
+ if (!m_noFill !m_noShow)
+m_currentFillGeometry.push_back(node);
+ if (!m_noLine !m_noShow)
+m_currentLineGeometry.push_back(node);
+
+ /* Decomposition of a spline of 3rd degree into Bezier segments
+ * adapted from the algorithm DecomposeCurve (Les Piegl, Wayne Tiller:
+ * The NURBS Book, 2nd Edition, 1997
+ */
+
+ unsigned m = controlPoints.size() + 4;
+ unsigned a = 3;
+ unsigned b = 4;
+ std::vector std::pairdouble, double Qw(4), NextQw(4);
+ unsigned i = 0;
+ for (; i = 3; i++)
+Qw[i] = controlPoints[i];
+ while (b m)
+ {
+i = b;
+while (b m knotVector[b+1] == knotVector[b])
+ b++;
+unsigned mult = b - i + 1;
+if (mult 3)
+{
+ double numer = (double)(knotVector[b] - knotVector[a]);
+ unsigned j = 3;
+ std::mapunsigned, double alphas;
+ for (; j mult; j--)
+alphas[j-mult-1] = numer/double(knotVector[a+j]-knotVector[a]);
+ unsigned r = 3 - mult;
+ for (j=1; j=r; j++)
+ {
+unsigned save = r - j;
+unsigned s = mult+j;
+for (unsigned k = 3; k=s; k--)
+{
+ double alpha = alphas[k-s];
+ Qw[k].first = alpha*Qw[k].first + (1.0-alpha)*Qw[k-1].first;
+ Qw[k].second = alpha*Qw[k].second + (1.0-alpha)*Qw[k-1].second;
+}
+if (b m)
+{
+ NextQw[save].first = Qw[3].first;
+ NextQw[save].second = Qw[3].second;
+}
+ }
+}
+// Pass the segment to the path
+
+node.clear();
+node.insert(libwpg:path-action, C);
+x = Qw[1].first;
+y = Qw[1].second;
+transformPoint(x, y);
+node.insert(svg:x1, m_scale*x);
+node.insert(svg:y1, m_scale*y);
+x = Qw[2].first;
+y = Qw[2].second;
+transformPoint(x, y);
+node.insert(svg:x2, m_scale*x);
+node.insert(svg:y2, m_scale*y);
+x = Qw[3].first;
+y = Qw[3].second;
+transformPoint(x, y);
+node.insert(svg:x, m_scale*x);
+node.insert(svg:y, m_scale*y);
+
+if (!m_noFill !m_noShow)
+ m_currentFillGeometry.push_back(node);
+if (!m_noLine !m_noShow)
+ m_currentLineGeometry.push_back(node);
+
+std::swap(Qw, NextQw);
+
+if (b m)
+{
+ for (i=3-mult; i = 3; i++)
+ {
+Qw[i].first = controlPoints[b-3+i].first;
+Qw[i].second = controlPoints[b-3+i].second;
+ }
+ a = b;
+ b++;
+}
}
+ m_originalX = controlPoints.back().first;
+ m_originalY = controlPoints.back().second;
+ m_x = controlPoints.back().first;
+ m_y = controlPoints.back().second;
+ transformPoint(m_x, m_y);
+}
- // Convert control points to static co-ordinates
- for (std::vectorstd::pairdouble, double ::iterator it =
controlPoints.begin();
- it != controlPoints.end(); ++it)
- {
-if (xType == 0) // Percentage
- (*it).first *= m_xform.width;
-if (yType == 0) // Percentage
- (*it).second *= m_xform.height;
+void libvisio::VSDContentCollector::_generateQuadraticBeziersFromNURBS(const
std::vectorstd::pairdouble, double controlPoints,
+const std::vectordouble knotVector)
+{
+ if (controlPoints.empty() ||
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/app/gtkdata.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 21a9089aa4324ccbdc9e9ee3669e5fb524efd03c
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Jul 5 14:17:46 2013 +0200
gtk/unx: remove successive calls to g_main_context_iteration
Replace the sequence:
non-blocking call to g_main_context_iteration
if no-event-recvd
blocking call to g_main_context_iteration
With this one:
blocking call to g_main_context_iteration until first evt reveived.
This allows more longer sleep period, when nothing is going on (verified
with strace).
Change-Id: I8f4ea911534c90aea091fd68e9f09db11591392f
Reviewed-on: https://gerrit.libreoffice.org/4777
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 6abb06b..5ff5a80 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -571,12 +571,10 @@ void GtkData::Yield( bool bWait, bool
bHandleAllCurrentEvents )
gboolean wasOneEvent = TRUE;
while( nMaxEvents-- wasOneEvent )
{
-wasOneEvent = g_main_context_iteration( NULL, FALSE );
+wasOneEvent = g_main_context_iteration( NULL, bWait
!bWasEvent );
if( wasOneEvent )
bWasEvent = true;
}
-if( bWait ! bWasEvent )
-bWasEvent = g_main_context_iteration( NULL, TRUE ) != 0;
}
else if( bWait )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/dtrans/X11_selection.cxx | 42 +--
vcl/unx/generic/dtrans/X11_selection.hxx |1
2 files changed, 36 insertions(+), 7 deletions(-)
New commits:
commit ec5a7256ca549d358b9c5380194ea2d1b991a73e
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Jul 5 14:44:38 2013 +0200
x11/unx: don't use a fixed 1sec timeout when polling X events
This commit replaces the 1 sec timeout by an infinite wait.
To properly handle application closing, a pipe is created and the
poll also waits for POLLIN event on it.
This allows to abort the infinite wait of poll by simply writing
a dummy byte to the pipe.
Change-Id: Ib340891f244a1b7bfb43b7c6ad866adfe260ec95
Reviewed-on: https://gerrit.libreoffice.org/4778
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index db613f3..871580f 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -453,6 +453,13 @@ void SelectionManager::initialize( const Sequence Any
arguments ) throw (::c
else
fprintf( stderr, SelectionManager::initialize: creation
of dispatch thread failed !\n );
#endif
+
+if (pipe(m_EndThreadPipe) != 0) {
+#if OSL_DEBUG_LEVEL 1
+fprintf(stderr, Failed to create endThreadPipe\n);
+#endif
+m_EndThreadPipe[0] = m_EndThreadPipe[1] = 0;
+}
}
}
}
@@ -3711,14 +3718,26 @@ void SelectionManager::dispatchEvent( int millisec )
osl::ResettableMutexGuard aGuard(m_aMutex);
if( !XPending( m_pDisplay ))
-{ // wait for any events if none are already queued
-pollfd aPollFD;
-aPollFD.fd = XConnectionNumber( m_pDisplay );
-aPollFD.events = POLLIN;
-aPollFD.revents = 0;
+{
+int nfds = 1;
+// wait for any events if none are already queued
+pollfd aPollFD[2];
+aPollFD[0].fd = XConnectionNumber( m_pDisplay );
+aPollFD[0].events = POLLIN;
+aPollFD[0].revents = 0;
+
+// on infinite timeout we need endthreadpipe monitoring too
+if (millisec 0)
+{
+aPollFD[1].fd = m_EndThreadPipe[0];
+aPollFD[1].events = POLLIN | POLLERR;
+aPollFD[1].revents = 0;
+nfds = 2;
+}
+
// release mutex for the time of waiting for possible data
aGuard.clear();
-if( poll( aPollFD, 1, millisec ) = 0 )
+if( poll( aPollFD, nfds, millisec ) = 0 )
return;
aGuard.reset();
}
@@ -3750,9 +3769,13 @@ void SelectionManager::run( void* pThis )
This-m_xDesktop.set( Desktop::create(xContext) );
This-m_xDesktop-addTerminateListener(This);
+// if end thread pipe properly initialized, allow infinite wait in poll
+// otherwise, fallback on 1 sec timeout
+const int timeout = (This-m_EndThreadPipe[0] != This-m_EndThreadPipe[1])
? -1 : 1000;
+
while( osl_scheduleThread(This-m_aThread) )
{
-This-dispatchEvent( 1000 );
+This-dispatchEvent( timeout );
timeval aNow;
gettimeofday( aNow, 0 );
@@ -3832,9 +3855,14 @@ void SelectionManager::shutdown() throw()
{
SolarMutexGuard guard2;
Application::Reschedule();
+// trigger poll()'s wait end by writing a dummy value
+int dummy=0;
+dummy = write(m_EndThreadPipe[1], dummy, 1);
}
osl_joinWithThread( m_aThread );
osl_destroyThread( m_aThread );
+close(m_EndThreadPipe[0]);
+close(m_EndThreadPipe[1]);
m_aThread = NULL;
aGuard.reset();
}
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx
b/vcl/unx/generic/dtrans/X11_selection.hxx
index f6982e7..84b6c0a 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -250,6 +250,7 @@ namespace x11 {
// internal data
Display*m_pDisplay;
oslThread m_aThread;
+int m_EndThreadPipe[2];
oslThread m_aDragExecuteThread;
::osl::Conditionm_aDragRunning;
XLIB_Window m_aWindow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/Library_scqahelper.mk sc/qa sc/source
sc/Library_scqahelper.mk|3 +++
sc/inc/formulacell.hxx |2 +-
sc/inc/global.hxx |1 +
sc/qa/unit/helper/csv_handler.hxx |2 --
sc/qa/unit/helper/qahelper.cxx |4 +++-
sc/qa/unit/helper/qahelper.hxx |7 ++-
sc/qa/unit/ucalc_sharedformula.cxx |2 ++
sc/source/core/data/formulacell.cxx |5 +
sc/source/core/data/global.cxx |5 +
9 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit dc2aa496c0252ef4a95289935eeac3340de1ca8b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 9 10:54:48 2013 -0400
Attempt to fix windows link error.
Change-Id: I27ef805c16dde46b9dff037356e8316e32c2d8c0
diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index d2370b0..c978c95 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -33,12 +33,15 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\
comphelper \
cppu \
cppuhelper \
+ for \
sal \
sfx \
sot \
svl \
svt \
+ test \
tl \
+ unotest \
utl \
sc \
ucbhelper \
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 07b726a..231789f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -272,7 +272,7 @@ public:
formula string because the formula is present as a token array, as it
is the case for binary Excel import.
*/
-voidSetResultDouble( double n ) { aResult.SetDouble( n); }
+void SetResultDouble( double n );
void SetResultToken( const formula::FormulaToken* pToken );
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dd60c4b..2b86a7c 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -576,6 +576,7 @@ public:
SC_DLLPUBLIC static sal_uLong GetStandardFormat( double,
SvNumberFormatter,
sal_uLong nFormat, short nType );
+SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
SC_DLLPUBLIC static double nScreenPPTX;
SC_DLLPUBLIC static double nScreenPPTY;
diff --git a/sc/qa/unit/helper/csv_handler.hxx
b/sc/qa/unit/helper/csv_handler.hxx
index 0f4b018..1223ef6 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -81,8 +81,6 @@ OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB
nTab, double aExpected,
}
-enum StringType { PureString, FormulaValue, StringValue };
-
class csv_handler
{
public:
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index d16d33d..5692b8d 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -7,7 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#undef SC_DLLIMPLEMENTATION
#include qahelper.hxx
+#include csv_handler.hxx
#if defined WNT
#define __ORCUS_STATIC_LIB
@@ -242,7 +244,7 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam*
aTestValues, unsigned in
SCTAB nTab = aTestValues[ index ].pData[ i ].nTab;
int nExpectedHeight = aTestValues[ index ].pData[ i
].nExpectedHeight;
if ( nExpectedHeight == -1 )
-nExpectedHeight = sc::TwipsToHMM( ScGlobal::nStdRowHeight );
+nExpectedHeight = sc::TwipsToHMM(
ScGlobal::GetStandardRowHeight() );
bool bCheckOpt = ( ( aTestValues[ index ].pData[ i ].nCheck
CHECK_OPTIMAL ) == CHECK_OPTIMAL );
for ( ; nRow = nEndRow; ++nRow )
{
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index efbd3b9..bec76e8 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -10,9 +10,12 @@
#ifndef SC_QA_HELPER_HXX
#define SC_QA_HELPER_HXX
+#define SC_DLLIMPLEMENTATION
+
#include scdllapi.h
#include debughelper.hxx
-#include csv_handler.hxx
+#include address.hxx
+#include docsh.hxx
#include test/bootstrapfixture.hxx
#include comphelper/documentconstants.hxx
@@ -44,6 +47,8 @@
#define LOTUS123 5
#define DIF 6
+enum StringType { PureString, FormulaValue, StringValue };
+
SC_DLLPUBLIC bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol );
#define CHECK_OPTIMAL 0x1
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index 3025b52..b6a52cd 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -9,6 +9,8 @@
#include ucalc.hxx
#include editutil.hxx
+#include formulacell.hxx
+#include cellvalue.hxx
void Test::testSharedFormulas()
{
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 288eaeb..0616acc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1593,6 +1593,11 @@ bool ScFormulaCell::IsDirtyOrInTableOpDirty() const
return bDirty || (bTableOpDirty
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66009, which changed state. Bug 66009 Summary: Crash, when inserting https URL https://bugs.freedesktop.org/show_bug.cgi?id=66009 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr4.cxx | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-)
New commits:
commit f3a0dd8fbc3ead1fe1ec1faec3377cedaacadd93
Author: Noel Power noel.po...@suse.com
Date: Tue Jul 9 16:42:01 2013 +0100
fix for fdo#51990 process external refs for macros
Change-Id: I4fe1d7240f277b532e11d2fbb5aa18f54f2c4695
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 926866d..62e28c3 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3209,6 +3209,22 @@ void ScInterpreter::ScMacro()
case svString:
pPar-PutString( GetString() );
break;
+case svExternalSingleRef:
+{
+ScExternalRefCache::TokenRef pToken;
+PopExternalSingleRef(pToken);
+if ( nGlobalError )
+{
+SetError( errIllegalArgument);
+bOk = false;
+}
+else
+{
+pPar-PutDouble( pToken-GetDouble() );
+bOk = true;
+}
+}
+break;
case svSingleRef:
{
ScAddress aAdr;
@@ -3269,11 +3285,16 @@ void ScInterpreter::ScMacro()
}
}
break;
+case svExternalDoubleRef:
case svMatrix:
{
-ScMatrixRef pMat = PopMatrix();
+ScMatrixRef pMat;
+if (nStackType == svMatrix)
+pMat = PopMatrix();
+else
+PopExternalDoubleRef(pMat);
SCSIZE nC, nR;
-if (pMat)
+if (pMat !nGlobalError)
{
pMat-GetDimensions(nC, nR);
SbxDimArrayRef refArray = new SbxDimArray;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/formulacell.hxx |2 +-
sc/qa/unit/subsequent_filters-test.cxx |1 +
sc/source/core/data/formulacell.cxx|5 +
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3a5cc4e322f1a1d5365a7455750b59e004c1b789
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 9 11:41:08 2013 -0400
More fix for link error on windows.
Change-Id: I4c419e87c3b3da1d28ff1e6aa2877c74cdbd1437
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 231789f..ae3db89 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -276,7 +276,7 @@ public:
void SetResultToken( const formula::FormulaToken* pToken );
-double GetResultDouble() const { return aResult.GetDouble(); }
+double GetResultDouble() const;
voidSetErrCode( sal_uInt16 n );
bool IsHyperLinkCell() const;
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 8d27a75..1a80e07 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -41,6 +41,7 @@
#include markdata.hxx
#include colorscale.hxx
#include olinetab.hxx
+#include patattr.hxx
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/drawing/XControlShape.hpp
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 0616acc..0fe2632 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1603,6 +1603,11 @@ void ScFormulaCell::SetResultToken( const
formula::FormulaToken* pToken )
aResult.SetToken(pToken);
}
+double ScFormulaCell::GetResultDouble() const
+{
+return aResult.GetDouble();
+}
+
void ScFormulaCell::SetResultMatrix( SCCOL nCols, SCROW nRows, const
ScConstMatrixRef pMat, formula::FormulaToken* pUL )
{
aResult.SetMatrix(nCols, nRows, pMat, pUL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e9/5f1d8134e25e272eb1dfc8ab9da48f88f53c4f
e9/5f1d8134e25e272eb1dfc8ab9da48f88f53c4f |1 + 1 file changed, 1 insertion(+) New commits: commit b02615f6b73928e69db1560fff66fa94aa235fe3 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 9 16:48:50 2013 +0100 Notes added by 'git notes add' diff --git a/e9/5f1d8134e25e272eb1dfc8ab9da48f88f53c4f b/e9/5f1d8134e25e272eb1dfc8ab9da48f88f53c4f new file mode 100644 index 000..f400f96 --- /dev/null +++ b/e9/5f1d8134e25e272eb1dfc8ab9da48f88f53c4f @@ -0,0 +1 @@ +reject: lets keep it, doesnt seem to hurt to do so ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sd/source sfx2/source
include/sfx2/thumbnailview.hxx |9
sd/source/ui/sidebar/MasterPageContainerProviders.cxx| 98
-
sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx | 98
-
sfx2/source/control/templateabstractview.cxx | 98
-
sfx2/source/control/thumbnailview.cxx| 103
++
5 files changed, 117 insertions(+), 289 deletions(-)
New commits:
commit 767af37a0e9f88737690bf3456df28315cc3f477
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Jul 9 02:51:16 2013 +0200
Remove duplicate code for reading thumbnails
Change-Id: I51de8d07a4dc51ba03d24a1a5805df051b6e09b4
Reviewed-on: https://gerrit.libreoffice.org/4779
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index dbbe57d..823e6ad 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -15,9 +15,16 @@
#include vector
#include boost/function.hpp
+#include comphelper/processfactory.hxx
+#include unotools/ucbstreamhelper.hxx
#include sfx2/thumbnailviewitem.hxx
#include vcl/ctrl.hxx
#include vcl/timer.hxx
+#include vcl/pngread.hxx
+
+#include com/sun/star/embed/ElementModes.hpp
+#include com/sun/star/embed/XStorage.hpp
+#include com/sun/star/embed/StorageFactory.hpp
class BitmapEx;
class MouseEvent;
@@ -242,6 +249,8 @@ public:
virtual bool renameItem(ThumbnailViewItem* pItem, OUString sNewTitle);
+static BitmapEx readThumbnail(const OUString msURL);
+
protected:
virtual void KeyInput( const KeyEvent rKEvt );
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index 448b8c8..8d52d1f 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -25,6 +25,7 @@
#include comphelper/processfactory.hxx
#include sfx2/app.hxx
#include sfx2/sfxsids.hrc
+#include sfx2/thumbnailview.hxx
#include unotools/ucbstreamhelper.hxx
#include vcl/image.hxx
#include vcl/pngread.hxx
@@ -107,102 +108,7 @@ Image TemplatePreviewProvider::operator() (
(void)pPage;
(void)rRenderer;
-// Load the thumbnail from a template document.
-uno::Referenceio::XInputStream xIStream;
-
-uno::Reference uno::XComponentContext
xContext(::comphelper::getProcessComponentContext());
-try
-{
-uno::Referencelang::XSingleServiceFactory xStorageFactory =
embed::StorageFactory::create(xContext);
-
-uno::Sequenceuno::Any aArgs (2);
-aArgs[0] = msURL;
-aArgs[1] = embed::ElementModes::READ;
-uno::Referenceembed::XStorage xDocStorage (
-xStorageFactory-createInstanceWithArguments(aArgs),
-uno::UNO_QUERY);
-
-try
-{
-if (xDocStorage.is())
-{
-uno::Referenceembed::XStorage xStorage (
-xDocStorage-openStorageElement(
-Thumbnails,
-embed::ElementModes::READ));
-if (xStorage.is())
-{
-uno::Referenceio::XStream xThumbnailCopy (
-xStorage-cloneStreamElement(thumbnail.png));
-if (xThumbnailCopy.is())
-xIStream = xThumbnailCopy-getInputStream();
-}
-}
-}
-catch (const uno::Exception rException)
-{
-OSL_TRACE (
-caught exception while trying to access
Thumbnail/thumbnail.png of %s: %s,
-OUStringToOString(msURL,
-RTL_TEXTENCODING_UTF8).getStr(),
-OUStringToOString(rException.Message,
-RTL_TEXTENCODING_UTF8).getStr());
-}
-
-try
-{
-// An (older) implementation had a bug - The storage
-// name was Thumbnail instead of Thumbnails. The
-// old name is still used as fallback but this code can
-// be removed soon.
-if ( ! xIStream.is())
-{
-uno::Referenceembed::XStorage xStorage (
-xDocStorage-openStorageElement( Thumbnail,
-embed::ElementModes::READ));
-if (xStorage.is())
-{
-uno::Referenceio::XStream xThumbnailCopy (
-xStorage-cloneStreamElement(thumbnail.png));
-if (xThumbnailCopy.is())
-xIStream = xThumbnailCopy-getInputStream();
-}
-}
-}
-catch (const uno::Exception rException)
-{
-OSL_TRACE (
-caught exception while trying to access
Thumbnails/thumbnail.png of %s: %s,
-OUStringToOString(msURL,
-
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66094, which changed state. Bug 66094 Summary: Crash when scrolling to a file with auto-updated links in it https://bugs.freedesktop.org/show_bug.cgi?id=66094 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- 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: Building LO 4.0.4.2 on illumos based OS
usually libs should contain not just search paths but also the libraries to be linked, e.g. in config_host.mk with a system nss i get: export NSS_LIBS=$(gb_SPACE)-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl also i guess only Sun ld knows -R, the GNU ld equivalent is -Wl,-rpath, Well done! With this env the build went on the unopkg.bin! CONFIGURE_ENV += NSS_CFLAGS=-I/usr/include/mps CONFIGURE_ENV += NSS_LIBS=-Wl,-rpath,/usr/lib/mps -L/usr/lib/mps -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl I prefer to use my userland Makefile options instead of modifying the solaris.mk Now the build is going on.let's wait and see... ;) Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 63d1f311c5421bcd75bcad026e41c3222be07141 Author: Joren De Cuyper joren.libreoff...@telenet.be Date: Tue Jul 9 13:37:24 2013 +0200 fdo#65839 group 'range' menu entries together There are 3 related range-entries in menu Data. 2 on the top, 1 on the bottom of the menu. Change-Id: I6045f9e5a1d9bbdb6a2ec10f69ecb7ca2759d59d Reviewed-on: https://gerrit.libreoffice.org/4782 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 777c324..6b29652 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -433,6 +433,7 @@ menu:menupopup menu:menuitem menu:id=.uno:DefineDBName/ menu:menuitem menu:id=.uno:SelectDB/ +menu:menuitem menu:id=.uno:DataAreaRefresh/ menu:menuseparator/ menu:menuitem menu:id=.uno:ManageXMLSource/ menu:menuseparator/ @@ -472,8 +473,6 @@ menu:menuitem menu:id=.uno:DeletePivotTable/ /menu:menupopup /menu:menu -menu:menuseparator/ -menu:menuitem menu:id=.uno:DataAreaRefresh/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:WindowList ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
usually libs should contain not just search paths but also the libraries to be linked, e.g. in config_host.mk with a system nss i get: export NSS_LIBS=$(gb_SPACE)-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl also i guess only Sun ld knows -R, the GNU ld equivalent is -Wl,-rpath, Well done! With this env the build went on the unopkg.bin! CONFIGURE_ENV += NSS_CFLAGS=-I/usr/include/mps CONFIGURE_ENV += NSS_LIBS=-Wl,-rpath,/usr/lib/mps -L/usr/lib/mps -lssl3 -lsmime3 -lnss3 - lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl I prefer to use my userland Makefile options instead of modifying the solaris.mk Now the build is going on.let's wait and see... ;) Gabriele. Ok, it stopped later with this: [build LNK] Executable/pluginapp.bin S=/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1 O=$S/solver/unxsogi.pro W=$S/workdir/unxsogi.pro mkdir -p $W/LinkTarget/Executable/ /usr/gcc/4.4/bin/g++ -Wl,-z,origin '-Wl,-rpath,$ORIGIN:$ORIGIN/../ure-link/lib' -Wl,-rpath-link,$O/lib -z nodefs $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o -Wl,--start-group $O/lib/libplugcon.a -Wl,--end-group -Wl,--no-as-needed -lm -lnsl -lsocket -lXm -lXt -lXext -lX11 -ldl -lgthread-2.0 -lpthread -lglib-2.0 -R/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdk_pixbuf_xlib-2.0 -lgmodule-2.0 -lpthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -R/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -luno_sal -o $W/LinkTarget/Executable/pluginapp.bin /usr/gnu/bin/ld: cannot find -luno_sal collect2: ld returned 1 exit status I guess I'm missing a librarynot built? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_filters-test.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3995c096a30a0242d9acebe343be3cf92a2a72e2 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jul 9 12:04:25 2013 -0400 Add this. Change-Id: I722520821835be962e108d941c75effc0bfe5ac2 diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 1a80e07..c851beb 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -25,6 +25,7 @@ #include editeng/postitem.hxx #include editeng/udlnitem.hxx #include editeng/editobj.hxx +#include editeng/brushitem.hxx #include editeng/brushitem.hxx #include editeng/justifyitem.hxx #include editeng/borderline.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/window/window.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 35208d62e32ee0a7aeacfe2f577b68c9dcb40671
Author: Noel Power noel.po...@suse.com
Date: Tue Jul 9 13:58:19 2013 +0100
fix for fdo#66718, access correct clipboard
Changes to use SystemClipboard::createUnix break some subtle behaviour
( or is it even misbehaviour ) that users of the service
com.sun.star.datatransfer.clipboard.SystemClipboard depend on.
When creating the SystemClipboard the arguments passed to
X11SalInstance::CreateClipboard(...) are used to access cached
instances. Previously the window clipboard was created with 'no'
params and then initialised ( via XInitialisation ) later
This ensured users creating the css.datatransfer.clipboard.SystemClipboard
with no paramaters immediately get that same clipboard. Note: creating
the SystemClipboard with no param seesm a sensible thing from an scripters
point of view as the params that would be required to match the correct
Clipboard seem rather difficult to access in an uno only world
Change-Id: Ib71d6744086d354025de4db62039b9a98f230eca
(cherry picked from commit 942501b6e49c6c9e19556d9ec132a458e5fef6c3)
Reviewed-on: https://gerrit.libreoffice.org/4784
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1018bb8..2c31c79 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8435,11 +8435,19 @@ uno::Reference XClipboard Window::GetClipboard()
try
{
uno::Reference XComponentContext xContext(
comphelper::getProcessComponentContext() );
-ReferenceXSystemClipboard xSystemClipboard;
+ReferenceXSystemClipboard xSystemClipboard =
SystemClipboard::createDefault(xContext);
#if defined(UNX) !defined(MACOSX) // unix clipboard needs to be
initialized
-xSystemClipboard = SystemClipboard::createUnix( xContext,
Application::GetDisplayConnection(), CLIPBOARD, vcl::createBmpConverter() );
-#else
-xSystemClipboard = SystemClipboard::createDefault(xContext);
+uno::Reference XInitialization xInit = uno::Reference
XInitialization ( xSystemClipboard, UNO_QUERY );
+
+if( xInit.is() )
+{
+Sequence Any aArgumentList( 3 );
+aArgumentList[ 0 ] = makeAny(
Application::GetDisplayConnection() );
+aArgumentList[ 1 ] = makeAny( OUString(CLIPBOARD) );
+aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
+
+xInit-initialize( aArgumentList );
+}
#endif
mpWindowImpl-mpFrameData-mxClipboard.set( xSystemClipboard,
UNO_QUERY );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_filters-test.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b45118b6c006b6c7f442fe70acb329ac843c11e1 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jul 9 12:14:46 2013 -0400 Add this. Change-Id: I0bab750be43813b2f88065c2fa4df5fc7f41f56f diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index c851beb..48c519d 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -43,6 +43,7 @@ #include colorscale.hxx #include olinetab.hxx #include patattr.hxx +#include scitems.hxx #include com/sun/star/drawing/XDrawPageSupplier.hpp #include com/sun/star/drawing/XControlShape.hpp ___ 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 58819, which changed state. Bug 58819 Summary: FILESAVE as .docx: loss of page background picture (watermark) https://bugs.freedesktop.org/show_bug.cgi?id=58819 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
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 mariosv mari...@miguelangel.mobi changed: What|Removed |Added CC||mari...@miguelangel.mobi --- Comment #48 from mariosv mari...@miguelangel.mobi --- https://bugs.freedesktop.org/show_bug.cgi?id=66655; Function GETPIVOTDATA() always return #REF! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo66565.rtf | 35 +
sw/qa/extras/rtfimport/rtfimport.cxx | 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 ++-
3 files changed, 50 insertions(+), 2 deletions(-)
New commits:
commit 0e24e60733c8743de89abd779d77f1a8784894a6
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 9 11:29:33 2013 +0200
fdo#66565 RTF import: don't produce cell widths smaller than MINLAY
In case we have a table of a given width and the second (or later) row
has fewer cells, we have to add a fake cell to such a row. However, it
doesn't make sense to do this when the difference is only a few twips:
we can't create such a small frame inside the cell later anyway.
Regression from c3b0f13546b30e5db3aecd311c7178e4e0933208.
(cherry picked from commit f6a00c88482ec30b61855cb6a95a5ad240b7a517)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ibc0f02d4184b58bd423c3405e786e1ec25b9dd13
Reviewed-on: https://gerrit.libreoffice.org/4785
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/qa/extras/rtfimport/data/fdo66565.rtf
b/sw/qa/extras/rtfimport/data/fdo66565.rtf
new file mode 100644
index 000..2169dc3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo66565.rtf
@@ -0,0 +1,35 @@
+{\rtf1\ansi\ansicpg1251\deflang1033
+\sectd\lndscpsxn\pgwsxn16840\pghsxn11907\marglsxn1133\margrsxn850\margtsxn850\margbsxn850\linex0\headery709\footery709\colsx709\endnhere\sectdefaultcl
+{\trowd\trql\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5039\clbrdrt\brdrdb\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx7420\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx8162\clbrdrt\brdrdb\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13717\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx14227\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrdb\brdrw10\cellx14850
+\intbl
+{\b\f0\fs16 A1 \cell}
+{\b\f0\fs16 B1 \cell}
+{\b\f0\fs16 C1 \cell}
+{\b\f0\fs16 D1 \cell}
+{\b\f0\fs16 E1 \cell}
+{\b\f0\fs16 F1 \cell}
+{\b\f0\fs16 G1 \cell}
+{\row}
+\trowd\trql\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5039\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx5832\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx6625\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx7418\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx8160\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx9123\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx9633\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx10143\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx10653\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdr
l\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx11163\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx11673\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx12183\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx12693\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13203\clbrdrt\brdrs\brdrw10\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx13713\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\cellx14223\clbrdrb\brdrdb\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrr\brdrdb\brdrw10\cellx14846
+\intbl
+{\b\f0\fs16 A2 \cell}
+{\b\f0\fs16 B2 \cell}
+{\b\f0\fs16 C2 \cell}
+{\b\f0\fs16 D2 \cell}
+{\b\f0\fs16 E2 \cell}
+{\b\f0\fs16 F2 \cell}
+{\b\f0\fs16 G2 \cell}
+{\b\f0\fs16 H2 \cell}
+{\b\f0\fs16 I2 \cell}
+{\b\f0\fs16 J2 \cell}
+{\b\f0\fs16 K2 \cell}
+{\b\f0\fs16 L2 \cell}
+{\b\f0\fs16 M2 \cell}
+{\b\f0\fs16 N2 \cell}
+{\b\f0\fs16 O2 \cell}
+{\b\f0\fs16 P2 \cell}
+{\b\f0\fs16 Q2 \cell}
+{\b\f0\fs16 R2 \cell}
+{\row}
+\pard}
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 80b52ef..fd05bdc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -143,6 +143,7 @@ public:
void testParaBottomMargin();
void testN823655();
void testFdo39001();
+void testFdo66565();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -274,6 +275,7 @@ void Test::run()
{para-bottom-margin.rtf,
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 mariosv mari...@miguelangel.mobi changed: What|Removed |Added Depends on||66655 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc
sc/inc/AccessibleFilterMenu.hxx | 14 ++-- sc/inc/AccessibleFilterMenuItem.hxx |8 +++--- sc/inc/bigrange.hxx |6 ++--- sc/inc/callform.hxx |6 ++--- sc/inc/cellform.hxx |6 ++--- sc/inc/patattr.hxx | 20 - sc/inc/pivot.hxx| 42 ++-- sc/inc/prnsave.hxx |8 +++--- sc/inc/progress.hxx | 10 sc/inc/queryentry.hxx |6 ++--- 10 files changed, 63 insertions(+), 63 deletions(-) New commits: commit 59db0c242a7c97bd40b1cc33dd37f34fcefa5019 Author: Nourah.AlShoeibi nourah.alshoe...@gmail.com Date: Tue Jul 9 19:50:34 2013 +0300 Modifying comments to meet Doxygen standards Change-Id: I5626478f75a95a47493689db73b2886e316edb5d Reviewed-on: https://gerrit.libreoffice.org/4788 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 0c6bd58..2078e6a 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -52,7 +52,7 @@ public: ScMenuFloatingWindow* pWin, const OUString rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenu(); -// XAccessibleComponent +/// XAccessibleComponent virtual ::com::sun::star::uno::Reference ::com::sun::star::accessibility::XAccessible SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point rPoint ) @@ -70,7 +70,7 @@ public: virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); -// XAccessibleContext +/// XAccessibleContext virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); @@ -90,7 +90,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); -// XAccessibleEventBroadcaster +/// XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference @@ -104,7 +104,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener xListener) throw (com::sun::star::uno::RuntimeException); -// XAccessibleSelection +/// XAccessibleSelection virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -128,7 +128,7 @@ public: virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); -// XInterface +/// XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const rType ) @@ -137,12 +137,12 @@ public: virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); -// XTypeProvider +/// XTypeProvider virtual ::com::sun::star::uno::Sequencesal_Int8 SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); -// non-UNO methods +/// non-UNO methods void appendMenuItem(const OUString rName, bool bEnabled, size_t nMenuPos); void setMenuPos(size_t nMenuPos); diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index 82b6f84..93927f9 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -41,7 +41,7 @@ public: virtual ~ScAccessibleFilterMenuItem(); -// XAccessibleContext +/// XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); @@ -59,7 +59,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); -// XAccessibleAction +/// XAccessibleAction virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ public: getAccessibleActionKeyBinding(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); -// XInterface +/// XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const rType ) @@ -84,7 +84,7 @@ public: virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); -// Non-UNO Methods +/// Non-UNO Methods void setEnabled(bool bEnabled); diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index a3efe5a..5abb2b0 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -185,9 +185,9 @@ public:
