[Libreoffice-commits] .: sw/source
sw/source/core/text/xmldump.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 1087afd9135b54e83c0ec3fa9aae19ac6c2d9c77
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Feb 16 09:26:27 2012 +0100
sw: mention node indexes in layout xml dump
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 25e8347..3530753 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -334,6 +334,12 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ), %p,
GetPrev() );
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ), %p,
this-GetUpper() );
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ), %p,
this-GetLower() );
+if ( IsTxtFrm( ) )
+{
+SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this;
+SwTxtNode *pTxtNode = pTxtFrm-GetTxtNode();
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( txtNodeIndex ),
%lu, pTxtNode-GetIndex() );
+}
}
void SwFrm::dumpChildrenAsXml( xmlTextWriterPtr writer )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 905df1bae9cab296ee7dd07e88813c667788ed8a
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Feb 16 10:35:12 2012 +0100
Fix crash in smartart import
Rather check iterator validity *before* accessing it. valgrind
warning on linux, and crash on windows for e.g. doc at n#736495.
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 493dcf2..29a9cb9 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -394,8 +394,8 @@ bool LayoutNode::setupShape( const ShapePtr rShape, const
Diagram rDgm, sal_uI
{
// find the data node to grab text from
DiagramData::PointsNameMap::const_iterator
aDataNode=rDgm.getData()-getPointsPresNameMap().find(msName);
-if( aDataNode-second.size() nIdx
-aDataNode != rDgm.getData()-getPointsPresNameMap().end() )
+if( aDataNode != rDgm.getData()-getPointsPresNameMap().end()
+aDataNode-second.size() nIdx )
{
OSL_TRACE( Filling content from %d th layout node named \%s\,
modelId \%s\,
nIdx,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0b6fd58c1910b98a11e2f2ee4818d4b239f5d56c
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Feb 16 10:35:12 2012 +0100
Fix crash in smartart import
Rather check iterator validity *before* accessing it. valgrind
warning on linux, and crash on windows for e.g. doc at n#736495.
Signed-off-by: Muthu Subramanian sumu...@suse.com
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 16b9420..c5f8774 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -394,8 +394,8 @@ bool LayoutNode::setupShape( const ShapePtr rShape, const
Diagram rDgm, sal_uI
{
// find the data node to grab text from
DiagramData::PointsNameMap::const_iterator
aDataNode=rDgm.getData()-getPointsPresNameMap().find(msName);
-if( aDataNode-second.size() nIdx
-aDataNode != rDgm.getData()-getPointsPresNameMap().end() )
+if( aDataNode != rDgm.getData()-getPointsPresNameMap().end()
+aDataNode-second.size() nIdx )
{
OSL_TRACE( Filling content from %d th layout node named \%s\,
modelId \%s\,
nIdx,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/ooo/folderitem_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 504995b94e0bb9a689c9b5b3089f56e6ce0d6cee Author: Andras Timar ati...@suse.com Date: Thu Feb 16 10:00:39 2012 +0100 put LibreOffice (start center) to Win7 Start menu instead of Base As Asa Dotzler kindly pointed out in his blog, it was a bit awkward to put Base - the less used application - into frequently used program icon area of Windows 7 start menu. It was not a design decision, Sbase preceded Soffice, that was all. Let's use LibreOffice instead of Soffice, and voilà , problem solved. Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index e1a25e9..b714e7d 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -27,7 +27,7 @@ #include macros.inc -FolderItem gid_Folderitem_Soffice +FolderItem gid_Folderitem_LibreOffice Name = %PRODUCTNAME; ModuleID = gid_Module_Root; #ifdef ENABLE_SILENT_MSI ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - basic/source connectivity/source l10ntools/inc l10ntools/source sd/source solenv/inc svl/inc svl/source svtools/inc svtools/source sw/source toolkit/inc toolkit/so
basic/source/comp/exprtree.cxx | 17 --
basic/source/inc/expr.hxx|1
connectivity/source/drivers/odbcbase/OConnection.cxx | 105 -
connectivity/source/inc/odbc/OConnection.hxx |1
l10ntools/inc/export.hxx |7 -
l10ntools/source/export2.cxx | 108 --
sd/source/filter/eppt/pptx-text.cxx | 19 +--
sd/source/filter/eppt/text.hxx | 12 +-
solenv/inc/settings.mk |2
svl/inc/svl/style.hxx|8 +
svl/source/items/style.cxx |8 -
svtools/inc/svtools/fmtfield.hxx |1
svtools/inc/svtools/svmedit.hxx |1
svtools/source/control/fmtfield.cxx | 14 --
svtools/source/edit/svmedit.cxx |6 -
sw/source/ui/config/usrpref.cxx | 112 +--
toolkit/inc/toolkit/controls/unocontrols.hxx |1
toolkit/source/controls/unocontrols.cxx | 36 --
tools/inc/tools/multisel.hxx |1
tools/source/memtools/multisel.cxx | 17 --
unusedcode.easy | 32 +
vcl/inc/unx/gtk/gtkframe.hxx |2
vcl/unx/gtk/window/gtkframe.cxx |6 -
23 files changed, 90 insertions(+), 427 deletions(-)
New commits:
commit d294b52d8def55964cd34e02dc8b2c2319fb031b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 10:31:28 2012 +
-Werror in dmake modules went missing
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 65751eb..b6de4bb 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1196,7 +1196,7 @@ CFLAGSCXX+=$(CFLAGSWARNCXX)
CFLAGSCC+=$(CFLAGSWALLCC)
CFLAGSCXX+=$(CFLAGSWALLCXX)
.ENDIF
-.IF $(COMPILER_WARN_ERRORS)!= $(EXTERNAL_WARNINGS_NOT_ERRORS)==
+.IF $(COMPILER_WARN_ERRORS)!= $(EXTERNAL_WARNINGS_NOT_ERRORS)==FALSE
CFLAGSCC+=$(CFLAGSWERRCC)
CFLAGSCXX+=$(CFLAGSWERRCXX)
.ENDIF
commit 08c475bb24a34f3a6a3f08e8490b521e8dcc96be
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 09:48:05 2012 +
callcatcher: update unused code list
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index ef4ee5d..02db392 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -720,23 +720,6 @@ SbiExprNode* SbiExpression::VBA_Not()
return pNd;
}
-SbiExprNode* SbiExpression::VBA_And()
-{
-SbiExprNode* pNd = VBA_Not();
-if( m_eMode != EXPRMODE_EMPTY_PAREN )
-{
-for( ;; )
-{
-SbiToken eTok = pParser-Peek();
-if( eTok != AND )
-break;
-eTok = pParser-Next();
-pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Not() );
-}
-}
-return pNd;
-}
-
SbiExprNode* SbiExpression::Like()
{
SbiExprNode* pNd = pParser-IsVBASupportOn() ? VBA_Not() : Comp();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index eb03504..4830a9c 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -189,7 +189,6 @@ protected:
SbiExprNode* Cat();
SbiExprNode* Like();
SbiExprNode* VBA_Not();
-SbiExprNode* VBA_And();
SbiExprNode* Comp();
SbiExprNode* Boolean();
public:
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx
b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 04df960..323e9d2 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -495,111 +495,6 @@ Any SAL_CALL OConnection::getWarnings( )
throw(SQLException, RuntimeException)
void SAL_CALL OConnection::clearWarnings( ) throw(SQLException,
RuntimeException)
{
}
-//
-void OConnection::buildTypeInfo() throw( SQLException)
-{
-::osl::MutexGuard aGuard( m_aMutex );
-
-Reference XResultSet xRs = getMetaData ()-getTypeInfo ();
-if(xRs.is())
-{
-Reference XRow xRow(xRs,UNO_QUERY);
-// Information for a single SQL type
-
-::connectivity::ORowSetValue aValue;
-::std::vectorsal_Int32 aTypes;
-ReferenceXResultSetMetaData xResultSetMetaData =
ReferenceXResultSetMetaDataSupplier(xRs,UNO_QUERY)-getMetaData();
-sal_Int32 nCount = xResultSetMetaData-getColumnCount();
-// Loop on the result set until we reach end of file
-while (xRs-next ())
-{
-OTypeInfo aInfo;
-sal_Int32 nPos = 1;
-if ( aTypes.empty() )
-{
-if ( nCount 1 )
-nCount = 18;
-aTypes.reserve(nCount+1);
-aTypes.push_back(-1);
-
[Libreoffice-commits] .: binfilter/bf_starmath binfilter/bf_svtools binfilter/inc
binfilter/bf_starmath/source/starmath_parse.cxx |2 +-
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 13 -
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 13 +
binfilter/inc/bf_sc/conditio.hxx |2 +-
binfilter/inc/bf_svx/svdio.hxx |2 +-
binfilter/inc/bf_tools/string.hxx|1 -
6 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit 482881720eef9228ce25fa1d228139ebd43fe9cd
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 10:25:42 2012 +
sync up post ByteString reduction
diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx
b/binfilter/bf_starmath/source/starmath_parse.cxx
index 33df5b1..8cb5b88 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -1847,7 +1847,7 @@ const sal_Int32 coNumContFlags =
/*N*/ }
/*N*/
/*N*/ // get number argument
-/*N*/ doublefTmp;
+/*N*/ doublefTmp(0.0);
/*N*/ Fraction aValue;
/*N*/ if(lcl_IsNumber(CurToken.aText)
/*N*/ sscanf(rtl::OUStringToOString(CurToken.aText,
RTL_TEXTENCODING_ASCII_US).getStr(), %lf, fTmp) == 1)
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 81f864c..b0d7279 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -219,19 +219,6 @@ STRING::STRING( const STRING rStr )
mpData = rStr.mpData;
}
-STRING::STRING( const ::STRING rStr )
-{
-DBG_CTOR( STRING, DBGCHECKSTRING );
-DBG_CHKOBJ( rStr, STRING, DBGCHECKSTRING );
-
-// this is good enough for binfilter...
-STRING temp;
-temp.Assign(rStr);
-
-STRING_ACQUIRE((STRING_TYPE *)temp.mpData);
-mpData = temp.mpData;
-}
-
// ---
STRING::STRING( const STRING rStr, xub_StrLen nPos, xub_StrLen nLen )
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index a4b4880..4657cd8 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -614,6 +614,19 @@ STRING STRING::EraseTrailingChars( STRCODE c )
return *this;
}
+STRING::STRING( const ::STRING rStr )
+{
+DBG_CTOR( STRING, DBGCHECKSTRING );
+DBG_CHKOBJ( rStr, STRING, DBGCHECKSTRING );
+
+// this is good enough for binfilter...
+STRING temp;
+temp.Assign(rStr);
+
+STRING_ACQUIRE((STRING_TYPE *)temp.mpData);
+mpData = temp.mpData;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/conditio.hxx b/binfilter/inc/bf_sc/conditio.hxx
index c2771ea..1ad0c29 100644
--- a/binfilter/inc/bf_sc/conditio.hxx
+++ b/binfilter/inc/bf_sc/conditio.hxx
@@ -114,7 +114,7 @@ public:
ScConditionEntry( const ScConditionEntry r ); // flache Kopie
der Formeln
// echte Kopie der Formeln (fuer Ref-Undo):
ScConditionEntry( ScDocument* pDocument, const ScConditionEntry r
);
-~ScConditionEntry();
+virtual ~ScConditionEntry();
int operator== ( const ScConditionEntry r ) const;
diff --git a/binfilter/inc/bf_svx/svdio.hxx b/binfilter/inc/bf_svx/svdio.hxx
index 37abf5b..ea967d6 100644
--- a/binfilter/inc/bf_svx/svdio.hxx
+++ b/binfilter/inc/bf_svx/svdio.hxx
@@ -262,7 +262,7 @@ protected:
public:
// Als Modus muss STREAM_READ oder STREAM_WRITE angegeben werden.
SdrDownCompat(SvStream rNewStream, UINT16 nNewMode, BOOL bAutoOpen =
TRUE);
-~SdrDownCompat();
+virtual ~SdrDownCompat();
#ifdef DBG_UTIL
// fuer etwas aussagekraeftigere Assertions
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index b5944c0..872136e 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -141,7 +141,6 @@ private:
public:
ByteString();
ByteString( const ByteString rStr );
-ByteString( const ::ByteString rStr );
ByteString( const ByteString rStr, xub_StrLen nPos,
xub_StrLen nLen );
ByteString( const rtl::OString rStr );
ByteString( const sal_Char* pCharStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/ole/vbamodule.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2174d4d44eeb83378f76ea34086b8a1989b70b76 Author: Noel Power noel.po...@novell.com Date: Thu Feb 16 10:34:59 2012 + use stream name for module names when importing vba. fdo#46151 bnc#747323 diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index d907051..585f28d 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -156,6 +156,9 @@ void VbaModule::importDirRecords( BinaryInputStream rDirStrm ) break; case VBA_ID_MODULESTREAMNAME: maStreamName = aRecStrm.readCharArrayUC( nRecSize, meTextEnc ); +// Actually the stream name seems the best name to use +// the VBA_ID_MODULENAME name can sometimes be the wrong case +maName = maStreamName; break; case VBA_ID_MODULESTREAMNAMEUNICODE: break; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods |binary 1 file changed New commits: commit c25c5a05ac6a0d678aa3d9592d213a08cabf6f7b Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Feb 16 11:59:21 2012 +0100 add missing file diff --git a/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods b/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods new file mode 100644 index 000..0561655 Binary files /dev/null and b/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: smoketest/lodownloadtest.py smoketest/losmoketest.py
smoketest/lodownloadtest.py | 685 smoketest/losmoketest.py| 666 -- 2 files changed, 685 insertions(+), 666 deletions(-) New commits: commit 1dd59441bd43071b11d2d952d625fb595083a793 Author: Yifan J yfji...@suse.com Date: Thu Feb 16 18:41:09 2012 +0800 Split download and run test part of losmoketest.py. 1. rename the tool to lodownloadtest.py 2. it will call native losmoketest in lo program directory 3. it will download test package as well as lo installables 4. fixing some bugs and optimize code - clean up extracted rpms after install - only uninstall necessary packages before installation - trivial improvements please see diff diff --git a/smoketest/lodownloadtest.py b/smoketest/lodownloadtest.py new file mode 100755 index 000..5d488b0 --- /dev/null +++ b/smoketest/lodownloadtest.py @@ -0,0 +1,685 @@ +#!/usr/bin/env python +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ + +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# [ Copyright (C) 2011 Yifan Jiang yfji...@suse.com (initial developer) ] +# [ Copyright (C) 2011 Petr Mladek pmla...@suse.cz ] +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +## +# The tool is designed to enable test machine fully automatically run smoketest +# with both daily and pre release build located in dev-build.libreoffice.org. +# +# The tool is named as losmoketest for its purpose, meanwhile it help you to +# check, download and install the latest build. By the fact the installation is +# designed not to be different from manually doing these repeated work, the +# installed libreoffice build can also be good for manual test. + +import sys, os, platform +import datetime, time +import subprocess, shutil +import glob, re +import urllib, urllib2 +import logging, getopt +try: +import ConfigParser as configparser # Python 3.0 change +except ImportError: +import configparser + +# FIXME: make this configurable via options or autodetect it +build_version = 3.5 +tag_version = 3-5 +# devel build +branding_pack=lodev +basis_pack=lodevbasis +# stable build +#branding_pack=libreoffice +#basis_pack=libobasis + +# possible program files of libreoffice, put all platform paths are +# expected in this list +lo_all_paths = [ +/opt/lodev + build_version, \ +/opt/libreoffice + build_version, \ +/usr/lib/libreoffice, \ +/usr/lib64/libreoffice, \ +C:\program file\libreoffice, \ +] + +build_check_interval = 5 #seconds + +# Distro list +RPM_DISTRO_LIST = ['SuSE', 'fedora', 'redhat', 'centos', 'mandrake', 'mandriva', 'yellowdog', 'turbolinux'] +DEB_DISTRO_LIST = ['debian', 'ubuntu', 'Ubuntu'] + +# Server urls +SERVER_URL = http://dev-builds.libreoffice.org; + +# Local dirs +root_dir = os.getcwd() +DOWNLOAD_DIR = os.path.join(root_dir, _download) +USR_DIR = os.path.join(root_dir, _libo_smoke_user) +LOCAL_BUILD_INFO_FILE = os.path.join(root_dir, build.cfg) + +# INSTALL_DIR = os.path.join(root_dir, _libo_smoke_installation) +INSTALL_DIR = # Installation dir + +# SOFFICE_BIN bin +if platform.system() == Linux: +SOFFICE_BIN = soffice +LOSMOKETEST_BIN = losmoketest +elif platform.system() == Windows: +SOFFICE_BIN = soffice.exe +LOSMOKETEST_BIN = losmoketest +else: +SOFFICE_BIN = soffice +LOSMOKETEST_BIN = losmoketest + +# Relative build url +## pre-releases +PR_RPM_X86_PATH = pre-releases/rpm/x86/ +PR_RPM_X86_64_PATH = pre-releases/rpm/x86_64/ + +PR_DEB_X86_PATH = pre-releases/deb/x86/ +PR_DEB_X86_64_PATH = pre-releases/deb/x86_64/ + +PR_MAC_X86_PATH = pre-releases/mac/x86/ +PR_MAC_PPC_PATH = pre-releases/mac/ppc/ + +PR_WIN_X86_PATH = pre-releases/win/x86/ + +## daily_master +DAILY_MASTER_RPM_X86_PATH = daily/Linux-x86_10-Release_Configuration/master/current +DAILY_MASTER_RPM_X86_64_PATH = daily/Linux-x86_64_11-Release_Configuration/master/current + +DAILY_MASTER_DEB_X86_PATH = daily/Linux-x86_10-Release_Configuration/master/current +DAILY_MASTER_DEB_X86_64_PATH =
[Libreoffice-commits] .: package/source zlib/zlib-1.2.5.patch
package/source/zipapi/Deflater.cxx |8
package/source/zipapi/Inflater.cxx |4 ++--
zlib/zlib-1.2.5.patch | 15 ---
3 files changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 39481744b199bed3a5f67f6ceee9c2e01595f2af
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 11:12:28 2012 +
drop Z_PREFIX from internal zlib, makes building clucene much easier
diff --git a/package/source/zipapi/Deflater.cxx
b/package/source/zipapi/Deflater.cxx
index 5aab0c5..0b5a7fe 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence sal_Int8
rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy);
#else
nResult = z_deflateParams(pStream, nLevel, nStrategy);
@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence
sal_Int8 rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
}
void SAL_CALL Deflater::reset( )
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
deflateReset(pStream);
#else
z_deflateReset(pStream);
@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
deflateEnd(pStream);
#else
z_deflateEnd(pStream);
diff --git a/package/source/zipapi/Inflater.cxx
b/package/source/zipapi/Inflater.cxx
index 1bc9972..043c501 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
inflateEnd(pStream);
#else
z_inflateEnd(pStream);
@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence sal_Int8
rBuffer, sal_Int32 n
pStream-next_out = reinterpret_cast unsigned char* (
rBuffer.getArray() + nNewOffset );
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 41ae0d4..7021a2c 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -69,18 +69,3 @@
+.INCLUDE : target.mk
+.INCLUDE : tg_wntx64.mk
+
misc/zlib-1.2.5/zconf.h2010-04-18 19:58:06.0 +0200
-+++ misc/build/zlib-1.2.5/zconf.h 2011-08-12 09:44:59.524936228 +0200
-@@ -14,6 +14,12 @@
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using ./configure --zprefix.
- */
-+/*
-+ * we need the prefix to get the same names as in 1.1.3
-+*/
-+
-+#define Z_PREFIX
-+
- #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-
- /* all linked symbols */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) New commits: commit 3bb279c73e0034c7c50e5561de82c681a2f3b3b9 Author: Andras Timar ati...@suse.com Date: Wed Sep 14 19:43:08 2011 +0200 default shortcut for .uno:SearchDialog should be Ctrl+H Ctrl+Alt+F was not good, because on some keyboard layouts it enters a character. Ctrl+Alt (=AltGr on Windows) should be avoided, if possible. Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 44de8c4..4fd42dc 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -85,7 +85,7 @@ value xml:lang=en-USvnd.sun.star.findbar:FocusToFindbar/value /prop /node - node oor:name=F_MOD1_MOD2 oor:op=replace + node oor:name=H_MOD1 oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:SearchDialog/value /prop @@ -235,7 +235,7 @@ value xml:lang=en-USvnd.sun.star.findbar:FocusToFindbar/value /prop /node -node oor:name=F_MOD1_MOD2 oor:op=replace +node oor:name=H_MOD1 oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno.SearchDialog/value /prop @@ -635,11 +635,6 @@ value xml:lang=en-US.uno:GoToStartSel/value /prop /node -node oor:name=H_MOD1 oor:op=replace - prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=de.uno:SuperScript/value - /prop -/node node oor:name=INSERT oor:op=replace prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:InsertContents/value ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy
svtools/inc/svtools/svmedit.hxx |3 ---
svtools/source/edit/svmedit.cxx | 19 ---
unusedcode.easy |3 ---
3 files changed, 25 deletions(-)
New commits:
commit 0e31821b12f36bd753f35a73fcaba8ede8eb1359
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Feb 16 11:38:04 2012 +
Removed unused functions from MultiLineEdit in svtools module
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index eb855da..bfce316 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -65,7 +65,6 @@ protected:
ExtTextEngine* GetTextEngine() const;
ExtTextView*GetTextView() const;
-ScrollBar* GetHScrollBar() const;
ScrollBar* GetVScrollBar() const;
public:
@@ -110,7 +109,6 @@ public:
{ SetText( rStr ); SetSelection( rNewSelection ); }
String GetText() const;
String GetText( LineEnd aSeparator ) const;
-String GetTextLines() const;
String GetTextLines( LineEnd aSeparator ) const;
voidSetRightToLeft( sal_Bool bRightToLeft );
@@ -137,7 +135,6 @@ public:
voidDraw( OutputDevice* pDev, const Point rPos, const Size
rSize, sal_uLong nFlags );
void SetLeftMargin( sal_uInt16 n );
-sal_uInt16 GetLeftMargin() const;
virtual
::com::sun::star::uno::Reference ::com::sun::star::awt::XWindowPeer
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 640f05a..bb5f4b3 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1215,11 +1215,6 @@ String MultiLineEdit::GetText( LineEnd aSeparator ) const
return pImpSvMEdit-GetText( aSeparator );
}
-String MultiLineEdit::GetTextLines() const
-{
-return pImpSvMEdit-GetTextLines();
-}
-
String MultiLineEdit::GetTextLines( LineEnd aSeparator ) const
{
return pImpSvMEdit-GetTextLines( aSeparator );
@@ -1559,12 +1554,6 @@ ExtTextView* MultiLineEdit::GetTextView() const
return pImpSvMEdit-GetTextWindow()-GetTextView();
}
-ScrollBar* MultiLineEdit::GetHScrollBar() const
-{
-return pImpSvMEdit-GetHScrollBar();
-}
-
-
ScrollBar* MultiLineEdit::GetVScrollBar() const
{
return pImpSvMEdit-GetVScrollBar();
@@ -1581,14 +1570,6 @@ void MultiLineEdit::SetLeftMargin( sal_uInt16 n )
GetTextEngine()-SetLeftMargin( n );
}
-sal_uInt16 MultiLineEdit::GetLeftMargin() const
-{
-if ( GetTextEngine() )
-return GetTextEngine()-GetLeftMargin();
-else
-return 0;
-}
-
void MultiLineEdit::SetRightToLeft( sal_Bool bRightToLeft )
{
if ( GetTextEngine() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 3dd0f66..647b4f3 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -42,9 +42,6 @@ Matrix3d::Inverse() const
Matrix3d::Matrix3d()
MenuBar::MenuBar(ResId const)
MergeData::Dump()
-MultiLineEdit::GetHScrollBar() const
-MultiLineEdit::GetLeftMargin() const
-MultiLineEdit::GetTextLines() const
NfCurrencyEntry::NfCurrencyEntry()
NumberFormatCodeWrapper::getDefault(short, short) const
NumericBox::GetValue(unsigned short) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source svtools/source
extensions/source/scanner/sanedlg.cxx |6 +++---
svtools/source/filter/sgvtext.cxx | 30 +++---
svtools/source/misc/imap2.cxx |4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit e49275751bde6410dcd9f0c543c03f57b068e1cd
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 15:26:43 2012 +0100
Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/source/scanner/sanedlg.cxx
b/extensions/source/scanner/sanedlg.cxx
index d08a175..9726f3b 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1214,18 +1214,18 @@ sal_Bool SaneDlg::LoadState()
using comphelper::string::matchL;
-if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(BOOL=)))
+if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(BOOL=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(BOOL=));
sal_Bool aBOOL = (sal_Bool)aValue.toInt32();
mrSane.SetOptionValue( nOption, aBOOL );
}
-else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(STRING=)))
+else if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(STRING=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(STRING=));
mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue,
osl_getThreadTextEncoding()) );
}
-else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(NUMERIC=)))
+else if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(NUMERIC=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(NUMERIC=));
diff --git a/svtools/source/filter/sgvtext.cxx
b/svtools/source/filter/sgvtext.cxx
index fbf9864..45b3a23 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1193,21 +1193,21 @@ void SgfFontOne::ReadOne( const rtl::OString rID,
ByteString Dsc )
{
s = s.toAsciiUpperCase();
using comphelper::string::matchL;
-if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(BOLD)))
Bold=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ITAL)))
Ital=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SERF)))
Serf=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SANS)))
Sans=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(FIXD)))
Fixd=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
+if (matchL(s, RTL_CONSTASCII_STRINGPARAM(BOLD)))
Bold=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ITAL)))
Ital=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SERF)))
Serf=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SANS)))
Sans=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(FIXD)))
Fixd=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
else
[Libreoffice-commits] .: basegfx/inc basegfx/source
basegfx/inc/basegfx/polygon/b3dpolygontools.hxx | 26 basegfx/source/polygon/b3dpolygontools.cxx | 146 2 files changed, 1 insertion(+), 171 deletions(-) New commits: commit 0aaecbac864b0c0e3ddb72355e416db0b4f72a77 Author: Björgvin Ragnarsson nifgr...@gmail.com Date: Wed Feb 15 01:04:12 2012 + Removed unused code. diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx index 2cd8ec9..defaae8 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx @@ -59,7 +59,6 @@ namespace basegfx // Get successor and predecessor indices. Returning the same index means there // is none. Same for successor. -BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B3DPolygon rCandidate); BASEGFX_DLLPUBLIC sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B3DPolygon rCandidate); // Get orientation of Polygon @@ -71,15 +70,9 @@ namespace basegfx // get normal vector of polygon BASEGFX_DLLPUBLIC B3DVector getNormal(const B3DPolygon rCandidate); -// get normal vector of positive oriented polygon -BASEGFX_DLLPUBLIC B3DVector getPositiveOrientedNormal(const B3DPolygon rCandidate); - // get signed area of polygon BASEGFX_DLLPUBLIC double getSignedArea(const B3DPolygon rCandidate); -// get area of polygon -BASEGFX_DLLPUBLIC double getArea(const B3DPolygon rCandidate); - // get signed area of polygon BASEGFX_DLLPUBLIC double getSignedArea(const B3DPolygon rCandidate); @@ -97,11 +90,6 @@ namespace basegfx // using getLength(...) BASEGFX_DLLPUBLIC B3DPoint getPositionAbsolute(const B3DPolygon rCandidate, double fDistance, double fLength = 0.0); -// get position on polygon for relative given distance in range [0.0 .. 1.0]. If -// length is given, it is assumed the correct polygon length, if 0.0 it is calculated -// using getLength(...) -BASEGFX_DLLPUBLIC B3DPoint getPositionRelative(const B3DPolygon rCandidate, double fDistance, double fLength = 0.0); - /** Apply given LineDashing to given polygon For a description see applyLineDashing in b2dpolygontoos.hxx @@ -143,15 +131,8 @@ namespace basegfx // fDistance, and the sphere around both points with radius fDistance. BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B3DPoint rEdgeStart, const B3DPoint rEdgeEnd, const B3DPoint rTestPosition, double fDistance); -// test if point is inside epsilon-range around the given Polygon. Can be used -// for HitTesting. The epsilon-range is defined to be the cylinder centered to -// the given edge, using radius fDistance, and the sphere around both points with radius fDistance. -BASEGFX_DLLPUBLIC bool isInEpsilonRange(const B3DPolygon rCandidate, const B3DPoint rTestPosition, double fDistance); - -// isInside tests for B3DPoint and other B3DPolygon. On border is not inside as long as -// not true is given in bWithBorder flag. +// isInside tests for B3DPoint. On border is not inside as long as not true is given in bWithBorder flag. BASEGFX_DLLPUBLIC bool isInside(const B3DPolygon rCandidate, const B3DPoint rPoint, bool bWithBorder = false); -BASEGFX_DLLPUBLIC bool isInside(const B3DPolygon rCandidate, const B3DPolygon rPolygon, bool bWithBorder = false); // calculates if given point is on given line, taking care of the numerical epsilon BASEGFX_DLLPUBLIC bool isPointOnLine(const B3DPoint rStart, const B3DPoint rEnd, const B3DPoint rCandidate, bool bWithPoints = false); @@ -164,14 +145,9 @@ namespace basegfx // and a line given by start and end point BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPlane(const B3DVector rPlaneNormal, const B3DPoint rPlanePoint, const B3DPoint rEdgeStart, const B3DPoint rEdgeEnd, double fCut); -// helper to get a fCut position between a 3d Polygon -// and a line given by start and end point -BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPolygon(const B3DPolygon rCandidate, const B3DPoint rEdgeStart, const B3DPoint rEdgeEnd, double fCut); - // // comparators with tolerance for 3D Polygons BASEGFX_DLLPUBLIC bool equal(const B3DPolygon rCandidateA, const B3DPolygon rCandidateB, const double rfSmallValue); -BASEGFX_DLLPUBLIC bool equal(const B3DPolygon rCandidateA, const B3DPolygon rCandidateB); /** snap some polygon coordinates to discrete coordinates diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index fda58fb..b31712a 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx | 30 +-
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit fe97bc5be1c8e9db176d55ae4347b0ffcef2a1c8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 15:38:04 2012 +0100
Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index fd8bc49..6a78e9a 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1190,21 +1190,21 @@ void SgfFontOne::ReadOne( const rtl::OString rID,
ByteString Dsc )
{
s = s.toAsciiUpperCase();
using comphelper::string::matchL;
-if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(BOLD)))
Bold=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ITAL)))
Ital=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SERF)))
Serf=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SANS)))
Sans=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(FIXD)))
Fixd=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
+if (matchL(s, RTL_CONSTASCII_STRINGPARAM(BOLD)))
Bold=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ITAL)))
Ital=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SERF)))
Serf=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SANS)))
Sans=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(FIXD)))
Fixd=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
else if (comphelper::string::isdigitAsciiString(s) )
SVWidth=sal::static_int_cast sal_uInt16 (s.toInt32());
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit e21cd8ac21062485bc36f63998d2b15674c71a89
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Feb 9 11:18:34 2012 +0100
fdo#45553 fix RTF import of space-before/after tokens
(cherry picked from commit c32b9cd2139249f0c680f664a0ceac3702dd0e73)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index df60ff7..7f1569e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2039,8 +2039,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
{
case RTF_SBASEDON: nSprm = NS_rtf::LN_ISTDBASE; break;
case RTF_SNEXT: nSprm = NS_rtf::LN_ISTDNEXT; break;
-case RTF_SB: nSprm = NS_ooxml::LN_CT_Spacing_before; break;
-case RTF_SA: nSprm = NS_ooxml::LN_CT_Spacing_after; break;
default: break;
}
if (nSprm 0)
@@ -2604,6 +2602,14 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_WMETAFILE:
m_aStates.top().aPicture.eWMetafile = nParam;
break;
+case RTF_SB:
+lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
+NS_ooxml::LN_CT_PPrBase_spacing,
NS_ooxml::LN_CT_Spacing_before, pIntValue);
+break;
+case RTF_SA:
+lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
+NS_ooxml::LN_CT_PPrBase_spacing,
NS_ooxml::LN_CT_Spacing_after, pIntValue);
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle value '%s', OSL_THIS_FUNC,
lcl_RtfToString(nKeyword));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/view/outlview.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 5b28f3488a033bd38b31071463b112df1713b64b
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:51:52 2012 +0100
Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in
Impress outline view, disable that here for the while. Better than
a crash for sure.
(cherry picked from commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3)
Conflicts:
sd/source/ui/view/outlview.cxx
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 53ebbb4..cdd442d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1672,12 +1672,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions ==
(mpOutliner-GetUndoManager().GetUndoActionCount() != 0),
sd::OutlineView::EndModelChange(), undo actions not in sync! );
-if( bHasUndoActions )
-{
-SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
-mpOutliner-GetUndoManager().AddUndoAction(pLink);
-}
-
mpOutliner-GetUndoManager().LeaveListAction();
if( bHasUndoActions
mpOutliner-GetEditEngine().HasTriedMergeOnLastAddUndo() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/sal/types.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2de115700e7c6c5ee9118c17c06eda0c462f394 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 16 13:10:58 2012 +0100 -Wundef diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 1bed00c..e8b5662 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -93,7 +93,7 @@ typedef unsigned char sal_uInt8; #error Could not find 32-bit type, add support for your architecture #endif -#if (_MSC_VER = 1000) +#if defined _MSC_VER _MSC_VER = 1000 typedef __int64 sal_Int64; typedef unsigned __int64 sal_uInt64; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 10 ++
binfilter/inc/bf_svx/xcolit.hxx |2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit babed3d40d1733cb3ea4b8a176e4ec0ffb03397d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 12:13:38 2012 +
WaE: can't return a temp, pTable is always null, lets just return aColor
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 341b16a..e11abf1 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -350,15 +350,9 @@ XubString aNameOrIndexEmptyString;
|*
\/
-/*N*/ const Color XColorItem::GetValue(const XColorTable* pTable) const
+/*N*/ const Color XColorItem::GetValue() const
/*N*/ {
-/*N*/ if (!IsIndex())
-/*N*/ return aColor;
-/*N*/ else if (pTable)
-/*?*/ return pTable-Get(GetIndex())-GetColor();
-else
-return Color(); // whatever
-/*N*/
+/*N*/ return aColor;
/*N*/ }
/*N*/ bool XColorItem::QueryValue( ::com::sun::star::uno::Any rVal, BYTE
/*nMemberId*/ ) const
diff --git a/binfilter/inc/bf_svx/xcolit.hxx b/binfilter/inc/bf_svx/xcolit.hxx
index fd231cf..1252485 100644
--- a/binfilter/inc/bf_svx/xcolit.hxx
+++ b/binfilter/inc/bf_svx/xcolit.hxx
@@ -58,7 +58,7 @@ public:
virtual SfxPoolItem*Create(SvStream rIn, USHORT nVer) const;
virtual SvStream Store(SvStream rOut, USHORT) const { return rOut;
}
-const ColorGetValue(const XColorTable* pTable = 0) const;
+const ColorGetValue() const;
voidSetValue(const Color rNew) { aColor = rNew; Detach(); }
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - extensions/source forms/source
extensions/source/propctrlr/formmetadata.cxx |6 -
forms/source/component/DatabaseForm.cxx | 127 ---
forms/source/component/ListBox.cxx | 46 -
3 files changed, 85 insertions(+), 94 deletions(-)
New commits:
commit 7212cc8081216a3b7d626dc81be077d0522e3737
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Wed Feb 15 15:29:55 2012 +0100
Translate German comments
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index d678f51..3796d79 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -493,12 +493,12 @@ ODatabaseForm::~ODatabaseForm()
//
-
::rtl::OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const
ReferenceXControl SubmitButton, const ::com::sun::star::awt::MouseEvent
MouseEvt)
{
-// Liste von successful Controls fuellen
+// Fill List of successful Controls
HtmlSuccessfulObjList aSuccObjList;
FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt );
-// Liste zu ::rtl::OUString zusammensetzen
+// Aggregate Liste to ::rtl::OUString
::rtl::OUStringBuffer aResult;
::rtl::OUString aName;
::rtl::OUString aValue;
@@ -512,8 +512,7 @@ ODatabaseForm::~ODatabaseForm()
aValue = pSuccObj-aValue;
if( pSuccObj-nRepresentation == SUCCESSFUL_REPRESENT_FILE
!aValue.isEmpty() )
{
-// Bei File-URLs wird der Dateiname und keine URL uebertragen,
-// weil Netscape dies so macht.
+// For File URLs we transfer the file name and not a URL, because
Netscape does it like that
INetURLObject aURL;
aURL.SetSmartProtocol(INET_PROT_FILE);
aURL.SetSmartURL(aValue);
@@ -554,17 +553,17 @@ ODatabaseForm::~ODatabaseForm()
Sequencesal_Int8 ODatabaseForm::GetDataMultiPartEncoded(const
ReferenceXControl SubmitButton, const ::com::sun::star::awt::MouseEvent
MouseEvt, ::rtl::OUString rContentType)
{
-// Parent erzeugen
+// Create Parent
INetMIMEMessage aParent;
aParent.EnableAttachChild( INETMSG_MULTIPART_FORM_DATA );
-// Liste von successful Controls fuellen
+// Fill List of successful Controls
HtmlSuccessfulObjList aSuccObjList;
FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt );
-// Liste zu ::rtl::OUString zusammensetzen
+// Aggregate Liste to ::rtl::OUString
::rtl::OUString aResult;
for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
pSuccObj aSuccObjList.end();
@@ -578,15 +577,15 @@ Sequencesal_Int8
ODatabaseForm::GetDataMultiPartEncoded(const ReferenceXContr
}
-// Liste loeschen
+// Delete List
aSuccObjList.clear();
-// Fuer Parent MessageStream erzeugen
+// Create MessageStream for parent
INetMIMEMessageStream aMessStream;
aMessStream.SetSourceMessage( aParent );
aMessStream.GenerateHeader( sal_False );
-// MessageStream in SvStream kopieren
+// Copy MessageStream to SvStream
SvMemoryStream aMemStream;
char* pBuf = new char[1025];
int nRead;
@@ -622,12 +621,11 @@ void
ODatabaseForm::AppendComponent(HtmlSuccessfulObjList rList, const Referenc
if (!xComponentSet.is())
return;
-// MIB 25.6.98: Geschachtelte Formulare abfangen ... oder muesste
-// man sie submitten?
+// MIB 25.6.98: Catch nested Forms Geschachtelte; or would we need to
submit them?
if (!hasProperty(PROPERTY_CLASSID, xComponentSet))
return;
-// Namen ermitteln
+// Get names
if (!hasProperty(PROPERTY_NAME, xComponentSet))
return;
@@ -637,7 +635,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList
rList, const Referenc
xComponentSet-getPropertyValue( PROPERTY_NAME ) = aName;
if( aName.isEmpty() nClassId != FormComponentType::IMAGEBUTTON)
return;
-else// Name um den Prefix erweitern
+else// Extend name with the prefix
aName = rNamePrefix + aName;
switch( nClassId )
@@ -645,8 +643,8 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList
rList, const Referenc
// Buttons
case FormComponentType::COMMANDBUTTON:
{
-// Es wird nur der gedrueckte Submit-Button ausgewertet
-// MIB: Sofern ueberhaupt einer uebergeben wurde
+// We only evaluate the pressed Submit button
+// MIB: If one is passed at all
if( rxSubmitButton.is() )
{
ReferenceXPropertySet
xSubmitButtonComponent(rxSubmitButton-getModel(), UNO_QUERY);
@@ -663,8 +661,8 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList
rList, const Referenc
// ImageButtons
case FormComponentType::IMAGEBUTTON:
{
-// Es wird nur der gedrueckte Submit-Button
[Libreoffice-commits] .: linguistic/source
linguistic/source/dlistimp.cxx |4 ++--
linguistic/source/dlistimp.hxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 77eaa51bc47ff6b02f319053d4ca5aaf37b28f37
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Thu Feb 16 12:20:09 2012 +
possible inefficient checking for emptiness
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index e824888..316d86d 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -608,7 +608,7 @@ void SAL_CALL
pDicEvtLstnrHelper-DisposeAndClear( aEvtObj );
//! avoid creation of dictionaries if not already done
-if (aDicList.size() 0)
+if ( !aDicList.empty() )
{
DictionaryVec_t rDicList = GetOrCreateDicList();
size_t nCount = rDicList.size();
@@ -720,7 +720,7 @@ void DicList::SaveDics()
{
// save dics only if they have already been used/created.
//! don't create them just for the purpose of saving them !
-if (aDicList.size() 0)
+if ( !aDicList.empty() )
{
// save (modified) dictionaries
DictionaryVec_t rDicList = GetOrCreateDicList();
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 4eb9a1a..b4de818 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -89,7 +89,7 @@ class DicList :
void_CreateDicList();
DictionaryVec_tGetOrCreateDicList()
{
-if (!bInCreation aDicList.size() == 0)
+if ( !bInCreation aDicList.empty() )
_CreateDicList();
return aDicList;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 2 commits - javaunohelper/cppumaker jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk jvmfwk/plugins ridljar/javamaker unoil/javamaker
javaunohelper/cppumaker/Makefile |3 ++- jvmfwk/Library_jvmfwk.mk |2 +- jvmfwk/Library_sunjavaplugin.mk|2 +- jvmfwk/plugins/sunmajor/pluginlib/Makefile |3 ++- ridljar/javamaker/Makefile |3 ++- unoil/javamaker/Makefile |3 ++- 6 files changed, 10 insertions(+), 6 deletions(-) New commits: commit 980e69cd61b41a644de0736ee7b70c84f5b9e013 Author: Matus Kukan matus.ku...@gmail.com Date: Wed Feb 15 23:26:40 2012 +0100 add gb_Helper_abbreviate_dirs_native diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile index 230daa0..017acf1 100644 --- a/javaunohelper/cppumaker/Makefile +++ b/javaunohelper/cppumaker/Makefile @@ -29,6 +29,7 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker -C -BUCR -O. \ -Tcom.sun.star.beans.NamedValue \ -Tcom.sun.star.beans.XPropertySet \ @@ -51,7 +52,7 @@ done : -Tcom.sun.star.uno.XComponentContext \ -Tcom.sun.star.uno.XWeak \ $(OUTDIR)/bin/udkapi.rdb) \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile index 2e91b1d..b190038 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile +++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile @@ -28,7 +28,8 @@ include $(GBUILDDIR)/gbuild.mk JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java - $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^ + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) .DEFAULT_GOAL := all .PHONY : all diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile index 65c106b..d2fe741 100644 --- a/ridljar/javamaker/Makefile +++ b/ridljar/javamaker/Makefile @@ -29,7 +29,8 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : $(OUTDIR)/bin/udkapi.rdb - $(call gb_Helper_execute,javamaker -BUCR -O./class $) touch $@ + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O./class $) touch $@) .DEFAULT_GOAL := all .PHONY : all diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile index 7c21708..d39e96b 100644 --- a/unoil/javamaker/Makefile +++ b/unoil/javamaker/Makefile @@ -29,8 +29,9 @@ gb_PARTIALBUILD := T include $(GBUILDDIR)/gbuild_simple.mk done : + $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) \ - touch $@ + touch $@) .DEFAULT_GOAL := all .PHONY : all commit 2faa029ade2b1bec92016e78b744502fbf680e38 Author: Matus Kukan matus.ku...@gmail.com Date: Wed Feb 15 23:25:11 2012 +0100 jvmfwk: these are also linked_libs diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5638164..e58dade 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,jvmfwk,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_libs,jvmfwk,\ +$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 9ce5461..734e564 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_libs,sunjavaplugin,\ +$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ advapi32 \ uwinapi \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - connectivity/source forms/source
connectivity/source/commontools/FValue.cxx |8 +--
forms/source/component/ListBox.cxx | 76 ++---
forms/source/component/ListBox.hxx | 11 +++-
3 files changed, 74 insertions(+), 21 deletions(-)
New commits:
commit c55d050400139a270f5b3b620db4845001db017d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Feb 16 13:24:58 2012 +0100
fdo#46163 convert bound values to bound column's type
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 2453ebc..eb8c6c9 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -326,7 +326,7 @@ namespace frm
// propagate
if ( m_eListSourceType == ListSourceType_VALUELIST )
{
-m_aBoundValues = m_aListSourceValues;
+setBoundValues(m_aListSourceValues);
}
else
{
@@ -556,7 +556,7 @@ namespace frm
OSL_FAIL(OListBoxModel::read : invalid (means unknown) version
!);
ValueList().swap(m_aListSourceValues);
m_aBoundColumn = (sal_Int16)0;
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_eListSourceType = ListSourceType_VALUELIST;
m_aDefaultSelectSeq.realloc(0);
defaultCommonProperties();
@@ -674,7 +674,7 @@ namespace frm
// outta here if we don't have all pre-requisites
if ( !xConnection.is() || sListSource.isEmpty() )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
return;
}
@@ -924,7 +924,7 @@ namespace frm
m_nNULLPos = 0;
}
-m_aBoundValues = aValueList;
+setBoundValues(aValueList);
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny(
lcl_convertToStringSequence( aDisplayList ) ) );
}
@@ -948,7 +948,7 @@ namespace frm
{
if ( m_eListSourceType != ListSourceType_VALUELIST )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_nNULLPos = -1;
m_nBoundColumnType = DataType::SQLNULL;
@@ -960,19 +960,63 @@ namespace frm
}
//--
+void OListBoxModel::setBoundValues(const ValueList l)
+{
+m_aConvertedBoundValues.clear();
+m_aBoundValues = l;
+}
+
+
//--
+void OListBoxModel::clearBoundValues()
+{
+ValueList().swap(m_aConvertedBoundValues);
+ValueList().swap(m_aBoundValues);
+}
+
+
//--
+void OListBoxModel::convertBoundValues(const sal_Int32 nFieldType) const
+{
+m_aConvertedBoundValues.resize(m_aBoundValues.size());
+ValueList::const_iterator src = m_aBoundValues.begin();
+const ValueList::const_iterator end = m_aBoundValues.end();
+ValueList::iterator dst = m_aConvertedBoundValues.begin();
+for (; src != end; ++src, ++dst )
+{
+*dst = *src;
+dst-setTypeKind(nFieldType);
+}
+m_nConvertedBoundValuesType = nFieldType;
+OSL_ENSURE(dst == m_aConvertedBoundValues.end(),
OListBoxModel::convertBoundValues expected to have overwritten all of
m_aConvertedBoundValues, but did not.);
+}
+
//--
+sal_Int32 OListBoxModel::getValueType() const
+{
+return impl_hasBoundComponent() ? m_nBoundColumnType : getFieldType();
+}
+
//--
ValueList OListBoxModel::impl_getValues() const
{
+const sal_Int32 nFieldType = getValueType();
+
+if ( !m_aConvertedBoundValues.empty() m_nConvertedBoundValuesType
== nFieldType )
+return m_aConvertedBoundValues;
+
if ( !m_aBoundValues.empty() )
-return m_aBoundValues;
+{
+convertBoundValues(nFieldType);
+return m_aConvertedBoundValues;
+}
Sequence ::rtl::OUString aStringItems( getStringItemList() );
ValueList aValues( aStringItems.getLength() );
-::std::copy(
-aStringItems.getConstArray(),
-aStringItems.getConstArray() + aStringItems.getLength(),
-aValues.begin()
-);
-
+ValueList::iterator dst = aValues.begin();
+const ::rtl::OUString *src (aStringItems.getConstArray());
+const ::rtl::OUString * const end = src + aStringItems.getLength();
+for (; src end; ++src, ++dst )
+{
+*dst = *src;
+dst-setTypeKind(nFieldType);
+}
return aValues;
}
[Libreoffice-commits] .: filter/inc filter/source
filter/inc/filter/msfilter/msfiltertracer.hxx |2 --
filter/source/msfilter/msfiltertracer.cxx | 11 ---
2 files changed, 13 deletions(-)
New commits:
commit 4f582dcef035c1ccdc8ec00bc8c2560bfd49064b
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Feb 16 11:06:56 2012 +0100
Removed SetProperty and StartElement method of MSFilterTracer.
diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx
b/filter/inc/filter/msfilter/msfiltertracer.hxx
index 66d20d6..e8fd049 100644
--- a/filter/inc/filter/msfilter/msfiltertracer.hxx
+++ b/filter/inc/filter/msfilter/msfiltertracer.hxx
@@ -80,7 +80,6 @@ class MSFILTER_DLLPUBLIC MSFilterTracer
inline sal_Bool IsEnabled() const { return mbEnabled; }
-void StartElement( const ::rtl::OUString rName,
::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XAttributeList
xAttribs );
void EndElement( const ::rtl::OUString rName );
void Trace( const ::rtl::OUString rElementID, const ::rtl::OUString
rMessage );
@@ -91,7 +90,6 @@ class MSFILTER_DLLPUBLIC MSFilterTracer
/* initially all properties of the configuration file and the
properties which are given to the c'tor can be retrieved */
::com::sun::star::uno::Any GetProperty( const ::rtl::OUString
rPropName, const ::com::sun::star::uno::Any* pDefault = NULL ) const;
-void SetProperty( const ::rtl::OUString rPropName, const
::com::sun::star::uno::Any rProperty );
};
#endif
diff --git a/filter/source/msfilter/msfiltertracer.cxx
b/filter/source/msfilter/msfiltertracer.cxx
index 51b40d0..c54ec6c 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -174,12 +174,6 @@ void MSFilterTracer::EndTracing()
mbEnabled = sal_False;
}
-void MSFilterTracer::StartElement( const rtl::OUString rName, uno::Reference
xml::sax::XAttributeList xAttribs )
-{
-if ( mxHandler.is() )
-mxHandler-startElement( rName, xAttribs );
-}
-
void MSFilterTracer::Trace( const rtl::OUString rElement, const
rtl::OUString rMessage )
{
if ( mbEnabled mxLogger.is() )
@@ -233,9 +227,4 @@ uno::Any MSFilterTracer::GetProperty( const rtl::OUString
rPropName, const uno:
return mpCfgItem-ReadAny( rPropName, aDefault );
}
-void MSFilterTracer::SetProperty( const ::rtl::OUString rPropName, const
uno::Any rProperty )
-{
-mpCfgItem-WriteAny( rPropName, rProperty );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/source stoc/source
desktop/source/deployment/registry/help/dp_help.cxx |5 +
stoc/source/javavm/javavm.cxx | 10 --
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 3675980cc1804e842b955b656fc03133ffbecea8
Author: Michael Meeks michael.me...@suse.com
Date: Thu Feb 16 12:44:56 2012 +
disable JRE warnings during help compilation on first start
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index d121833..adc2875 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,6 +38,7 @@
#include comphelper/servicedecl.hxx
#include svl/inettype.hxx
#include unotools/pathoptions.hxx
+#include uno/current_context.hxx
#if !defined(ANDROID) !defined(IOS)
#include l10ntools/compilehelp.hxx
@@ -420,6 +421,10 @@ void BackendImpl::implProcessHelp(
Reference script::XInvocation xInvocation;
if( xContext.is() )
{
+// Ignore the missing JRE scenario on upgrade/first-start
without
+// horrible end-user warnings that are ignorable,and cause
grief.
+Reference XCurrentContext xNoContext;
+com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
try
{
xInvocation = Reference script::XInvocation (
commit 3823c4fbbaa5e9f73c37a5e66f63640d59eb20cf
Author: Michael Meeks michael.me...@suse.com
Date: Thu Feb 16 12:38:24 2012 +
java: add STOC_FORCE_NO_JRE env. var to enable easy testing of no-JRE case.
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 14437ee..2c900d2 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -782,8 +782,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence sal_Int8
const rProcessId)
JNIEnv * pMainThreadEnv = 0;
javaFrameworkError errcode = JFW_E_NONE;
-errcode = jfw_startVM(arOptions, index, m_pJavaVm,
- pMainThreadEnv);
+
+if (getenv(STOC_FORCE_NO_JRE))
+errcode = JFW_E_NO_SELECT;
+else
+errcode = jfw_startVM(arOptions, index, m_pJavaVm,
+ pMainThreadEnv);
bool bStarted = false;
switch (errcode)
@@ -794,6 +798,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence sal_Int8
const rProcessId)
// No Java configured. We silenty run the java configuration
// Java.
javaFrameworkError errFind = jfw_findAndSelectJRE( NULL );
+if (getenv(STOC_FORCE_NO_JRE))
+errFind = JFW_E_NO_JAVA_FOUND;
if (errFind == JFW_E_NONE)
{
continue;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - basebmp/Executable_basebmp_cppunittester_all.mk basebmp/Module_basebmp.mk basegfx/Executable_basegfx_cppunittester_all.mk basegfx/Module_basegfx.mk codemaker/sourc
basebmp/Executable_basebmp_cppunittester_all.mk | 70
basebmp/Module_basebmp.mk |6
basegfx/Executable_basegfx_cppunittester_all.mk | 71
-
basegfx/Module_basegfx.mk |6
codemaker/source/cppumaker/makefile.mk |4
codemaker/source/javamaker/makefile.mk |4
cpputools/source/registercomponent/makefile.mk |4
cpputools/source/regsingleton/makefile.mk |4
cpputools/source/unoexe/makefile.mk | 11 +
framework/inc/services.h|2
framework/util/fwl.component|2
i18npool/Executable_i18npool_cppunittester_all.mk | 70
i18npool/Module_i18npool.mk |6
jvmaccess/source/makefile.mk|4
jvmaccess/util/makefile.mk |4
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |6
sal/inc/sal/main.h | 78
--
sax/Executable_sax_cppunittester_all.mk | 64
sax/Module_sax.mk |6
sax/test/makefile.mk|4
tools/Executable_tools_cppunittester_all.mk | 69
tools/Module_tools.mk |6
22 files changed, 35 insertions(+), 466 deletions(-)
New commits:
commit a4e05e583f58f1baaf518e71cc48da78296ab5f4
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 16 13:13:31 2012 +0200
Typo fix: com.sum - com.sun
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 232d924..982fcd0 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -209,7 +209,7 @@ namespace framework{
#define IMPLEMENTATIONNAME_URIABBREVIATION
DECLARE_ASCII(com.sun.star.comp.framework.UriAbbreviation )
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER
DECLARE_ASCII(com.sun.star.comp.framework.PopupMenuControllerDispatcher )
#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER
DECLARE_ASCII(com.sun.star.comp.framework.LangSelectionStatusbarController )
-#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER
DECLARE_ASCII(com.sum.star.comp.framework.LanguageSelectionMenuController )
+#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER
DECLARE_ASCII(com.sun.star.comp.framework.LanguageSelectionMenuController )
#define IMPLEMENTATIONNAME_IMAGEMANAGER
DECLARE_ASCII(com.sun.star.comp.framework.ImageManager)
#define IMPLEMENTATIONNAME_TABWINDOWSERVICE
DECLARE_ASCII(com.sun.star.comp.framework.TabWindowService)
#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER
DECLARE_ASCII(com.sun.star.comp.framework.WindowContentFactoryManager )
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
index 5fca040..b81a9f2 100755
--- a/framework/util/fwl.component
+++ b/framework/util/fwl.component
@@ -28,7 +28,7 @@
component loader=com.sun.star.loader.SharedLibrary prefix=fwl
xmlns=http://openoffice.org/2010/uno-components;
- implementation
name=com.sum.star.comp.framework.LanguageSelectionMenuController
+ implementation
name=com.sun.star.comp.framework.LanguageSelectionMenuController
service name=com.sun.star.frame.PopupMenuController/
/implementation
implementation name=com.sun.star.comp.framework.DispatchRecorder
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 0054c7a..32cad81 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -158,7 +158,7 @@
value/
/prop
prop oor:name=Controller
-
valuecom.sum.star.comp.framework.LanguageSelectionMenuController/value
+
valuecom.sun.star.comp.framework.LanguageSelectionMenuController/value
/prop
/node
node oor:name=c14 oor:op=replace
@@ -169,7 +169,7 @@
value/
/prop
prop oor:name=Controller
-
valuecom.sum.star.comp.framework.LanguageSelectionMenuController/value
+
valuecom.sun.star.comp.framework.LanguageSelectionMenuController/value
/prop
/node
node oor:name=c15 oor:op=replace
@@ -180,7 +180,7 @@
value/
/prop
prop oor:name=Controller
-
valuecom.sum.star.comp.framework.LanguageSelectionMenuController/value
+
[Libreoffice-commits] .: 6 commits - solenv/bin
solenv/bin/make_installer.pl|8 +-
solenv/bin/modules/installer/sorter.pm | 89 +++-
solenv/bin/modules/installer/windows/feature.pm | 13 +--
solenv/bin/modules/installer/worker.pm | 20 -
solenv/bin/modules/t/installer-sorter.t | 48
5 files changed, 71 insertions(+), 107 deletions(-)
New commits:
commit 51f8f151780b6514d515b739e3167f36eb30787c
Author: Tim Retout t...@retout.co.uk
Date: Wed Feb 15 20:08:57 2012 +
Simplify installer::sorter::sorting_array_of_hashes.
diff --git a/solenv/bin/modules/installer/sorter.pm
b/solenv/bin/modules/installer/sorter.pm
index 54e5c34..b08dd80 100644
--- a/solenv/bin/modules/installer/sorter.pm
+++ b/solenv/bin/modules/installer/sorter.pm
@@ -44,26 +44,10 @@ sub sorting_array_of_hashes
{
my ($arrayref, $sortkey) = @_;
-for ( my $i = 0; $i = $#{$arrayref}; $i++ )
-{
-my $onehashunder = ${$arrayref}[$i];
-my $sortvalueunder = $onehashunder-{$sortkey};
-
-for ( my $j = $i + 1; $j = $#{$arrayref}; $j++ )
-{
-my $onehashover = ${$arrayref}[$j];
-my $sortvalueover = $onehashover-{$sortkey};
-
-if ( $sortvalueunder gt $sortvalueover)
-{
-${$arrayref}[$i] = $onehashover;
-${$arrayref}[$j] = $onehashunder;
-
-$onehashunder = $onehashover;
-$sortvalueunder = $sortvalueover;
-}
-}
-}
+@$arrayref = map { $_-[1] }
+ sort { $a-[0] cmp $b-[0] }
+ map { [$_-{$sortkey}, $_] }
+ @$arrayref;
}
1;
commit 01fde2e939cbc4aeeb15978febb5e2fa0396c125
Author: Tim Retout t...@retout.co.uk
Date: Wed Feb 15 19:00:10 2012 +
Add tests for installer::sorter
diff --git a/solenv/bin/modules/t/installer-sorter.t
b/solenv/bin/modules/t/installer-sorter.t
new file mode 100644
index 000..fe67b4e
--- /dev/null
+++ b/solenv/bin/modules/t/installer-sorter.t
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Tim Retout t...@retout.co.uk (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+use strict;
+use warnings;
+
+use lib '.';
+
+use Test::More;
+use List::Util 'shuffle';
+
+BEGIN {
+use_ok('installer::sorter', qw(
+sorting_array_of_hashes
+));
+}
+
+my @loh_str_sorted = map { { key = $_ } } (a..j);
+
+my @loh_str_random = shuffle @loh_str_sorted;
+
+sorting_array_of_hashes(\@loh_str_random, key);
+
+is_deeply(\@loh_str_random, \@loh_str_sorted);
+
+done_testing();
commit a1bc2d7d23e160bd9bb9570b4d512eee740aca15
Author: Tim Retout t...@retout.co.uk
Date: Wed Feb 15 18:50:06 2012 +
Use Exporter for installer::sorter
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 4f35aed..45dede0 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -57,7 +57,7 @@ use installer::scpzipfiles;
use installer::scriptitems;
use installer::setupscript;
use installer::simplepackage;
-use installer::sorter;
+use installer::sorter qw(sorting_array_of_hashes);
use installer::strip;
use installer::substfilenamefiles;
use installer::systemactions;
@@ -1101,7 +1101,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3alangpack.log, $directoriesforepmarrayref); }
($directoriesforepmarrayref, $alldirectoryhash) =
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
$alldirectoryhash);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3blangpack.log, $directoriesforepmarrayref); }
-installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref,
HostName);
+sorting_array_of_hashes($directoriesforepmarrayref, HostName);
[Libreoffice-commits] .: sw/source
sw/source/ui/uno/SwXDocumentSettings.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 746e9a7d338db5fb0af285d453055ae5fa45037d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 13:39:09 2012 +
allow unsetting database settings without warnings
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index c349631..fa8a704 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -474,21 +474,23 @@ void SwXDocumentSettings::_setSingleValue( const
comphelper::PropertyInfo rInf
case HANDLE_CURRENT_DATABASE_COMMAND:
{
SwDBData aData = mpDoc-GetDBData();
-SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
-\CurrentDatabaseCommand\ property possibly set before
\CurrentDatabaseDataSource\ );
+
if ( rValue = aData.sCommand )
mpDoc-ChgDBData( aData );
+
+SAL_WARN_IF( aData.sDataSource.isEmpty()
!aData.sCommand.isEmpty(), sw.uno,
+\CurrentDatabaseCommand\ property possibly set before
\CurrentDatabaseDataSource\ );
}
break;
case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
{
SwDBData aData = mpDoc-GetDBData();
-SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
-\CurrentDatabaseCommandType\ property possibly set before
\CurrentDatabaseDataSource\ );
-SAL_WARN_IF( aData.sCommand.isEmpty(), sw.uno,
-\CurrentDatabaseCommandType\ property possibly set before
\CurrentDatabaseCommand\ );
if ( rValue = aData.nCommandType )
mpDoc-ChgDBData( aData );
+SAL_WARN_IF( aData.nCommandType aData.sDataSource.isEmpty(),
sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before
\CurrentDatabaseDataSource\ );
+SAL_WARN_IF( aData.nCommandType aData.sCommand.isEmpty(),
sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before
\CurrentDatabaseCommand\ );
}
break;
case HANDLE_SAVE_VERSION_ON_CLOSE:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S | 18 +++
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 34 ++-
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx |2
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 105 +++---
4 files changed, 142 insertions(+), 17 deletions(-)
New commits:
commit dab11f7fe2a2fa4155e4c4feaa5fc54e57cfbd37
Author: Jani Monoses j...@ubuntu.com
Date: Fri Feb 10 14:50:22 2012 +0200
ARM bridge: VFP ABI (armhf) support
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
index d5faf15..27148dc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
@@ -10,6 +10,17 @@
# define UNWIND @
#endif
+@ If the VFP ABI variant (armhf in Debian/Ubuntu) is used, an additional extra
64 bytes
+@ are taken up on the stack (the equivalent of the 8 double precision VFP
registers)
+
+#ifdef __ARM_PCS_VFP
+# define PAD 80
+# define DISCARDED 84
+#else
+# define PAD 16
+# define DISCARDED 20
+#endif
+
.file armhelper.s
.text
.align 4
@@ -19,9 +30,12 @@ privateSnippetExecutor:
UNWIND .fnstart@ start of unwinder entry
stmfd sp!, {r0-r3} @ follow other parameters on stack
- UNWIND .pad #16 @ throw this data away on exception
mov r0, ip @ r0 points to functionoffset/vtable
mov r1, sp @ r1 points to this and params
+#ifdef __ARM_PCS_VFP
+ vpush {d0-d7} @ floating point parameter on stack
+#endif
+ UNWIND .pad #PAD @ throw this data away on exception
@ (see cppuno.cxx:codeSnippet())
stmfd sp!, {r4,lr} @ save return address
@ (r4 pushed to preserve stack alignment)
@@ -30,7 +44,7 @@ privateSnippetExecutor:
blcpp_vtable_call(PLT)
add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
- ldr pc, [sp], #20@ return, discarding function arguments
+ ldr pc, [sp], #DISCARDED @ return, discarding function arguments
UNWIND .fnend @ end of unwinder entry
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index d347aa0..07bdea1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -69,6 +69,9 @@ namespace
char * pTopStack = (char *)(pCallStack + 0);
char * pCppStack = pTopStack;
+#ifdef __ARM_PCS_VFP
+char * pFloatArgs = (char *)(pCppStack - 64);
+#endif
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
if (pReturnTypeRef)
@@ -125,7 +128,9 @@ namespace
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
+#ifndef __ARM_PCS_VFP
case typelib_TypeClass_DOUBLE:
+#endif
if ((pCppStack - pTopStack) % 8) pCppStack+=sizeof(sal_Int32);
//align to 8
break;
default:
@@ -133,13 +138,31 @@ namespace
}
#endif
-pCppArgs[nPos] = pCppStack;
-pUnoArgs[nPos] = pCppStack;
+// For armhf we get the floating point arguments from a different area of the
stack
+// TODO: deal with functions with more than 8 floating point args that need to
overflow
+// to the stack. Find such an UNO API to try on.
+#ifdef __ARM_PCS_VFP
+if (pParamTypeDescr-eTypeClass == typelib_TypeClass_FLOAT)
+{
+pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
+pFloatArgs += sizeof(float);
+} else
+if (pParamTypeDescr-eTypeClass == typelib_TypeClass_DOUBLE)
+{
+if ((pFloatArgs - pTopStack) % 8)
pFloatArgs+=sizeof(float); //align to 8
+pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
+pFloatArgs += sizeof(double);
+} else
+#endif
+pCppArgs[nPos] = pUnoArgs[nPos] = pCppStack;
+
switch (pParamTypeDescr-eTypeClass)
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
+#ifndef __ARM_PCS_VFP
case typelib_TypeClass_DOUBLE:
+#endif
pCppStack += sizeof(sal_Int32); // extra long
break;
default:
@@ -179,6 +202,13 @@ namespace
TYPELIB_DANGER_RELEASE( pParamTypeDescr );
}
}
+#ifdef __ARM_PCS_VFP
+// use the stack for output parameters or non floating point values
+if (rParam.bOut ||
+
[Libreoffice-commits] .: oox/source
oox/source/ppt/pptshapegroupcontext.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 5c714632583036f72377aa0fa6ed1137e53582dc
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Feb 16 20:59:57 2012 +0530
n744503: Importing useBgFill colors for shapes.
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index cf982cf..0529ec6 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -41,6 +41,7 @@
#include oox/drawingml/customshapegeometry.hxx
#include oox/drawingml/textbodycontext.hxx
#include oox/drawingml/connectorshapecontext.hxx
+#include oox/drawingml/fillproperties.hxx
#include extdrawingfragmenthandler.hxx
using rtl::OUString;
@@ -108,7 +109,19 @@ Reference XFastContextHandler
PPTShapeGroupContext::createFastChildContext( s
xRet.set( new PPTShapeGroupContext( *this, mpSlidePersistPtr,
meShapeLocation, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape(
meShapeLocation, com.sun.star.drawing.GroupShape ) ) ) );
break;
case PPT_TOKEN( sp ): // Shape
-xRet.set( new PPTShapeContext( *this, mpSlidePersistPtr,
mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation,
com.sun.star.drawing.CustomShape ) ) ) );
+{
+AttributeList aAttribs( xAttribs );
+oox::drawingml::ShapePtr pShape = oox::drawingml::ShapePtr( new
PPTShape( meShapeLocation, com.sun.star.drawing.CustomShape ) );
+if( aAttribs.getBool( XML_useBgFill, false ) )
+{
+::oox::drawingml::FillProperties aFill =
pShape-getFillProperties();
+aFill.moFillType = XML_solidFill;
+// This is supposed to fill with slide (background) color, but
+// TODO: We are using white here, because thats the closest we
can assume (?)
+aFill.maFillColor.setSrgbClr( API_RGB_WHITE );
+}
+xRet.set( new PPTShapeContext( *this, mpSlidePersistPtr,
mpGroupShapePtr, pShape ) );
+}
break;
case PPT_TOKEN( pic ): // CT_Picture
xRet.set( new PPTGraphicShapeContext( *this, mpSlidePersistPtr,
mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation,
com.sun.star.drawing.GraphicObjectShape ) ) ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/pyuno_dlopenwrapper.c | 76 +-
1 file changed, 55 insertions(+), 21 deletions(-)
New commits:
commit 1bb0d979b5ac5ed0cd831c6c8c0ab55dc2621eba
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 16:30:25 2012 +0100
Adapt pyuno.so wrapper to Python 3 support
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c
b/pyuno/source/module/pyuno_dlopenwrapper.c
index 1ace044..487665b 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -26,38 +26,72 @@
*
/
-#include rtl/string.h
+#include sal/config.h
#include stdlib.h
#include string.h
-#ifdef LINUX
-# ifndef __USE_GNU
-# define __USE_GNU
-# endif
+#if defined LINUX !defined __USE_GNU
+#define __USE_GNU
#endif
#include dlfcn.h
-void initpyuno ()
-{
-Dl_info dl_info;
-void (*func)(void);
+#include Python.h
+
+#include rtl/string.h
-if (dladdr((void*)initpyuno, dl_info) != 0) {
-void* h = 0;
-size_t len = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname + 1;
-char* libname = malloc(len + RTL_CONSTASCII_LENGTH( SAL_DLLPREFIX pyuno
SAL_DLLEXTENSION ) + 1);
-strncpy(libname, dl_info.dli_fname, len);
-strcpy(libname + (len), SAL_DLLPREFIX pyuno SAL_DLLEXTENSION);
+/* A wrapper around libpyuno.so, making sure the latter is loaded RTLD_GLOBAL
+ so that C++ exception handling works with old GCC versions (that determine
+ RTTI identity by comparing string addresses rather than string content).
+*/
-h = dlopen (libname, RTLD_NOW | RTLD_GLOBAL);
+static void * load(void * address, char const * symbol) {
+Dl_info dl_info;
+char * slash;
+size_t len;
+char * libname;
+void * h;
+void * func;
+if (dladdr(address, dl_info) == 0) {
+abort();
+}
+slash = strrchr(dl_info.dli_fname, '/');
+if (slash == NULL) {
+abort();
+}
+len = slash - dl_info.dli_fname + 1;
+libname = malloc(
+len + RTL_CONSTASCII_LENGTH(SAL_DLLPREFIX pyuno SAL_DLLEXTENSION)
++ 1);
+if (libname == 0) {
+abort();
+}
+strncpy(libname, dl_info.dli_fname, len);
+strcpy(libname + len, SAL_DLLPREFIX pyuno SAL_DLLEXTENSION);
+h = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
free(libname);
-if( h )
-{
-func = (void (*)())dlsym (h, initpyuno);
-(func) ();
-}
+if (h == NULL) {
+abort();
}
+func = dlsym(h, symbol);
+if (func == NULL) {
+abort();
+}
+return func;
}
+#if PY_MAJOR_VERSION = 3
+
+PyObject * PyInit_pyuno(void) {
+((PyObject * (*)(void)) load((void *) PyInit_pyuno, PyInit_pyuno))();
+}
+
+#else
+
+void initpyuno(void) {
+((void (*)(void)) load((void *) initpyuno, initpyuno))();
+}
+
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: forms/source
forms/source/component/DatabaseForm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f6473f1302d2067e6d7925c17bfed284031d164 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 16 17:01:31 2012 +0100 Forgotten German word in translated comment diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 3796d79..559a29e 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -621,7 +621,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList rList, const Referenc if (!xComponentSet.is()) return; -// MIB 25.6.98: Catch nested Forms Geschachtelte; or would we need to submit them? +// MIB 25.6.98: Catch nested Forms; or would we need to submit them? if (!hasProperty(PROPERTY_CLASSID, xComponentSet)) return; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/pyuno_dlopenwrapper.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d90fd406fd8b9a0e03a5284673304008166a8b7e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 17:06:41 2012 +0100
Missing return
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c
b/pyuno/source/module/pyuno_dlopenwrapper.c
index 487665b..01386e6 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -83,7 +83,8 @@ static void * load(void * address, char const * symbol) {
#if PY_MAJOR_VERSION = 3
PyObject * PyInit_pyuno(void) {
-((PyObject * (*)(void)) load((void *) PyInit_pyuno, PyInit_pyuno))();
+return
+((PyObject * (*)(void)) load((void *) PyInit_pyuno,
PyInit_pyuno))();
}
#else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit ca9801809249dbc98b28d3a24325fa54f2e91724 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Feb 16 17:39:26 2012 +0100 let src.downloaded not depend on phony target to avoid re-creating each time diff --git a/Makefile b/Makefile index 99cae26..7ef0842 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -.PHONY : all autogen bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags +.PHONY : all bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -332,9 +332,8 @@ endif ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # -# autogen +# Makefile # -autogen: Makefile # I don't like to touch stuff that are supposed to be # in the source tree, hence read-only @@ -354,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # fetch: src.downloaded -src.downloaded : autogen ooo.lst download +src.downloaded : Makefile ooo.lst download ifeq ($(DO_FETCH_TARBALLS),YES) @./download $(SRCDIR)/ooo.lst touch $@ else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/pyuno_dlopenwrapper.c |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit a545badd656ce00e36945b188f620a67e19fdf55 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 16 18:15:04 2012 +0100 Work around macro redefinition warning diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c index 01386e6..3bdc912 100644 --- a/pyuno/source/module/pyuno_dlopenwrapper.c +++ b/pyuno/source/module/pyuno_dlopenwrapper.c @@ -26,6 +26,10 @@ * / +/* make Python.h go first as a hack to work around _POSIX_C_SOURCE redefinition + warnings: */ +#include Python.h + #include sal/config.h #include stdlib.h @@ -36,8 +40,6 @@ #endif #include dlfcn.h -#include Python.h - #include rtl/string.h /* A wrapper around libpyuno.so, making sure the latter is loaded RTLD_GLOBAL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/qa
android/qa/desktop/Makefile |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 1cc602e09b8b6ddaac8ddf526383ed28a1e42bd5 Author: Michael Meeks michael.me...@suse.com Date: Thu Feb 16 17:32:04 2012 + android: prune missing libraries from install list diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 67fdb7c..c0fbe00 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -159,13 +159,11 @@ copy-stuff: buildrcs uno_cppuhelpergcc3 \ uno_sal \ uno_salhelpergcc3 \ - unoexceptionprotector \ unotest \ unoxmllo \ utllo \ vbahelperlo \ vcllo \ - vclplug_svplo \ xcrlo \ xml2 \ xmlreader \ @@ -178,6 +176,7 @@ copy-stuff: buildrcs done #deployment \ #deploymentmisclo \ +#unoexceptionprotector \ # # Then the shared GNU C++ library ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - comphelper/inc comphelper/source dbaccess/source
comphelper/inc/comphelper/asyncnotification.hxx | 11 +--
comphelper/source/misc/asyncnotification.cxx |4 ++--
dbaccess/source/core/dataaccess/documenteventnotifier.cxx |1 +
3 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 81921bec4b81b7e3e87c24a6b4e3cfdd0cced47d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 19:00:40 2012 +0100
Make sure spawned thread is joined again
...otherwise, it might still run during exit(3) and cause problems.
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 8d6b90d..24a46a2 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -165,6 +165,7 @@ namespace dbaccess
{
m_pEventBroadcaster-removeEventsForProcessor( this );
m_pEventBroadcaster-terminate();
+m_pEventBroadcaster-join();
m_pEventBroadcaster = NULL;
}
commit 4a98b359d8ba392362ac6a40692912b58a3b1544
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 18:59:38 2012 +0100
Clean up AsyncEventNotifier interface
diff --git a/comphelper/inc/comphelper/asyncnotification.hxx
b/comphelper/inc/comphelper/asyncnotification.hxx
index 6f2f1af..e7d5ac3 100644
--- a/comphelper/inc/comphelper/asyncnotification.hxx
+++ b/comphelper/inc/comphelper/asyncnotification.hxx
@@ -91,7 +91,6 @@ namespace comphelper
//
//= AsyncEventNotifier
//
-typedef ::osl::Thread AsyncEventNotifier_TBASE;
struct EventNotifierImpl;
/** a helper class for notifying events asynchronously
@@ -110,7 +109,7 @@ namespace comphelper
events in the queue. As soon as you add an event, the thread is woken
up, processes the event,
and sleeps again.
*/
-class COMPHELPER_DLLPUBLIC AsyncEventNotifier :protected
AsyncEventNotifier_TBASE
+class COMPHELPER_DLLPUBLIC AsyncEventNotifier :public ::osl::Thread
,public ::rtl::IReference
{
friend struct EventNotifierImpl;
@@ -118,7 +117,6 @@ namespace comphelper
private:
::std::auto_ptr EventNotifierImpl m_pImpl;
-protected:
// Thread
virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
@@ -132,13 +130,6 @@ namespace comphelper
virtual oslInterlockedCount SAL_CALL acquire();
virtual oslInterlockedCount SAL_CALL release();
-using AsyncEventNotifier_TBASE::create;
-using AsyncEventNotifier_TBASE::join;
-using AsyncEventNotifier_TBASE::getIdentifier;
-
-using AsyncEventNotifier_TBASE::operator new;
-using AsyncEventNotifier_TBASE::operator delete;
-
/** terminates the thread
Note that this is a cooporative termination - if you call this
from a thread different
diff --git a/comphelper/source/misc/asyncnotification.cxx
b/comphelper/source/misc/asyncnotification.cxx
index 7e225ed..cf8b628 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -171,7 +171,7 @@ namespace comphelper
::osl::MutexGuard aGuard( m_pImpl-aMutex );
// remember the termination request
-AsyncEventNotifier_TBASE::terminate();
+Thread::terminate();
// awake the thread
m_pImpl-aPendingActions.set();
@@ -251,7 +251,7 @@ namespace comphelper
//
void SAL_CALL AsyncEventNotifier::onTerminated()
{
-AsyncEventNotifier_TBASE::onTerminated();
+Thread::onTerminated();
// when we were started (-run), we aquired ourself. Release this now
// that we were finally terminated
release();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/generic/poly.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2dd1722d2729f0d6cda6e31297f3e03ae36c555f
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 16 22:36:35 2012 +0100
Fix a bug found with cclang
Null pointer passed as an argument to a 'nonnull'
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 3c86a7a..4e71b35 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -88,7 +88,7 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, sal_Bool
bFlags )
if( bFlags )
{
mpFlagAry = new sal_uInt8[ nInitSize ];
-memset( mpPointAry, 0, nInitSize );
+memset( mpFlagAry, 0, nInitSize );
}
else
mpFlagAry = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - tools/source
tools/source/generic/poly.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9315b52380648c83db09b171a92134f8d2e4de5d
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 16 22:39:00 2012 +0100
Apply master fix 2dd1722d2729f0d6cda6e31297f3e03ae36c555f
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 14b34d3..a34e1e6 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -88,7 +88,7 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, sal_Bool
bFlags )
if( bFlags )
{
mpFlagAry = new sal_uInt8[ nInitSize ];
-memset( mpPointAry, 0, nInitSize );
+memset( mpFlagAry, 0, nInitSize );
}
else
mpFlagAry = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/inc/xlpivot.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 689f2fa7aec03090ac150591d472aea74b17ca50 Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Feb 16 15:55:53 2012 +0900 Removed unused header include diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 1a88868..74aef36 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -41,7 +41,6 @@ #include xladdress.hxx #include dpobject.hxx -#include boost/noncopyable.hpp #include boost/scoped_ptr.hpp class XclImpStream; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/qa test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
sc/qa/extras/sccellrangeobj.cxx | 28 +++
sc/qa/extras/testdocuments/xcellrangesquery.ods |binary
test/Library_subsequenttest.mk |1
test/Package_inc.mk |1
test/inc/test/sheet/xcellrangedata.hxx | 48
test/source/sheet/xcellrangedata.cxx| 89
6 files changed, 165 insertions(+), 2 deletions(-)
New commits:
commit 7b91c6d1c0686b06de4d2e87b02df10aa9afbf4c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Feb 17 01:59:32 2012 +0100
add test for ScCellRangeObj::setDataArray and getDataArray
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 050724d..2152a2d 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -31,6 +31,7 @@
#include test/sheet/cellproperties.hxx
#include test/util/xreplaceable.hxx
#include test/util/xsearchable.hxx
+#include test/sheet/xcellrangedata.hxx
#include com/sun/star/sheet/XSpreadsheetDocument.hpp
#include com/sun/star/sheet/XSpreadsheet.hpp
@@ -38,10 +39,10 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 12
+#define NUMBER_OF_TESTS 14
class ScCellRangeObj : public UnoApiTest, apitest::XCellRangesQuery,
apitest::CellProperties,
-apitest::XSearchable, apitest::XReplaceable
+apitest::XSearchable, apitest::XReplaceable,
apitest::XCellRangeData
{
public:
ScCellRangeObj();
@@ -49,6 +50,7 @@ public:
virtual void setUp();
virtual void tearDown();
virtual uno::Reference uno::XInterface init();
+virtual uno::Reference uno::XInterface getXCellRangeData();
CPPUNIT_TEST_SUITE(ScCellRangeObj);
CPPUNIT_TEST(testQueryColumnDifference);
@@ -64,6 +66,8 @@ public:
CPPUNIT_TEST(testFindFirst);
CPPUNIT_TEST(testReplaceAll);
CPPUNIT_TEST(testCreateReplaceDescriptor);
+CPPUNIT_TEST(testGetDataArray);
+CPPUNIT_TEST(testSetDataArray);
CPPUNIT_TEST_SUITE_END();
private:
@@ -101,6 +105,26 @@ uno::Reference uno::XInterface ScCellRangeObj::init()
return xReturn;
}
+uno::Reference uno::XInterface ScCellRangeObj::getXCellRangeData()
+{
+rtl::OUString aFileURL;
+const rtl::OUString
aFileBase(RTL_CONSTASCII_USTRINGPARAM(xcellrangesquery.ods));
+createFileURL(aFileBase, aFileURL);
+std::cout rtl::OUStringToOString(aFileURL,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
+if( !mxComponent.is())
+mxComponent = loadFromDesktop(aFileURL);
+uno::Reference sheet::XSpreadsheetDocument xDoc (mxComponent,
UNO_QUERY_THROW);
+uno::Reference container::XIndexAccess xIndex (xDoc-getSheets(),
UNO_QUERY_THROW);
+uno::Reference sheet::XSpreadsheet xSheet( xIndex-getByIndex(1),
UNO_QUERY_THROW);
+
+CPPUNIT_ASSERT_MESSAGE(Could not create interface of type XSpreadsheet,
xSheet.is());
+
+uno::Referencetable::XCellRange
xReturn(xSheet-getCellRangeByPosition(0,0,3,3), UNO_QUERY_THROW);
+
+CPPUNIT_ASSERT_MESSAGE(Could not create object of type XCellRangesQuery,
xReturn.is());
+return xReturn;
+}
+
void ScCellRangeObj::setUp()
{
nTest++;
diff --git a/sc/qa/extras/testdocuments/xcellrangesquery.ods
b/sc/qa/extras/testdocuments/xcellrangesquery.ods
index 562229c..ec7335f 100644
Binary files a/sc/qa/extras/testdocuments/xcellrangesquery.ods and
b/sc/qa/extras/testdocuments/xcellrangesquery.ods differ
commit 4e1e72dc346e732ff5693e5428e39710ca3b78a5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Feb 17 01:41:04 2012 +0100
add test code for XCellRangeData
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 6c1556f..53cc8e4 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -69,6 +69,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xnamed \
test/source/sheet/cellproperties \
test/source/sheet/datapilotfield \
+test/source/sheet/xcellrangedata \
test/source/sheet/xcellrangesquery \
test/source/sheet/xdatabaserange \
test/source/sheet/xdatapilotdescriptor \
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index 55a50af..768c6a8 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -40,6 +40,7 @@ $(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,t
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamereplace.hxx,test/container/xnamereplace.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
+$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xcellrangedata.hxx,test/sheet/xcellrangedata.hxx))
$(eval $(call
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 178a30236e763051fa1e52f0b4de4d9540753df2
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Feb 16 23:15:26 2012 -0600
use bzip2 compression for dmg
On MacOSX the installable packages (dmg), can use diverse format and
diverse compression method.
Since 10.4 a new format is supported that use bzip2 as a compression
back-end. The result if a reduction of ~30MB of the main dmg.
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 8c0e9ee..8bd8bda 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -535,7 +535,7 @@ sub create_package
chdir $localfrom;
}
-$systemcall = cd $localtempdir hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \$volume_name\ -ov -o
$installdir/tmp hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o
$archive ;
+$systemcall = cd $localtempdir hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \$volume_name\ -ov -o
$installdir/tmp hdiutil convert -ov -format UDBZ $installdir/tmp.dmg -o
$archive ;
if (( $ref ne ) ( $$ref ne )) {
$systemcall .= hdiutil unflatten $archive Rez -a $$ref -o
$archive hdiutil flatten $archive ;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ure/Rdb_ure.mk
ure/Rdb_ure.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42e8410538995a28274a4d4a8936e75ad4dedcd8 Author: David Tardon dtar...@redhat.com Date: Fri Feb 17 08:57:54 2012 +0100 component file moved diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index b3b6531..a0639c1 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -49,7 +49,7 @@ ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Rdb_add_components,ure/services,\ javaloader \ javavm \ -juh \ +javaunohelper/util/juh \ )) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] - [core/vcl/source/window/splitwin.cxx:2045]: (style) Found duplicate branches for if and else.
Il 16/02/2012 00:02, Mariusz Dykierek ha scritto:
+ some simplification
+sal_Bool bLeft = sal_True;
+if ( ( meAlign == WINDOWALIGN_TOP ) || ( meAlign ==
WINDOWALIGN_LEFT ) )
+bLeft = sal_False;
I think that keeping possible values explicit could be a good thing so
what about a switch?
sal_Bool bLeft;
switch (meAlign) {
case WINDOWALIGN_TOP:
case WINDOWALIGN_LEFT:
bLeft = sal_False;
case WINDOWALIGN_BOTTOM:
case WINDOWALIGN_RIGHT:
default:
bLeft = sal_True;
}
Otherwise you can simplify it even more:
sal_Bool bLeft = (meAlign == WINDOWALIGN_TOP || meAlign ==
WINDOWALIGN_LEFT) ? sal_False : sal_True;
cheers
--
Riccardo Magliocchetti
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] - [core/vcl/source/window/splitwin.cxx:2045]: (style) Found duplicate branches for if and else.
On 02/16/2012 09:35 AM, Riccardo Magliocchetti wrote: Otherwise you can simplify it even more: sal_Bool bLeft = (meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT) ? sal_False : sal_True; ... which of course reduces to bool bLeft = !(meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT); or bool bLeft = meAlign == WINDOWALIGN_RIGHT || meAlign == WINDOWALIGN_BOTTOM given that WindowAlign has exactly those four members (and it makes the name bLeft look odd...). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] Fix for crash in smartart import
Hi there, could someone please review http://cgit.freedesktop.org/libreoffice/core/commit/?id=905df1bae9cab296ee7dd07e88813c667788ed8a and cherry-pick to -3-5? A very obvious getting-ahead-of-myself problem when accessing an iterator. ;) Thanks, -- Thorsten pgpbVNxgKDF88.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-5] Fix for crash in smartart import
+1 should we also push it to 3.5.x branches as well? On 02/16/2012 03:16 PM, Thorsten Behrens wrote: Hi there, could someone please review http://cgit.freedesktop.org/libreoffice/core/commit/?id=905df1bae9cab296ee7dd07e88813c667788ed8a and cherry-pick to -3-5? A very obvious getting-ahead-of-myself problem when accessing an iterator. ;) Thanks, -- Thorsten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW-3-5] Fix for crash in smartart import
Hi Muthu, Muthu Subramanian K píše v Čt 16. 02. 2012 v 15:58 +0530: +1 should we also push it to 3.5.x branches as well? Thanks for push, marking it [PUSHED]. No need to push to any other branch, libreoffice-3-5-1 is not created yet, and for -3-5-0 it is too late ;-) Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removed unused code from MSFilterTracer
Hi!
sry didn't attach file :$
This is my first patch, I hope everything's correct.
Removed functions: (used unusedcode.easy)
MSFilterTracer::SetProperty(rtl::OUString const, com::sun::star::uno::Any
const)
MSFilterTracer::StartElement(rtl::OUString
const,
com::sun::star::uno::Referencecom::sun::star::xml::sax::XAttributeList)
Files modified:
filter/inc/filter/msfilter/msfiltertracer.hxx
filter/source/msfilter/msfiltertracer.cxx
From e6c5331e5f55f847052588afbbcca1e41b3b2ca0 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 16 Feb 2012 11:06:56 +0100
Subject: [PATCH] Removed SetProperty and StartElement method of
MSFilterTracer.
---
filter/inc/filter/msfilter/msfiltertracer.hxx |2 --
filter/source/msfilter/msfiltertracer.cxx | 11 ---
2 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx
index 66d20d6..e8fd049 100644
--- a/filter/inc/filter/msfilter/msfiltertracer.hxx
+++ b/filter/inc/filter/msfilter/msfiltertracer.hxx
@@ -80,7 +80,6 @@ class MSFILTER_DLLPUBLIC MSFilterTracer
inline sal_Bool IsEnabled() const { return mbEnabled; }
-void StartElement( const ::rtl::OUString rName, ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XAttributeList xAttribs );
void EndElement( const ::rtl::OUString rName );
void Trace( const ::rtl::OUString rElementID, const ::rtl::OUString rMessage );
@@ -91,7 +90,6 @@ class MSFILTER_DLLPUBLIC MSFilterTracer
/* initially all properties of the configuration file and the
properties which are given to the c'tor can be retrieved */
::com::sun::star::uno::Any GetProperty( const ::rtl::OUString rPropName, const ::com::sun::star::uno::Any* pDefault = NULL ) const;
-void SetProperty( const ::rtl::OUString rPropName, const ::com::sun::star::uno::Any rProperty );
};
#endif
diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index 51b40d0..c54ec6c 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -174,12 +174,6 @@ void MSFilterTracer::EndTracing()
mbEnabled = sal_False;
}
-void MSFilterTracer::StartElement( const rtl::OUString rName, uno::Reference xml::sax::XAttributeList xAttribs )
-{
-if ( mxHandler.is() )
-mxHandler-startElement( rName, xAttribs );
-}
-
void MSFilterTracer::Trace( const rtl::OUString rElement, const rtl::OUString rMessage )
{
if ( mbEnabled mxLogger.is() )
@@ -233,9 +227,4 @@ uno::Any MSFilterTracer::GetProperty( const rtl::OUString rPropName, const uno:
return mpCfgItem-ReadAny( rPropName, aDefault );
}
-void MSFilterTracer::SetProperty( const ::rtl::OUString rPropName, const uno::Any rProperty )
-{
-mpCfgItem-WriteAny( rPropName, rProperty );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Timur gti...@gmail.com changed: What|Removed |Added Depends on||44127 --- Comment #187 from Timur gti...@gmail.com 2012-02-16 02:22:41 PST --- Added 44127 - Writer EDITING: LO crash on Apply Numbering Undo with Tracked Changes -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: Hosting LibreOffice online
Hi Drew, On Thu, 2012-02-16 at 00:50 -0500, drew wrote: Well, after adding --enable-gtk3 it works. Nice :-) WebSocket support was (is) an issue. - Win7 and Vista with ie9: Fail - HP Mini 110, Mi (Linux) w/ FireFox [latest updates applied]: Fail Oh - that is odd. I guess I should look into that - but perhaps they don't support v7 websockets (?) or ... All the other browsers I tried (FF under Natty, Chromium, Opera): Pass So - that at least is encouraging. I'm interested that a Firefox didn't work though. @Andor - if you just want to play with this, I could point you to a VM with everything pre-installed - I'd need a day or 2 to put it together I suppose, just let me know. That's it for now, Thanks drew :-) and of course, since we're interested in people hacking on this (since it's clearly in need of more love), it's fantastic to have a VM with all the build intermediates ready-to-hack etc. ;-) Good stuff, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
Hi, I confirm that all my past, present and future contributions to the LibreOffice project are licensed under the MPL / LGPLv3+. Regards Szabolcs Dezsi. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 39026, which changed state. Bug 39026 Summary: Recent Documents list does not work https://bugs.freedesktop.org/show_bug.cgi?id=39026 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: feature/gbuild_java is finished
On 16 February 2012 00:52, Matúš Kukan matus.ku...@gmail.com wrote: I had a look but couldn't build jurt: So, if we don't want to use $(OUTDIR)/class, adding +$(eval $(call gb_Jar_add_jars,jurt,\ +$(WORKDIR)/CustomTarget/ridljar/javamaker/class \ +)) in Jar_jurt.mk seems to help. I wonder how this works on other systems. I guess that should be included from ridljar.jar and I don't know why it isn't on Windows. Of course I really am not java experienced. There are also more missing gb_Helper_abbreviate_dirs_native in unoil's climaker custom target. By the way, I plan to remove gb_Helper_abbreviate_dirs and rename gb_Helper_abbreviate_dirs_native - gb_Helper_abbreviate_dirs I don't think we need both. Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Mail Merge Functionality
Hi Jerry, On Wed, 2012-02-15 at 18:17 -0800, J B wrote: I like to say the LibreOffice just keeps getting better and better, keep up the good work. Thank you - it's great to encourage other developers as you get involved yourself :-) One item I would like to see improved is the Mail Merge, namely the address labels. When viewing the forms it would be nice to see the actual names and addresses in the sheet as well, just as a preview before the printing function. That way a person can see how the names will fit into an area and do some changes if necessary. Maybe add a option in the view menu to select record view to make it easy. Sure - there are plenty of things that can be improved in mail-merge; when you have your first build done, am most happy to help you out with some code pointers to get stuck into that. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: enable XDatabaseRangeTest again
On 02/16/2012 12:58 AM, Markus Mohrhard wrote: dbaccess/Module_dbaccess.mk|6 +- sc/Module_sc.mk|1 + sc/qa/extras/scdatabaserangeobj.cxx|6 -- sc/qa/unit/filters-test.cxx|2 +- test/inc/test/sheet/xdatabaserange.hxx |2 ++ test/source/sheet/xdatabaserange.cxx | 13 + 6 files changed, 26 insertions(+), 4 deletions(-) New commits: [...] commit 1263cafe8e487b5db0c439966056516be99bc1e4 Author: Markus Mohrhardmarkus.mohrh...@googlemail.com Date: Thu Feb 16 00:18:03 2012 +0100 enable XDatabaseRangeTest again diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 074b1f1..a221f22 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ CppunitTest_sc_cellrangeobj \ +CppunitTest_sc_databaserangeobj \ CppunitTest_sc_datapilottableobj \ CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_macros_test \ sc_databaserangeobj.test onsistently fails for me now with warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:sfx2.bastyp:15606:1:/data/lo/core/sfx2/source/bastyp/helper.cxx:151: GetResultSet: Any other exception: Unable to create Content! warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testDataArea An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetSortDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetSubtotalDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetImportDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetFilterDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetFilterDescriptor tearDown() failed - An uncaught exception of type com.sun.star.uno.RuntimeException - unsatisfied query for interface of type com.sun.star.util.XCloseable! Failures !!! Run: 5 Failure total: 6 Failures: 0 Errors: 6 warn:legacy.osl:15606:1:/data/lo/core/unotools/source/config/configmgr.cxx:217: OSL_ASSERT Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck# for memory checking and retry. make: *** [/data/lo/core/workdir/unxlngx6/CppunitTest/sc_databaserangeobj.test] Error 1 Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
windows / cygwin - unable to start build
I have installed the last version of Cygwin: CYGWIN_NT-6.1-WOW64 LAZY 1.7.10(0.259/5/3) 2012-02-05 12:36 i686 Cygwin Now I can not start the build. Please see logs AT http://pastebin.com/u/walterLO Regards walter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] - [core/vcl/source/window/splitwin.cxx:2045]: (style) Found duplicate branches for if and else.
On 2012-02-16 10:02, Stephan Bergmann wrote: On 02/16/2012 09:35 AM, Riccardo Magliocchetti wrote: Otherwise you can simplify it even more: sal_Bool bLeft = (meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT) ? sal_False : sal_True; ... which of course reduces to bool bLeft = !(meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT); or bool bLeft = meAlign == WINDOWALIGN_RIGHT || meAlign == WINDOWALIGN_BOTTOM given that WindowAlign has exactly those four members (and it makes the name bLeft look odd...). I personally find 'if' more legible than ?: and definitely expressions like b = x==y || x==z; I am not sure if WindowAlign will always have only these 4 members and possibly the author of the original version wasn't either (thus final else). Since I am a newbie here, I would vote for a simple 'if' or a 'switch'. Let me know what is the decision and I will change the code accordingly or... feel free to change the code and provide an alternative patch. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Master fails to compile with cclan in moz module
Hi Julien, On Wed, 2012-02-15 at 14:51 -0800, julien2412 wrote: I'm still trying to compile with llvm/cclang. I disabled mozilla compilation and it compiled until cairo. Nice :-) If someone has an idea about this cairo problem cairo-mutex-impl-private.h:262:3: error: #error XXX: No mutex implementation found. Cairo will not work with multiple threads. Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support. I guess I'd read that file. I suspect it has some platform detection / conditional in it that is not working with clang. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Refactor installer::sorter
On 15 February 2012 21:58, Tim Retout t...@retout.co.uk wrote: subroutines, and replaced the third with a Schwartzian Transform (which might be overkill for this case, but I need to check the callers). Yeah, I've woken up and benchmarked this, and the complexity just makes it slower compared to just doing the hash lookups. So I'll probably revise or add to the last few patches later to just inline installer::sorter altogether. -- Tim Retout t...@retout.co.uk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removed unused functions from MultiLineEdit in svtools module
Hi!
I removed 4 unused functions from class MultiLineEdit. (based on
unusedcode.easy)
Functions removed:
MultiLineEdit::GetHScrollBar() const
MultiLineEdit::GetLeftMargin() const
MultiLineEdit::GetTextLines() const
MultiLineEdit::IsFocusSelectionHideEnabled() const
Files modified:
svtools/inc/svtools/svmedit.hxx
svtools/source/edit/svmedit.cxx
From 60fa233ea0398cd02712f9d02c04f48c4f776b6d Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 16 Feb 2012 11:50:42 +0100
Subject: [PATCH] Removed unused functions from MultiLineEdit in svtools
module
---
svtools/inc/svtools/svmedit.hxx |4
svtools/source/edit/svmedit.cxx | 25 -
unusedcode.easy |8
3 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 5ff8ab4..bfce316 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -65,7 +65,6 @@ protected:
ExtTextEngine* GetTextEngine() const;
ExtTextView*GetTextView() const;
-ScrollBar* GetHScrollBar() const;
ScrollBar* GetVScrollBar() const;
public:
@@ -89,7 +88,6 @@ public:
virtual sal_BoolIsReadOnly() const;
voidEnableFocusSelectionHide( sal_Bool bHide );
-sal_BoolIsFocusSelectionHideEnabled() const;
virtual voidSetMaxTextLen( xub_StrLen nMaxLen = 0 );
virtual xub_StrLen GetMaxTextLen() const;
@@ -111,7 +109,6 @@ public:
{ SetText( rStr ); SetSelection( rNewSelection ); }
String GetText() const;
String GetText( LineEnd aSeparator ) const;
-String GetTextLines() const;
String GetTextLines( LineEnd aSeparator ) const;
voidSetRightToLeft( sal_Bool bRightToLeft );
@@ -138,7 +135,6 @@ public:
voidDraw( OutputDevice* pDev, const Point rPos, const Size rSize, sal_uLong nFlags );
void SetLeftMargin( sal_uInt16 n );
-sal_uInt16 GetLeftMargin() const;
virtual
::com::sun::star::uno::Reference ::com::sun::star::awt::XWindowPeer
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 44ad0d1..df7bce3 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1221,11 +1221,6 @@ String MultiLineEdit::GetText( LineEnd aSeparator ) const
return pImpSvMEdit-GetText( aSeparator );
}
-String MultiLineEdit::GetTextLines() const
-{
-return pImpSvMEdit-GetTextLines();
-}
-
String MultiLineEdit::GetTextLines( LineEnd aSeparator ) const
{
return pImpSvMEdit-GetTextLines( aSeparator );
@@ -1565,12 +1560,6 @@ ExtTextView* MultiLineEdit::GetTextView() const
return pImpSvMEdit-GetTextWindow()-GetTextView();
}
-ScrollBar* MultiLineEdit::GetHScrollBar() const
-{
-return pImpSvMEdit-GetHScrollBar();
-}
-
-
ScrollBar* MultiLineEdit::GetVScrollBar() const
{
return pImpSvMEdit-GetVScrollBar();
@@ -1581,26 +1570,12 @@ void MultiLineEdit::EnableFocusSelectionHide( sal_Bool bHide )
pImpSvMEdit-GetTextWindow()-SetAutoFocusHide( bHide );
}
-sal_Bool MultiLineEdit::IsFocusSelectionHideEnabled() const
-{
-return pImpSvMEdit-GetTextWindow()-IsAutoFocusHide();
-}
-
-
void MultiLineEdit::SetLeftMargin( sal_uInt16 n )
{
if ( GetTextEngine() )
GetTextEngine()-SetLeftMargin( n );
}
-sal_uInt16 MultiLineEdit::GetLeftMargin() const
-{
-if ( GetTextEngine() )
-return GetTextEngine()-GetLeftMargin();
-else
-return 0;
-}
-
void MultiLineEdit::SetRightToLeft( sal_Bool bRightToLeft )
{
if ( GetTextEngine() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a40c2f..360a738 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,10 +72,10 @@ MailDispatcher::removeListener(rtl::ReferenceIMailDispatcherListener)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
MenuBar::MenuBar(ResId const)
-MultiLineEdit::GetHScrollBar() const
-MultiLineEdit::GetLeftMargin() const
-MultiLineEdit::GetTextLines() const
-MultiLineEdit::IsFocusSelectionHideEnabled() const
+***MultiLineEdit::GetHScrollBar() const
+***MultiLineEdit::GetLeftMargin() const
+***MultiLineEdit::GetTextLines() const
+***MultiLineEdit::IsFocusSelectionHideEnabled() const
NfCurrencyEntry::NfCurrencyEntry()
NotificationSettings::CopyData()
NumberFormatCodeWrapper::getDefault(short, short) const
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEWED] Remove unused (hopefully!) methods from l10ntools Export
On Wed, 2012-02-15 at 20:34 +, Kate Goss wrote: Another patch to remove methods listed as unused in unusedcode.easy Gosh; sorry about this one too ! Caolan seemed to remove those yesterday himself. It looks like he re-generated the unusedcode.easy list too (from a compilation with gtk3 enabled) - so hopefully the list there is more accurate. It'd be best to pull-up to master I suspect, if you can ? Sorry about that, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: dbaccess_macros_test: no orderly shutdown
Hi Stephan, On Wed, 2012-02-15 at 20:12 +0100, Stephan Bergmann wrote: Just experienced a spurious crash of cppunittester when executing Cppunit_dbaccess_macros_test, see backtraces below: Good :-) I was getting an apparently unrelated memory corruption destroying some vector of toolkit controls IIRC. Unfortunately, running: VALGRIND=memcheck make tail_build turns into some aggressive fork bomb ;-) at least, when you're building in parallel - the working set for umpteen valgrinds is really staggeringly vast. Another area where (somehow) forcing serialization of testing might make sense (?) Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: enable XDatabaseRangeTest again
Fixed now. Sorry for that. 2012/2/16 Stephan Bergmann sberg...@redhat.com: On 02/16/2012 12:58 AM, Markus Mohrhard wrote: dbaccess/Module_dbaccess.mk | 6 +- sc/Module_sc.mk | 1 + sc/qa/extras/scdatabaserangeobj.cxx | 6 -- sc/qa/unit/filters-test.cxx | 2 +- test/inc/test/sheet/xdatabaserange.hxx | 2 ++ test/source/sheet/xdatabaserange.cxx | 13 + 6 files changed, 26 insertions(+), 4 deletions(-) New commits: [...] commit 1263cafe8e487b5db0c439966056516be99bc1e4 Author: Markus Mohrhardmarkus.mohrh...@googlemail.com Date: Thu Feb 16 00:18:03 2012 +0100 enable XDatabaseRangeTest again diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 074b1f1..a221f22 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ CppunitTest_sc_cellrangeobj \ + CppunitTest_sc_databaserangeobj \ CppunitTest_sc_datapilottableobj \ CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_macros_test \ sc_databaserangeobj.test onsistently fails for me now with warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.help.XMLHelp. warn:sfx2.bastyp:15606:1:/data/lo/core/sfx2/source/bastyp/helper.cxx:151: GetResultSet: Any other exception: Unable to create Content! warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. warn:legacy.osl:15606:1:/data/lo/core/ucb/source/core/provprox.cxx:398: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.GIOContentProvider. ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testDataArea An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetSortDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetSubtotalDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetImportDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetFilterDescriptor An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL file:///data/lo/core/sc/qa/extras/testdocuments/ScDatabaseRa ngeObj.ods ##Failure Location unknown## : Error Test name: N10sc_apitest18ScDatabaseRangeObjE::testGetFilterDescriptor tearDown() failed - An uncaught exception of type com.sun.star.uno.RuntimeException - unsatisfied query for interface of type com.sun.star.util.XCloseable! Failures !!! Run: 5 Failure total: 6 Failures: 0 Errors: 6 warn:legacy.osl:15606:1:/data/lo/core/unotools/source/config/configmgr.cxx:217: OSL_ASSERT Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE # for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck # for memory checking and retry. make: *** [/data/lo/core/workdir/unxlngx6/CppunitTest/sc_databaserangeobj.test] Error 1 Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Turn on strictures for some installer Perl modules
On 15 February 2012 11:58, Michael Meeks michael.me...@suse.com wrote: Also the 'make_installer.pl' takes about 20 options, AFAIR there are however only a few legitimate parameters / configurations that are possible in the LibreOffice world. So - digging out the call sites (luckily the ooinstall wrapper seems to have swallowed most of them outside of instsetoo_native) and simplifying those paths would prolly expose much more redundancy to perl. Ah, thanks for pointing me to that. There's some nice cleanup possible in installer::parameter. Norbert reports you want: make cmd cmd=solenv/bin/ooinstall ... Running this under Devel::NYTProf, I found that a good deal of the slowness of make_installer.pl was due to Archive::Zip, which could be replaced by a call to 'unzip'. So some more nice cleanup should be possible in installer::archivefiles. :) Kind regards, -- Tim Retout t...@retout.co.uk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-4] Ctrl+Alt type shortcuts don't work on Windows
Hi, A friend of mine asked me, if it was possible backport the following fix to 3.4, too. http://cgit.freedesktop.org/libreoffice/core/commit/?id=a75cb232c41b9f895e27dd85532ff624f85181de default shortcut for .uno:SearchDialog should be Ctrl+H Ctrl+Alt+F was not good, because on some keyboard layouts it enters a character. Ctrl+Alt (=AltGr on Windows) should be avoided, if possible. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Remove unused code from gtkframe
On Wed, 2012-02-15 at 22:55 +0100, Michael Stahl wrote: On 15/02/12 21:31, Kate Goss wrote: Hi Michael, Caolan, How accurate/ up to date is unusedcode.easy? Is there a way to make sure the methods I'm removing are genuinely unused? Its generally up to date, but it always requires at least some casual manual inspection to see if the code is used in some specific configuration, e.g. sticking the name into opengrok.libreoffice.org to see if there are some uses hidden behind #ifdef WNT or something of that nature. If it was a completely automatizable operation we could just script up something to remove them all in one go :-( I've now moved those two unused-in-normal-configuration methods behind GTK3 conditionals where the rest of the similar code lived already. the problem is that unusedcode.easy is generated from a single configuration of LO. because there is a huge number of potential configurations, there may be some false positives I don't consider them false positives btw. e.g. if there was, say, 300MB of binary in our Linux install which was only called on some Windows specific code-path then I imagine we'd like to only conditionally include it on the appropriate platform. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEWED][REVIEW-3-4] Ctrl+Alt type shortcuts don't work on Windows
On Thu, 2012-02-16 at 12:10 +0100, Andras Timar wrote: default shortcut for .uno:SearchDialog should be Ctrl+H Ctrl+Alt+F was not good, because on some keyboard layouts it enters a character. Ctrl+Alt (=AltGr on Windows) should be avoided, if possible. Seems reasonable, done. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Removed unused functions from MultiLineEdit in svtools module
On Thu, 2012-02-16 at 11:54 +0100, Dézsi Szabolcs wrote: Hi! I removed 4 unused functions from class MultiLineEdit. (based on unusedcode.easy) Looks good, pushed now, thanks for this. Can you add yourself to http://wiki.documentfoundation.org/Development/Developers and send a mail to the list confirming that your submissions is under our preferred MPLv1.1+/LGPLv3+ combo ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEWED][REVIEW-3-5] Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM
On Wed, 2012-02-15 at 23:32 +0100, Stephan Bergmann wrote: The attached core-0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch and binfilter-0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch damnit, yeah, pushed now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] -[core/vcl/source/window/splitwin.cxx:2045]:(style) Found duplicate branches for if and else.
Hi all, -- Mariusz Dykierek mariuszdykie...@gmail.com wrote: (16/02/2012 11:46) On 2012-02-16 10:02, Stephan Bergmann wrote: On 02/16/2012 09:35 AM, Riccardo Magliocchetti wrote: Otherwise you can simplify it even more: sal_Bool bLeft = (meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT) ? sal_False : sal_True; ... which of course reduces to bool bLeft = !(meAlign == WINDOWALIGN_TOP || meAlign == WINDOWALIGN_LEFT); or bool bLeft = meAlign == WINDOWALIGN_RIGHT || meAlign == WINDOWALIGN_BOTTOM given that WindowAlign has exactly those four members (and it makes the name bLeft look odd...). I personally find 'if' more legible than ?: and definitely expressions like b = x==y || x==z; I am not sure if WindowAlign will always have only these 4 members and possibly the author of the original version wasn't either (thus final else). Since I am a newbie here, I would vote for a simple 'if' or a 'switch'. Let me know what is the decision and I will change the code accordingly or... feel free to change the code and provide an alternative patch. +1 for switch/break approach! More legible and open to possible later modifications without requiring code decodification efforts. Hopefully the compiler is smart enough to generate efficient code for such simple actions. Best regards Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Remove unused code
Hi Björgvin, looks good to me. Pushed. Thanks! Cheers Radek On Wed, 2012-02-15 at 01:10 +, Björgvin Ragnarsson wrote: Hi, Attached is a patch for removal of unused code in files core/basegfx/source/polygon/b3dpolygontools.cxx and core/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx thanks, Björgvin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEWED][REVIEW] fdo#45553 fix RTF import of space-before/after tokens
On Wed, 2012-02-15 at 12:10 +0100, Miklos Vajna wrote: Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=c32b9cd2139249f0c680f664a0ceac3702dd0e73 Could someone review and cherry-pick to -3-5, please? Done. I won't pretend I understand the commit, but nothing screams wrong. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEWED][REVIEW-3-5] Fix for fdo#45177 - crash in Impress outline view
On Wed, 2012-02-15 at 17:21 +0100, Thorsten Behrens wrote: Hi, couldl someone please review http://cgit.freedesktop.org/libreoffice/core/commit/?id=57e6f04066cfddfa79eb2b79cf5c45653c79eff3 and cherry-pick to -3-5? It's not a final solution, since we're loosing some convenience in outline view undo, but better than a crash I think. Meh, pushed, can't make it worse I guess. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEWED][REVIEW] fdo#45553 fix RTF import of space-before/after tokens
On Thu, Feb 16, 2012 at 11:54:17AM +, Caolán McNamara caol...@redhat.com wrote: Done. I won't pretend I understand the commit, but nothing screams wrong. Just for the reference - the rtf tokenizer generates a parse tree, which is then accessed by the domain mapper. In this case the problem was that these paragraph properties should not be put to the paragraph properties list directly, but inside the NS_ooxml::LN_CT_PPrBase_spacing sub-list, otherwise dmapper simply ignores it later. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Configure LO for Python 3?
With http://cgit.freedesktop.org/libreoffice/core/commit/?id=a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port PyUno to support Python 3, is there any way to configure a LO build so that it actually uses Python 3 instead of 2, on a Fedora 16 machine that has both installed? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Translate German comments
Hi Philipp, looks good. Pushed. Thanks! Happy to not have to translate these comments when run into them :-) Cheers Radek On Wed, 2012-02-15 at 15:36 +0100, Philipp Weissenbacher wrote: Hi all, Lionel, Here are the files you mentioned earlier. Hope quality didn't suffer with this quick job. You might want to take a look at line num 2185 in DatabaseForm.cxx. Looks like commented out code. If you still find any German strings, please contact me and I'll help you. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] [core/linguistic/source/dlistimp.*:*]: (performance) Possible inefficient checking for 'aDicList' emptiness.
looks perfectly sane, pushed now, thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On Thu, Feb 16, 2012 at 11:38:07AM +0100, Matúš Kukan wrote: On 16 February 2012 00:52, Matúš Kukan matus.ku...@gmail.com wrote: I had a look but couldn't build jurt: So, if we don't want to use $(OUTDIR)/class, adding +$(eval $(call gb_Jar_add_jars,jurt,\ +$(WORKDIR)/CustomTarget/ridljar/javamaker/class \ +)) in Jar_jurt.mk seems to help. I wonder how this works on other systems. I guess that should be included from ridljar.jar and I don't know why it isn't on Windows. The generated UNO classes must be present in ridl.jar . They are (or should be) added into the jar by $(eval $(call gb_Jar_add_packagedirs,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ )) in ridl/Jar_ridl.mk . Look at the content of the jar, if they are there or not. Also, did you do a clean build in ridl after adding the missing gb_Helper_abbreviate_dirs_native? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configure LO for Python 3?
Hi, On Thu, Feb 16, 2012 at 01:08:48PM +0100, Stephan Bergmann wrote: With http://cgit.freedesktop.org/libreoffice/core/commit/?id=a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port PyUno to support Python 3, is there any way to configure a LO build so that it actually uses Python 3 instead of 2, on a Fedora 16 You just point to it afaics. (you specify the correct python binary). But never tried it myself. Default should be python2 anyway. But if you want to do python2 and 3 in parallel, you need a hack. What I do here is: 1602 ifeq $(BUILD_PYUNO) y 1603 ifeq $(ENABLE_PYTHON3) y 1604 # FIXME: won't work when pyuno is migrated to gbuild as all is directly in solver 1605 # then... 1606 rm -rf $(SOURCE_TREE)/pyuno-py3 1607 cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3 1608 cd $(SOURCE_TREE)/pyuno-py3; \ 1609 rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \ 1610 . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \ 1611 PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \ 1612 ../solenv/bin/build.pl # NO DELIVER! 1613 endif 1614 endif + other stuff to reuse python2s files if the same and install python3 stuff manually. (see http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=blob;f=rules;h=1a35e8ee8d0ff3de5d495a036197355b784269f1;hb=refs/heads/debian-experimental-3.5 and look for ENABLE_PYTHON3 stuff) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments
On Wed, Feb 15, 2012 a-t 03:36:25PM +0100, Philipp Weissenbacher wrote: Here are the files you mentioned earlier. Thank you very much. Radek beat me to it to commit that, but there seems to be an untranslated word that is left; Geschachtelte in -// MIB 25.6.98: Geschachtelte Formulare abfangen ... oder muesste -// man sie submitten? +// MIB 25.6.98: Catch nested Forms Geschachtelte; or would we need to submit them? Maybe it means nested and should just be removed? I'm not sure. You might want to take a look at line num 2185 in DatabaseForm.cxx. Looks like commented out code. Line 2185 *after* your patch? That is: } // if (xDisp.is()) My guess is that this is an explicit end if. It shows what if is being closed there, so that one does not have to count braces / go up to see that. So it is a real comment, not forgotten code. Thanks for the pointer, though. Was worth checking out. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] Removed unused code from MSFilterTracer
On Thu, 2012-02-16 at 11:18 +0100, Dézsi Szabolcs wrote: Hi! sry didn't attach file :$ This is my first patch, I hope everything's correct. Removed functions: (used unusedcode.easy) Looks good to me, pushed now, thanks for this. IMO the whole MSFilterTracer thing can/should go if you want to have a look at that. Its all out of date, it was an effort to sort of log what MSWord features we *didn't* import/export got used in documents in order to target what we'd implement next but I know I found it more of an effort to log the details of what we didn't implement than actually implement them :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] bin bogus JRE warnings on first-start ...
Hi there,
This is not really my sphere of expertise, so review appreciated.
Rather than clobber the DesktopContext with some out-of band magic
(which creates the JavaInteractionHandler that in the end complains). I
thought I'd just give this guy a nil context - which seems to work
reasonably.
On master you can also export STOC_FORCE_NO_JRE=1 # to debug this stuff
on Linux (it's harder to provoke a non-working JRE otherwise).
I'd like to get this into 3.5.1 - thoughts appreciated :-) IMHO it is
rather better not to show this warning, than provide two scary looking,
and ultimately bogus dialogs there.
All the best,
Michael.
From 3675980cc1804e842b955b656fc03133ffbecea8 Mon Sep 17 00:00:00 2001
From: Michael Meeks michael.me...@suse.com
Date: Thu, 16 Feb 2012 12:44:56 +
Subject: [PATCH] disable JRE warnings during help compilation on first start
---
.../source/deployment/registry/help/dp_help.cxx|5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index d121833..adc2875 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,6 +38,7 @@
#include comphelper/servicedecl.hxx
#include svl/inettype.hxx
#include unotools/pathoptions.hxx
+#include uno/current_context.hxx
#if !defined(ANDROID) !defined(IOS)
#include l10ntools/compilehelp.hxx
@@ -420,6 +421,10 @@ void BackendImpl::implProcessHelp(
Reference script::XInvocation xInvocation;
if( xContext.is() )
{
+// Ignore the missing JRE scenario on upgrade/first-start
without
+// horrible end-user warnings that are ignorable,and cause
grief.
+Reference XCurrentContext xNoContext;
+com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
try
{
xInvocation = Reference script::XInvocation (
--
1.7.3.4
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configure LO for Python 3?
Hi, On Thu, Feb 16, 2012 at 01:29:59PM +0100, Rene Engelhard wrote: On Thu, Feb 16, 2012 at 01:08:48PM +0100, Stephan Bergmann wrote: With http://cgit.freedesktop.org/libreoffice/core/commit/?id=a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port PyUno to support Python 3, is there any way to configure a LO build so that it actually uses Python 3 instead of 2, on a Fedora 16 You just point to it afaics. (you specify the correct python binary). But never tried it myself. Default should be python2 anyway. That said, yes, you need to fix the pkg-config check to look for the correct .pc... 1611 PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \ ... as here. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [REVIEW:3-5] fdo#46163 database form listbox only for VARCHAR
Just reported and fixed fdo#46163. A list box is a control that is
supposed to match two sets of data:
An entry in the list content property is matched to the
corresponding entry in the list entries property (yeah, that's
rather confusing naming...). The list entries entry is shown to the
user, but the list content entry is stored in the database.
The bug: This matching works only if the column is of type
VARCHAR. Even CHAR does not work, and in particular integer types do
not work; integer types are a common case: store a reference number in
the database, but show the user a nice textual description.
To understand how stupid this sounds to the user, note that VARCHAR is
the type of variable-length strings and CHAR the type of fixed-length
strings, not a single character (unless the length is 1, obviously).
Attached patch 0003-fdo-46163-convert-bound-values-to-bound-column-s-typ.patch
makes sure the values are converted to the right type before being
compared to the value in the database.
Attached patch
0001-ORowSetValue-setTypeKind-correctly-convert-to-C-LOB-.patch
avoids a crash under some conditions that can be triggered after
application of other patch: instead of assuming the ORowSetValue
already contains an Any, construct one if necessary. Note that the
other cases already do type conversion nicely, e.g. string to int or
8-bit int to 32-bit int.
Please apply both to libreoffice-3-5. I haven't tested 3.4 in any way,
if you feel like it (and the affected code looks unchanged), you can
use your own judgement.
--
Lionel
From aef29c37fbe2bf2d248048c699972fb9e0ac2b4e Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane lio...@mamane.lu
Date: Thu, 16 Feb 2012 09:06:26 +0100
Subject: [PATCH 1/3] ORowSetValue::setTypeKind: correctly convert to
(C)LOB/OBJECT/OTHER
as opposed to crashing
---
connectivity/source/commontools/FValue.cxx |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 93a8c9d..acd1ef0 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -254,11 +254,10 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
case DataType::CLOB:
case DataType::OBJECT:
case DataType::OTHER:
-(*this) = getAny();
+(*this) = makeAny();
break;
default:
-(*this) = getAny();
+(*this) = makeAny();
OSL_FAIL(ORowSetValue:operator==(): UNSPUPPORTED TYPE!);
}
}
--
1.7.7.3
From c55d050400139a270f5b3b620db4845001db017d Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane lio...@mamane.lu
Date: Thu, 16 Feb 2012 13:24:58 +0100
Subject: [PATCH 3/3] fdo#46163 convert bound values to bound column's type
---
forms/source/component/ListBox.cxx | 70 +---
forms/source/component/ListBox.hxx | 11 +-
2 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 2453ebc..eb8c6c9 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -326,7 +326,7 @@ namespace frm
// propagate
if ( m_eListSourceType == ListSourceType_VALUELIST )
{
-m_aBoundValues = m_aListSourceValues;
+setBoundValues(m_aListSourceValues);
}
else
{
@@ -556,7 +556,7 @@ namespace frm
OSL_FAIL(OListBoxModel::read : invalid (means unknown) version !);
ValueList().swap(m_aListSourceValues);
m_aBoundColumn = (sal_Int16)0;
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_eListSourceType = ListSourceType_VALUELIST;
m_aDefaultSelectSeq.realloc(0);
defaultCommonProperties();
@@ -674,7 +674,7 @@ namespace frm
// outta here if we don't have all pre-requisites
if ( !xConnection.is() || sListSource.isEmpty() )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
return;
}
@@ -924,7 +924,7 @@ namespace frm
m_nNULLPos = 0;
}
-m_aBoundValues = aValueList;
+setBoundValues(aValueList);
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( lcl_convertToStringSequence( aDisplayList ) ) );
}
@@ -948,7 +948,7 @@ namespace frm
{
if ( m_eListSourceType != ListSourceType_VALUELIST )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_nNULLPos = -1;
m_nBoundColumnType = DataType::SQLNULL;
@@ -960,19 +960,63 @@ namespace frm
}
//--
+void OListBoxModel::setBoundValues(const
[PATCH] Removed unused code from svl, svtools and sfx2
Hi!
I removed some unused code from modules svl, svltools and sfx2 according to
unusedcode.easy.
Removed functions:
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxApplication::Main()
SfxBrushItemLink::Set(SfxBrushItemLink*)
SfxHintPoster::RegisterEvent()
SfxProgress::Lock()
SfxRangeItem::SfxRangeItem(unsigned short, SvStream)
SfxULongRanges::Contains(unsigned long) const
SfxULongRanges::Intersects(SfxULongRanges const) const
Ps.: if it's ok, update unusedcode.easy accordingly, i think they're still in
it. Forgot to delete them :$
From 41d2d08ef1228fb658e11e89951837297320ea3c Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu, 16 Feb 2012 14:00:48 +0100
Subject: [PATCH] Removed unused code from svl and sfx2
---
sfx2/inc/sfx2/app.hxx|1 -
sfx2/inc/sfx2/childwin.hxx |2 +-
sfx2/inc/sfx2/hintpost.hxx |1 -
sfx2/inc/sfx2/mnuitem.hxx|1 -
sfx2/inc/sfx2/progress.hxx |1 -
sfx2/source/appl/appmain.cxx |4 --
sfx2/source/bastyp/progress.cxx | 39
sfx2/source/menu/mnuitem.cxx |8 -
sfx2/source/notify/hintpost.cxx |6
svl/inc/svl/nranges.hxx |2 -
svl/inc/svl/rngitem.hxx |1 -
svl/source/items/nranges.cxx | 61 --
svl/source/items/rngitem_inc.cxx | 10 --
svtools/inc/svtools/wallitem.hxx |2 +-
svtools/source/misc/wallitem.cxx |4 +-
unusedcode.easy | 16 +-
16 files changed, 12 insertions(+), 147 deletions(-)
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index c255035..ea9dbc2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -147,7 +147,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
voidInit();
voidExit();
voidSettingsChange( sal_uInt16, const AppSettings );
-voidMain( );
voidPreInit( );
voidQuit();
voidDeinitialize();
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fc7cf83..c96d1a6 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -307,7 +307,7 @@ public:
return pWin; \
} \
sal_uInt16 Class::GetChildWindowId () \
-{ return MyID; } \
+ { return MyID; } \
voidClass::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
{ \
SfxChildWinFactory *pFact = new SfxChildWinFactory( \
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index f455d84..0f8eae2 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -56,7 +56,6 @@ class SfxHintPoster: public SvRefBase
GenLink aLink;
private:
-voidRegisterEvent();
DECL_LINK( DoEvent_Impl, SfxHint * );
protected:
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 62ebce6..08acfa6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,7 +56,6 @@ public:
SfxMenuControl( sal_uInt16, SfxBindings);
static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu rMenu, SfxBindings rBindings );
-static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
~SfxMenuControl();
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 6dbdcfa..2f397c3 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -66,7 +66,6 @@ public:
voidSuspend();
sal_BoolIsSuspended() const { return bSuspended; }
-voidLock();
voidUnLock();
voidReschedule();
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 3a16624..fbc6c77 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -118,10 +118,6 @@ void SfxApplication::PreInit( )
{
}
-void SfxApplication::Main( )
-{
-}
-
//-
SfxFilterMatcher SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index d6fb779..22025a6 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -461,45 +461,6 @@ void SfxProgress::Suspend()
// ---
-void SfxProgress::Lock()
-{
-if( pImp-pActiveProgress ) return;
-// No Reschedule for Embedded-Objects,
-// because we are defenseless against the OLE protocol
-if (
Re: [ANN] Referencing bugs in commits
On Tue, Feb 14, 2012 at 07:49:04PM +0100, Jan Holesovsky wrote: Ivan Timofeev píše v Út 14. 02. 2012 v 20:33 +0400: Is it possible somehow include the information about a target version? Oh - great idea :-) Added that to the script; it does some best-effort guess, (...) Please test that it works :-) It seems to set target:3.6 for commits to master. As per http://wiki.documentfoundation.org/BugReport_Details, this should be 3.6.0. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] Referencing bugs in commits
Hi Lionel, On 2012-02-16 at 14:11 +0100, Lionel Elie Mamane wrote: It seems to set target:3.6 for commits to master. As per http://wiki.documentfoundation.org/BugReport_Details, this should be 3.6.0. Fixed :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] Removed unused code from MSFilterTracer
On Thu, 2012-02-16 at 12:42 +, Caolán McNamara wrote: Its all out of date, it was an effort to sort of log what MSWord features we *didn't* import/export got used in documents in order to target what we'd implement next but I know I found it more of an effort to log the details of what we didn't implement than actually implement them :-) Added as an easy hack: https://bugs.freedesktop.org/show_bug.cgi?id=46166 :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Refactor installer::sorter
Hi Tim, On Wed, 2012-02-15 at 21:58 +, Tim Retout wrote: Here are a few patches related to installer::sorter. I've tried to keep them low-risk, because much of the code is called during Windows builds, which I'm not yet testing. Thanks ! :-) One thing I do when I hack this stuff, is to keep a pristine install tree around from the known working version; and do a sequence of new ooinstall's as I re-factor, and a: diff -ur old-inst new-inst just to sanity check :-) I think the sort algorithm used currently in installer::sorter must be equivalent to bubble sort; in any case, I removed two of the subroutines, and replaced the third with a Schwartzian Transform (which might be overkill for this case, but I need to check the callers). Heh :-) it is of course, no surprise that the original author didn't know how to use perl's 'sort' builtin, and great to see some of this stuff disappear. I added a unit test for the remaining sort function, but I haven't tried to plug it in to the build system or anything. I tried to adapt the standard license header template to Perl comments. Oh - interesting. So I think this might be our first perl unit test ever ;-) As such - you prolly want to ask Markus for some help - I guess we want the tests in solenv/ and to just run a perl script that passes or fails (?). Oh, and it'd be great if you can add [PATCH] to the Subject when you send your nice work, so we can see it stuff more quickly :-) Thanks again for the encouraging progress ! All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [core/vcl/source/window/splitwin.cxx:2047] -[core/vcl/source/window/splitwin.cxx:2045]:(style) Found duplicate branches for if and else.
On 02/16/2012 12:18 PM, Matteo Casalin wrote: I personally find 'if' more legible than ?: and definitely expressions like b = x==y || x==z; I am not sure if WindowAlign will always have only these 4 members and possibly the author of the original version wasn't either (thus final else). Since I am a newbie here, I would vote for a simple 'if' or a 'switch'. Let me know what is the decision and I will change the code accordingly or... feel free to change the code and provide an alternative patch. +1 for switch/break approach! More legible and open to possible later modifications without requiring code decodification efforts. Hopefully the compiler is smart enough to generate efficient code for such simple actions. Whatever somebody chooses to actually put in here is fine with me anyway. (I only woke up when I saw the ... ? false : true construct, which is unnecessarily complex.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEWED][REVIEW-3-5] Fix for fdo#45177 - crash in Impress outline view
Caolan McNamara wrote: Meh, pushed, can't make it worse I guess. Yeah, that was somehow my take there. ;) Thanks, -- Thorsten pgpWOPDwCUrpo.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On 16 February 2012 13:29, David Tardon dtar...@redhat.com wrote: The generated UNO classes must be present in ridl.jar . They are (or should be) added into the jar by $(eval $(call gb_Jar_add_packagedirs,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ )) Ok, so they were present but in wrong form, there was: ... com/sun/star/uno/UnoRuntime.class c:/git/libo/workdir/wntmsci12.pro/CustomTarget/ridljar/javamaker/class/com/sun/star/beans/Ambiguous.class ... - $(foreach root,$(PACKAGEDIRS), $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \ + $(foreach root,$(PACKAGEDIRS), cd $(dir $(root)) $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ helps solve the problem. jar command on Windows seems to behave differently when using -C Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH]fdo#44516 improved label and business card document creation (2/3)
Attached a first fix for the problems that showed after my first patch for
fdo44516.
Labels documents are now created with proper gaps between the labels.
The fix is not yet complete, but covers approx. 95% percent of the labels.
My next fix will be for the remaining 5%.
That is for labels where the H/V gap between labels is greater than the
right/bottom
page margin. I hope to submit that soon...
Exuses for the inconvenience.
Winfried
From 52e8c195faa346ab99349bdf63a485c9a7130335 Mon Sep 17 00:00:00 2001
From: Winfried Donkers o...@dci-electronics.nl
Date: Thu, 16 Feb 2012 15:33:53 +0100
Subject: [PATCH] fix for patch that did not create gaps between labels in
document
---
sw/source/ui/app/applab.cxx | 26 ++
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 3ccbf13..d8acd55 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -294,9 +294,6 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
// Prepare border template
SwFrmFmt* pFmt = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL );
-SwFrmFmt* pFmtEORow = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL ); //new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOCol = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL ); //new SwFrmFmt (*pFmt);
-SwFrmFmt* pFmtEOColEORow = pSh-GetFrmFmtFromPool( RES_POOLFRM_LABEL ); //new SwFrmFmt (*pFmt);
sal_Int32 iResultWidth = rItem.lLeft + (rItem.nCols - 1) * rItem.lHDist + rItem.lWidth - rItem.lPWidth;
sal_Int32 iResultHeight = rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + rItem.lHeight - rItem.lPHeight;
@@ -306,24 +303,13 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight),
RES_UL_SPACE);
-SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE);
SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth),
0, 0, RES_LR_SPACE);
-SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE);
pFmt-SetFmtAttr( aFrmSize );
pFmt-SetFmtAttr(aFrmULSpace);
pFmt-SetFmtAttr(aFrmLRSpace);
-pFmtEORow-SetFmtAttr( aFrmSize );
-pFmtEORow-SetFmtAttr(aFrmULSpace);
-pFmtEORow-SetFmtAttr(aFrmNoLRSpace);
-pFmtEOCol-SetFmtAttr( aFrmSize );
-pFmtEOCol-SetFmtAttr(aFrmNoULSpace);
-pFmtEOCol-SetFmtAttr(aFrmLRSpace);
-pFmtEOColEORow-SetFmtAttr( aFrmSize );
-pFmtEOColEORow-SetFmtAttr(aFrmNoULSpace);
-pFmtEOColEORow-SetFmtAttr(aFrmNoLRSpace);
const SwFrmFmt *pFirstFlyFmt = 0;
if ( rItem.bPage )
@@ -331,26 +317,18 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
SwFmtVertOrient aFrmVertOrient( pFmt-GetVertOrient() );
aFrmVertOrient.SetVertOrient( text::VertOrientation::TOP );
pFmt-SetFmtAttr(aFrmVertOrient);
-pFmtEORow-SetFmtAttr(aFrmVertOrient);
-pFmtEOCol-SetFmtAttr(aFrmVertOrient);
-pFmtEOColEORow-SetFmtAttr(aFrmVertOrient);
for ( sal_uInt16 i = 0; i rItem.nRows; ++i )
{
for ( sal_uInt16 j = 0; j rItem.nCols; ++j )
{
pSh-Push();
-SwFrmFmt* pFrmFmt;
-if ( j == rItem.nCols - 1 )
-pFrmFmt = ( i == rItem.nRows - 1 ? pFmtEOColEORow : pFmtEORow );
-else
-pFrmFmt = ( i == rItem.nRows - 1 ? pFmtEOCol : pFmt );
const SwFrmFmt *pTmp =
bLabel ?
-lcl_InsertLabText( *pSh, rItem, *pFrmFmt, *pFldMgr, j, i,
+lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr, j, i,
i == rItem.nRows - 1 j == rItem.nCols - 1, sal_True ) :
-lcl_InsertBCText(*pSh, rItem, *pFrmFmt, j, i, sal_True);
+lcl_InsertBCText(*pSh, rItem, *pFmt, j, i, sal_True);
if (!(i|j))
{
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building LibreOffice on Windows
Hi, New to open source and attracted to LibreOffice and I want to start contributing. But how does the whole build process work on Windows? Gareth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
New to open source and attracted to LibreOffice and I want to start contributing. Great! Welcome! But how does the whole build process work on Windows? This is a short summary, and I might be missing something. For more detail, there should be stuff in the wiki. Don't hesitate to ask more on this list! And as you read the wiki, please fix inconsistencies you notice, that is why it is a wiki... First you need to install Cygwin. That is a Linux emulation layer, kinda like a guest operating system on top of Windows. The build process is run in Cygwin. The actual compiler and linker used are unaware of Cygwin, though. You need to add some more Cygwin packages to the default installation. The wiki hopefully has details. Then install Microsoft Visual Studio 2008. (The Express variant which doesn't cost anything is supposed to work.) I think Visual Studio 2010 is not known to work for building LibreOffice. Then install the WIndows SDK and DirectX SDKs. The most recent ones should be fine as far as I know, or a bit older ones if you happen to have them already. You can install the latest Java JDK, but it is also possble to build without any Java. Then clone the source code Git repository (the core one). You do this from the Cygwin shell. Then you go to the core directory (the top of the source code tree) and run ./autogen.sh. I think that it is supposed to use sane defaults if you don't enter any command-line options at all, but I must admit I haven't actually checked... If you intend to work on the code, you probably want the --enable-debug switch at least. When the autogen.sh has completed (should take a minute or so), you can run a make. That will take quite a lot of time, something like six hours even on a fast machine, I think. The end result will be an Windows Installer package for LibreOffice. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#46166: EasyHack: remove obsolete MSFilterTracer
Hi! I removed the MSFilterTracer class as suggested by Caolán McNamara. Hope it's ok. Szabolcs From 3f02b8043d86341572727b772c934ab7ccb496ec Mon Sep 17 00:00:00 2001 From: Szabolcs Dezsi dezsisz...@hotmail.com Date: Thu, 16 Feb 2012 16:11:52 +0100 Subject: [PATCH] Removed obsolete MSFilterTracer class --- filter/Library_msfilter.mk|1 - filter/Package_inc.mk |1 - filter/inc/filter/msfilter/msdffimp.hxx |7 +- filter/inc/filter/msfilter/msfiltertracer.hxx | 99 -- filter/inc/filter/msfilter/svdfppt.hxx|4 +- filter/source/msfilter/msdffimp.cxx | 26 +--- filter/source/msfilter/msfiltertracer.cxx | 241 - filter/source/msfilter/svdfppt.cxx| 20 +-- 8 files changed, 8 insertions(+), 391 deletions(-) delete mode 100644 filter/inc/filter/msfilter/msfiltertracer.hxx delete mode 100644 filter/source/msfilter/msfiltertracer.cxx diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 316a47d..e454dfb 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/eschesdo \ filter/source/msfilter/mscodec \ filter/source/msfilter/msdffimp \ - filter/source/msfilter/msfiltertracer \ filter/source/msfilter/msocximex \ filter/source/msfilter/msoleexp \ filter/source/msfilter/mstoolbar \ diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk index af2ade6..27a6c45 100644 --- a/filter/Package_inc.mk +++ b/filter/Package_inc.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,f $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx)) -$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx)) diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index e2d6ced..9d60ffc 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -37,7 +37,6 @@ #include tools/gen.hxx #include tools/table.hxx #include svx/msdffdef.hxx -#include filter/msfilter/msfiltertracer.hxx #include vcl/graph.hxx #include string.h #include map @@ -578,7 +577,6 @@ public: DffRecordManagermaShapeRecords; ColorData mnDefaultColor; -MSFilterTracer* mpTracer; sal_BoolmbTracing; Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; @@ -621,12 +619,11 @@ public: long nApplicationScale= 0, ColorData mnDefaultColor_ = COL_DEFAULT, sal_uLong nDefaultFontHeight_ = 24, - SvStream* pStData2_= 0, - MSFilterTracer* pTracer= NULL ); + SvStream* pStData2_= 0); // in PPT werden die Parameter DGGContainerOffset und PicStream // mit Hilfe einer Init Routine Uebergeben. -SvxMSDffManager( SvStream rStCtrl, const String rBaseURL, MSFilterTracer* pTracer ); +SvxMSDffManager( SvStream rStCtrl, const String rBaseURL ); void InitSvxMSDffManager(sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nSvxMSDffOLEConvFlags); void SetDgContainer( SvStream rSt ); diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx deleted file mode 100644 index 66d20d6..000 --- a/filter/inc/filter/msfilter/msfiltertracer.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY;
Re: Configure LO for Python 3?
On 02/16/2012 01:46 PM, Rene Engelhard wrote:
On Thu, Feb 16, 2012 at 01:29:59PM +0100, Rene Engelhard wrote:
On Thu, Feb 16, 2012 at 01:08:48PM +0100, Stephan Bergmann wrote:
Withhttp://cgit.freedesktop.org/libreoffice/core/commit/?id=a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe
Port PyUno to support Python 3, is there any way to configure a LO
build so that it actually uses Python 3 instead of 2, on a Fedora 16
You just point to it afaics. (you specify the correct python binary).
But never tried it myself. Default should be python2 anyway.
That said, yes, you need to fix the pkg-config check to look for the
correct .pc...
1611 PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell
pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell
pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
... as here.
For the record, adding
##
## Python 3
## PYTHON_{CFLGS,LIBS}: pkg-config --{cflags,libs} python3
##
--enable-python=system
PYTHON=/usr/bin/python3
PYTHON_CFLAGS=-I/usr/include/python3.2mu
PYTHON_LIBS=-lpython3.2mu
##
to autogen.lastrun did the trick for me, and
LD_LIBRARY_PATH=/data/lo/core/solver/unxlngx6/installation/opt/ure/lib \
UNO_PATH=/data/lo/core/solver/unxlngx6/installation/opt/program \
URE_BOOTSTRAP=vnd.sun.star.pathname:/data/lo/core/solver/unxlngx6/installation/opt/program/fundamentalrc
\
PYTHONPATH=/data/lo/core/solver/unxlngx6/installation/opt/program \
python3 -c 'import uno'
worked without failure then.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5] Reintroduce pyuno.so wrapper around libpyuno.so
On 02/15/2012 04:54 PM, Michael Meeks wrote: On Wed, 2012-02-15 at 15:07 +0100, Stephan Bergmann wrote: As perhttps://bugs.freedesktop.org/show_bug.cgi?id=45696#c3 Importing uno bindings in python causes crash the master commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290 Reintroduce pyuno.so wrapper around libpyuno.so should please be reviewed and cherry-picked to libreoffice-3-5. Looks reasonable enough to me; can you cherry-pick it with my sign-off ? :-) and I assume the relevant .component file is magically updated as it's built etc. ? Just noted that the revert does not take the necessary changes for Python 3 into account, so an additional http://cgit.freedesktop.org/libreoffice/core/commit/?id=1bb0d979b5ac5ed0cd831c6c8c0ab55dc2621eba Adapt pyuno.so wrapper to Python 3 support is necessary. So please re-review attached 0001-Reintroduce-pyuno.so-wrapper-around-libpyuno.so.patch (which combines the two relevant master commits into one) for application to libreoffice-3-5. Thanks, Stephan From 85d95692d43b90c7955dbb2ba8393e948835d469 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann sberg...@redhat.com Date: Thu, 16 Feb 2012 16:42:58 +0100 Subject: [PATCH] Reintroduce pyuno.so wrapper around libpyuno.so ...it was cleaned away by a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe Port PyUno to support Python 3 but is still needed to make sure libpyuno.so is loaded RTLD_GLOBAL (Python apparently loads its modules RTLD_LOCAL). At least with pre 4.5 GCC this can cause problems with C++ exception handling, see the mail thread starting at http://lists.freedesktop.org/archives/libreoffice/2012-February/025166.html LibO 3.5RC2: terminate called after throwing an instance of 'com::sun::star::registry::InvalidRegistryException' for details. (cherry picked from commit 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290) ...plus... Adapt pyuno.so wrapper to Python 3 support (cherry picked from commit 1bb0d979b5ac5ed0cd831c6c8c0ab55dc2621eba) --- pyuno/source/module/makefile.mk | 43 +++-- pyuno/source/module/pyuno_dlopenwrapper.c | 76 + 2 files changed, 83 insertions(+), 36 deletions(-) diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index f72e1c3..714a120 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -50,6 +50,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python .ENDIF # .IF $(EXTRA_CFLAGS)!= .IF $(GUI) == UNX +# python expects modules without the lib prefix +# pyuno.so even on Mac OS X, because it is a python module +PYUNO_MODULE=$(DLLDEST)$/pyuno.so PYUNORC=pyunorc .ELSE .IF $(CROSS_COMPILING) != YES @@ -109,6 +112,7 @@ DEFLIB1NAME=$(TARGET) ALLTAR : \ $(DLLDEST)/uno.py \ $(DLLDEST)/unohelper.py \ +$(PYUNO_MODULE) \ $(MISC)/$(PYUNORC) \ $(LB)/lib$(TARGET).a @@ -116,17 +120,10 @@ $(LB)/lib$(TARGET).a: $(MISC)/$(TARGET).def $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)/$(TARGET).def --kill-at --output-lib=$(LB)/lib$(TARGET).a .ELSE -.IF $(GUI)!=WNT -# For some reason the build breaks on Windows if this is listed in the -# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go -# figure. But we need it on non-Windows. -targetdll=$(LB)/$(TARGET)$(DLLPOST) -.ENDIF - ALLTAR : \ $(DLLDEST)/uno.py \ $(DLLDEST)/unohelper.py \ -$(targetdll) \ +$(PYUNO_MODULE) \ $(MISC)/$(PYUNORC) .ENDIF .ENDIF @@ -141,6 +138,29 @@ $(MISC)/framework_link : $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework @touch $@ +.IF $(GUI) == UNX +$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj +.IF $(OS) == LINUX +@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == SOLARIS +@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == FREEBSD +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == NETBSD +@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == OPENBSD +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == DRAGONFLY +@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ELIF $(OS) == MACOSX +@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) $(MISC)$/$(@:b).cmd +.ELSE +@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(MISC)$/$(@:b).cmd +.ENDIF +cat $(MISC)$/$(@:b).cmd +@+source $(MISC)$/$(@:b).cmd +.ENDIF + $(MISC)/$(PYUNORC) : pyuno -rm -f $@ cat pyuno $@ @@ -149,11 +169,4 @@ $(MISC)/pyuno.flt : pyuno.flt -rm -f $@ cat $? $@ -.IF $(DLLPRE)!= -# python does not accept the lib prefix in the module library -$(LB)/$(TARGET)$(DLLPOST) :
Re: [PATCH] Translate German comments
On 16 February 2012 13:37, Lionel Elie Mamane lio...@mamane.lu wrote: Thank you very much. Radek beat me to it to commit that, but there seems to be an untranslated word that is left; Geschachtelte in - // MIB 25.6.98: Geschachtelte Formulare abfangen ... oder muesste - // man sie submitten? + // MIB 25.6.98: Catch nested Forms Geschachtelte; or would we need to submit them? Maybe it means nested and should just be removed? I'm not sure. Hmm ... that seems to be a remains of my editing. Just remove Geschachtelte (and yes Geschachtelte means nested). You might want to take a look at line num 2185 in DatabaseForm.cxx. Looks like commented out code. Line 2185 *after* your patch? That is: } // if (xDisp.is()) My guess is that this is an explicit end if. It shows what if is being closed there, so that one does not have to count braces / go up to see that. So it is a real comment, not forgotten code. Thanks for the pointer, though. Was worth checking out. Ah, ok. You're welcome. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
