[Libreoffice-commits] .: sc/source
sc/source/filter/oox/addressconverter.cxx | 11 ---
sc/source/filter/oox/drawingbase.cxx | 11 ---
2 files changed, 22 deletions(-)
New commits:
commit 7c3c0c557e8b293551fb6b1b7a1f39b45a394777
Author: Tor Lillqvist t...@iki.fi
Date: Tue Apr 17 10:04:17 2012 +0300
WaE: unused functions
diff --git a/sc/source/filter/oox/addressconverter.cxx
b/sc/source/filter/oox/addressconverter.cxx
index 90c916c..ef7c0fa 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -97,17 +97,6 @@ const sal_Unicode BIFF_URL_UNC = '@'; /// UNC
path root.
const sal_Unicode BIFF_DCON_ENCODED = '\x01'; /// First character of an
encoded path from DCON* records.
const sal_Unicode BIFF_DCON_INTERN = '\x02'; /// First character of an
encoded sheet name from DCON* records.
-
-inline sal_uInt8 lclGetBiffAddressSize( bool bCol16Bit, bool bRow32Bit )
-{
-return (bCol16Bit ? 2 : 1) + (bRow32Bit ? 4 : 2);
-}
-
-inline sal_uInt8 lclGetBiffRangeSize( bool bCol16Bit, bool bRow32Bit )
-{
-return 2 * lclGetBiffAddressSize( bCol16Bit, bRow32Bit );
-}
-
} // namespace
//
diff --git a/sc/source/filter/oox/drawingbase.cxx
b/sc/source/filter/oox/drawingbase.cxx
index 330cada..3e3cb64 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -61,17 +61,6 @@ inline sal_Int32 lclEmuToHmm( sal_Int64 nValue )
return (nValue 0) ? -1 : convertEmuToHmm( nValue );
}
-/** Reads the cell anchor model from a BIFF or DFF stream. */
-BinaryInputStream operator( BinaryInputStream rStrm, CellAnchorModel
rModel )
-{
-// all members are given as 16-bit unsigned values
-rModel.mnCol = rStrm.readuInt16();
-rModel.mnColOffset = rStrm.readuInt16();
-rModel.mnRow = rStrm.readuInt16();
-rModel.mnRowOffset = rStrm.readuInt16();
-return rStrm;
-}
-
} // namespace
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bug/bug.xhtml bug/Makefile
bug/Makefile |3 +++ bug/bug.xhtml | 13 ++--- 2 files changed, 9 insertions(+), 7 deletions(-) New commits: commit 5bec8422eb057b72532fbe00737353899f086bd5 Author: Rob Snelders programm...@ertai.nl Date: Sun Apr 15 13:24:16 2012 +0200 Display submitted-text always where it is visible diff --git a/bug/bug.xhtml b/bug/bug.xhtml index 0e9c073..c0f017b 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -92,10 +92,14 @@ /div /div /div - + + div class=state_success +pThe bug report has been successfully submitted./p +pYou can edit it or add attachments using a class=bugthe corresponding bugzilla page/a./p + /div + div class=username/div - div class=state signin div class=signin-invite Please login using your a class=login-link target=_blankbugzilla account/a. @@ -209,11 +213,6 @@ Platform (if different from the browser): /div - div class=state_success -pThe bug report has been successfully submitted./p -pYou can edit it or add attachments using a class=bugthe corresponding bugzilla page/a./p - /div - div class=submission div class=state state_subcomponent state_duplicates commit 7507c6422053f9fc96dd148a094de4e65b20a0fe Author: Rob Snelders programm...@ertai.nl Date: Sun Apr 15 00:50:15 2012 +0200 added make clean to the bugassistent diff --git a/bug/Makefile b/bug/Makefile index 56665d7..bd846fc 100644 --- a/bug/Makefile +++ b/bug/Makefile @@ -33,3 +33,6 @@ compose: check: perl sanity.pl TEST + +clean: + rm -f BugReport_Details.xhtml component_comments.xhtml subcomponents.xhtml components.xhtml query.xhtml versions.xhtml bug/bug.html ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype | 278 +--
1 file changed, 191 insertions(+), 87 deletions(-)
New commits:
commit 04101329727b355752f31684d27bd86f71b88640
Author: Gökçen Eraslan gokcen.eras...@gmail.com
Date: Sun Apr 15 16:39:12 2012 +0300
fdo#46538 Easyhack: Add support for more bug trackers to
get-bugzilla-attachments-by-mimetype
This adds support for Novell, KDE (for KOffice/Calligra), GNOME (for
Gnumeric), AbiSource (for AbiWord) bugzillas and Launchpad to
bin/get-bugzilla-attachments-by-mimetype script as required by
easyhack#46538. However, there two glitches and workarounds:
1- As stated in the code, Novell bugzilla requires users to log in to
bugzilla in
order to get full information about the bugs such as attachment bodies etc.
Since
Novell bugzilla uses some proprietary login extensions it's hard to
implement log in
mechanism and use it via xmlrpc API. python-bugzilla claims that it
supports Novell
bugzilla login but I could not make it work. As a workaround, comments
containing
Created an attachment (id=xxx) pattern are parsed and attachments are
downloaded
using urllib. Attachments are filtered using mimetype info obtained from
http headers.
2- For launchpad, launchpadlib python module is used. But currently
launchpad api
does not support really advanced search like bugzilla. For example, it's
not possible
to search for bugs having application/pdf attachments. So, again a
workaround is used. Code
iterates over all the bugs of the *libreoffice* source package and check
their attachments.
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 0b18060..7316f0a 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -39,6 +39,7 @@
import urllib
import feedparser
import base64
+import re
import os, os.path
import xmlrpclib
from xml.dom import minidom
@@ -83,6 +84,42 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
break
attachmentid += 1
+def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
+id = url.rsplit('=', 2)[1]
+print id is, prefix, id, suffix
+if os.path.isfile(suffix + '/' + prefix + id + '-1.' + suffix):
+print assuming, id, is up to date
+else:
+print parsing, id
+sock = urlopen_retry(url+ctype=xml)
+dom = minidom.parse(sock)
+sock.close()
+attachmentid=1
+for comment in dom.getElementsByTagName('thetext'):
+commentText = comment.firstChild.nodeValue
+match = re.search(r.*Created an attachment \(id=([0-9]+)\),
commentText)
+if not match:
+continue
+
+realAttachmentId = match.group(1)
+handle = urlopen_retry(novellattach + realAttachmentId)
+if not handle:
+print attachment %s is not accessible, realAttachmentId
+continue
+
+remoteMime = handle.info().gettype()
+if remoteMime != mimetype:
+print skipping
+continue
+
+download = suffix + '/' + prefix + id + '-' + str(attachmentid) +
'.' + suffix
+print 'downloading as', download
+f = open(download, 'w')
+f.write(handle.read())
+f.close()
+break
+attachmentid += 1
+
def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
try:
proxy = xmlrpclib.ServerProxy(rpcurl)
@@ -109,108 +146,164 @@ def get_through_rss_query_url(url, mimetype, prefix,
suffix):
except:
pass
d = feedparser.parse(url)
+
+#Getting detailed bug information and downloading an attachment body is
not possible without logging in to Novell bugzilla
+#get_novell_bug_via_xml function is a workaround for that situation
+get_bug_function = get_novell_bug_via_xml if prefix == novell else
get_from_bug_url_via_xml
+
for entry in d['entries']:
-get_from_bug_url_via_xml(entry['id'], mimetype, prefix, suffix)
+get_bug_function(entry['id'], mimetype, prefix, suffix)
def get_through_rss_query(queryurl, mimetype, prefix, suffix):
url = queryurl +
'?query_format=advancedfield0-0-0=attachments.mimetypetype0-0-0=equalsvalue0-0-0='
+ escape(mimetype) + 'ctype=rss'
print 'url is', url
get_through_rss_query_url(url, mimetype, prefix, suffix)
+def get_launchpad_bugs(prefix):
+#launchpadlib python module is required to download launchpad attachments
+from launchpadlib.launchpad import Launchpad
+
+launchpad = Launchpad.login_anonymously(attachmentdownload, production)
+ubuntu = launchpad.distributions[ubuntu]
+
+#since searching bugs having attachments with specific mimetypes is not
available in launchpad API
+#we're iterating over all bugs of the
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit f9f8d9ac12979e7ec2f269e7f42f1408da9b6795 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:57:19 2012 +0200 --enable-ext-languagetool requires --with-java now bit more sanely. diff --git a/configure.in b/configure.in index d1dff86..13cc862 100644 --- a/configure.in +++ b/configure.in @@ -9655,7 +9655,7 @@ dnl === dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) -if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then +if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno -a x$with_java != xno; then BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) commit a774c6e38503975fdeea165db914176ef1c9a3be Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:55:28 2012 +0200 Revert --enable-ext-languagetool requires --with-java This reverts commit 844b4520a9f0879d7b756654cef8fdbaa03a9000. diff --git a/configure.in b/configure.in index eb4e746..d1dff86 100644 --- a/configure.in +++ b/configure.in @@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart, AC_ARG_ENABLE(ext-languagetool, AS_HELP_STRING([--enable-ext-languagetool], -[Enable the LanguageTool extension. Does not work --without-java.]) +[Enable the LanguageTool extension.]) ) AC_ARG_ENABLE(ext-mysql-connector, @@ -9656,9 +9656,6 @@ dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then -if test -z $SOLAR_JAVA; then -AC_MSG_ERROR([--enable_ext_languagetool requires --with-java]) -fi BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3fa15b05f5fab3d62f10a5419ea56cd8d87e629 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 10:01:13 2012 +0200 Fix help string in --with-flat-logo. diff --git a/configure.in b/configure.in index 13cc862..e71aaa9 100644 --- a/configure.in +++ b/configure.in @@ -1766,7 +1766,7 @@ AC_ARG_WITH(intro-progressbar-frame-color, AC_ARG_WITH(flat-logo-svg, [ --with-flat-logo-svgAllows specification of the flat Logo SVG. - Usage: --with-about-background-svg=/path/my_flat_logo.svg + Usage: --with-flat-logo-svg=/path/my_flat_logo.svg ],,) AC_ARG_WITH(about-background-svg, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 81c20913cdeb0c819b3b74115902da1c51d280fa Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 10:05:50 2012 +0200 Add the system-clucene under the with-system-libs As the distros already had enough time to pick up the required patch and most did. diff --git a/configure.in b/configure.in index e71aaa9..b108b79 100644 --- a/configure.in +++ b/configure.in @@ -1140,7 +1140,8 @@ AC_ARG_WITH(system-jpeg, AC_ARG_WITH(system-clucene, AS_HELP_STRING([--with-system-clucene], -[Use clucene already on system.]),,) +[Use clucene already on system.]),, +[with_system_clucene=$with_system_libs]) AC_ARG_WITH(system-expat, AS_HELP_STRING([--with-system-expat], ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/layout/paintfrm.cxx | 67 -
1 file changed, 67 deletions(-)
New commits:
commit f20c1f3081c98cfb03940318e4ba7ec33f624aec
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 16:12:39 2012 +0200
fdo#38635: fix border printing:
Apparently this special case in lcl_PaintLeftRightLine for printer
output devices is no longer necessary with the new drawing layer borders
and causes the vertical border lines to be far too short, leading to
visible gaps in the PDF.
(regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)
(cherry picked from commit 502c93143ef29989692ca3e63e3e6abc255fd53f)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 3a93e47..659606f 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4462,73 +4462,6 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
if ( _rAttrs.JoinedWithNext( _rFrm ) ) pBottomBorder = NULL;
}
-// OD 06.05.2003 #107169# - adjustments for printer output device
-if ( bPrtOutputDev )
-{
-// substract width of outer top line.
-if ( rBox.GetTop() (!bCnt || _rAttrs.GetTopLine( _rFrm )) )
-{
-long nDist = ::lcl_AlignHeight( rBox.GetTop()-GetOutWidth() );
-(aRect.*_rRectFn-fnSubTop)( -nDist );
-// OD 19.05.2003 #109667# - If outer top line is hair line,
calculated
-// top has to be adjusted.
-if ( nDist == 1 )
-{
-if ( _rFrm.IsVertical() )
-{
-// right of border rectangle has to be checked and adjusted
-Point aCompPt( aRect.Right(), 0 );
-Point aRefPt( aCompPt.X() + 1, aCompPt.Y() );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_True, -1 );
-aRect.Right( aCompPt.X() );
-}
-else
-{
-// top of border rectangle has to be checked and adjusted
-Point aCompPt( 0, aRect.Top() );
-Point aRefPt( aCompPt.X(), aCompPt.Y() - 1 );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_False, +1 );
-aRect.Top( aCompPt.Y() );
-}
-}
-}
-// substract width of outer bottom line.
-if ( rBox.GetBottom() (!bCnt || _rAttrs.GetBottomLine( _rFrm )) )
-{
-long nDist = ::lcl_AlignHeight( rBox.GetBottom()-GetOutWidth());
-(aRect.*_rRectFn-fnAddBottom)( -nDist );
-// OD 19.05.2003 #109667# - If outer bottom line is hair line,
calculated
-// top has to be adjusted.
-if ( nDist == 1 )
-{
-if ( _rFrm.IsVertical() )
-{
-// left of border rectangle has to be checked and adjusted
-Point aCompPt( aRect.Left(), 0 );
-Point aRefPt( aCompPt.X() - 1, aCompPt.Y() );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_True, +1 );
-aRect.Left( aCompPt.X() );
-}
-else
-{
-// bottom of border rectangle has to be checked and
adjusted
-Point aCompPt( 0, aRect.Bottom() );
-Point aRefPt( aCompPt.X(), aCompPt.Y() + 1 );
-lcl_CompPxPosAndAdjustPos( *(pGlobalShell-GetOut()),
- aRefPt, aCompPt,
- sal_False, -1 );
-aRect.Bottom( aCompPt.Y() );
-}
-}
-}
-}
-
if ( !pLeftRightBorder-GetInWidth() )
{
// OD 06.05.2003 #107169# - add 6th parameter
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - bin/get-bugzilla-attachments-by-mimetype cui/source sc/source sd/source unusedcode.easy vcl/unx
bin/get-bugzilla-attachments-by-mimetype | 16 -
cui/source/options/optinet2.cxx |8
sc/source/filter/inc/addressconverter.hxx| 18 -
sc/source/filter/inc/richstring.hxx |1
sc/source/filter/inc/stylesbuffer.hxx|3
sc/source/filter/oox/addressconverter.cxx| 170 ---
sc/source/filter/oox/richstring.cxx | 20 -
sc/source/filter/oox/stylesbuffer.cxx| 14
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 25 -
unusedcode.easy |2
vcl/unx/generic/app/wmadaptor.cxx|6
11 files changed, 16 insertions(+), 267 deletions(-)
New commits:
commit 605c51cebbcf352d52595a0b28288ebc9dcfbdbb
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 17 09:49:07 2012 +0100
attachmentid should be stable across mime-type changes
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 7316f0a..b9488b9 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -66,8 +66,9 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
sock = urlopen_retry(url+ctype=xml)
dom = minidom.parse(sock)
sock.close()
-attachmentid=1
+attachmentid=0
for attachment in dom.getElementsByTagName('attachment'):
+attachmentid += 1
print mimetype is,
for node in attachment.childNodes:
if node.nodeName == 'type':
@@ -82,7 +83,6 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
f.write(base64.b64decode(node.firstChild.nodeValue))
f.close()
break
-attachmentid += 1
def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
id = url.rsplit('=', 2)[1]
@@ -94,20 +94,24 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
sock = urlopen_retry(url+ctype=xml)
dom = minidom.parse(sock)
sock.close()
-attachmentid=1
+attachmentid=0
for comment in dom.getElementsByTagName('thetext'):
commentText = comment.firstChild.nodeValue
match = re.search(r.*Created an attachment \(id=([0-9]+)\),
commentText)
if not match:
continue
+attachmentid += 1
+
realAttachmentId = match.group(1)
handle = urlopen_retry(novellattach + realAttachmentId)
if not handle:
print attachment %s is not accessible, realAttachmentId
continue
+print mimetype is,
remoteMime = handle.info().gettype()
+print remoteMime,
if remoteMime != mimetype:
print skipping
continue
@@ -117,8 +121,6 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
f = open(download, 'w')
f.write(handle.read())
f.close()
-break
-attachmentid += 1
def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
try:
@@ -175,8 +177,9 @@ def get_launchpad_bugs(prefix):
bug = bugtask.bug
id = str(bug.id)
print parsing , id, status:, bugtask.status, title:,
bug.title[:50]
-attachmentid = 1
+attachmentid = 0
for attachment in bug.attachments:
+attachmentid += 1
handle = attachment.data.open()
if not handle.content_type in mimetypes:
#print skipping
@@ -200,7 +203,6 @@ def get_launchpad_bugs(prefix):
f = open(download, w)
f.write(handle.read())
f.close()
-attachmentid += 1
freedesktop = 'http://bugs.freedesktop.org/buglist.cgi'
abisource = 'http://bugzilla.abisource.com/buglist.cgi' #added for abiword
commit 18825a4d596f69793ee11e643f6ea34317a880c9
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 17 00:47:00 2012 +0100
callcatcher: update unused code list
diff --git a/sc/source/filter/inc/addressconverter.hxx
b/sc/source/filter/inc/addressconverter.hxx
index 3f77269..261752c 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -247,24 +247,6 @@ public:
sal_Int32 nStart = 0,
sal_Int32 nLength = SAL_MAX_INT32 );
-/** Tries to parse an encoded name of an external link target in BIFF
-documents, e.g. from EXTERNSHEET or SUPBOOK records.
-
-@param orClassName (out-parameter) DDE server name or OLE class name.
-@param orTargetUrl (out-parameter) Target URL, DDE topic or OLE
object name.
-@param orSheetName (out-parameter)
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source ucb/source
sfx2/source/doc/docfile.cxx | 13 -
ucb/source/ucp/file/shell.cxx |4
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit c16c9fe5b9caa5792d930ec2f3339108d50cd2e1
Author: Michael Meeks michael.me...@suse.com
Date: Sun Apr 15 03:33:22 2012 +0200
re-open output file on save to fsync to improve first-start performance
(cherry picked from commit a0b5ba2e821091b8053bfc1d2f9c99aca7431907)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b9aeb16..3b41fc7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1942,9 +1942,20 @@ void SfxMedium::Transfer_Impl()
xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
Reference
::com::sun::star::ucb::XProgressHandler () );
-if ( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL(
INetURLObject::NO_DECODE ) ) || !aDest.removeSegment() )
+rtl::OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) );
+if ( ::utl::LocalFileHelper::IsLocalFile( aDestURL ) ||
!aDest.removeSegment() )
{
TransactedTransferForFS_Impl( aSource, aDest, xComEnv );
+
+// Hideous - no clean way to do this, so we re-open the file just
to fsync it
+osl::File aFile( aDestURL );
+if ( aFile.open( osl_File_OpenFlag_Write ) ==
osl::FileBase::E_None )
+{
+aFile.sync();
+OSL_TRACE(fsync'd saved file '%s'\n,
+ rtl::OUStringToOString( aDestURL,
RTL_TEXTENCODING_UTF8 ).getStr() );
+aFile.close();
+}
}
else
{
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 1cd1505..fcc238b 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1913,10 +1913,6 @@ shell::write( sal_Int32 CommandId,
}
} while( nReadBytes == nRequestedBytes );
-aFile.sync(); // fsync / flush it to disk.
-OSL_TRACE( fsync'd file '%s'\n,
- rtl::OUStringToOString( aUnqPath, RTL_TEXTENCODING_UTF8
).getStr() );
-
err = aFile.close();
if( err != osl::FileBase::E_None )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - bin/lo-pack-sources bin/unpack-sources download
bin/lo-pack-sources | 11 +--
bin/unpack-sources | 18 +-
download| 16 +---
3 files changed, 23 insertions(+), 22 deletions(-)
New commits:
commit fcb1cc5f3788ae1ae3309159d66111767e8781fe
Author: Petr Mladek pmla...@suse.cz
Date: Mon Apr 16 17:16:32 2012 +0200
allow to download main source tarballs again
The file core.ver was removed in configure together with other core.*
files. It was ugly name. Better to use sources.ver and the variable
lo_sources_ver=...
The source version is not used in unpack-sources, so do not source the
.ver file
at all.
The source tarballs are put into major.minor.micro version subdirectory
on the download site now.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index b57ae1b..11fcd74 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -117,14 +117,13 @@ sub run_autoreconf($$)
cd - /dev/null 21) die Error: autoreconf failed: $!\n;
}
-sub generate_version_file($$$)
+sub generate_sources_version_file($$)
{
-my ($dir, $piece, $release_version) = @_;
+my ($dir, $release_version) = @_;
-# FIXME: crazy hacks to copy libreoffice-build without too big and useless
subdirectories and to show a progress
-open (VERFILE, $dir/$piece.ver) || die Can't open $dir/lo-$piece.ver:
$!\n;
+open (VERFILE, $dir/sources.ver) || die Can't open $dir/sources.ver:
$!\n;
-print VERFILE lo_core_ver=$release_version\n;
+print VERFILE lo_sources_ver=$release_version\n;
close VERFILE;
}
@@ -248,7 +247,7 @@ sub prepare_piece_sources()
my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece,
$piece_tarball_name);
generate_lo_piece_changelog($piece_dir, $temp_dir/$piece_tarball_name,
$piece);
run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq
'core');
-generate_version_file($temp_dir/$piece_tarball_name, $piece,
$release_version) if ($piece eq 'core');
+generate_sources_version_file($temp_dir/$piece_tarball_name,
$release_version) if ($piece eq 'core');
return $temp_dir;
}
diff --git a/bin/unpack-sources b/bin/unpack-sources
index 271a5e3..0fe4499 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -78,13 +78,12 @@ if ! test -f $start_dir/Repository.mk -a -f
$start_dir/solenv/inc/target.mk ; th
exit 1;
fi
-if test ! -f $start_dir/core.ver -o -d $start_dir/.git ; then
-echo Warning: core sources are from git and not from tarball
+if test ! -f $start_dir/sources.ver -o -d $start_dir/.git ; then
+echo Warning: sources are from git and not from tarball
echo Do nothing.
exit 0;
fi
-source $start_dir/bootstrap.ver
lo_src_dir=$start_dir/src
mkdir -p $lo_src_dir
diff --git a/download b/download
index e8ebeff..b5774f1 100755
--- a/download
+++ b/download
@@ -181,15 +181,17 @@ if [ $COM = MSC ]; then
downloaditem
http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/;
WindowsXP-KB975337-x86-ENU.exe 946d00d87e4094f3a6e425e2d538eadd
fi
-if [ -f $start_dir/core.ver -a ! -d $start_dir/.git ] ; then
-# core is from sources, so get the other source tarballs
-. $start_dir/core.ver
+if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
+# these sources are from a tarball, so get the other source tarballs
+. $start_dir/sources.ver
+# sources are put into major.minor.micro version directory on the
dowload site, e.g. 3.5.2
+lo_bugfix_release_sources_ver=`echo $lo_sources_ver | sed -e
s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/`
lo_src_dir=$start_dir/src
mkdir -p $lo_src_dir
for piece in `cat $start_dir/bin/repo-list` ; do
-tarname=libreoffice-$piece-$lo_core_ver
+tarname=libreoffice-$piece-$lo_sources_ver
if [ ! -f $TARFILE_LOCATION/$tarname.tar.xz ] ; then
- downloaditem
http://download.documentfoundation.org/libreoffice/src/; $tarname.tar.xz
+ downloaditem
http://download.documentfoundation.org/libreoffice/src/$lo_bugfix_release_sources_ver;
$tarname.tar.xz
fi
$start_dir/bin/unpack-sources $start_dir
$TARFILE_LOCATION/$tarname.tar.xz
done
commit de27fa7a22cf6bb08a03121c7144ac99692a5220
Author: Petr Mladek pmla...@suse.cz
Date: Fri Apr 13 16:20:55 2012 +0200
unpack-sources, download: update for .xz source tarballs
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/bin/unpack-sources b/bin/unpack-sources
index 130c9a2..271a5e3 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -73,13 +73,13 @@ if test -z $start_dir ; then
echo Error: Please, define where to unpack sources, try --help
fi
-if ! test -d $start_dir/src -a -f $start_dir/solenv/inc/target.mk ; then
-echo Error: $start_dir is not a valid bootstrap directory
+if ! test -f $start_dir/Repository.mk -a -f
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/inc/output.hxx |2 -
sc/source/ui/view/output2.cxx | 59 --
2 files changed, 35 insertions(+), 26 deletions(-)
New commits:
commit 7a028f6c1e7fb80a22002ad6fed1604dab327e36
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Apr 16 22:02:12 2012 -0400
fdo#48431: More reliable way to check for RTL text.
This is probably more reliable way to fix fdo#32530 such that it won't
cause the regression in rendering Thai texts as reported in fdo#48431.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 9a81555..5bdb101 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -102,12 +102,12 @@ private:
longmnPosX;
longmnPosY;
longmnInitPosX;
-sal_uInt8 mnScript;
boolmbBreak;
boolmbCellIsValue;
boolmbAsianVertical;
boolmbPixelToLogic;
boolmbHyphenatorSet;
+boolmbRTL;
ScFieldEditEngine* mpEngine;
ScBaseCell* mpCell;
const ScPatternAttr*mpPattern;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 82a9905..7f9a9eb 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -70,10 +70,14 @@
#include scmod.hxx
#include fillinfo.hxx
+#include com/sun/star/i18n/DirectionProperty.hpp
+
#include boost/ptr_container/ptr_vector.hpp
#include math.h
+using namespace com::sun::star;
+
//! Autofilter-Breite mit column.cxx zusammenfassen
#define DROPDOWN_BITMAP_SIZE18
@@ -1330,6 +1334,29 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE
nArrY, long nPosX, long nPosY
rParam.maClipRect.Justify();
}
+namespace {
+
+bool beginsWithRTLCharacter(const rtl::OUString rStr)
+{
+if (rStr.isEmpty())
+return false;
+
+switch (ScGlobal::pCharClass-getCharacterDirection(rStr, 0))
+{
+case i18n::DirectionProperty_RIGHT_TO_LEFT:
+case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC:
+case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING:
+case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE:
+return true;
+default:
+;
+}
+
+return false;
+}
+
+}
+
void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
{
OSL_ENSURE( pDev == pRefDevice ||
@@ -1564,18 +1591,8 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
if (aVars.GetHorJust() == SVX_HOR_JUSTIFY_STANDARD)
{
// fdo#32530: Default alignment depends on value vs
-// string, and the script type of the 1st letter.
-sal_uInt8 nScript1st = 0;
-rtl::OUString aStr = aVars.GetString();
-if (!aStr.isEmpty())
-{
-aStr = aStr.copy(0, 1);
-nScript1st = pDoc-GetStringScriptType(aStr);
-if (!nScript1st)
-nScript1st = ScGlobal::GetDefaultScriptType();
-}
-
-if (nScript1st == SCRIPTTYPE_COMPLEX)
+// string, and the direction of the 1st letter.
+if (beginsWithRTLCharacter(aVars.GetString()))
eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_LEFT
: SVX_HOR_JUSTIFY_RIGHT;
else
eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT
: SVX_HOR_JUSTIFY_LEFT;
@@ -2155,12 +2172,12 @@ ScOutputData::DrawEditParam::DrawEditParam(const
ScPatternAttr* pPattern, const
mnArrY(0),
mnX(0), mnY(0), mnCellX(0), mnCellY(0),
mnPosX(0), mnPosY(0), mnInitPosX(0),
-mnScript(0),
mbBreak( (meHorJust == SVX_HOR_JUSTIFY_BLOCK) ||
lcl_GetBoolValue(*pPattern, ATTR_LINEBREAK, pCondSet) ),
mbCellIsValue(bCellIsValue),
mbAsianVertical(false),
mbPixelToLogic(false),
mbHyphenatorSet(false),
+mbRTL(false),
mpEngine(NULL),
mpCell(NULL),
mpPattern(pPattern),
@@ -2590,8 +2607,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam rParam)
if (eOutHorJust == SVX_HOR_JUSTIFY_STANDARD)
{
// fdo#32530: Default alignment depends on value vs string, and the
-// script type of the 1st letter.
-if (rParam.mnScript == SCRIPTTYPE_COMPLEX)
+// direction of the 1st letter.
+if (rParam.mbRTL)
eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_LEFT :
SVX_HOR_JUSTIFY_RIGHT;
else
eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT :
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - python/makefile.mk
python/makefile.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit 35f7233f498785904f37968ee2dedfc59a64e992 Author: Laurent Godard lgodard.li...@laposte.net Date: Tue Apr 10 16:07:47 2012 +0100 to find the headers and (static) library of our internal openssl Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/python/makefile.mk b/python/makefile.mk index 4f50ed3..1af56e5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -65,6 +65,13 @@ CONFIGURE_DIR= BUILD_DIR= MYCWD=$(shell @pwd)/$(INPATH)/misc/build +.IF $(SYSTEM_OPENSSL) != YES +#we want to be sure we use our internal openssl if +#that's enabled +CC+:=-I$(SOLARINCDIR)$/external +python_LDFLAGS+=-L$(SOLARLIBDIR) +.ENDIF + # CLFLAGS get overwritten in Makefile.pre.in .IF $(SYSBASE)!= CC+:=-I$(SYSBASE)$/usr$/include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - drawinglayer/source
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 513ae531ccd3080fa1089d2d9d7dc829e96267cf
Author: Thorsten Behrens tbehr...@suse.com
Date: Sun Apr 15 03:38:40 2012 +0200
Fix fdo#33591 - edge-case trans gradients came out empty
Gradients with start==end got us zero steps, thus no fill at all.
Funnily this was wrong since pre-3.0 or somesuch.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index b2f1bb5..a16783d 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -72,6 +72,8 @@ namespace drawinglayer
nSteps = nMaxSteps;
}
+nSteps = std::max(sal_uInt32(1), nSteps);
+
switch(getFillGradient().getStyle())
{
case attribute::GRADIENTSTYLE_LINEAR:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/SpellDialog.cxx | 21 +
cui/source/inc/SpellDialog.hxx |4 +++-
2 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 808be9732e409789f9d26c13c15bbd899c408cd0
Author: Rob Snelders r...@ertai.nl
Date: Sat Apr 14 13:17:04 2012 +0200
fdo#40778 Remove dictionary choice when adding new entry to the spellchecker
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 04f8185..fe1e39d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -324,7 +324,10 @@ void SpellDialog::Init_Impl()
aSuggestionLB.SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) );
aSentenceED.SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
-aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictionaryHdl ) );
+
+aAddToDictMB.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictSelectHdl ) );
+aAddToDictMB.SetClickHdl(LINK ( this, SpellDialog, AddToDictClickHdl ) );
aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
aExplainLink.SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) );
@@ -1003,7 +1006,19 @@ void SpellDialog::InitUserDicts()
}
//---
-IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(1, pButton-GetPopupMenu());
+}
+
+//---
+IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(pButton-GetCurItemId(),
pButton-GetPopupMenu());
+}
+
+//---
+int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
{
aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
@@ -1011,8 +1026,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*,
pButton )
//manually changed
const String aNewWord= aSentenceED.GetErrorText();
-sal_uInt16 nItemId = pButton-GetCurItemId();
-PopupMenu *pMenu = pButton-GetPopupMenu();
String aDicName ( pMenu-GetItemText( nItemId ) );
uno::Reference linguistic2::XDictionary xDic;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 2d9383b..f302e1f 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -212,13 +212,15 @@ private:
DECL_LINK(CancelHdl, void *);
DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
DECL_LINK(UndoHdl, void *);
-DECL_LINK( AddToDictionaryHdl, MenuButton* );
+DECL_LINK( AddToDictSelectHdl, MenuButton* );
+DECL_LINK( AddToDictClickHdl, MenuButton* );
DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
+int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu
*pMenu );
voidStartSpellOptDlg_Impl();
voidInitUserDicts();
voidUpdateBoxes_Impl();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icon-themes/galaxy
dev/null |binary 1 file changed New commits: commit 212c18430864f110e5a3549c0279b1a2ea4bb6bd Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 17 10:45:20 2012 +0100 remove redundant artwork diff --git a/icon-themes/galaxy/sfx2/res/an01.png b/icon-themes/galaxy/sfx2/res/an01.png deleted file mode 100644 index b9dfc05..000 Binary files a/icon-themes/galaxy/sfx2/res/an01.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an02.png b/icon-themes/galaxy/sfx2/res/an02.png deleted file mode 100644 index 752ec39..000 Binary files a/icon-themes/galaxy/sfx2/res/an02.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an03.png b/icon-themes/galaxy/sfx2/res/an03.png deleted file mode 100644 index ce195e5..000 Binary files a/icon-themes/galaxy/sfx2/res/an03.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an04.png b/icon-themes/galaxy/sfx2/res/an04.png deleted file mode 100644 index 8c0de0f..000 Binary files a/icon-themes/galaxy/sfx2/res/an04.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an05.png b/icon-themes/galaxy/sfx2/res/an05.png deleted file mode 100644 index b61b012..000 Binary files a/icon-themes/galaxy/sfx2/res/an05.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an06.png b/icon-themes/galaxy/sfx2/res/an06.png deleted file mode 100644 index b72d8ba..000 Binary files a/icon-themes/galaxy/sfx2/res/an06.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/lco.png b/icon-themes/galaxy/sfx2/res/lco.png deleted file mode 100644 index bafbc47..000 Binary files a/icon-themes/galaxy/sfx2/res/lco.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/lmo.png b/icon-themes/galaxy/sfx2/res/lmo.png deleted file mode 100644 index 134b88e..000 Binary files a/icon-themes/galaxy/sfx2/res/lmo.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/sco.png b/icon-themes/galaxy/sfx2/res/sco.png deleted file mode 100644 index 248b89e..000 Binary files a/icon-themes/galaxy/sfx2/res/sco.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/smo.png b/icon-themes/galaxy/sfx2/res/smo.png deleted file mode 100644 index bd56c02..000 Binary files a/icon-themes/galaxy/sfx2/res/smo.png and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |5 + 1 file changed, 5 insertions(+) New commits: commit cd2d737dd5b1d46261a9aa6c5caae57347a287af Author: Gökçen Eraslan gokcen.eras...@gmail.com Date: Tue Apr 17 12:04:05 2012 +0300 Fix handling of deleted bugzilla attachments As in https://bugs.kde.org/show_bug.cgi?ctype=xmlid=53343 data tag may not have a value if the attachment is deleted. diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index b9488b9..7c77957 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -77,6 +77,11 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix): print 'skipping' break elif node.nodeName == 'data': +# check if attachment is deleted (i.e. https://bugs.kde.org/show_bug.cgi?id=53343ctype=xml) +if not node.firstChild: +print 'deleted attachment, skipping' +continue + download = suffix + '/' +prefix + id + '-' + str(attachmentid) + '.' + suffix print 'downloading as', download f = open(download, 'w') ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/layout/pagechg.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 2d7ce65af37195343ff74b9e01c60f4b86eb6ebe Author: Andreas Schierl openoff...@schierla.de Date: Mon Jan 30 23:34:56 2012 +0100 ClrContourCache for SwAnchoredDrawObjects (fdo#45376) call it only for contour wrapped drawing objects Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 79d7d1b..ef0d1c8 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -39,6 +39,7 @@ #include fmtfordr.hxx #include fmtfld.hxx #include fmtornt.hxx +#include fmtsrnd.hxx #include ftninfo.hxx #include tgrditem.hxx #include viewopt.hxx @@ -2035,6 +2036,10 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point rOffset ) const Point aNewAnchorPos( ( aCurrAnchorPos + rOffset ) ); pAnchoredDrawObj-DrawObj()-SetAnchorPos( aNewAnchorPos ); pAnchoredDrawObj-SetLastObjRect( pAnchoredDrawObj-GetObjRect().SVRect() ); + +// clear contour cache +if ( pAnchoredDrawObj-GetFrmFmt().GetSurround().IsContour() ) +ClrContourCache( pAnchoredDrawObj-GetDrawObj() ); } // #i92511# // cache for object rectangle inclusive spaces has to be invalidated. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source writerfilter/inc writerfilter/source
sw/source/core/unocore/unoframe.cxx|2 -
writerfilter/inc/dmapper/DomainMapper.hxx |4 ++
writerfilter/source/dmapper/DomainMapper.cxx |8
writerfilter/source/dmapper/GraphicHelpers.cxx | 41 +
writerfilter/source/dmapper/GraphicHelpers.hxx | 10 ++
writerfilter/source/dmapper/GraphicImport.cxx | 12 ++-
writerfilter/source/dmapper/PropertyIds.cxx|1
writerfilter/source/dmapper/PropertyIds.hxx|1
8 files changed, 77 insertions(+), 2 deletions(-)
New commits:
commit 0a9161263b8e2e5df424dda3c8f80ef5067bbcc9
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 17 13:53:17 2012 +0200
implement relativeHeight (z-order) in .docx import (part of bnc#747461)
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 4713763..95ddc6f 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -36,6 +36,7 @@
#include map
#include vector
+#include boost/scoped_ptr.hpp
namespace com{ namespace sun {namespace star{
namespace beans{
@@ -65,6 +66,7 @@ class PropertyMap;
class DomainMapper_Impl;
class ListsManager;
class StyleSheetTable;
+class GraphicZOrderHelper;
// different context types require different sprm handling (e.g. names)
enum SprmType
@@ -113,6 +115,7 @@ public:
::rtl::OUString getOrCreateCharStyle( PropertyValueVector_t
rCharProperties );
boost::shared_ptr StyleSheetTable GetStyleSheetTable( );
+GraphicZOrderHelper* graphicZOrderHelper();
private:
// Stream
@@ -150,6 +153,7 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
+boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
} // namespace dmapper
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 54fe0a0..dcc20cf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -71,6 +71,7 @@
#include tools/color.hxx
#include CellColorHandler.hxx
#include SectionColumnHandler.hxx
+#include GraphicHelpers.hxx
using namespace ::com::sun::star;
using namespace ::rtl;
@@ -3755,6 +3756,13 @@ StyleSheetTablePtr DomainMapper::GetStyleSheetTable( )
return m_pImpl-GetStyleSheetTable( );
}
+GraphicZOrderHelper* DomainMapper::graphicZOrderHelper()
+{
+if( zOrderHelper.get() == NULL )
+zOrderHelper.reset( new GraphicZOrderHelper );
+return zOrderHelper.get();
+}
+
} //namespace dmapper
} //namespace writerfilter
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index cdafb8e..819dc6f 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -216,6 +216,47 @@ sal_Int32 WrapHandler::getWrapMode( )
return nMode;
}
+
+void GraphicZOrderHelper::addItem( uno::Reference beans::XPropertySet
props, sal_Int32 relativeHeight )
+{
+items[ relativeHeight ] = props;
+}
+
+// The relativeHeight value in .docx is an arbitrary number, where only the
relative ordering matters.
+// But in Writer, the z-order is index in 0..(numitems-1) range, so whenever a
new item needs to be
+// added in the proper z-order, it is necessary to find the proper index.
+sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
+{
+Items::const_iterator it = items.begin();
+while( it != items.end())
+{
+// std::map is iterated sorted by key
+if( it-first relativeHeight )
+break; // this is the first one higher, we belong right before it
+else
+++it;
+}
+if( it == items.end()) // we're topmost
+{
+if( items.empty())
+return 0;
+sal_Int32 itemZOrder;
+--it;
+if(
it-second-getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
+.GetName( PROP_Z_ORDER )) = itemZOrder )
+return itemZOrder + 1; // after the topmost
+}
+else
+{
+sal_Int32 itemZOrder;
+if(
it-second-getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
+.GetName( PROP_Z_ORDER )) = itemZOrder )
+return itemZOrder; // before the item
+}
+SAL_WARN( writerfilter, findZOrder() didn't find item z-order );
+return 0; // this should not(?) happen
+}
+
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx
b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 80ddc93..f87b6f9 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -51,6 +51,16 @@ public:
};
typedef boost::shared_ptrWrapHandler WrapHandlerPtr;
+class WRITERFILTER_DLLPRIVATE GraphicZOrderHelper
+{
+public:
+void
[Libreoffice-commits] .: 2 commits - oovbaapi/ooo sc/inc sc/source svl/inc svl/source vbahelper/source
oovbaapi/ooo/vba/msforms/XControl.idl |1
sc/inc/cellform.hxx |4 +
sc/source/core/tool/cellform.cxx|5 +
sc/source/ui/view/output2.cxx | 43 +++-
svl/inc/svl/zforlist.hxx|4 -
svl/source/numbers/zforlist.cxx | 16 --
vbahelper/source/msforms/vbacontrol.cxx | 84 +++-
vbahelper/source/msforms/vbacontrol.hxx |2
8 files changed, 146 insertions(+), 13 deletions(-)
New commits:
commit 46e18bc915ac94a81462642cc9d56d29c04d0c46
Author: Noel Power noel.po...@novell.com
Date: Mon Apr 16 16:20:51 2012 +0100
enable '*' repeat next char to fill available width for calc num formats
but - however no support to import/export this to file format yet
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index cdfa09c..3a5418d 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -53,7 +53,9 @@ public:
Color** ppColor, SvNumberFormatter rFormatter,
sal_Bool bNullVals = sal_True,
sal_Bool bFormula = false,
- ScForceTextFmt eForceTextFmt = ftDontForce );
+ ScForceTextFmt eForceTextFmt = ftDontForce,
+ bool bUseStarFormat = false );
+
static void GetInputString( ScBaseCell* pCell, sal_uLong nFormat,
rtl::OUString rString,
SvNumberFormatter rFormatter );
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index f33a48c..0da6866 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -49,7 +49,8 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong
nFormat, rtl::OUStrin
Color** ppColor, SvNumberFormatter rFormatter,
sal_Bool bNullVals,
sal_Bool bFormula,
- ScForceTextFmt eForceTextFmt )
+ ScForceTextFmt eForceTextFmt,
+ bool bUseStarFormat )
{
*ppColor = NULL;
if (rFormatter==NULL)
@@ -92,7 +93,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong
nFormat, rtl::OUStrin
rFormatter.GetOutputString( aTemp, nFormat, rString,
ppColor );
}
else
-rFormatter.GetOutputString( nValue, nFormat, rString,
ppColor );
+rFormatter.GetOutputString( nValue, nFormat, rString,
ppColor, bUseStarFormat );
}
}
break;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 2b99bb8..6c616eb 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -128,6 +128,8 @@ class ScDrawStringsVars
Color aBackConfigColor; // used for
ScPatternAttr::GetFont calls
Color aTextConfigColor;
+sal_Int32 nPos;
+sal_Unicode nChar;
public:
ScDrawStringsVars(ScOutputData* pData, sal_Bool bPTL);
@@ -162,6 +164,7 @@ public:
sal_BoolGetLineBreak() const{ return bLineBreak; }
sal_BoolIsRepeat() const{ return bRepeat; }
sal_BoolIsShrink() const{ return bShrink; }
+voidRepeatToFill( long colWidth );
longGetAscent() const { return nAscentPixel; }
sal_BoolIsRotated() const { return bRotated; }
@@ -206,7 +209,9 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData,
sal_Bool bPTL) :
bLineBreak ( false ),
bRepeat ( false ),
bShrink ( false ),
-bPixelToLogic( bPTL )
+bPixelToLogic( bPTL ),
+nPos( STRING_NOTFOUND ),
+nChar( 0x0 )
{
ScModule* pScMod = SC_MOD();
bCellContrast = pOutput-bUseStyleColor
@@ -502,9 +507,19 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
*pOutput-pDoc-GetFormatTable(),
pOutput-bShowNullValues,
pOutput-bShowFormulas,
- ftCheck );
+ ftCheck, true );
aString = aOUString;
-
+if ( nFormat )
+{
+nPos = aString.Search( 0x1B );
+if ( nPos != STRING_NOTFOUND )
+{
+nPos = nPos - 1;
+nChar = aString.GetChar( nPos );
+// delete placeholder and char to repeat
+aString.Erase( nPos, 2 );
+}
+}
if (aString.Len() DRAWTEXT_MAX)
aString.Erase(DRAWTEXT_MAX);
@@ -537,6 +552,27 @@ void ScDrawStringsVars::SetHashText()
[Libreoffice-commits] .: solenv/inc
solenv/inc/libs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf1e3b9132a804bd5d7eb0294c1d7e4f0254f52b Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 16:38:39 2012 +0200 Use proper variable when using system clucene. Thanks to Caolan for the fix. diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 3adeb01..a936193 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -182,7 +182,7 @@ HM2LIBST=-lhmwrap LINGULIB=$(HM2LIBST) LNGLIB=-llng$(DLLPOSTFIX) .IF $(SYSTEM_CLUCENE)==YES -CLUCENELIB=$(LIBCLUCENE_LIBS) +CLUCENELIB=$(CLUCENE_LIBS) .ELSE CLUCENELIB=-lclucene .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/file/shell.cxx | 77 +-
1 file changed, 40 insertions(+), 37 deletions(-)
New commits:
commit 45b57a9dfb5df8b9c4a1974cb6e848d4f3b57ea3
Author: Noel Power noel.po...@novell.com
Date: Tue Apr 17 15:50:35 2012 +0100
prevent getFileURL() getLinkTargetURL() asserting for broken links
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 1cb03b3..1907d16 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2491,54 +2491,57 @@ shell::getv(
osl_FileStatus_Mask_FileURL |
osl_FileStatus_Mask_Type |
osl_FileStatus_Mask_LinkTargetURL );
-aDirItem.getFileStatus( aFileStatus );
-aUnqPath = aFileStatus.getFileURL();
-// If the directory item type is a link retrieve the type of the target
-
-if ( aFileStatus.getFileType() == osl::FileStatus::Link )
+osl::FileBase::RC aRes = aDirItem.getFileStatus( aFileStatus );
+if ( aRes == osl::FileBase::E_None )
{
-// Assume failure
-aIsRegular = false;
-osl::FileBase::RC result = osl::FileBase::E_INVAL;
-osl::DirectoryItem aTargetItem;
-osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
-if ( aTargetItem.is() )
+aUnqPath = aFileStatus.getFileURL();
+
+// If the directory item type is a link retrieve the type of the target
+
+if ( aFileStatus.getFileType() == osl::FileStatus::Link )
{
-osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
+// Assume failure
+aIsRegular = false;
+osl::FileBase::RC result = osl::FileBase::E_INVAL;
+osl::DirectoryItem aTargetItem;
+osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(),
aTargetItem );
+if ( aTargetItem.is() )
+{
+osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
-if ( osl::FileBase::E_None ==
- ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
-aIsRegular =
-aTargetStatus.getFileType() == osl::FileStatus::Regular;
+if ( osl::FileBase::E_None ==
+ ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
+aIsRegular =
+aTargetStatus.getFileType() ==
osl::FileStatus::Regular;
+}
}
-}
-else
-aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
+else
+aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
-registerNotifier( aUnqPath,pNotifier );
-insertDefaultProperties( aUnqPath );
-{
-osl::MutexGuard aGuard( m_aMutex );
+registerNotifier( aUnqPath,pNotifier );
+insertDefaultProperties( aUnqPath );
+{
+osl::MutexGuard aGuard( m_aMutex );
-shell::ContentMap::iterator it = m_aContent.find( aUnqPath );
-commit( it,aFileStatus );
+shell::ContentMap::iterator it = m_aContent.find( aUnqPath );
+commit( it,aFileStatus );
-shell::PropertySet::iterator it1;
-PropertySet propset = *(it-second.properties);
+shell::PropertySet::iterator it1;
+PropertySet propset = *(it-second.properties);
-for( sal_Int32 i = 0; i seq.getLength(); ++i )
-{
-MyProperty readProp( properties[i].Name );
-it1 = propset.find( readProp );
-if( it1 == propset.end() )
-seq[i] = uno::Any();
-else
-seq[i] = it1-getValue();
+for( sal_Int32 i = 0; i seq.getLength(); ++i )
+{
+MyProperty readProp( properties[i].Name );
+it1 = propset.find( readProp );
+if( it1 == propset.end() )
+seq[i] = uno::Any();
+else
+seq[i] = it1-getValue();
+}
}
+deregisterNotifier( aUnqPath,pNotifier );
}
-deregisterNotifier( aUnqPath,pNotifier );
-
XRow_impl* p = new XRow_impl( this,seq );
return uno::Reference sdbc::XRow ( p );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source vcl/win
vcl/source/window/menu.cxx |5 +++-
vcl/win/source/gdi/salnativewidgets-luna.cxx | 33 ---
2 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit 672071c02622c8ad4b9f23f2a5b885cfe7f72669
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Apr 11 21:34:06 2012 +0400
fdo#42537: fix RTL menu rendering on Windows
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3da96c2..92803a9 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2775,7 +2775,10 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder,
long nStartY, MenuItemDa
aTmpPos.Y() = aOuterCheckRect.Top() +
(aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight,
nCtrlHeight ) );
-MenupopupValue aVal( nTextPos-GUTTERBORDER,
Rectangle( aPos, pData-aSz ) );
+Size aSz( pData-aSz );
+aSz.Width() = aOutSz.Width() - 2*nOuterSpace;
+Rectangle aItemRect( aPos, aSz );
+MenupopupValue aVal( nTextPos-GUTTERBORDER,
aItemRect );
pWin-DrawNativeControl( CTRL_MENU_POPUP, nPart,
aCheckRect,
nState,
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index a4f094f..17b8517 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -989,8 +989,16 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
if( nPart == PART_ENTIRE_CONTROL )
{
RECT aGutterRC = rc;
-aGutterRC.left += aValue.getNumericVal();
-aGutterRC.right = aGutterRC.left+3;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aGutterRC.right -= aValue.getNumericVal()+1;
+aGutterRC.left = aGutterRC.right-3;
+}
+else
+{
+aGutterRC.left += aValue.getNumericVal();
+aGutterRC.right = aGutterRC.left+3;
+}
return
ImplDrawTheme( hTheme, hDC, MENU_POPUPBACKGROUND, 0, rc,
aCaption )
ImplDrawTheme( hTheme, hDC, MENU_POPUPGUTTER, 0, aGutterRC,
aCaption )
@@ -1012,13 +1020,18 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
if( aValue.getType() == CTRL_MENU_POPUP )
{
const MenupopupValue rMVal( static_castconst
MenupopupValue(aValue) );
-aBGRect.left = rMVal.maItemRect.Left();
aBGRect.top= rMVal.maItemRect.Top();
aBGRect.bottom = rMVal.maItemRect.Bottom()+1; // see
below in drawNativeControl
-aBGRect.right = rMVal.getNumericVal();
-
-// FIXME: magic
-aBGRect.left += 1; aBGRect.top += 1; aBGRect.bottom
+=1;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aBGRect.right = rMVal.maItemRect.Right()+1;
+aBGRect.left = aBGRect.right -
(rMVal.getNumericVal()-rMVal.maItemRect.Left());
+}
+else
+{
+aBGRect.right = rMVal.getNumericVal();
+aBGRect.left = rMVal.maItemRect.Left();
+}
}
iState = (nState CTRL_STATE_ENABLED) ? MCB_NORMAL :
MCB_DISABLED;
ImplDrawTheme( hTheme, hDC, MENU_POPUPCHECKBACKGROUND,
iState, aBGRect, aCaption );
@@ -1033,7 +1046,11 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme,
RECT rc,
}
else if( nPart == PART_MENU_SEPARATOR )
{
-rc.left += aValue.getNumericVal(); // adjust for gutter
position
+// adjust for gutter position
+if( Application::GetSettings().GetLayoutRTL() )
+rc.right -= aValue.getNumericVal()+1;
+else
+rc.left += aValue.getNumericVal()+1;
Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
MENU_POPUPSEPARATOR, 0, Rectangle( rc.left, rc.top,
rc.right, rc.bottom ) ) );
// center the separator inside the passed rectangle
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 8475d4e14ce068b5eae155aa26f40f79ebadc0e2 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Apr 17 17:12:09 2012 +0200 Fix fdo#47484 - use older ODF encryption by default As recently discussed, 3.5.x will use the older, more backwards- compatible encryption methods, as a way to transition people over. Starting with 3.6, the stronger AES will be the default. In all versions, this is configurable though. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c74e508..0f2918d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2705,17 +2705,17 @@ authorMAV/author descSpecifies whether SHA1 algorithm instead of SHA256 should be used in ODF12 for StartKey and Checksum generation during -encryption./desc +encryption. If true, compatible with older OOo/LibO versions./desc /info - valuefalse/value + valuetrue/value /prop prop oor:name=UseBlowfishInODF12 oor:type=xs:boolean info authorMAV/author descSpecifies whether Blowfish algorithm instead of AES should be -used in ODF12 for encryption./desc +used in ODF12 for encryption. If true, compatible with older OOo/LibO versions./desc /info - valuefalse/value + valuetrue/value /prop /group /group ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/basicide/basobj2.cxx |9 +
basctl/source/basicide/bastype2.cxx | 14 +++---
basctl/source/basicide/bastype3.cxx | 10 --
3 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit b1bee56af9a4cbbaabfe43290d28f53efdebc14d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Apr 18 00:23:42 2012 +0900
calling GetChar() only once suffices
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index ddbc3a4..cd9986c 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -108,10 +108,11 @@ sal_Bool IsValidSbxName( const String rName )
{
for ( sal_uInt16 nChar = 0; nChar rName.Len(); nChar++ )
{
-sal_Bool bValid = ( ( rName.GetChar(nChar) = 'A'
rName.GetChar(nChar) = 'Z' ) ||
-( rName.GetChar(nChar) = 'a' rName.GetChar(nChar)
= 'z' ) ||
-( rName.GetChar(nChar) = '0' rName.GetChar(nChar)
= '9' nChar ) ||
-( rName.GetChar(nChar) == '_' ) );
+sal_Unicode c = rName.GetChar(nChar);
+sal_Bool bValid = ( ( c = 'A' c = 'Z' ) ||
+( c = 'a' c = 'z' ) ||
+( c = '0' c = '9' nChar ) ||
+( c == '_' ) );
if ( !bValid )
return sal_False;
}
commit f00d60997edc56bf0f4653b1bd78c5379cedda6a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Apr 18 00:22:17 2012 +0900
replaced String by rtl::OUString
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 986efa3..34a1aaf 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -332,7 +332,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry*
pLibRootEntry, const
for ( sal_Int32 i = 0 ; i nModCount ; i++ )
{
-String aModName = pModNames[ i ];
+::rtl::OUString aModName = pModNames[ i ];
SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry,
aModName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
pModuleEntry = AddEntry(
@@ -408,10 +408,10 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode(
SvLBoxEntry* pLibRootEnt
{
::std::vector std::pair BasicEntryType, ::rtl::OUString aEntries;
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String(
IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, String(
IDEResId( RID_STR_USERFORMS ) ) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, String(
IDEResId( RID_STR_NORMAL_MODULES ) ) ) );
-aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, String(
IDEResId( RID_STR_CLASS_MODULES ) ) ) );
+aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS,
ResId::toString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
+aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, ResId::toString(
IDEResId( RID_STR_USERFORMS ) ) ) );
+aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES,
ResId::toString( IDEResId( RID_STR_NORMAL_MODULES ) ) ) );
+aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES,
ResId::toString( IDEResId( RID_STR_CLASS_MODULES ) ) ) );
::std::vector std::pair BasicEntryType, ::rtl::OUString ::iterator
iter;
for( iter = aEntries.begin(); iter != aEntries.end(); ++iter )
@@ -798,8 +798,8 @@ void BasicTreeListBox::SetCurrentEntry(
BasicEntryDescriptor rDesc )
{
aDesc = BasicEntryDescriptor(
ScriptDocument::getApplicationScriptDocument(),
-LIBRARY_LOCATION_USER, String::CreateFromAscii( Standard ),
-String(), String::CreateFromAscii( . ), OBJ_TYPE_UNKNOWN );
+LIBRARY_LOCATION_USER, Standard,
+::rtl::OUString(), ., OBJ_TYPE_UNKNOWN );
}
ScriptDocument aDocument( aDesc.GetDocument() );
OSL_ENSURE( aDocument.isValid(), BasicTreeListBox::SetCurrentEntry:
invalid document! );
diff --git a/basctl/source/basicide/bastype3.cxx
b/basctl/source/basicide/bastype3.cxx
index 4128474..d906471 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -67,8 +67,7 @@ void BasicTreeListBox::RequestingChildren( SvLBoxEntry*
pEntry )
}
else if ( eType == OBJ_TYPE_LIBRARY )
{
-String aLibName( aDesc.GetLibName() );
-::rtl::OUString aOULibName( aLibName );
+::rtl::OUString aOULibName( aDesc.GetLibName() );
// check password
sal_Bool bOK = sal_True;
@@ -79,7 +78,7 @@ void BasicTreeListBox::RequestingChildren( SvLBoxEntry*
pEntry )
if ( xPasswd.is() xPasswd-isLibraryPasswordProtected(
aOULibName ) !xPasswd-isLibraryPasswordVerified( aOULibName ) )
{
[Libreoffice-commits] .: basebmp/source svtools/qa vcl/source
basebmp/source/bitmapdevice.cxx | 12 ++-
svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png |3 +
svtools/qa/cppunit/data/png/fail/CVE-2005-0633-1.png |binary
svtools/qa/cppunit/data/png/fail/CVE-2006-7210-1.png |binary
svtools/qa/cppunit/data/png/fail/CVE-2007-2365-1.png |binary
svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png |1
svtools/qa/cppunit/data/png/pass/black.png |binary
svtools/qa/cppunit/filters-test.cxx |4 ++
vcl/source/gdi/pngread.cxx | 31 +--
9 files changed, 40 insertions(+), 11 deletions(-)
New commits:
commit 9ff94ae0fa947c5fd6a31fbc38421f60eb5e1fba
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 17 16:45:23 2012 +0100
png parsing regression test
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 1586fce..b3676c6 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1881,8 +1881,16 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const
basegfx::B2IVector
// factor in bottom-up scanline order case
nScanlineStride *= bTopDown ? 1 : -1;
-const std::size_t nMemSize(
-(nScanlineStride 0 ? -nScanlineStride :
nScanlineStride)*rSize.getY() );
+const sal_uInt32 nWidth(nScanlineStride 0 ? -nScanlineStride :
nScanlineStride);
+const sal_uInt32 nHeight(rSize.getY());
+
+if (nHeight nWidth nWidth SAL_MAX_INT32 / nHeight)
+{
+SAL_WARN( basebmp, suspicious massive alloc nWidth *
nHeight);
+return BitmapDeviceSharedPtr();
+}
+
+const std::size_t nMemSize(nWidth * nHeight);
if( !pMem )
{
diff --git a/svtools/qa/cppunit/data/png/fail/.gitignore
b/svtools/qa/cppunit/data/png/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png
b/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png
new file mode 100644
index 000..fa90a29
--- /dev/null
+++ b/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png
@@ -0,0 +1,3 @@
+Àë#Mb£ }ÕÔo 7ë2ÎË~X¨á.^TÿwBè!õf1±°ÿ»±sé
tùgça2b A±ÕðÁËHbè8àî|ìeGfS$N0nIÖªõ
+Ôç0ðJG°zÀ¤Ü¢(s?d)À ËÿGE¢×F¯9~}ÇrÕ
TÎp?áÅÂ*¿ìò ·¥ckµ$EXï¯8á¾=2±T_3³v¿#é
á$Hh4«JÑKiÝJÿ7r
ú
Ï=u¯ù69KÙjãûäÎçèÿëWh{é½Ï$·
dVÅÜ[îÐÐÊy\à%º%ǾH® meÛÃÞ+
Á}ÀgXI¡2ñ*Ä«õùÕúÍ·
)̸6ÔpUTjODhÙ¶1éù-ÄÔW µUR±Kø591Òþ¦«M?
+~æ*Nr¡Ìu;µãÀkh©ÉXÔà{ÖßÔ¤»'
Ów©ìF[ÛÒKèRÓf§yO¹¨%0´©iháx×wz¿4dT.¥@Xm4¦Þi¤íô÷pçð¬Z¼¾^±ßyÝÂЯú`®ºÎ_Y¬?
t uw4\kÁd¬J~mgú`2ìl²Ñn¦ÒãùÞ*ð
òök h*n÷w7! YIÃP+hKØ*Ô`õ?Ëâçü
\ No newline at end of file
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2005-0633-1.png
b/svtools/qa/cppunit/data/png/fail/CVE-2005-0633-1.png
new file mode 100644
index 000..d0644d1
Binary files /dev/null and
b/svtools/qa/cppunit/data/png/fail/CVE-2005-0633-1.png differ
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2006-7210-1.png
b/svtools/qa/cppunit/data/png/fail/CVE-2006-7210-1.png
new file mode 100644
index 000..9b30cc3
Binary files /dev/null and
b/svtools/qa/cppunit/data/png/fail/CVE-2006-7210-1.png differ
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2007-2365-1.png
b/svtools/qa/cppunit/data/png/fail/CVE-2007-2365-1.png
new file mode 100644
index 000..b9ff67b
Binary files /dev/null and
b/svtools/qa/cppunit/data/png/fail/CVE-2007-2365-1.png differ
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png
b/svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png
new file mode 100644
index 000..592fda1
--- /dev/null
+++ b/svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png
@@ -0,0 +1 @@
+Àë#Mb£ }ÕÔo 7ë2Í~\íá._èÃ{ÜÚß'p|êFàà¨/û§§ô¬
\ No newline at end of file
diff --git a/svtools/qa/cppunit/data/png/indeterminate/.gitignore
b/svtools/qa/cppunit/data/png/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/png/pass/.gitignore
b/svtools/qa/cppunit/data/png/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/png/pass/black.png
b/svtools/qa/cppunit/data/png/pass/black.png
new file mode 100644
index 000..cbba93b
Binary files /dev/null and b/svtools/qa/cppunit/data/png/pass/black.png differ
diff --git a/svtools/qa/cppunit/filters-test.cxx
b/svtools/qa/cppunit/filters-test.cxx
index a1c4a44..296d96e 100644
--- a/svtools/qa/cppunit/filters-test.cxx
+++ b/svtools/qa/cppunit/filters-test.cxx
@@ -80,6 +80,10 @@ void SvtoolsFiltersTest::testCVEs()
testDir(rtl::OUString(),
getURLFromSrc(/svtools/qa/cppunit/data/sgv/),
rtl::OUString());
+
+testDir(rtl::OUString(),
+getURLFromSrc(/svtools/qa/cppunit/data/png/),
+rtl::OUString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest);
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68fc62667c23cd8cbab01c91667186356a4ef031 Author: Rene Engelhard r...@debian.org Date: Tue Apr 17 17:46:03 2012 +0200 add 5.3 into the db check for-loop diff --git a/configure.in b/configure.in index ed16f92..fc6fdb1 100644 --- a/configure.in +++ b/configure.in @@ -6383,7 +6383,7 @@ if test $with_system_db = yes; then AC_MSG_RESULT([external]) db_header= -for dbver in 5.1 5.0 5 4.8 4.7 4; do +for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do for dash in - ''; do AC_CHECK_HEADER([db$dash$dbver/db.h], [ db_header=db$dash$dbver/db.h; break 2 ]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source
editeng/inc/editeng/editeng.hxx | 20 ++
editeng/inc/editeng/editund2.hxx| 11 -
editeng/source/editeng/editeng.cxx | 55 ++
editeng/source/editeng/editundo.cxx | 295
editeng/source/editeng/editundo.hxx | 84 +-
editeng/source/editeng/impedit.hxx |5
editeng/source/editeng/impedit2.cxx | 22 +-
editeng/source/editeng/impedit4.cxx |2
editeng/source/editeng/impedit5.cxx | 12 -
9 files changed, 271 insertions(+), 235 deletions(-)
New commits:
commit 56ef4ea05520115dc5db6bf861dca80a20a76775
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 17 12:12:43 2012 -0400
Removed all references to ImpEditEngine from all of edit undo classes.
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 523addf..5cbad78 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -132,6 +132,9 @@ class EDITENG_DLLPUBLIC EditEngine
friend class EditDbg;
friend class Outliner;
+public:
+typedef std::vectorEditView* ViewsType;
+
private:
ImpEditEngine* pImpEditEngine;
@@ -214,6 +217,7 @@ public:
size_t GetViewCount() const;
sal_BoolHasView( EditView* pView ) const;
EditView* GetActiveView() const;
+void SetActiveView(EditView* pView);
voidSetPaperSize( const Size rSize );
const Size GetPaperSize() const;
@@ -572,6 +576,12 @@ public:
void RemoveCharAttribs(sal_uInt16 nPara, sal_uInt16 nWhich = 0, bool
bRemoveFeatures = false);
void RemoveCharAttribs(const EditSelection rSel, bool bRemoveParaAttribs,
sal_uInt16 nWhich = 0);
+
+ViewsType GetEditViews();
+const ViewsType GetEditViews() const;
+
+void SetUndoMode(bool b);
+void FormatAndUpdate(EditView* pCurView = NULL);
};
#endif // _MyEDITENG_HXX
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index 85ad570..dc465a9 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -33,17 +33,15 @@
#include svl/undo.hxx
class EditEngine;
-class ImpEditEngine;
class EDITENG_DLLPRIVATE EditUndoManager : public SfxUndoManager
{
using SfxUndoManager::Undo;
using SfxUndoManager::Redo;
-private:
-ImpEditEngine* pImpEE;
+EditEngine* mpEditEngine;
public:
-EditUndoManager( ImpEditEngine* pImpEE );
+EditUndoManager(EditEngine* pEE);
virtual sal_Bool Undo();
virtual sal_Bool Redo();
@@ -56,15 +54,14 @@ class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
{
private:
sal_uInt16 nId;
-ImpEditEngine* mpEditEngine;
+EditEngine* mpEditEngine;
public:
TYPEINFO();
-EditUndo(sal_uInt16 nI, ImpEditEngine* pEE);
+EditUndo(sal_uInt16 nI, EditEngine* pEE);
virtual ~EditUndo();
EditEngine* GetEditEngine();
-ImpEditEngine* GetImpEditEngine();
virtual voidUndo() = 0;
virtual voidRedo() = 0;
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 2f9e901..8314387 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -421,6 +421,11 @@ EditView* EditEngine::GetActiveView() const
return pImpEditEngine-GetActiveView();
}
+void EditEngine::SetActiveView(EditView* pView)
+{
+pImpEditEngine-SetActiveView(pView);
+}
+
void EditEngine::SetDefTab( sal_uInt16 nDefTab )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -807,6 +812,26 @@ void EditEngine::RemoveCharAttribs(const EditSelection
rSel, bool bRemoveParaAt
pImpEditEngine-RemoveCharAttribs(rSel, bRemoveParaAttribs, nWhich);
}
+EditEngine::ViewsType EditEngine::GetEditViews()
+{
+return pImpEditEngine-GetEditViews();
+}
+
+const EditEngine::ViewsType EditEngine::GetEditViews() const
+{
+return pImpEditEngine-GetEditViews();
+}
+
+void EditEngine::SetUndoMode(bool b)
+{
+pImpEditEngine-SetUndoMode(b);
+}
+
+void EditEngine::FormatAndUpdate(EditView* pCurView)
+{
+pImpEditEngine-FormatAndUpdate(pCurView);
+}
+
uno::Referencedatatransfer::XTransferable
EditEngine::CreateTransferable(const EditSelection rSelection)
{
return pImpEditEngine-CreateTransferable(rSelection);
diff --git a/editeng/source/editeng/editundo.cxx
b/editeng/source/editeng/editundo.cxx
index ebbc6e9..be05f7d 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -65,22 +65,19 @@ void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
pView-GetImpEditView()-SetEditSelection( aSel );
}
-EditUndoManager::EditUndoManager( ImpEditEngine* p )
-{
-pImpEE = p;
-}
+EditUndoManager::EditUndoManager(EditEngine* pEE) : mpEditEngine(pEE) {}
sal_Bool EditUndoManager::Undo()
{
if ( GetUndoActionCount() == 0 )
return sal_False;
-DBG_ASSERT( pImpEE-GetActiveView(), Active View? );
+DBG_ASSERT( mpEditEngine-GetActiveView(), Active
[Libreoffice-commits] .: distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeLinux.conf | 34 +++--- 1 file changed, 23 insertions(+), 11 deletions(-) New commits: commit e0c713aa4c97b0c757be12879a63e5550712cc87 Author: Kalman Szalai - KAMI kami...@gmail.com Date: Tue Apr 17 19:54:51 2012 +0200 Update OxygenOffice's config diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index d3d5496..5857170 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -1,22 +1,29 @@ --with-vendor=OxygenOffice Professional Team ---with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png +--with-intro-progressbar-color=15,52,122 +--with-intro-progressbar-size=430,5 +--with-intro-progressbar-position=5,210 +--with-intro-progressbar-frame-color=138,156,190 --enable-binfilter --enable-vba +--enable-mozilla --enable-build-mozilla --without-system-mozilla --with-package-format=rpm deb ---enable-epm +--with-epm=internal --disable-symbols +--enable-split-app-modules +--enable-split-opt-features +--enable-strip-solver +--with-linker-hash-style=both --enable-systray ---with-epm=internal ---disable-kde +--enable-kde --disable-kde4 --enable-gtk --enable-evolution2 --enable-lockdown ---without-unix-wrapper +--with-unix-wrapper --with-fonts --enable-extra-gallery --enable-extra-template @@ -26,6 +33,7 @@ --enable-opengl --enable-dbus --enable-gnome-vfs +--enable-extensions --enable-extension-integration --enable-ext-wiki-publisher --enable-ext-report-builder @@ -44,8 +52,9 @@ --enable-ext-validator --enable-ext-barcode --disable-ext-oooblogger +--enable-ext-mysql-connector +--enable-postgresql-sdbc --with-sun-templates ---without-system-poppler --enable-neon --with-jdk-home=/usr/local/jdk1.6.0_23/ --without-system-dicts @@ -53,21 +62,24 @@ --without-system-stdlibs --without-system-poppler --without-system-openssl ---without-system-mozilla --without-system-mesa-headers --without-system-libxml --without-system-jpeg --without-system-jars --without-system-cairo +--without-system-mysql +--without-system-postgresql --without-junit --with-helppack-integration ---with-linker-hash-style=both --enable-odk --enable-gstreamer ---enable-cairo --enable-graphite --enable-dependency-tracking ---enable-mozilla --enable-python=internal ---with-system-mozilla=mozilla --with-openldap +--enable-oxygenoffice +--enable-ccache +--enable-crashdump +--enable-cairo-canvas +--enable-nsplugin + ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/datauno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 84a1ca6d9136c71bf20514307876824c1f915c0a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Apr 18 03:38:08 2012 +0900
fdo#46983 Macros: Macro to set filter in Calc does not work with
.StringValue
this fixed a regression slipped into
8808d77f199720be596a09084fbc36569ed2f1f1
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 8380c0b..2043e26 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1324,7 +1324,7 @@ throw(uno::RuntimeException)
if (!bByEmpty !rEntry.GetQueryItems().empty())
{
const ScQueryEntry::Item rItem = rEntry.GetQueryItems().front();
-aField.IsNumeric = !rItem.meType != ScQueryEntry::ByString;
+aField.IsNumeric = rItem.meType != ScQueryEntry::ByString;
aField.StringValue = rItem.maString;
aField.NumericValue = rItem.mfVal;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source
editeng/inc/editeng/editeng.hxx |7 ++
editeng/inc/editeng/editund2.hxx|1
editeng/source/editeng/editeng.cxx | 20 ++
editeng/source/editeng/editundo.cxx | 23 ---
editeng/source/editeng/editundo.hxx | 12 ---
editeng/source/editeng/editview.cxx | 114 ++--
editeng/source/editeng/edtspell.cxx | 14 ++--
editeng/source/editeng/impedit.cxx | 58 +-
editeng/source/editeng/impedit.hxx | 16 ++---
editeng/source/editeng/impedit2.cxx |2
editeng/source/editeng/impedit5.cxx |3
editeng/source/editeng/textconv.cxx | 16 ++---
12 files changed, 144 insertions(+), 142 deletions(-)
New commits:
commit fe4f272a385ee4fe5f541ff37eb710956a0ad38b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 17 14:13:16 2012 -0400
no TYPEINFO for edit undo objects.
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index dc465a9..6411da8 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -57,7 +57,6 @@ private:
EditEngine* mpEditEngine;
public:
-TYPEINFO();
EditUndo(sal_uInt16 nI, EditEngine* pEE);
virtual ~EditUndo();
diff --git a/editeng/source/editeng/editundo.cxx
b/editeng/source/editeng/editundo.cxx
index be05f7d..d44a173 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -42,20 +42,6 @@ DBG_NAME( EditUndo )
#define NO_UNDO 0x
#define GROUP_NOTFOUND 0x
-TYPEINIT1( EditUndo, SfxUndoAction );
-TYPEINIT1( EditUndoDelContent, EditUndo );
-TYPEINIT1( EditUndoConnectParas, EditUndo );
-TYPEINIT1( EditUndoSplitPara, EditUndo );
-TYPEINIT1( EditUndoInsertChars, EditUndo );
-TYPEINIT1( EditUndoRemoveChars, EditUndo );
-TYPEINIT1( EditUndoInsertFeature, EditUndo );
-TYPEINIT1( EditUndoMoveParagraphs, EditUndo );
-TYPEINIT1( EditUndoSetStyleSheet, EditUndo );
-TYPEINIT1( EditUndoSetParaAttribs, EditUndo );
-TYPEINIT1( EditUndoSetAttribs, EditUndo );
-TYPEINIT1( EditUndoTransliteration, EditUndo );
-TYPEINIT1( EditUndoMarkSelection, EditUndo );
-
void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
{
EPaM aEPaM( nPara, 0 );
@@ -140,12 +126,10 @@ sal_Bool EditUndoManager::Redo()
EditUndo::EditUndo(sal_uInt16 nI, EditEngine* pEE) :
nId(nI), mpEditEngine(pEE)
{
-DBG_CTOR( EditUndo, 0 );
}
EditUndo::~EditUndo()
{
-DBG_DTOR( EditUndo, 0 );
}
EditEngine* EditUndo::GetEditEngine()
@@ -342,10 +326,9 @@ void EditUndoInsertChars::Redo()
sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
{
-if ( !pNextAction-ISA( EditUndoInsertChars ) )
-return sal_False;
-
-EditUndoInsertChars* pNext = (EditUndoInsertChars*)pNextAction;
+EditUndoInsertChars* pNext =
dynamic_castEditUndoInsertChars*(pNextAction);
+if (!pNext)
+return false;
if ( aEPaM.nPara != pNext-aEPaM.nPara )
return sal_False;
diff --git a/editeng/source/editeng/editundo.hxx
b/editeng/source/editeng/editundo.hxx
index 63b08cf..9358350 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -54,7 +54,6 @@ private:
// undestroyed object!
public:
-TYPEINFO();
EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, size_t nPortion);
virtual ~EditUndoDelContent();
@@ -82,7 +81,6 @@ private:
boolbBackward;
public:
-TYPEINFO();
EditUndoConnectParas(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
const SfxItemSet rLeftParaAttribs, const SfxItemSet
rRightParaAttribs,
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet*
pRightStyle, bool bBackward);
@@ -102,7 +100,6 @@ private:
sal_uInt16 nSepPos;
public:
-TYPEINFO();
EditUndoSplitPara(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos);
~EditUndoSplitPara();
@@ -120,7 +117,6 @@ private:
String aText;
public:
-TYPEINFO();
EditUndoInsertChars(EditEngine* pEE, const EPaM rEPaM, const String
rStr);
const EPaM GetEPaM() { return aEPaM; }
@@ -142,7 +138,6 @@ private:
String aText;
public:
-TYPEINFO();
EditUndoRemoveChars(EditEngine* pEE, const EPaM rEPaM, const String
rStr);
const EPaM GetEPaM() { return aEPaM; }
@@ -162,7 +157,6 @@ private:
SfxPoolItem*pFeature;
public:
-TYPEINFO();
EditUndoInsertFeature(EditEngine* pEE, const EPaM rEPaM, const
SfxPoolItem rFeature);
virtual ~EditUndoInsertFeature();
@@ -180,7 +174,6 @@ private:
sal_uInt16 nDest;
public:
-TYPEINFO();
EditUndoMoveParagraphs(EditEngine* pEE, const Range rParas, sal_uInt16
nDest);
virtual ~EditUndoMoveParagraphs();
@@ -202,7 +195,6 @@ private:
SfxItemSet aPrevParaAttribs;
public:
-TYPEINFO();
EditUndoSetStyleSheet(EditEngine* pEE, sal_uInt16
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/mvtabdlg.hxx |2 ++
sc/source/ui/miscdlgs/mvtabdlg.cxx | 27 +--
2 files changed, 19 insertions(+), 10 deletions(-)
New commits:
commit e1ca72ca9f783a2f956f1445ce82cd3eacffe4a2
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 17 20:57:34 2012 +0200
resolved rhbz#813280 the current document is not always the first in list
i.e. if more than one document open and dialog invoked on any but the first
document.
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index c53a59f..f9c63a3 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -58,6 +58,7 @@ private:
void ResetRenameInput();
void CheckNewTabName();
ScDocument* GetSelectedDoc();
+bool IsCurrentDocSelected() const;
private:
FixedLine aFlAction;
@@ -82,6 +83,7 @@ private:
const rtl::OUString maDefaultName;
+sal_uInt16 mnCurrentDocPos;
sal_uInt16 nDocument;
SCTAB nTable;
boolbCopyTable:1;
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 4287e20..b3f30c4 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -70,6 +70,7 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const
rtl::OUString rDefault)
maStrTabNameInvalid(
ResId::toString(ScResId(STR_TABNAME_WARN_INVALID)) ),
//
maDefaultName( rDefault ),
+mnCurrentDocPos( 0 ),
nDocument ( 0 ),
nTable ( 0 ),
bCopyTable ( false ),
@@ -127,8 +128,13 @@ void ScMoveTableDlg::EnableRenameTable(sal_Bool bFlag)
void ScMoveTableDlg::ResetRenameInput()
{
if (mbEverEdited)
+{
// Don't reset the name when the sheet name has ever been edited.
+// But check the name, as this is also called for change of copy/move
+// buttons and document listbox selection.
+CheckNewTabName();
return;
+}
if (!aEdTabName.IsEnabled())
{
@@ -178,19 +184,15 @@ void ScMoveTableDlg::CheckNewTabName()
return;
}
-bool bFound = false;
+bool bMoveInCurrentDoc = (aBtnMove.IsChecked() IsCurrentDocSelected());
+bool bFound = false;
sal_uInt16 nLast = aLbTable.GetEntryCount() - 1;
-for ( sal_uInt16 i=0; i=nLast; ++i )
+for ( sal_uInt16 i=0; i=nLast !bFound; ++i )
{
if ( aNewName.equals(aLbTable.GetEntry(i)) )
{
-if (aBtnMove.IsChecked()
-aLbDoc.GetSelectEntryPos() == 0
-maDefaultName.equals(aEdTabName.GetText()))
-
-// Move inside same document, thus same name is allowed.
-bFound = false;
-else
+// Only for move within same document the same name is allowed.
+if (!bMoveInCurrentDoc || !maDefaultName.equals(
aEdTabName.GetText()))
bFound = true;
}
}
@@ -214,6 +216,11 @@ ScDocument* ScMoveTableDlg::GetSelectedDoc()
return static_castScDocument*(aLbDoc.GetEntryData(nPos));
}
+bool ScMoveTableDlg::IsCurrentDocSelected() const
+{
+return aLbDoc.GetSelectEntryPos() == mnCurrentDocPos;
+}
+
//
void ScMoveTableDlg::Init()
@@ -254,7 +261,7 @@ void ScMoveTableDlg::InitDocListBox()
if ( pScSh == SfxObjectShell::Current() )
{
-nSelPos = i;
+mnCurrentDocPos = nSelPos = i;
aEntryName += sal_Unicode( ' ' );
aEntryName += String( ScResId( STR_CURRENTDOC ) );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/printopt.hxx |4 ++--
sc/inc/viewopti.hxx |4 ++--
sc/source/core/tool/printopt.cxx |4 ++--
sc/source/core/tool/viewopti.cxx |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 3ef53adf7eb7ea68fe4ba5b8f4fee8a7c6014756
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Sun Apr 15 17:15:20 2012 +0200
Have operators of ScViewOptions and ScPrintOptions return bool instead of
int
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 5883e7c..8e32b7c 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -52,8 +52,8 @@ public:
voidSetDefaults();
const ScPrintOptions operator= ( const ScPrintOptions rCpy );
-int operator== ( const ScPrintOptions rOpt ) const;
-int operator!= ( const ScPrintOptions rOpt ) const;
+booloperator== ( const ScPrintOptions rOpt ) const;
+booloperator!= ( const ScPrintOptions rOpt ) const;
};
//==
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 0c763ce..b82f566 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -83,8 +83,8 @@ public:
voidSetDefaults();
const ScGridOptionsoperator= ( const ScGridOptions rCpy );
-int operator== ( const ScGridOptions rOpt ) const;
-int operator!= ( const ScGridOptions rOpt ) const {
return !(operator==(rOpt)); }
+booloperator== ( const ScGridOptions rOpt ) const;
+booloperator!= ( const ScGridOptions rOpt ) const {
return !(operator==(rOpt)); }
};
//==
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 095e594..215989b 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -74,13 +74,13 @@ const ScPrintOptions ScPrintOptions::operator=( const
ScPrintOptions rCpy )
return *this;
}
-int ScPrintOptions::operator==( const ScPrintOptions rOpt ) const
+bool ScPrintOptions::operator==( const ScPrintOptions rOpt ) const
{
return bSkipEmpty == rOpt.bSkipEmpty
bAllSheets == rOpt.bAllSheets;
}
-int ScPrintOptions::operator!=( const ScPrintOptions rOpt ) const
+bool ScPrintOptions::operator!=( const ScPrintOptions rOpt ) const
{
return !(operator==(rOpt));
}
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 7c40d22..b20c57d 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -105,7 +105,7 @@ const ScGridOptions ScGridOptions::operator=( const
ScGridOptions rCpy )
//
-int ScGridOptions::operator==( const ScGridOptions rCpy ) const
+bool ScGridOptions::operator==( const ScGridOptions rCpy ) const
{
return ( nFldDrawX== rCpy.nFldDrawX
nFldDivisionX== rCpy.nFldDivisionX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/inc sc/Module_sc.mk sc/qa sc/source test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
sc/Module_sc.mk |1
sc/inc/tokenuno.hxx |2
sc/qa/extras/sctablesheetobj.cxx |6 ++
sc/qa/unit/data/contentCSV/shared-formula.csv |9 +++
sc/qa/unit/data/xlsx/shared-formula.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx| 32 +
sc/source/filter/inc/defnamesbuffer.hxx |4 -
sc/source/filter/inc/sheetdatabuffer.hxx |1
sc/source/filter/inc/workbookhelper.hxx |7 +-
sc/source/filter/oox/defnamesbuffer.cxx | 24 +-
sc/source/filter/oox/sheetdatabuffer.cxx | 10 +---
sc/source/filter/oox/workbookhelper.cxx | 29 +---
test/Library_subsequenttest.mk|1
test/Package_inc.mk |1
test/inc/test/sheet/xprintareas.hxx | 59 +
test/source/sheet/xprintareas.cxx | 61 ++
16 files changed, 206 insertions(+), 41 deletions(-)
New commits:
commit 32bd4c6c4b2ff3835cfb7af50e88be6004dd7852
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Apr 17 20:58:05 2012 +0200
enable sctablesheetobj again
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 8f51646..b6a42e1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_macros_test \
CppunitTest_sc_namedrangeobj \
CppunitTest_sc_namedrangesobj \
+CppunitTest_sc_tablesheetobj \
CppunitTest_sc_tablesheetsobj \
))
commit a48195f4c24cd20a79514b608a1eae40baff9ed1
Author: Artur Dorda artur.dorda+l...@gmail.com
Date: Sun Apr 15 02:20:16 2012 +0200
transferring java XPrintAreas to c++
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index 0f1d79a..28b4d2b 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -29,6 +29,7 @@
#include test/unoapi_test.hxx
#include test/util/xreplaceable.hxx
#include test/util/xsearchable.hxx
+#include test/sheet/xprintareas.hxx
#include com/sun/star/sheet/XSpreadsheetDocument.hpp
#include com/sun/star/sheet/XSpreadsheet.hpp
@@ -36,7 +37,7 @@
namespace sc_apitest
{
-class ScTableSheetObj : public UnoApiTest, apitest::XSearchable,
apitest::XReplaceable
+class ScTableSheetObj : public UnoApiTest, apitest::XSearchable,
apitest::XReplaceable, apitest::XPrintAreas
{
public:
ScTableSheetObj();
@@ -49,6 +50,9 @@ public:
CPPUNIT_TEST(testFindFirst);
CPPUNIT_TEST(testReplaceAll);
CPPUNIT_TEST(testCreateReplaceDescriptor);
+// XPrintAreas
+CPPUNIT_TEST(testSetAndGetPrintTitleColumns);
+CPPUNIT_TEST(testSetAndGetPrintTitleRows);
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 070c6d1..7d865f8 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -79,6 +79,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xdatapilottable2 \
test/source/sheet/xnamedrange \
test/source/sheet/xnamedranges \
+test/source/sheet/xprintareas \
test/source/sheet/xspreadsheetdocument \
test/source/sheet/xspreadsheets2 \
test/source/util/xreplaceable \
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index 62c3fa4..160d7b0 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -46,6 +46,7 @@ $(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,te
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable2.hxx,test/sheet/xdatapilottable2.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotfieldgrouping.hxx,test/sheet/xdatapilotfieldgrouping.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,test/sheet/datapilotfield.hxx))
+$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xprintareas.hxx,test/sheet/xprintareas.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheetdocument.hxx,test/sheet/xspreadsheetdocument.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/util/xreplaceable.hxx,test/util/xreplaceable.hxx))
diff --git a/test/inc/test/sheet/xprintareas.hxx
b/test/inc/test/sheet/xprintareas.hxx
new file mode 100644
index 000..08f5348
--- /dev/null
+++ b/test/inc/test/sheet/xprintareas.hxx
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeLinux.conf | 34 +++--- 1 file changed, 23 insertions(+), 11 deletions(-) New commits: commit b3c88b75058d4d3f9ac376956222fe84f064bf75 Author: Kalman Szalai - KAMI kami...@gmail.com Date: Tue Apr 17 19:54:51 2012 +0200 Update OxygenOffice's config diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index d3d5496..5857170 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -1,22 +1,29 @@ --with-vendor=OxygenOffice Professional Team ---with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png +--with-intro-progressbar-color=15,52,122 +--with-intro-progressbar-size=430,5 +--with-intro-progressbar-position=5,210 +--with-intro-progressbar-frame-color=138,156,190 --enable-binfilter --enable-vba +--enable-mozilla --enable-build-mozilla --without-system-mozilla --with-package-format=rpm deb ---enable-epm +--with-epm=internal --disable-symbols +--enable-split-app-modules +--enable-split-opt-features +--enable-strip-solver +--with-linker-hash-style=both --enable-systray ---with-epm=internal ---disable-kde +--enable-kde --disable-kde4 --enable-gtk --enable-evolution2 --enable-lockdown ---without-unix-wrapper +--with-unix-wrapper --with-fonts --enable-extra-gallery --enable-extra-template @@ -26,6 +33,7 @@ --enable-opengl --enable-dbus --enable-gnome-vfs +--enable-extensions --enable-extension-integration --enable-ext-wiki-publisher --enable-ext-report-builder @@ -44,8 +52,9 @@ --enable-ext-validator --enable-ext-barcode --disable-ext-oooblogger +--enable-ext-mysql-connector +--enable-postgresql-sdbc --with-sun-templates ---without-system-poppler --enable-neon --with-jdk-home=/usr/local/jdk1.6.0_23/ --without-system-dicts @@ -53,21 +62,24 @@ --without-system-stdlibs --without-system-poppler --without-system-openssl ---without-system-mozilla --without-system-mesa-headers --without-system-libxml --without-system-jpeg --without-system-jars --without-system-cairo +--without-system-mysql +--without-system-postgresql --without-junit --with-helppack-integration ---with-linker-hash-style=both --enable-odk --enable-gstreamer ---enable-cairo --enable-graphite --enable-dependency-tracking ---enable-mozilla --enable-python=internal ---with-system-mozilla=mozilla --with-openldap +--enable-oxygenoffice +--enable-ccache +--enable-crashdump +--enable-cairo-canvas +--enable-nsplugin + ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/GraphicHelpers.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b92de73fdd81acc5fdb92005af34b3ce9f8ed37b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 17 20:11:20 2012 +0100
WaE: MacOSX itemZOrder may be unused uninitialized
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 819dc6f..551c5e9 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -240,7 +240,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32
relativeHeight )
{
if( items.empty())
return 0;
-sal_Int32 itemZOrder;
+sal_Int32 itemZOrder(0);
--it;
if(
it-second-getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
.GetName( PROP_Z_ORDER )) = itemZOrder )
@@ -248,7 +248,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32
relativeHeight )
}
else
{
-sal_Int32 itemZOrder;
+sal_Int32 itemZOrder(0);
if(
it-second-getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
.GetName( PROP_Z_ORDER )) = itemZOrder )
return itemZOrder; // before the item
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/datauno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5920b681eaf2f1203efd5af581827db2e1a81bc8
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Apr 18 03:38:08 2012 +0900
fdo#46983 Macros: Macro to set filter in Calc does not work with
.StringValue
this fixed a regression slipped into
8808d77f199720be596a09084fbc36569ed2f1f1
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 3695f14..69252ed 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1334,7 +1334,7 @@ throw(uno::RuntimeException)
if (!bByEmpty !rEntry.GetQueryItems().empty())
{
const ScQueryEntry::Item rItem = rEntry.GetQueryItems().front();
-aField.IsNumeric = !rItem.meType != ScQueryEntry::ByString;
+aField.IsNumeric = rItem.meType != ScQueryEntry::ByString;
aField.StringValue = rItem.maString;
aField.NumericValue = rItem.mfVal;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 8ae293f0a1509b26f9a65f9297fddca7b106e46e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 17 20:49:51 2012 +0100
WaE: MacOSX pScRangeData may be unused uninitialized
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 479f504..83c67bd 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -382,8 +382,7 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument rDoc,
ScRangeName* pNames, c
ScRangeData* WorkbookGlobals::createNamedRangeObject( OUString orName, const
Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
{
// create the name and insert it into the Calc document
-Reference XNamedRange xNamedRange;
-ScRangeData* pScRangeData;
+ScRangeData* pScRangeData = NULL;
if( !orName.isEmpty() ) try
{
// find an unused name
@@ -396,7 +395,7 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject(
OUString orName, const Se
ScRangeName* pNames = rDoc.GetRangeName();
pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName,
rTokens, nIndex, nNameFlags );
}
-catch( Exception )
+catch (const Exception)
{
}
return pScRangeData;
@@ -405,8 +404,7 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject(
OUString orName, const Se
ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( OUString orName,
const Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32
nNameFlags, sal_Int32 nTab ) const
{
// create the name and insert it into the Calc document
-Reference XNamedRange xNamedRange;
-ScRangeData* pScRangeData;
+ScRangeData* pScRangeData = NULL;
if( !orName.isEmpty() ) try
{
// find an unused name
@@ -423,7 +421,7 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject(
OUString orName, con
ScRangeName* pNames = rDoc.GetRangeName( nTab );
pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName,
rTokens, nIndex, nNameFlags );
}
-catch( Exception )
+catch (const Exception)
{
}
return pScRangeData;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/inc/mvtabdlg.hxx |2 ++
sc/source/ui/miscdlgs/mvtabdlg.cxx | 27 +--
2 files changed, 19 insertions(+), 10 deletions(-)
New commits:
commit 05579aa8b26f593af650d8434ff1c25c0a2702a6
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 17 20:57:34 2012 +0200
resolved rhbz#813280 the current document is not always the first in list
i.e. if more than one document open and dialog invoked on any but the first
document.
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index c53a59f..f9c63a3 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -58,6 +58,7 @@ private:
void ResetRenameInput();
void CheckNewTabName();
ScDocument* GetSelectedDoc();
+bool IsCurrentDocSelected() const;
private:
FixedLine aFlAction;
@@ -82,6 +83,7 @@ private:
const rtl::OUString maDefaultName;
+sal_uInt16 mnCurrentDocPos;
sal_uInt16 nDocument;
SCTAB nTable;
boolbCopyTable:1;
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 831905d..ffe96af 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -70,6 +70,7 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const
rtl::OUString rDefault)
maStrTabNameInvalid(
ResId::toString(ScResId(STR_TABNAME_WARN_INVALID)) ),
//
maDefaultName( rDefault ),
+mnCurrentDocPos( 0 ),
nDocument ( 0 ),
nTable ( 0 ),
bCopyTable ( false ),
@@ -127,8 +128,13 @@ void ScMoveTableDlg::EnableRenameTable(sal_Bool bFlag)
void ScMoveTableDlg::ResetRenameInput()
{
if (mbEverEdited)
+{
// Don't reset the name when the sheet name has ever been edited.
+// But check the name, as this is also called for change of copy/move
+// buttons and document listbox selection.
+CheckNewTabName();
return;
+}
if (!aEdTabName.IsEnabled())
{
@@ -178,19 +184,15 @@ void ScMoveTableDlg::CheckNewTabName()
return;
}
-bool bFound = false;
+bool bMoveInCurrentDoc = (aBtnMove.IsChecked() IsCurrentDocSelected());
+bool bFound = false;
sal_uInt16 nLast = aLbTable.GetEntryCount() - 1;
-for ( sal_uInt16 i=0; i=nLast; ++i )
+for ( sal_uInt16 i=0; i=nLast !bFound; ++i )
{
if ( aNewName.equals(aLbTable.GetEntry(i)) )
{
-if (aBtnMove.IsChecked()
-aLbDoc.GetSelectEntryPos() == 0
-maDefaultName.equals(aEdTabName.GetText()))
-
-// Move inside same document, thus same name is allowed.
-bFound = false;
-else
+// Only for move within same document the same name is allowed.
+if (!bMoveInCurrentDoc || !maDefaultName.equals(
aEdTabName.GetText()))
bFound = true;
}
}
@@ -214,6 +216,11 @@ ScDocument* ScMoveTableDlg::GetSelectedDoc()
return static_castScDocument*(aLbDoc.GetEntryData(nPos));
}
+bool ScMoveTableDlg::IsCurrentDocSelected() const
+{
+return aLbDoc.GetSelectEntryPos() == mnCurrentDocPos;
+}
+
//
void ScMoveTableDlg::Init()
@@ -254,7 +261,7 @@ void ScMoveTableDlg::InitDocListBox()
if ( pScSh == SfxObjectShell::Current() )
{
-nSelPos = i;
+mnCurrentDocPos = nSelPos = i;
aEntryName += sal_Unicode( ' ' );
aEntryName += String( ScResId( STR_CURRENTDOC ) );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source toolkit/inc toolkit/source unusedcode.easy
connectivity/source/drivers/mozab/MResultSet.cxx | 14 --
connectivity/source/drivers/mozab/MResultSet.hxx |1 -
toolkit/inc/toolkit/awt/vclxdevice.hxx |1 -
toolkit/inc/toolkit/awt/vclxwindows.hxx |1 -
toolkit/source/awt/vclxdevice.cxx|5 -
toolkit/source/awt/vclxwindows.cxx |7 ---
unusedcode.easy |3 ---
7 files changed, 32 deletions(-)
New commits:
commit 393b14fddd7b328a6e2af78c0c351447ccb0ba6a
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Apr 17 22:08:56 2012 +0200
Remove some unused methods
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx
b/connectivity/source/drivers/mozab/MResultSet.cxx
index ed92e42..6e1cdbe 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -717,16 +717,6 @@ void SAL_CALL OResultSet::release() throw()
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
-//
-
-void OResultSet::initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount)
-{
-if(!_rRow.is())
-{
-_rRow = new OValueVector(_nColumnCount);
-(_rRow-get())[0].setBound(sal_True);
-
::std::for_each(_rRow-get().begin()+1,_rRow-get().end(),TSetBound(sal_False));
-}
-}
// -
void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString
rMatchString )
@@ -1205,10 +1195,6 @@ void SAL_CALL OResultSet::executeQuery() throw(
::com::sun::star::sdbc::SQLExcep
OSL_ENSURE(m_xColumns.is(), Need the Columns!!);
-// sal_Int32 nColumnCount = m_xColumns-size();
-// initializeRow(m_aRow,nColumnCount);
-// initializeRow(m_aEvaluateRow,nColumnCount);
-
switch( m_pSQLIterator-getStatementType() )
{
case SQL_STATEMENT_SELECT:
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx
b/connectivity/source/drivers/mozab/MResultSet.hxx
index 47e9ad1..2559b7f 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -258,7 +258,6 @@ protected:
void parseParameter( const OSQLParseNode* pNode, rtl::OUString
rMatchString );
void fillRowData() throw( ::com::sun::star::sdbc::SQLException );
-void initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount);
void analyseWhereClause( const OSQLParseNode*
parseTree,
MQueryExpression
queryExpression);
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx
b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index fba5ec7..b800b2c 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -75,7 +75,6 @@ public:
OutputDevice* GetOutputDevice() const { return mpOutputDevice; }
voidSetCreatedWithToolkit( sal_Bool
bCreatedWithToolkit );
-sal_BoolIsCreatedWithToolkit() const;
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx
b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 3949b54..a1f0784 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -338,7 +338,6 @@ public:
static void ImplGetPropertyIds( std::list sal_uInt16 aIds );
virtual voidGetPropertyIds( std::list sal_uInt16 aIds ) { return
ImplGetPropertyIds( aIds ); }
-::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
getFirstActionListener ();
};
//
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index 40a5bb7..39c74b1 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -81,11 +81,6 @@ void VCLXDevice::SetCreatedWithToolkit( sal_Bool
bCreatedWithToolkit )
nFlags = ~FLAGS_CREATEDWITHTOOLKIT;
}
-sal_Bool VCLXDevice::IsCreatedWithToolkit() const
-{
-return ( nFlags FLAGS_CREATEDWITHTOOLKIT ) != 0;
-}
-
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXDevice::queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException)
{
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 64a4ad8..b8d13e2 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1335,13 +1335,6 @@ void VCLXRadioButton::ImplClickedOrToggled( sal_Bool
bToggled )
}
}
-::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx | 32 ++--
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit e5322f13e0d433a7103edbf36cd3d2ab0d3e18c7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Apr 17 22:10:10 2012 +0200
some more uno removement in oox range name import
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 83c67bd..6e5dce8 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -401,29 +401,33 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject(
OUString orName, const Se
return pScRangeData;
}
+namespace {
+
+rtl::OUString findUnusedName( const ScRangeName* pRangeName, const
rtl::OUString rSuggestedName )
+{
+rtl::OUString aNewName = rSuggestedName;
+sal_Int32 nIndex = 0;
+
while(pRangeName-findByUpperName(ScGlobal::pCharClass-uppercase(aNewName)))
+aNewName = rtl::OUStringBuffer(rSuggestedName).append( '_' ).append(
nIndex++ ).makeStringAndClear();
+
+return aNewName;
+}
+
+}
+
ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( OUString orName,
const Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32
nNameFlags, sal_Int32 nTab ) const
{
// create the name and insert it into the Calc document
ScRangeData* pScRangeData = NULL;
-if( !orName.isEmpty() ) try
+if( !orName.isEmpty() )
{
-// find an unused name
-Reference XIndexAccess xSheets(mxDoc-getSheets(), UNO_QUERY_THROW);
-Reference XSpreadsheet xSheet (xSheets-getByIndex(nTab),
UNO_QUERY_THROW);
-Reference com::sun::star::container::XNamed xNamed(xSheet,
UNO_QUERY_THROW);
-rtl::OUString aName = xNamed-getName();
-PropertySet aSheetProps( xSheet );
-Reference XNamedRanges xNamedRanges( aSheetProps.getAnyProperty(
PROP_NamedRanges ), UNO_QUERY_THROW );
-Reference XNameAccess xNameAccess( xNamedRanges, UNO_QUERY_THROW );
-orName = ContainerHelper::getUnusedName( xNameAccess, orName, '_' );
-// create the named range
ScDocument rDoc = getScDocument();
ScRangeName* pNames = rDoc.GetRangeName( nTab );
+// find an unused name
+orName = findUnusedName( pNames, orName );
+// create the named range
pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName,
rTokens, nIndex, nNameFlags );
}
-catch (const Exception)
-{
-}
return pScRangeData;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx | 39 +---
1 file changed, 17 insertions(+), 22 deletions(-)
New commits:
commit cbcf7e32ade5b5402845e14065476f5423351ebf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Apr 17 22:23:08 2012 +0200
forgot the normal range names
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 6e5dce8..1110ebc 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -379,28 +379,6 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument rDoc,
ScRangeName* pNames, c
return pNew;
}
-ScRangeData* WorkbookGlobals::createNamedRangeObject( OUString orName, const
Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
-{
-// create the name and insert it into the Calc document
-ScRangeData* pScRangeData = NULL;
-if( !orName.isEmpty() ) try
-{
-// find an unused name
-PropertySet aDocProps( mxDoc );
-Reference XNamedRanges xNamedRanges( aDocProps.getAnyProperty(
PROP_NamedRanges ), UNO_QUERY_THROW );
-Reference XNameAccess xNameAccess( xNamedRanges, UNO_QUERY_THROW );
-orName = ContainerHelper::getUnusedName( xNameAccess, orName, '_' );
-// create the named range
-ScDocument rDoc = getScDocument();
-ScRangeName* pNames = rDoc.GetRangeName();
-pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName,
rTokens, nIndex, nNameFlags );
-}
-catch (const Exception)
-{
-}
-return pScRangeData;
-}
-
namespace {
rtl::OUString findUnusedName( const ScRangeName* pRangeName, const
rtl::OUString rSuggestedName )
@@ -415,6 +393,23 @@ rtl::OUString findUnusedName( const ScRangeName*
pRangeName, const rtl::OUString
}
+ScRangeData* WorkbookGlobals::createNamedRangeObject( OUString orName, const
Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
+{
+// create the name and insert it into the Calc document
+ScRangeData* pScRangeData = NULL;
+if( !orName.isEmpty() )
+{
+ScDocument rDoc = getScDocument();
+ScRangeName* pNames = rDoc.GetRangeName();
+// find an unused name
+orName = findUnusedName( pNames, orName );
+// create the named range
+pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName,
rTokens, nIndex, nNameFlags );
+}
+return pScRangeData;
+}
+
+
ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( OUString orName,
const Sequence FormulaToken rTokens, sal_Int32 nIndex, sal_Int32
nNameFlags, sal_Int32 nTab ) const
{
// create the name and insert it into the Calc document
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 20 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit b08e9f3023e9ea1ca0926334becac939ca8fdfac Author: Michael Stahl mst...@redhat.com Date: Tue Apr 17 22:30:25 2012 +0200 fdo#38635: sw: fix border corner gaps: The start and end points of the vertical and adjacent horizontal borders were apart by 1.5 to 3 twips, leading to small visible gaps in the corners. This is fixed by using lcl_AlignWidth/lcl_AlignHeight on the border widths, and by always computing the start/end positions from the outer edge, which makes the horizontal and vertical start/end points match. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1c09c4d..03e9731 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4616,8 +4616,13 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, nExtentOE = lcl_GetExtent( pBottomBorder, NULL ); } -basegfx::B2DPoint aStart( aRect.Left() + aRect.Width() / 2.0, aRect.Top() + lcl_GetLineWidth( pTopBorder ) / 2.0 ); -basegfx::B2DPoint aEnd( aRect.Left() + aRect.Width() / 2.0, aRect.Bottom() - lcl_GetLineWidth( pBottomBorder ) / 2.0 ); +double const fStartX( (_bLeft) // fdo#38635: always from outer edge +? aRect.Left() + (aRect.Width() / 2.0) +: aRect.Right() - (aRect.Width() / 2.0)); +basegfx::B2DPoint const aStart(fStartX, +aRect.Top() + lcl_AlignHeight(lcl_GetLineWidth(pTopBorder))/2.0 ); +basegfx::B2DPoint const aEnd(fStartX, +aRect.Bottom() - lcl_AlignHeight(lcl_GetLineWidth(pBottomBorder))/2.0 ); double nLeftWidth = !_bLeft ? pLeftRightBorder-GetOutWidth() : pLeftRightBorder-GetInWidth( ); double nRightWidth = !_bLeft ? pLeftRightBorder-GetInWidth() : pLeftRightBorder-GetOutWidth( ); @@ -4691,8 +4696,15 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop, nExtentOE = lcl_GetExtent( NULL, pRightBorder ); } -basegfx::B2DPoint aStart( aRect.Left() + lcl_GetLineWidth( pLeftBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); -basegfx::B2DPoint aEnd( aRect.Right() - lcl_GetLineWidth( pRightBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); +double const fStartY( (_bTop) // fdo#38635: always from outer edge +? aRect.Top()+ (aRect.Height() / 2.0) +: aRect.Bottom() - (aRect.Height() / 2.0)); +basegfx::B2DPoint const aStart( +aRect.Left() + lcl_AlignWidth(lcl_GetLineWidth(pLeftBorder))/2.0, +fStartY ); +basegfx::B2DPoint const aEnd( +aRect.Right() - lcl_AlignWidth(lcl_GetLineWidth(pRightBorder))/2.0, +fStartY ); double nLeftWidth = !_bTop ? pTopBottomBorder-GetOutWidth() : pTopBottomBorder-GetInWidth( ); double nRightWidth = !_bTop ? pTopBottomBorder-GetInWidth() : pTopBottomBorder-GetOutWidth( ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppu/inc
cppu/inc/com/sun/star/uno/Reference.h | 44 +- 1 file changed, 22 insertions(+), 22 deletions(-) New commits: commit aa28e0e3d47d94e7eb58c125602c6fdecddab0aa Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Apr 17 22:10:10 2012 -0500 remove doxygen warnings diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index 50c7b77..326a4fa 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -268,7 +268,7 @@ public: @param pInterface another reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()); +inline Reference( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(()); /** Constructor: Sets given interface pointer without acquiring it. Deprecated, please use SAL_NO_ACQUIRE version. @@ -276,26 +276,26 @@ public: @param pInterface another reference @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()); +inline Reference( interface_type * pInterface, UnoReference_NoAcquire dummy ) SAL_THROW(()); /** Constructor: Queries given interface for reference interface type (interface_type). @param rRef another reference @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( const BaseReference rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( const BaseReference rRef, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). @param pInterface an interface pointer @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( XInterface * pInterface, UnoReference_Query dummy) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). @param rAny an any @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( const Any rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( const Any rAny, UnoReference_Query dummy) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -304,7 +304,7 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( const BaseReference rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const BaseReference rRef, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -312,7 +312,7 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( XInterface * pInterface, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -320,25 +320,25 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( const Any rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const Any rAny, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: assigns from the given interface of the same type. Throws a RuntimeException -if the source interface is NULL/. +if the source interface is NULL. @param rRef another interface reference of the same type @param dummy UNO_SET_THROW to distinguish from default copy constructor @since UDK 3.2.8 */ -inline Reference( const Reference interface_type rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const Reference interface_type rRef, UnoReference_SetThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: assigns from the given interface of the same type. Throws
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/genstaticheader.pl | 83 ++
1 file changed, 83 insertions(+)
New commits:
commit 815cee8bd2d96b40b018f96cf3a9096c7691ed7b
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 18 08:18:35 2012 +0300
Add the genstaticheader.pl script
diff --git a/i18npool/source/localedata/genstaticheader.pl
b/i18npool/source/localedata/genstaticheader.pl
new file mode 100644
index 000..adba340
--- /dev/null
+++ b/i18npool/source/localedata/genstaticheader.pl
@@ -0,0 +1,83 @@
+#!/usr/bin/perl -w # -*- tab-width: 4; indent-tabs-mode: nil;
+
+# 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 Tor Lillqvist t...@iki.fi (initial developer)
+# Copyright (C) 2012 SUSE Linux http://suse.com (initial developer's employer)
+#
+# 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
+
+my @FUNCS = qw(
+getAllCalendars
+getAllCurrencies
+getAllFormats0
+getBreakIteratorRules
+getCollationOptions
+getCollatorImplementation
+getContinuousNumberingLevels
+getDateAcceptancePatterns
+getFollowPageWords
+getForbiddenCharacters
+getIndexAlgorithm
+getLCInfo
+getLocaleItem
+getOutlineNumberingLevels
+getReservedWords
+getSearchOptions
+getTransliterations
+getUnicodeScripts
+);
+
+print 'extern C {
+
+';
+
+foreach my $lang (@ARGV) {
+foreach my $func (@FUNCS) {
+ printf(void %s_%s();\n, $func, $lang);
+}
+}
+
+print '
+static const struct {
+const char *pLocale;
+';
+foreach my $func (@FUNCS) {
+printf(void (*%s)();\n, $func);
+}
+print '} aLibTable[] = {
+';
+
+foreach my $lang (@ARGV) {
+printf({\n);
+printf(\%s\,\n, $lang);
+foreach my $func (@FUNCS) {
+ printf(%s_%s,\n, $func, $lang);
+}
+printf(}%s\n, ($lang ne $ARGV[$#ARGV]) ? ',' : '');
+}
+
+print '};
+
+}
+';
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
