[Libreoffice-commits] .: .gitignore
.gitignore |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 743e279933624d248bdd855d9be7070ad875685f Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 22 08:41:38 2012 +0200 No more clone directory Change-Id: I59239bfa1865bc5f19e620216edd95227c5fb318 diff --git a/.gitignore b/.gitignore index c7eda8b..ebb1e06 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,7 @@ # python generated file *.pyc -# where the 'subrepos' and downloads are located -/clone +# where the downloads are located /src # the build directories ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Attached patch modifies the calc functions WEEKNUM and WEEKNUM_ADD to respectively ISOWEEKNUM and WEEKNUM. I noted that the patch for fdo50950 has been pushed to master whilst 'git pul --rebase'-ing this morning. However i did not see any mail that it has been checked. Is it correct that the patch has been pushed to master? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: can we drop rdbmaker ?
On Sun, Oct 21, 2012 at 06:00:08PM +0200, David Tardon dtar...@redhat.com wrote: I assumed it is a part of URE, but that turns out not to be true. As far as I can see, it is not even part of any installation set. Drop it, I say! Stephan mentioned on the conference that it's still used somewhere, probably worthy to check with him before killing it. :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/Server.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ae4da42e5fd0222fa1d1336ae1090b1ad840327f
Author: Tor Lillqvist t...@iki.fi
Date: Mon Oct 22 09:23:22 2012 +0300
WaE: unused parameter
Change-Id: I15bfeda7f9bf0fbeff9e4f3297f127941cadcf9b
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 220a3b2..69a53f4 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -320,6 +320,8 @@ void RemoteServer::setBluetoothDiscoverable( bool
aDiscoverable )
{
#ifdef ENABLE_BLUETOOTH
BluetoothServer::setDiscoverable( aDiscoverable );
+#else
+(void) aDiscoverable;
#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 55059, which changed state. Bug 55059 Summary: EDITING: Calculate formula https://bugs.freedesktop.org/show_bug.cgi?id=55059 What|Removed |Added Status|VERIFIED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: boost/boost.7551.unusedvars.patch boost/UnpackedTarball_boost.mk sal/inc tools/source ucb/source unotools/source
boost/UnpackedTarball_boost.mk |2 ++
boost/boost.7551.unusedvars.patch | 10 ++
sal/inc/sal/log-areas.dox |5 +
tools/source/stream/strmunx.cxx |4 ++--
ucb/source/ucp/gvfs/gvfs_content.cxx| 12 +---
unotools/source/i18n/localedatawrapper.cxx |6 +++---
unotools/source/i18n/transliterationwrapper.cxx |4 ++--
7 files changed, 29 insertions(+), 14 deletions(-)
New commits:
commit 9d2cfee5e9e3ac82fab2e920730d04f23593ec10
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 09:10:55 2012 +0100
some more clang warnings
Change-Id: I4359784279875dc9dac99bc4d2db95dccf094b20
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 584d479..b7ebd67 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -24,6 +24,8 @@ boost_patches += boost.6369.warnings.patch
boost_patches += boost.6397.warnings.patch
#backport from boost 1.48.0 fix for opcode not supported on this processor
boost_patches += boost.mipsbackport.patch
+#https://svn.boost.org/trac/boost/ticket/7551
+boost_patches += boost.7551.unusedvars.patch
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
diff --git a/boost/boost.7551.unusedvars.patch
b/boost/boost.7551.unusedvars.patch
new file mode 100644
index 000..839f925
--- /dev/null
+++ b/boost/boost.7551.unusedvars.patch
@@ -0,0 +1,10 @@
+--- misc/boost_1_44_0/boost/date_time/tz_db_base.hpp
+--- misc/build/boost_1_44_0/boost/date_time/tz_db_base.hpp
+@@ -170,7 +170,6 @@
+ /*! May throw data_not_accessible, or bad_field_count exceptions */
+ void load_from_file(const std::string pathspec)
+ {
+-string_type in_str;
+ std::string buff;
+
+ std::ifstream ifs(pathspec.c_str());
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 5ecfd39..91b1e8d 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -130,6 +130,7 @@ certain functionality.
@li @c svx.dialog
@li @c svx.form
+@li @c svx.tbxcrtls
@section tools
@@ -175,6 +176,10 @@ certain functionality.
@li @c xmloff.chart
@li @c xmloff.style
+@section xmlsecurity
+
+@li @c xmlsecurity.dialogs - xml security dialogs
+
@section other
@li @c accessibility
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index c059ae8..ec3c871 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -110,14 +110,14 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart,
sal_Size nEnd, SvFileStr
osl::DirectoryItem aItem;
if (osl::DirectoryItem::get( pStream-GetFileName(), aItem) !=
osl::FileBase::E_None )
{
-SAL_INFO(tools, Failed to lookup stream for locking);
+SAL_INFO(tools.stream, Failed to lookup stream for locking);
return sal_True;
}
osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
if ( aItem.getFileStatus( aStatus ) != osl::FileBase::E_None )
{
-SAL_INFO(tools, Failed to stat stream for locking);
+SAL_INFO(tools.stream, Failed to stat stream for locking);
return sal_True;
}
if( aStatus.getFileType() == osl::FileStatus::Directory )
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx
b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 6ae71a8..d3b3083 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -504,7 +504,7 @@ Content::createNewContent( const ucb::ContentInfo Info )
g_warning( createNewContent (%d), (int) create_document );
#endif
-rtl::OUString aURL = getOUURI();
+rtl::OUString aURL = getOUURI();
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
aURL += rtl::OUString(/);
@@ -513,14 +513,14 @@ Content::createNewContent( const ucb::ContentInfo Info )
// This looks problematic to me cf. webdav
aURL += rtl::OUString::createFromAscii( name );
-uno::Reference ucb::XContentIdentifier xId
+uno::Reference ucb::XContentIdentifier xId
( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) );
-try {
+try {
return new ::gvfs::Content( m_xSMgr, m_pProvider, xId,
!create_document );
} catch ( ucb::ContentCreationException ) {
return uno::Reference ucb::XContent ();
-}
+}
}
rtl::OUString Content::getParentURL()
@@ -1031,8 +1031,6 @@ void Content::destroy( sal_Bool bDeletePhysical )
throw( uno::Exception )
{
// @@@ take care about bDeletePhysical - trashcan support
-rtl::OUString aURL = getOUURI();
-
uno::Reference ucb::XContent xThis = this;
deleted();
@@ -1397,7 +1395,7 @@ uno::Sequence ucb::CommandInfo Content::getCommands(
rtl::OUString
Content::getOUURI ()
{
-osl::Guard osl::Mutex aGuard( m_aMutex );
+osl::Guard osl::Mutex aGuard( m_aMutex );
return
[Libreoffice-commits] .: 3 commits - icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen vcl/inc vcl/source
dev/null |binary icon-themes/galaxy/vcl/res/index.png |binary icon-themes/hicontrast/vcl/res/index.png |binary icon-themes/human/vcl/res/collate.png|binary icon-themes/human/vcl/res/index.png |binary icon-themes/human/vcl/res/ncollate.png |binary icon-themes/industrial/vcl/res/index.png |binary icon-themes/oxygen/vcl/res/collate.png |binary icon-themes/oxygen/vcl/res/index.png |binary icon-themes/oxygen/vcl/res/ncollate.png |binary vcl/inc/svids.hrc|1 vcl/inc/vcl/window.hxx | 77 ++- vcl/inc/window.h |3 - vcl/source/src/images.src|5 ++ vcl/source/window/builder.cxx| 22 vcl/source/window/layout.cxx |1 vcl/source/window/window.cxx |1 vcl/source/window/window2.cxx| 13 + 18 files changed, 61 insertions(+), 62 deletions(-) New commits: commit ca6aa93fd448203a08b65b8b2c2db762f991d4d5 Author: Caolán McNamara caol...@redhat.com Date: Sat Oct 20 12:57:22 2012 +0100 add infrastructure for secondary button groups Change-Id: I5fd1bbc31a0259e92f6eb23beef5d3c77b74eed8 diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 5b83760..54a9ba9 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -1119,67 +1119,41 @@ public: Size get_preferred_size() const; /* - * Gets the value of the halign property. + * How to horizontally align this widget */ VclAlign get_halign() const; - -/* - * Sets the horizontal alignment of widget. See the halign property. - */ void set_halign(VclAlign eAlign); /* - * Gets the value of the valign property. + * How to vertically align this widget */ VclAlign get_valign() const; - -/* - * Sets the horizontal alignment of widget. See the valign property. - */ void set_valign(VclAlign eAlign); /* - * Gets whether the widget would like to use any available extra horizontal + * Whether the widget would like to use any available extra horizontal * space. */ bool get_hexpand() const; - -/* - * Sets whether the widget would like to use any available extra horizontal - * space. - */ void set_hexpand(bool bExpand); /* - * Gets whether the widget would like to use any available extra vertical + * Whether the widget would like to use any available extra vertical * space. */ bool get_vexpand() const; - -/* - * Sets whether the widget would like to use any available extra vertical - * space. - */ void set_vexpand(bool bExpand); /* - * Gets whether the widget would like to use any available extra space. + * Whether the widget would like to use any available extra space. */ bool get_expand() const; - -/* - * Sets whether the widget would like to use any available extra space. - */ void set_expand(bool bExpand); /* - * Gets whether the widget should receive extra space when the parent grows + * Whether the widget should receive extra space when the parent grows */ bool get_fill() const; - -/* - * Sets whether the widget should receive extra space when the parent grows - */ void set_fill(bool bFill); void set_border_width(sal_Int32 nBorderWidth); @@ -1198,64 +1172,47 @@ public: sal_Int32 get_margin_bottom() const; /* - * Gets how the widget is packed with reference to the start or end of the parent + * How the widget is packed with reference to the start or end of the parent */ VclPackType get_pack_type() const; - -/* - * Sets how the widget is packed with reference to the start or end of the parent - */ void set_pack_type(VclPackType ePackType); /* - * Sets extra space to put between the widget and its neighbors + * The extra space to put between the widget and its neighbors */ sal_Int32 get_padding() const; - -/* - * Sets extra space to put between the widget and its neighbors - */ void set_padding(sal_Int32 nPadding); /* - * Gets the number of columns that the widget spans + * The number of columns that the widget spans */ sal_Int32 get_grid_width() const; - -/* - * Sets the number of columns that the widget spans - */ void set_grid_width(sal_Int32 nCols); /* - * Gets the column number to attach the left side of the widget to + * The column number to attach the left side of the widget to */ sal_Int32 get_grid_left_attach() const; - -/* - * Sets the column number to attach the left side of the widget to - */ void set_grid_left_attach(sal_Int32 nAttach); /* - * Gets the number of row that the widget spans + * The number of row
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fc211a5fde10109ac022f0dbdc04bcb0480fb9e0
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Oct 22 10:44:40 2012 +0200
DomainMapper::lcl_attribute: typo fixes
Change-Id: Ib6ea496f7fb6d87011a74fc49e77c54d62cb09ec
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c71854e..2676d5c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -833,11 +833,11 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
vertical text flow (0x01), or
two lines in one layout (0x02).
For 0x01, if the higher byte of is zero, the text is not
scaled to fit the line height,
-in oposite case, it is to be scaled.
-For 0x02, the higher byte of is determinig the prefix and
suffix of the run:
+in opposite case, it is to be scaled.
+For 0x02, the higher byte of is determining the prefix
and suffix of the run:
no brackets (0x00) ,
() round brackets (0x01),
-[] square backets (0x02),
+[] square brackets (0x02),
angle brackets (0x03) and
{} curly brackets (0x04).
is different and we do not know its signification
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |8
1 file changed, 8 deletions(-)
New commits:
commit 349cf01b1dd3a4c08fb3e17ffd89aa7ea9211f6c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 10:46:11 2012 +0200
Remove spurious find_substr
Change-Id: I4b001e6fd963df2fad97aaf5885b0b38189e59d6
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 81a4792..ccc117f 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -711,14 +711,6 @@ static inline void eat_space(char ** token)
}
/*
- * Find substring in bounded length string
- */
-static inline const char *find_substr(const char *key, int key_len,
- const char *substr, int substr_len)
-{
-}
-
-/*
* Prune LibreOffice specific duplicate dependencies to improve
* gnumake startup time, and shrink the disk-space footprint.
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
REMINDER: Release 3.6.3-rc2 from libreoffice-3-6-3 branch
Hi, please note that the commit deadline for 3.6.3-rc2 is today, October 22, 2012. It will be used as LO-3.6.3 final if no blocker is reported. See also http://wiki.documentfoundation.org/ReleasePlan#3.6_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 55059, which changed state. Bug 55059 Summary: EDITING: Calculate formula: Delete or Backspace to empty a refecenced cell, do not result in updating https://bugs.freedesktop.org/show_bug.cgi?id=55059 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc vcl/source
vcl/inc/vcl/layout.hxx| 12 ++
vcl/source/window/builder.cxx |7 +++
vcl/source/window/layout.cxx | 84 +++---
3 files changed, 74 insertions(+), 29 deletions(-)
New commits:
commit 841b975a09b2159e824c51fc1c42b02e7f542052
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 10:27:50 2012 +0100
implement secondary button groups in buttonboxes
Change-Id: I0e60b7e197ba4f6ebd3f24cb2e9072ce3e1353fb
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 43fc7a9..38ad29e 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -201,6 +201,18 @@ protected:
virtual void setAllocation(const Size rAllocation);
private:
VclButtonBoxStyle m_eLayoutStyle;
+struct Requisition
+{
+sal_uInt16 m_nPrimaryChildren;
+sal_uInt16 m_nSecondaryChildren;
+Size m_aSize;
+Requisition()
+: m_nPrimaryChildren(0)
+, m_nSecondaryChildren(0)
+{
+}
+};
+Requisition calculatePrimarySecondaryRequisitions() const;
};
class VCL_DLLPUBLIC VclVButtonBox : public VclButtonBox
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bf14656..cc2af7f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1076,6 +1076,13 @@ bool
VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con
return true;
if (ePackA ePackB)
return false;
+//group secondaries before primaries
+bool bPackA = pA-get_secondary();
+bool bPackB = pB-get_secondary();
+if (bPackA bPackB)
+return true;
+if (bPackA bPackB)
+return false;
//honour relative box positions with pack group
return m_pBuilder-get_window_packing_position(pA)
m_pBuilder-get_window_packing_position(pB);
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e2a594b..607fa20 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -243,9 +243,9 @@ bool VclBox::set_property(const rtl::OString rKey, const
rtl::OString rValue)
#define DEFAULT_CHILD_MIN_WIDTH 85
#define DEFAULT_CHILD_MIN_HEIGHT 27
-Size VclButtonBox::calculateRequisition() const
+VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions() const
{
-sal_uInt16 nVisibleChildren = 0;
+Requisition aReq;
sal_Int32 nChildMinWidth = DEFAULT_CHILD_MIN_WIDTH; //to-do, pull from
theme
sal_Int32 nChildMinHeight = DEFAULT_CHILD_MIN_HEIGHT; //to-do, pull from
theme
@@ -255,8 +255,10 @@ Size VclButtonBox::calculateRequisition() const
{
if (!pChild-IsVisible())
continue;
-SAL_WARN_IF(pChild-get_secondary(), vcl.layout, secondary groups
not implemented yet);
-++nVisibleChildren;
+if (pChild-get_secondary())
+++aReq.m_nSecondaryChildren;
+else
+++aReq.m_nPrimaryChildren;
Size aChildSize = getLayoutRequisition(*pChild);
if (aChildSize.Width() aSize.Width())
aSize.Width() = aChildSize.Width();
@@ -264,18 +266,25 @@ Size VclButtonBox::calculateRequisition() const
aSize.Height() = aChildSize.Height();
}
+sal_uInt16 nVisibleChildren = aReq.m_nPrimaryChildren +
aReq.m_nSecondaryChildren;
+
if (!nVisibleChildren)
-return Size();
+return aReq;
long nPrimaryDimension =
(getPrimaryDimension(aSize) * nVisibleChildren) +
(m_nSpacing * (nVisibleChildren-1));
-setPrimaryDimension(aSize, nPrimaryDimension + m_nSpacing);
+setPrimaryDimension(aReq.m_aSize, nPrimaryDimension + m_nSpacing);
long nSecondaryDimension = getSecondaryDimension(aSize);
-setSecondaryDimension(aSize, nSecondaryDimension);
+setSecondaryDimension(aReq.m_aSize, nSecondaryDimension);
-return aSize;
+return aReq;
+}
+
+Size VclButtonBox::calculateRequisition() const
+{
+return calculatePrimarySecondaryRequisitions().m_aSize;
}
bool VclButtonBox::set_property(const rtl::OString rKey, const rtl::OString
rValue)
@@ -308,54 +317,71 @@ bool VclButtonBox::set_property(const rtl::OString rKey,
const rtl::OString rV
void VclButtonBox::setAllocation(const Size rAllocation)
{
-sal_uInt16 nVisibleChildren = 0;
-for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild =
pChild-GetWindow(WINDOW_NEXT))
-{
-if (!pChild-IsVisible())
-continue;
-++nVisibleChildren;
-}
+Requisition aReq(calculatePrimarySecondaryRequisitions());
+sal_uInt16 nVisibleChildren = aReq.m_nPrimaryChildren +
aReq.m_nSecondaryChildren;
if (!nVisibleChildren)
return;
Size aSize = rAllocation;
long nAllocPrimaryDimension = getPrimaryDimension(rAllocation);
-Size aRequisition = calculateRequisition();
-long nHomogeneousDimension = ((getPrimaryDimension(aRequisition) -
+long
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/impgraph.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit dedff8f84ce19949da03c02bb7b41bc62d2789af
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 11:31:38 2012 +0200
-Werror,-Wtautological-constant-out-of-range-compare
Change-Id: I320c11d4b3d295c65dcd966f70a2de4f05926ebb
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 333fb3f..13e651a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1127,7 +1127,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream rIStm,
sal_Bool bSwap )
rIStm *this;
bRet = ( rIStm.GetError() == 0UL );
}
-else if( meType = SYS_WINMETAFILE meType = SYS_MACMETAFILE )
+else if( sal::static_int_castsal_uLong(meType) = SYS_WINMETAFILE
+ sal::static_int_castsal_uLong(meType) = SYS_MACMETAFILE
)
{
Graphic aSysGraphic;
sal_uLong nCvtType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_class.mk |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 012a996721b12baf6365300bf6f4e691260d26de Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 22 12:11:40 2012 +0200 Remove arguments unused when compiling assembler object (-D, -I, etc.) ...at least Clang 3.2 warns about them, and with -Werror would produce fatal errors for them. Change-Id: I59568adc969ebd1ba2f20ef6c41edc7c5f5d29ed diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 1a88a36..a8f2d4b 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -38,13 +38,9 @@ $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) cd $(SRCDIR) \ $(gb_CC) \ - $(DEFS) \ - $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ $(T_CFLAGS) \ -c $(3) \ - -o $(1) \ - -I$(dir $(3)) \ - $(INCLUDE)) \ + -o $(1)) \ echo $(1) : $(3) $(4) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 34984, which changed state. Bug 34984 Summary: Saving to .doc format copies first page header onto all others https://bugs.freedesktop.org/show_bug.cgi?id=34984 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/config/optload.src |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a47a8515d2a8cdd9c2866deb43e3c148ef99de13
Author: Andras Timar ati...@suse.com
Date: Mon Oct 22 12:21:26 2012 +0200
add help ID to 'Enable char units' checkbox
Change-Id: Ic968253460363c9d73ddc247d680f38f81df1272
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 5dc8dd0..4cdb44e 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -144,6 +144,8 @@ TabPage TP_OPTLOAD_PAGE
};
CheckBox CB_USE_CHAR_UNIT
{
+HelpID = sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_CHAR_UNIT;
+Pos = MAP_APPFONT ( 12 , 111) ;
Pos = MAP_APPFONT ( 12 , 130) ;
Size = MAP_APPFONT ( 109 , 10 ) ;
Text [ en-US ] = Enable char unit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/config/optload.src |1 -
1 file changed, 1 deletion(-)
New commits:
commit ff4aca8591efcef92ad17ff86a84b75b598bce05
Author: Andras Timar ati...@suse.com
Date: Mon Oct 22 12:35:50 2012 +0200
typo
Change-Id: Ief230fc60ddf3008d7d75af2cf57e20d3818634b
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 4cdb44e..1e58a43 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -145,7 +145,6 @@ TabPage TP_OPTLOAD_PAGE
CheckBox CB_USE_CHAR_UNIT
{
HelpID = sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_CHAR_UNIT;
-Pos = MAP_APPFONT ( 12 , 111) ;
Pos = MAP_APPFONT ( 12 , 130) ;
Size = MAP_APPFONT ( 109 , 10 ) ;
Text [ en-US ] = Enable char unit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: SAL build failure on master
On 10/21/2012 05:36 AM, Alex Thurgood wrote: I'm getting a reproducible SAL build failure on Linux 64bit (Bodhi 2.0): Failed to load dynamic library: /home/alex/Development/libo/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_sal_osl_process.so /usr/lib/libuno_sal.so.3: version `LIBO_UDK_3.7' not found (required by /home/alex/Development/libo/workdir/unxlngx6.pro/LinkTarget/CppunitTest/libtest_sal_osl_process.so) This is the same problem Joel reported a few days ago (Build error, Oct. 19). Do you by chance have LD_LIBRARY_PATH environment variable set when doing make? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: starmath/inc starmath/source
starmath/inc/view.hxx |4 ++--
starmath/source/dialog.cxx | 22 +-
starmath/source/view.cxx | 10 +-
3 files changed, 16 insertions(+), 20 deletions(-)
New commits:
commit 2006bc9d5acc80038577bc295b45fa8dcd8766e2
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 22 15:08:50 2012 +0400
String - OUString
Change-Id: I154c856c2813130aae1af611abcc4bcb4f0d1d13
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 7707c50..f508cf5 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -228,7 +228,7 @@ class SmViewShell: public SfxViewShell
SmGraphicWindow aGraphic;
SmGraphicController aGraphicController;
-String StatusText;
+OUStringaStatusText;
::com::sun::star::uno:: Reference
::com::sun::star::lang:: XEventListener xClipEvtLstnr;
@@ -292,7 +292,7 @@ public:
SmGraphicWindow GetGraphicWindow() { return aGraphic; }
const SmGraphicWindow GetGraphicWindow() const { return aGraphic; }
-voidSetStatusText(const String Text);
+voidSetStatusText(const OUString rText);
voidShowError( const SmErrorDesc *pErrorDesc );
voidNextError();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 9561087..c0cc81f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -35,7 +35,6 @@
#include vcl/wall.hxx
#include sfx2/dispatch.hxx
#include sfx2/sfx.hrc
-#include tools/string.hxx
#include osl/diagnose.h
#include svx/ucsubset.hxx
@@ -51,8 +50,6 @@
#include unomodel.hxx
-using ::rtl::OUString;
-
// Since it's better to set/query the FontStyle via its attributes rather
// than via the StyleName we create a way to translate
// Attribute - StyleName
@@ -1183,7 +1180,7 @@ void SmShowSymbolSet::Paint(const Rectangle)
int nIV = i - v;
sal_UCS4 cChar = aSymbol.GetCharacter();
-String aText( OUString( cChar, 1 ) );
+OUString aText(cChar, 1);
Size aSize( GetTextWidth( aText ), GetTextHeight());
DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2,
@@ -1383,7 +1380,7 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol)
SetFont(aFont);
sal_UCS4 cChar = pSymbol-GetCharacter();
-String aText( OUString( cChar, 1 ) );
+OUString aText(cChar, 1);
SetText( aText );
}
@@ -1505,13 +1502,12 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *,
EMPTYARG pButton )
const SmSym *pSym = GetSymbol();
if (pSym)
{
-String aText = rtl::OUString('%');
-aText += pSym-GetName();
-aText += (sal_Unicode)' ';
+OUStringBuffer aText;
+aText.append('%').append(pSym-GetName()).append(' ');
rViewSh.GetViewFrame()-GetDispatcher()-Execute(
SID_INSERTSYMBOL, SFX_CALLMODE_STANDARD,
-new SfxStringItem(SID_INSERTSYMBOL, aText), 0L);
+new SfxStringItem(SID_INSERTSYMBOL,
aText.makeStringAndClear()), 0L);
}
return 0;
@@ -1709,7 +1705,7 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font
rFont )
SetFont(aFont);
aFont.SetTransparent(true);
-String aText( OUString( cChar, 1) );
+OUString aText(cChar, 1);
SetText( aText );
Invalidate();
@@ -1920,9 +1916,9 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
UpdateButtons();
// display Unicode position as symbol name while iterating over characters
-const String aHex(rtl::OUString::valueOf(static_castsal_Int64(cChar), 16
).toAsciiUpperCase());
-const String aPattern( OUString::createFromAscii( aHex.Len() 4 ?
Ux00 : Ux ) );
-String aUnicodePos( aPattern.Copy( 0, aPattern.Len() - aHex.Len() ) );
+const OUString aHex(rtl::OUString::valueOf(static_castsal_Int64(cChar),
16 ).toAsciiUpperCase());
+const OUString aPattern( (aHex.getLength() 4) ? OUString(Ux00) :
OUString(Ux) );
+OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() -
aHex.getLength() ) );
aUnicodePos += aHex;
aSymbols.SetText( aUnicodePos );
aSymbolName.SetText( aUnicodePos );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 2f7e0a7..880b8da 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1414,11 +1414,11 @@ SmEditWindow *SmViewShell::GetEditWindow()
}
-void SmViewShell::SetStatusText(const String Text)
+void SmViewShell::SetStatusText(const OUString rText)
{
RTL_LOGFILE_CONTEXT( aLog, starmath: SmViewShell::SetStatusText );
-StatusText = Text;
+aStatusText = rText;
GetViewFrame()-GetBindings().Invalidate(SID_TEXTSTATUS);
}
@@ -1576,7 +1576,7 @@ void SmViewShell::Execute(SfxRequest rReq)
if (pWin)
{
GetDoc()-SetText( pWin-GetText() );
-SetStatusText(String());
+
Re: can we drop rdbmaker ?
On 10/22/2012 09:53 AM, Miklos Vajna wrote: On Sun, Oct 21, 2012 at 06:00:08PM +0200, David Tardon dtar...@redhat.com wrote: I assumed it is a part of URE, but that turns out not to be true. As far as I can see, it is not even part of any installation set. Drop it, I say! Stephan mentioned on the conference that it's still used somewhere, probably worthy to check with him before killing it. :) Looks like I was confusing what rdbmaker is actually good for, and that it can apparently go for good indeed. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 34984, which changed state. Bug 34984 Summary: Saving to .doc format copies first page header onto all others https://bugs.freedesktop.org/show_bug.cgi?id=34984 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9a09f9e4a308052c2ca6d6435c01b04d7bf Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 22 13:41:45 2012 +0200 dummy_can_throw_anything reportedly needed at least with GCC 4.5.1, too ...see http://lists.freedesktop.org/archives/libreoffice/2012-October/039995.html RuntimeException while building Change-Id: I038806d4ca1d7a2a2518106ba722509fbe3a7843 diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx index 56612d2..cb4b574 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx @@ -67,7 +67,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( // unexpected size of int assert(nStackLongs pStackLongs); // no stack -#ifdef __clang__ +#if defined __clang__ || __GNUC__ == 4 __GNUC_MINOR__ = 6 if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything(xxx); // address something #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: RuntimeException while building
On 10/19/2012 05:44 PM, Ruslan Kabatsayev wrote: On Fri, Oct 19, 2012 at 6:26 PM, Stephan Bergmann sberg...@redhat.com wrote: On 10/19/2012 04:13 PM, Ruslan Kabatsayev wrote: I'm trying to build current libo master, and build fails with this log: http://pastebin.com/d191HeiH Here's the backtrace: http://pastebin.com/6T7CCAZL . LibO did build OK at the time of Version 3.7.0.0.alpha0+ (Build ID: ecf56e). This *might* have to do with somewhat recent commit dccddcc20b0b873ca182983506d97b500edfe4f1 make gcc-uno bridge work with both gcc-4.7 and clang. Can you try with that two-line patch reverted? Also, what version of GCC do you use? With this patch reverted it builds OK. I'm using gcc 4.5.1. So http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9a09f9e4a308052c2ca6d6435c01b04d7bf dummy_can_throw_anything reportedly needed at least with GCC 4.5.1, too hopefully makes all compiler variations happy, then. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on|54514 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on|50542 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|4 +++-
android/experimental/LibreOffice4Android/native-code.cxx
|2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d8feea6c28540797b4959e66bdc9f38209f7c512
Author: Tor Lillqvist t...@iki.fi
Date: Fri Oct 19 18:10:58 2012 +0300
Seems that on the emulator the y scale is -1, huh
Change-Id: I1ad30e278a5b04de3ee544c30c38f4765539157d
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index e1e7506..841b341 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -575,7 +575,9 @@ public class DocumentLoader
int t = (int)(h/2 - values[Matrix.MTRANS_Y]/scale);
Log.i(TAG, Unzoomed rect: + l + , + t + , +
(int)(l+w/scale) + , + (int)(t+h/scale));
-Assert.assertTrue(values[Matrix.MSCALE_X] ==
values[Matrix.MSCALE_Y]);
+Log.i(TAG, Scales: + values[Matrix.MSCALE_X] + , +
values[Matrix.MSCALE_Y]);
+
+// Assert.assertTrue(values[Matrix.MSCALE_X] ==
values[Matrix.MSCALE_Y]);
super.draw(canvas);
commit a09a98ee45c024005b139a9c265d76a3bee8d89c
Author: Tor Lillqvist t...@iki.fi
Date: Fri Oct 19 18:09:26 2012 +0300
Add ucppkg1
Change-Id: I471440867895b2a8ef2f2de90ed37f5b3c9c0721
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 22c9a7e..f304915 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -42,6 +42,7 @@ extern C
extern void * swd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * t602filter_component_getFactory( const char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * textfd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * ucppkg1_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * unoxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * unordf_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * wpftdraw_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
@@ -88,6 +89,7 @@ lo_get_libmap(void)
{ libswlo.a, sw_component_getFactory },
{ libt602filterlo.a, t602filter_component_getFactory },
{ libtextfdlo.a, textfd_component_getFactory },
+{ libucppkg1.a, ucppkg1_component_getFactory },
{ libunordflo.a, unordf_component_getFactory },
{ libunoxmllo.a, unoxml_component_getFactory },
{ libwpftdrawlo.a, wpftdraw_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source xmloff/source
sc/source/ui/view/cellsh3.cxx |3 -
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx | 27 +---
xmloff/source/draw/ximpshap.cxx |2
3 files changed, 23 insertions(+), 9 deletions(-)
New commits:
commit cfacb2d111b5319f5e5c494e1cf6426277e88b59
Author: Michael Meeks michael.me...@suse.com
Date: Mon Oct 22 13:26:47 2012 +0100
accelerate shape import export by more sensible XInterface handling.
Instead of converting both XInterfaces (again) to a root XInterface
inside the Reference == operator - we ensure that we have done this on
insertion, and do a fast pointer compare; saves ~40% of load time on
some docs, and more on save.
Change-Id: Ic3c97dd731ffb3854ebc135f416f6032d87b9d15
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index c0c4ad9..967bb8f 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -109,9 +109,6 @@ void ScCellShell::Execute( SfxRequest rReq )
switch ( nSlot )
{
-
-
-
case SID_ATTR_SIZE://XXX ???
break;
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 4e9a715..4b1d133 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -20,6 +20,7 @@
#include xmloff/unointerfacetouniqueidentifiermapper.hxx
+using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
using ::rtl::OUString;
@@ -37,8 +38,12 @@
UnoInterfaceToUniqueIdentifierMapper::UnoInterfaceToUniqueIdentifierMapper()
*/
const OUString UnoInterfaceToUniqueIdentifierMapper::registerReference( const
Reference XInterface rInterface )
{
+// Be certain that the references we store in our table are to the
+// leading / primary XInterface - cf. findReference
+uno::Reference uno::XInterface xRef( rInterface, uno::UNO_QUERY );
+
IdMap_t::const_iterator aIter;
-if( findReference( rInterface, aIter ) )
+if( findReference( xRef, aIter ) )
{
return (*aIter).first;
}
@@ -46,7 +51,7 @@ const OUString
UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
{
OUString aId( id );
aId += OUString::valueOf( mnNextId++ );
-return (*maEntries.insert( IdMap_t::value_type( aId, rInterface )
).first).first;
+return (*maEntries.insert( IdMap_t::value_type( aId, xRef )
).first).first;
}
}
@@ -58,7 +63,12 @@ const OUString
UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
bool UnoInterfaceToUniqueIdentifierMapper::registerReference( const OUString
rIdentifier, const Reference XInterface rInterface )
{
IdMap_t::const_iterator aIter;
-if( findReference( rInterface, aIter ) )
+
+// Be certain that the references we store in our table are to the
+// leading / primary XInterface - cf. findReference
+uno::Reference uno::XInterface xRef( rInterface, uno::UNO_QUERY );
+
+if( findReference( xRef, aIter ) )
{
return rIdentifier != (*aIter).first;
}
@@ -68,7 +78,7 @@ bool UnoInterfaceToUniqueIdentifierMapper::registerReference(
const OUString rI
}
else
{
-maEntries.insert( IdMap_t::value_type( rIdentifier, rInterface ) );
+maEntries.insert( IdMap_t::value_type( rIdentifier, xRef ) );
// see if this is a reference like something we would generate in the
future
const sal_Unicode *p = rIdentifier.getStr();
@@ -138,11 +148,18 @@ const Reference XInterface
UnoInterfaceToUniqueIdentifierMapper::getReferenc
bool UnoInterfaceToUniqueIdentifierMapper::findReference( const Reference
XInterface rInterface, IdMap_t::const_iterator rIter ) const
{
+uno::Reference uno::XInterface xRef( rInterface, uno::UNO_QUERY );
+
rIter = maEntries.begin();
+
const IdMap_t::const_iterator aEnd( maEntries.end() );
while( rIter != aEnd )
{
-if( (*rIter).second == rInterface )
+// The Reference == operator, does a repeated queryInterface on
+// this to ensure we got the right XInterface base-class. However,
+// we can be sure that this has been done already by the time we
+// get to here.
+if( (*rIter).second.get() == xRef.get() )
return true;
rIter++;
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a7434c0..989892d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -470,7 +470,7 @@ void SdXMLShapeContext::AddShape(uno::Reference
drawing::XShape xShape)
if( !maShapeId.isEmpty() )
{
-uno::Reference uno::XInterface xRef( xShape, uno::UNO_QUERY );
+uno::Reference uno::XInterface xRef(
static_castuno::XInterface
[Libreoffice-commits] .: sw/source
sw/source/ui/config/optload.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 03cd2e780bdf24c4869a0ed584099f0d3d32b170
Author: Andras Timar ati...@suse.com
Date: Mon Oct 22 14:29:48 2012 +0200
change the order of these checkboxes
Change-Id: I2bdfb770ded91bc66618dcc27e574cd39a3b267e
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 1e58a43..e849b75 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -138,14 +138,14 @@ TabPage TP_OPTLOAD_PAGE
CheckBox CB_USE_SQUARE_PAGE_MODE
{
HelpID = sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_SQUARE_PAGE_MODE;
-Pos = MAP_APPFONT ( 12 , 111) ;
+Pos = MAP_APPFONT ( 12 , 130) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = Use square page mode for text grid;
};
CheckBox CB_USE_CHAR_UNIT
{
HelpID = sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_CHAR_UNIT;
-Pos = MAP_APPFONT ( 12 , 130) ;
+Pos = MAP_APPFONT ( 12 , 111) ;
Size = MAP_APPFONT ( 109 , 10 ) ;
Text [ en-US ] = Enable char unit;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Depends on||56281 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox failure, Win-x86@6, MASTER, last success: 2012-10-20 18:35:26
Hi, On Mon, Oct 22, 2012 at 12:07:49PM +, Tinderbox wrote: Hi folks, One of you broke the build of LibreOffice with your commit :-( Please commit and push a fix ASAP! Full log available at http://tinderbox.libreoffice.org/MASTER/status.html Tinderbox info: Box name: Win-x86@6 Branch: MASTER starttime: 1350905238 Machine: CYGWIN_NT-6.1-WOW64 mel 1.7.11(0.260/5/3) 2012-02-24 14:05 i686 Cygwin Configured with: --with-max-jobs=5 --with-num-cpus=4 --enable-binfilter --disable-build-mozilla --disable-dependency-tracking --with-ant-home=/home/kendy/apache-ant-1.8.2 --with-java-target-version=1.5 --with-jdk-home=/cygdrive/c/Program Files (x86)/Java/jdk1.5.0_22 --without-junit --with-mozilla-build=/home/kendy/mozilla-build ... /usr/bin/cp: cannot stat `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/workdir/wntmsci12.pro/UnpackedTarball/postgresql/src/interfaces/libpq//postgresql-sdbc-impl.uno.dll': No such file or directory make[2]: *** [C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntmsci12.pro/lib/libpq.lib] Error 1 make[2]: *** Deleting file `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntmsci12.pro/lib/libpq.lib' make[2]: *** Waiting for unfinished jobs ERROR: error 512 occurred while making /home/tinderbox/tinderbox-master-build-libreoffice/tail_build/prj This is most unusual. I cannot imagine how it could happen. Could someone on Windows run cd tail_build; make -pqr and send the output to me? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - configure.ac solenv/gbuild
configure.ac |6 +++--- solenv/gbuild/CliAssembly.mk | 34 -- solenv/gbuild/TargetLocations.mk |3 ++- 3 files changed, 33 insertions(+), 10 deletions(-) New commits: commit bec62421a45da89d2812bdff30fbbab73291cf91 Author: David Tardon dtar...@redhat.com Date: Mon Oct 22 13:57:11 2012 +0200 factor out common code Change-Id: I733dc593b2395e06bf86d8ad9dec16c958c880b9 diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 13eaaa2..b6e216a 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -158,9 +158,14 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe endef +define gb_CliAssembly__add_file +$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) + +endef + define gb_CliAssembly__set_configfile_impl $(call gb_CliAssemblyTarget_set_configfile,$(1),$(2)) -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) +$(call gb_CliAssembly__add_file,$(1),$(2)) endef @@ -185,15 +190,10 @@ $(call gb_CliAssemblyTarget_set_platform,$(1),$(2)) endef -define gb_CliAssembly__set_policy -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) - -endef - define gb_CliAssembly_set_policy $(call gb_CliAssemblyTarget_set_version,$(1),$(3)) $(call gb_CliAssemblyTarget_set_name,$(1),$(2)) -$(call gb_CliAssembly__set_policy,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2))) +$(call gb_CliAssembly__add_file,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2))) endef commit cbd9dddb4d259df3ab7b3e58e5b7165d18037c1a Author: David Tardon dtar...@redhat.com Date: Mon Oct 22 13:55:17 2012 +0200 fdo#55290 create CLI assemblies with the right name Change-Id: I521a8a1fc013684fde6055d7e2c32790462e64c6 diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 440b408..13eaaa2 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -56,11 +56,12 @@ define gb_CliAssemblyTarget__command $(call gb_Output_announce,$(2),$(true),AL ,2) $(call gb_Helper_abbreviate_dirs,\ al \ - -out:$(1) \ + -out:$(CLI_ASSEMBLY_OUTFILE) \ -version:$(CLI_ASSEMBLY_VERSION) \ -keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \ -link:$(CLI_ASSEMBLY_CONFIGFILE) \ - $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) \ + $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) \ + touch $(1) \ ) endef @@ -73,22 +74,29 @@ $(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir : $(call gb_CliAssemblyTarget_get_target,%) : $(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set)) $(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set)) + $(if $(strip $(CLI_ASSEMBLY_NAME)),,$(call gb_Output_error,assembly name not set)) $(call gb_CliAssemblyTarget__command,$@,$*,$) +$(call gb_CliAssemblyTarget_get_assembly_target,%) : + touch $@ + .PHONY : $(call gb_CliAssemblyTarget_get_clean_target,%) $(call gb_CliAssemblyTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),AL ,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_CliAssemblyTarget_get_target,$*) \ + rm -f $(call gb_CliAssemblyTarget_get_target,$*) $(CLI_ASSEMBLY_OUTFILE) \ ) # Create a CLI assembly define gb_CliAssemblyTarget_CliAssemblyTarget $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_CONFIGFILE := $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_KEYFILE := $(gb_CliAssemblyTarget_KEYFILE_DEFAULT) +$(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_OUTFILE := $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_PLATFORM := $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_VERSION := +$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : CLI_ASSEMBLY_OUTFILE := + $(call gb_CliAssemblyTarget_get_target,$(1)) :| $(dir $(call gb_CliAssemblyTarget_get_target,$(1))).dir endef @@ -105,6 +113,14 @@ $(call gb_CliAssemblyTarget_get_target,$(1)) : $(2) endef +define gb_CliAssemblyTarget_set_name +$(call gb_CliAssemblyTarget_get_target,$(1)) \ +$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : \ + CLI_ASSEMBLY_OUTFILE := $(call gb_CliAssemblyTarget_get_assembly_target,$(2)) +$(call gb_CliAssemblyTarget_get_assembly_target,$(2)) : $(call gb_CliAssemblyTarget_get_target,$(1)) + +endef + define gb_CliAssemblyTarget_set_platform $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_PLATFORM := $(2) @@ -169,9 +185,15 @@ $(call gb_CliAssemblyTarget_set_platform,$(1),$(2)) endef +define gb_CliAssembly__set_policy +$(call
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 56281, which changed state. Bug 56281 Summary: German OK and Cancel buttons show ~ https://bugs.freedesktop.org/show_bug.cgi?id=56281 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - vcl/source
vcl/source/control/button.cxx | 13 -
vcl/source/window/builder.cxx |2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 920807d4491834cd88e545fdb930c9105d58c4cd
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 13:31:38 2012 +0100
Resolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translations
We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if
string already contains those.
Though its an open question if the presence of ~ is a bad thing
for the Windows case. i.e. if we should have tooling to not
allow the OK/Cancel translations to contain ~ in the first place,
of if we should drop the ifdef UNX and do it globally now
Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 373143b..d2336ec 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -157,12 +157,15 @@ XubString Button::GetStandardText( StandardButtonType
eButton )
sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
aText = ResId(nResId, *pResMgr).toString();
-// Windows (apparently) has some magic auto-accelerator evil around
-// ok / cancel so add this only for Unix
-#ifdef UNX
-if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL )
-aText.Insert( rtl::OUString(~), 0 );
+if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
+{
+#ifndef WNT
+// Windows (apparently) has some magic auto-accelerator evil around
+// ok / cancel so add accelerators only for Unix
+if (aText.Search('~') == STRING_NOTFOUND)
+aText.Insert(rtl::OUString(~), 0);
#endif
+}
}
else
{
commit 3c71a0bae6dab8dc53c5f2b014933dcf7ef45024
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 12:49:13 2012 +0100
explictly require Bitmap to get image
Change-Id: I0f7e0510f6c946be7cf930659db961d3c17e1c4f
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index cc2af7f..deb563c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -190,7 +190,7 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir,
OUString sUIFile, OStri
{
pTarget-SetSymbol(eType);
if (eType == SYMBOL_IMAGE)
-
pTarget-SetModeImage(VclResId(mapStockToImageResource(rImage)));
+
pTarget-SetModeImage(Bitmap(VclResId(mapStockToImageResource(rImage;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6][REVIEW 3-6] ~ appears in German unix OK/Cancel translations
In 3.5.7 the German unix OK/Cancel translations visually have ~ in them. ~ is our accelerator code, and in the last update of the 3.5.7 .de translations ~ appears in the .de translations, but we have some unix specific code which prepends ~ to the OK/Cancel translations, resulting in a double ~ https://bugs.freedesktop.org/show_bug.cgi?id=56281 proposing 920807d4491834cd88e545fdb930c9105d58c4cd for 3-6 and 3-5 to protect against this. I'm unsure, reading the comments in the weird vcl code, if there might be an additional problem under windows. If someone could check the windows German 3.5.7 for problems in OK/Cancel that'd be good, to know if we need tooling to disallow ~ in OK/Cancel translations. Or if we can remove the platform conditionality. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 8 commits - config_host.mk.in configure.ac solenv/gbuild solenv/inc
config_host.mk.in | 20 ++- configure.ac| 207 +++- solenv/gbuild/CppunitTest.mk|2 solenv/gbuild/Executable.mk |2 solenv/gbuild/Library.mk|2 solenv/gbuild/LinkTarget.mk | 15 +- solenv/gbuild/Module.mk |4 solenv/gbuild/StaticLibrary.mk |2 solenv/gbuild/gbuild.help.txt | 12 - solenv/gbuild/gbuild.mk | 42 ++ solenv/gbuild/platform/IOS_ARM_GCC.mk |7 - solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 solenv/gbuild/platform/WNT_INTEL_MSC.mk |5 solenv/gbuild/platform/com_GCC_defs.mk |2 solenv/gbuild/platform/macosx.mk|7 - solenv/gbuild/platform/solaris.mk | 14 +- solenv/gbuild/platform/unxgcc.mk| 14 +- solenv/inc/settings.mk | 15 +- 18 files changed, 207 insertions(+), 170 deletions(-) New commits: commit f1386b7706686e0c65ba0ad6d92574658cdca3a9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Oct 22 14:54:14 2012 +0200 make dmake use C(XX)FLAGS from the environment too Change-Id: I2214674181c137a312b0109e7d19a1fd2fc942be diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 29e245e..6ab5211 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -146,7 +146,7 @@ CDEFSDEBUG= CDEFSDBGUTIL= CDEFSOPT= -CFLAGS= +#CFLAGS= CFLAGSCALL= CFLAGSCXX= CFLAGSCC= @@ -227,7 +227,7 @@ PASCAL= BFLAGS= COBFLAGS= CPPFLAGS= -CXXFLAGS= +#CXXFLAGS= FFLAGS= PFLAGS= RFLAGS= @@ -1049,6 +1049,13 @@ CFLAGSCC+=$(CFLAGSENABLESYMBOLS_CC_ONLY) .ENDIF # $(DEBUG) == .ENDIF # ($(ENABLE_CRASHDUMP)!= $(ENABLE_CRASHDUMP)!=DUMMY) || $(ENABLE_DEBUG)!= +.IF $(CFLAGS)!= +CFLAGSCC+=$(CFLAGS) +.ENDIF +.IF $(CXXFLAGS)!= +CFLAGSCXX+=$(CXXFLAGS) +.ENDIF + .IF $(profile)!= CDEFS+= $(CDEFSPROF) CFLAGS+= $(CFLAGSPROF) commit 07f67f3ed79913afc6614357e95d1b263064b2b5 Author: Lubos Lunak l.lu...@suse.cz Date: Fri Oct 19 17:23:17 2012 +0200 fail on configure debug options that no longer make sense Change-Id: I4d01e0e00bd06e219fdc0208292ddcd5631fa235 diff --git a/configure.ac b/configure.ac index ac52b59..c493a74 100644 --- a/configure.ac +++ b/configure.ac @@ -4208,7 +4208,13 @@ AC_SUBST(PROEXT) dnl Set the ENABLE_DEBUG variable. dnl === AC_MSG_CHECKING([whether to do a debug build]) +if test -n $enable_debug test $enable_debug != yes test $enable_debug != no; then +AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) +fi if test -n $ENABLE_DBGUTIL; then +if test $enable_debug = no; then +AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) +fi ENABLE_DEBUG=TRUE AC_MSG_RESULT([yes (dbgutil)]) elif test -n $enable_debug test $enable_debug != no; then commit 40763e05acac832a274c194564ff1b182ee01d3f Author: Lubos Lunak l.lu...@suse.cz Date: Fri Oct 19 17:00:46 2012 +0200 disable gb_COMPILEROPTFLAGS in debug mode This means that modules where --enable-selective-debuginfo disables -g do not revert back to -O just because -g is not wanted there. As this will presumably happen with modules the developer does not care about, there's no gain from the -O and the compile there would take longer. Change-Id: Ied84d2f69035d6580279b0657c5a5ba5440c6f16 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 9a17541..fc6783d 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -154,7 +154,12 @@ endif gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline +ifneq ($(gb_DEBUGLEVEL),0) +gb_COMPILEROPTFLAGS := +else gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) +endif + gb_COMPILERNOOPTFLAGS := -O0 # LinkTarget class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index c5c7a30..f90963e 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -153,7 +153,12 @@ else gb_LINKEROPTFLAGS := -Wl,-O1 endif +ifneq ($(gb_DEBUGLEVEL),0) +gb_COMPILEROPTFLAGS := +else gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) +endif + gb_COMPILERNOOPTFLAGS := -O0 gb_LINKERSTRIPDEBUGFLAGS := -Wl,-S commit 84b4293e3dc6edd59e7d09383320361aaeed9e87 Author: Lubos Lunak l.lu...@suse.cz Date: Fri Oct 19 16:27:35 2012 +0200 allow LDFLAGS from gbuild to be selective too Just like CXXFLAGS can be controlled using --enable-selective-debuginfo. Non-debug libraries can be debug-stripped this way, which can save quite some disk space with those cppunittests which just include all .o's from sw/sc. Change-Id: Ib947f76f535161e4eef1421a5539df5e25fa4042 diff --git a/solenv/gbuild/CppunitTest.mk
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - accessibility/bridge
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b3a49f990273c9fa6e2b90245c271a14b38280f0
Author: David Tardon dtar...@redhat.com
Date: Mon Oct 15 07:13:23 2012 +0200
export symbols after gbuildification
Change-Id: I5c8ef1009a65fa5a38174898f58f9146e1367aa9
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 9ee03eb..b1d8d61 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -83,12 +83,12 @@ jmethodID g_jmRevokeTopWindow = 0;
// functions
//
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
+SAL_DLLPUBLIC_EXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
{
return JNI_VERSION_1_2;
}
-JNIEXPORT jbyteArray JNICALL
+SAL_DLLPUBLIC_EXPORT jbyteArray JNICALL
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
*pJNIEnv, jclass clazz)
{
// Initialize global class and method references
@@ -124,7 +124,7 @@
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
return jbaProcessID;
}
-JNIEXPORT jboolean JNICALL
+SAL_DLLPUBLIC_EXPORT jboolean JNICALL
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv
*, jclass, jlong pointer)
{
uno_Environment * pJava_environment = NULL;
@@ -180,7 +180,7 @@
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
return JNI_TRUE;
}
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
+SAL_DLLPUBLIC_EXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
{
::Application::RemoveEventListener(g_aEventListenerLink);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
FYI: Cleanup of debug options
Hello, at the conference we had a discussion about the --enable-symbols/debug/dbgutil DEBUG/debug options and some confusion these occassionally cause. As a result, I've committed some patches that clean up and change them in the following way: The intended behavior now, in short: - --enable-dbgutil is the recommended developer default, and it is --enable-debug plus BIC stuff - --enable-debug is -g, no optimizations, assertions and logging enabled (old-style OSL/RTL/whatever logging may still require dbgutil though, I'm not sure how that stuff works and it should ideally be converted to SAL_INFO/SAL_WARN) - --enable-selective-debuginfo is for selective -g and requires --enable-debug/dbgutil (i.e. it only saves disk space and I/O throughput by removing -g for some modules) - make DEBUG=true still works like temporary --enable-debug (and even overrides --enable-selective-debuginfo) - --enable-symbols has been removed, set CXXFLAGS if needed - C/CXX/LDFLAGS passed to configure, if present, is now remembered and used to override any debug/optimizations flags that would be used otherwise See the commit log message for full details: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a0320a908875f42bab9983ffe4db5b49fe7ba2f6 -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 53474, which changed state. Bug 53474 Summary: Java Accessibility Bridge based Accessibility does not work on Windows for ALL LibreOffice 3.6.x releases thusfar https://bugs.freedesktop.org/show_bug.cgi?id=53474 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Use of markup in .ui strings
On Sun, 2012-10-21 at 00:47 +0200, Khaled Hosny wrote: Hi all, Commit 8274df8 seems to have introduced the use of markup in .ui files to set text in bold, however this is not really a good idea l10n-wise as it is very error-prone, Gnome is actually moving away from using markup in translatable strings[1], which I think something LibreOffice should do. Glade/.ui files support attributes which can be used to set text attributes that affect the while string, while markup is reserved for the rare case where only part of the string need to be marked up (though it is still not a very good idea). We can make that change easily enough, and it would match our internal logic far better anyway. The only (smallish) catch is that glade (well 3.12.0 anyway) defaults to having markup enabled, and putting bfoo/b in the placeholder for frame labels so its a bit of a manual pain to click through selecting bold instead. I'll change things around later this week to use attributes instead, unless you want to give it a shot for me :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox failure, Win-x86@6, MASTER, last success: 2012-10-20 18:35:26
On Monday 22 of October 2012 14:32:47 David Tardon wrote: Hi, On Mon, Oct 22, 2012 at 12:07:49PM +, Tinderbox wrote: Hi folks, One of you broke the build of LibreOffice with your commit :-( Please commit and push a fix ASAP! Full log available at http://tinderbox.libreoffice.org/MASTER/status.html Tinderbox info: Box name: Win-x86@6 ... /usr/bin/cp: cannot stat `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/workdir/wntm sci12.pro/UnpackedTarball/postgresql/src/interfaces/libpq//postgresql-sdbc -impl.uno.dll': No such file or directory make[2]: *** [C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntms ci12.pro/lib/libpq.lib] Error 1 make[2]: *** Deleting file `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntms ci12.pro/lib/libpq.lib' make[2]: *** Waiting for unfinished jobs ERROR: error 512 occurred while making /home/tinderbox/tinderbox-master-build-libreoffice/tail_build/prj This is most unusual. I cannot imagine how it could happen. Could someone on Windows run cd tail_build; make -pqr and send the output to me? http://ge.tt/2zraAzP/v/0 . It's from this tinderbox right after the tinderbox build failed. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source svtools/inc svtools/source vcl/inc vcl/source
cui/source/dialogs/about.cxx |1 +
cui/source/dialogs/insdlg.cxx|1 -
svtools/inc/svtools/svmedit2.hxx |1 -
svtools/source/edit/svmedit2.cxx |5 -
vcl/inc/vcl/vclmedit.hxx |1 +
vcl/source/edit/vclmedit.cxx |5 +
vcl/source/window/msgbox.cxx |1 +
7 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 9dbb62555f0813cc55e48be28047f22e2b3ea4ef
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 22 17:25:12 2012 +0400
disable cursor in about dialog and message boxes
Change-Id: I060872e0a468f2ce26a2ab519c5bfe271574170b
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 23b9bd5..9dc8384 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -166,6 +166,7 @@ void AboutDialog::StyleControls()
// Version Text
aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.2 ) );
aVersionText.SetControlFont( aLargeFont );
+aVersionText.EnableCursor( sal_False );
// Copyright Text
aCopyrightText.SetTextSelectable( sal_False );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 069d26c..9c42a48 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -46,7 +46,6 @@
#include vcl/lstbox.hxx
#include vcl/msgbox.hxx
#include vcl/svapp.hxx
-#include vcl/vclmedit.hxx
#include sot/clsids.hxx
#include sfx2/frmdescr.hxx
#include sfx2/viewsh.hxx
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index 74645a2..68b7541 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.hxx
@@ -34,7 +34,6 @@ public:
// methods of TextView
voidInsertText( const String rNew, sal_Bool bSelect =
sal_False );
voidSetAutoScroll( sal_Bool bAutoScroll );
-voidEnableCursor( sal_Bool bEnable );
// methods of TextEngine
voidSetAttrib( const TextAttrib rAttr, sal_uLong nPara,
sal_uInt16 nStart, sal_uInt16 nEnd );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 8d530b2..911c47f 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -49,11 +49,6 @@ void ExtMultiLineEdit::SetAutoScroll( sal_Bool bAutoScroll )
GetTextView()-SetAutoScroll( bAutoScroll );
}
-void ExtMultiLineEdit::EnableCursor( sal_Bool bEnable )
-{
-GetTextView()-EnableCursor( bEnable );
-}
-
void ExtMultiLineEdit::SetAttrib( const TextAttrib rAttr, sal_uLong nPara,
sal_uInt16 nStart, sal_uInt16 nEnd )
{
GetTextEngine()-SetAttrib( rAttr, nPara, nStart, nEnd );
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 7ecb944..0264b4a 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -137,6 +137,7 @@ public:
voidDisableSelectionOnFocus();
voidSetTextSelectable( sal_Bool bTextSelectable );
+voidEnableCursor( sal_Bool bEnable );
};
inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index fce3a0d..bee4278 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1569,4 +1569,9 @@ void VclMultiLineEdit::SetTextSelectable( sal_Bool
bTextSelectable )
pImpVclMEdit-GetTextWindow()-SetTextSelectable( bTextSelectable );
}
+void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
+{
+GetTextView()-EnableCursor( bEnable );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 41c1505..353eab8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -403,6 +403,7 @@ void MessBox::ImplPosControls()
mpVCLMultiLineEdit-SetPosSizePixel( aTextPos, aMEditSize );
mpVCLMultiLineEdit-Show();
mpVCLMultiLineEdit-SetPaintTransparent(sal_True);
+mpVCLMultiLineEdit-EnableCursor(sal_False);
SetPageSizePixel( aPageSize );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - 2 commits - sc/source
sc/source/core/data/column3.cxx |4
sc/source/ui/app/scmod.cxx |3 +++
sc/source/ui/optdlg/tpusrlst.cxx |2 ++
3 files changed, 9 insertions(+)
New commits:
commit d8643c11d4c89f0534b3caebd4e0fbf212777140
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Oct 17 15:45:18 2012 +0200
write the custom sort list info into the item set, fdo#53870
(cherry picked from commit 4302eb0a6c4e28ab675de9d59e73cac345ba30c7)
Signed-off-by: David Tardon dtar...@redhat.com
(cherry picked from commit 07cc274256ebff259e228e7285bc27e6ddc94fdc)
Change-Id: I9c7f62b47f83b7798a8efdbf3896503918929f03
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 845e551..2635cb8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2051,7 +2051,10 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId )
// TP_USERLISTS
if ( pUL )
+{
aULItem.SetUserList( *pUL );
+pRet-Put(aULItem);
+}
// TP_COMPATIBILITY
pRet-Put( SfxUInt16Item( SID_SC_OPT_KEY_BINDING_COMPAT,
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 3eee008..ba6fc9a 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -96,6 +96,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
{
SetExchangeSupport();
Init();
+Reset(rCoreAttrs);
FreeResource();
}
@@ -153,6 +154,7 @@ void ScTpUserLists::Init()
aFtCopyFrom.Disable();
aEdCopyFrom.Disable();
}
+
}
// ---
commit a25776ae243646179a0bb3cd7f16a6d46f09b4cf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Oct 17 12:28:27 2012 +0200
ignore broadcaster cells to fill autofilter dialog, fdo#55712
(cherry picked from commit 622f7751b78fd8584e34f5fa96a04ed6e8bb98f5)
Signed-off-by: David Tardon dtar...@redhat.com
(cherry picked from commit 637096b75f2989640967e72aee41e48b07a5a602)
Change-Id: Iacd3f8cfc26bb147eaf3b6957338be212b448226
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 48d77dc..475299d 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1501,6 +1501,10 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW
nEndRow, std::vectorScTy
}
break;
+// skip broadcaster cells
+case CELLTYPE_NOTE:
+continue;
+
default:
;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: SAL build failure on master
Le 22/10/12 13:07, Stephan Bergmann a écrit : Hi Stephan, This is the same problem Joel reported a few days ago (Build error, Oct. 19). Do you by chance have LD_LIBRARY_PATH environment variable set when doing make? Not in front of the Linux machine at the moment, will check later. I certainly haven't set anything specific in that regard, so unless it is the LO autogen or config script that has done it for me... Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3][ fix for fdo#55712, ignore broadcaster cells to fill autofilter dialog
Hi, On Friday, 2012-10-19 16:41:47 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 10:20 +0200, David Tardon wrote: On Wed, Oct 17, 2012 at 04:26:22PM +0200, Markus Mohrhard wrote: [1] fixes the problem that cells referenced in a formula where added to the autofilter dialog. Pushed with my sign-off. The commit in the 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=637096b75f2989640967e72aee41e48b07a5a602 It looks quite safe and works well = +1 Pushed with sign-offs http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6-3id=a25776ae243646179a0bb3cd7f16a6d46f09b4cf Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp9FYgSVQnqp.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3] fdo#53870, write sort list information into the item set
Hi, On Friday, 2012-10-19 15:59:17 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 11:06 +0200, David Tardon wrote: On Wed, Oct 17, 2012 at 04:30:50PM +0200, Markus Mohrhard wrote: [1] writes the custom sort list information into the SfxItemSet. Otherwise the old information is lost and a new default custom sort list information is created. Cherry picked. The commit in 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=07cc274256ebff259e228e7285bc27e6ddc94fdc It looks fine and works well = +1 We need one more approval for 3-6-3 branch. Pushed with sign-offs http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6-3id=d8643c11d4c89f0534b3caebd4e0fbf212777140 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp6MrDTHtHj2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: fdo#55034 Update default Hebrew font from Lucida Sans to Luc...
On Fri, 2012-10-19 at 17:51 +0200, Lior Kaplan wrote: = Lucida Sans Unicode is used many times and lucidasansunicode only 3 times. But lucidasans is used 100 times. Sigh - the level of pointless / painful duplication in VCL.xcu is really irritating to me - it takes longer to parse, chews memory pointlessly etc. etc. It'd be rather nice to have a more intelligent font-fallback mechanism that shared the basic information IMHO, but - clearly that needs a little work. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d4287fb59bc2bc6cf54fe0ea2786b48ad3afa982
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Fri Oct 12 21:09:42 2012 +0700
Fix fdo#47669: also check if we started the tag before ending it
The problem is we created imbalance end tag /w:hyperlink which shouldn't
be there. So, place a check before inserting end tag should help.
Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;)
(cherry picked from commit 3b042335208cb2c995f4860bf8ba3bd1e2f2e859)
Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 179c2f6..387c9ea 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -546,7 +546,11 @@ void DocxAttributeOutput::EndRun()
if ( m_closeHyperlinkInPreviousRun )
{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+if ( m_startedHyperlink )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_startedHyperlink = false;
+}
m_closeHyperlinkInPreviousRun = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW-3-6-3] Windows Java Accessibility fix ...
On Fri, 2012-10-19 at 09:48 +0200, David Tardon wrote: Nominated the fdo#53474 as a most annoying for 3.6. It is a regression from 3.5 and has been with us now for four build/QA reviews. Not sure of the etiquette but are you willing to take assignment of the bug? Provisionally, on the condition that the patch really fixes the problem I guess that would not be a problem (except to actually round someone to review the patch, because nearly everyone is at the conference). So - the patch looks rather sensible to me; I've back-ported it to -3-6 to avoid the win32 build issues it can't really hurt I think; it'd be great to have a confirmation that it helps though :-) I'd be happy to have that in -3-6-3 too if we can; anyone else want to give a +1 to: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=b3a49f990273c9fa6e2b90245c271a14b38280f0 Thanks for the testing Stuart ! :-) Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3] fix fdo#47669: check for started hyperlink before closing
On Fri, 2012-10-19 at 17:10 +0200, Petr Mladek wrote: On Fri, 2012-10-12 at 21:11 +0700, Korrawit Pruegsanusak wrote: Hello all, I'd like to propose the attached patch fixing fdo#47669 into -3-6 and -3-6-3 branches. Explanation is in commit message. I've compiled and tested on -3-6 branch at 0eee6469304ba15f42bcafb6707cc98bcbff9112, and it worked fine. It makes sense and works well = pushed into 3-6 branch, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=d401dcc51cec798c8c19febcc25c4325ddafa178 Two more approvals are needed for the 3-6-3 branch. I have got approvals from Michael Stahl and Miklos Vajna on IRC and pushed. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source
sc/source/core/data/column2.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c38b67a171615ddc444e0fe849e10d7cada74b6a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Oct 17 13:10:09 2012 +0200
only use non blank cells in the visible data methods, fdo#54552
(cherry picked from commit 40377a6e26aa61a1c0788cad1c97a10911d38da8)
Signed-off-by: David Tardon dtar...@redhat.com
(cherry picked from commit 23e6bac62ef6482c287bb0f55c662ac2047ebb33)
Change-Id: I2a0914fbaff3e3f707a9c06f693079aed2b89ba4
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c28249a..03f7b54 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1131,7 +1131,8 @@ bool ScColumn::IsEmptyVisData() const
SCSIZE i;
for (i=0; imaItems.size() !bVisData; i++)
{
-bVisData = true;
+if(!maItems[i].pCell-IsBlank())
+bVisData = true;
}
return !bVisData;
}
@@ -1165,8 +1166,11 @@ SCROW ScColumn::GetLastVisDataPos() const
for (i=maItems.size(); i0 !bFound; )
{
--i;
-bFound = true;
-nRet = maItems[i].nRow;
+if(!maItems[i].pCell-IsBlank())
+{
+bFound = true;
+nRet = maItems[i].nRow;
+}
}
}
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-6-3 2/3] Windows Java Accessibility fix ...
On 10/22/2012 03:50 PM, Michael Meeks wrote: On Fri, 2012-10-19 at 09:48 +0200, David Tardon wrote: Nominated the fdo#53474 as a most annoying for 3.6. It is a regression from 3.5 and has been with us now for four build/QA reviews. Not sure of the etiquette but are you willing to take assignment of the bug? Provisionally, on the condition that the patch really fixes the problem I guess that would not be a problem (except to actually round someone to review the patch, because nearly everyone is at the conference). So - the patch looks rather sensible to me; I've back-ported it to -3-6 to avoid the win32 build issues it can't really hurt I think; it'd be great to have a confirmation that it helps though :-) I'd be happy to have that in -3-6-3 too if we can; anyone else want to give a +1 to: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=b3a49f990273c9fa6e2b90245c271a14b38280f0 You have my +1, but I'm not sure the fix actually helps on Windows, where JNIEXPORT likely expands to the same as SAL_DLLPUBLIC_EXPORT (namely __declspec(dllexport)), anyway. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 54552, which changed state. Bug 54552 Summary: EDITING: Cell used in a formula is considered non-empty https://bugs.freedesktop.org/show_bug.cgi?id=54552 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3] fix for fdo#54552, only use non blank cells in the visible data methods in ScColumn
Hi, On Friday, 2012-10-19 16:12:24 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 10:46 +0200, David Tardon wrote: On Wed, Oct 17, 2012 at 04:28:27PM +0200, Markus Mohrhard wrote: [1] fixes the problem that blank cells, like broadcaster, cells are considerend non empty for the visible methods. Pushed with my sign-off. The commit in 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=23e6bac62ef6482c287bb0f55c662ac2047ebb33 It looks reasonable and works fine = +1 One more approval is needed for 3-6-3. I would prefer if it is from a Calc expert :-) Pushed with sign-offs http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6-3id=c38b67a171615ddc444e0fe849e10d7cada74b6a Correct me if I am mistaken, but shouldn't the same check be used in GetFirstVisDataPos and VisibleCount too? It would make sense. I think so too, and before the change of note cell handling that was the case. However, Markus said he'd like to have testcases for that first before changing. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpXFKLcJiIDD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 53482, which changed state. Bug 53482 Summary: UI: Option 'Range contains column headings' ignored https://bugs.freedesktop.org/show_bug.cgi?id=53482 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/unitymenus-quantal' - 4 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx| 12
vcl/unx/gtk/window/gtkframe.cxx |2 +-
vcl/unx/gtk/window/gtksalmenu.cxx | 29 +
3 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 8f3152f39b3d8be2d746349c9ebc148c06db3c36
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Mon Oct 22 15:08:52 2012 +0100
Removed pre-definition of class GtkSalMenu.
Change-Id: I56652b6074d0138128178b479503a21e0bcd0c7f
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index b7d3bdd..2da7c88 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -35,7 +35,6 @@
class MenuItemList;
-class GtkSalMenu;
class GtkSalMenuItem;
commit 8f7852e08114d4413881407e1c101da176a1fd0f
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Mon Oct 22 14:44:50 2012 +0100
Added ImplUpdate method to provide recursive and non-recursive menu
updating.
Change-Id: Ifd4b3f0d68f4919a10f97d6681bfd0002fa48c7a
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 5b77a29..b7d3bdd 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -59,6 +59,7 @@ private:
GActionGroup* mpActionGroup;
GtkSalMenu* GetMenuForItemCommand( gchar* aCommand,
gboolean bGetSubmenu );
+voidImplUpdate( gboolean bRecurse );
public:
GtkSalMenu( sal_Bool bMenuBar );
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 38a90db..a6295c4 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -241,7 +241,7 @@ void RemoveUnusedCommands( GLOActionGroup* pActionGroup,
GList* pOldCommandList,
}
}
-void GtkSalMenu::Update()
+void GtkSalMenu::ImplUpdate( gboolean bRecurse )
{
SolarMutexGuard aGuard;
//GTK_YIELD_GRAB();
@@ -358,149 +358,17 @@ void GtkSalMenu::Update()
}
g_object_unref( pSubMenuModel );
-}
-
-g_free( aNativeCommand );
-
-++nItemPos;
-++validItems;
-}
-
-// Delete extra items in last section.
-RemoveSpareItemsFromNativeMenu( pLOMenu, pOldCommandList, nSection,
validItems );
-
-// Delete extra sections.
-RemoveSpareSectionsFromNativeMenu( pLOMenu, pOldCommandList, nSection );
-
-// Delete unused commands.
-RemoveUnusedCommands( pActionGroup, pOldCommandList, pNewCommandList );
-}
-void GtkSalMenu::UpdateFull()
-{
-SolarMutexGuard aGuard;
-//GTK_YIELD_GRAB();
-
-if( !PrepUpdate() )
-return;
-
-Menu* pVCLMenu = mpVCLMenu;
-GLOMenu* pLOMenu = G_LO_MENU( mpMenuModel );
-GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
-GList *pOldCommandList = NULL;
-GList *pNewCommandList = NULL;
-
-sal_uInt16 nLOMenuSize = g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu )
);
-
-if ( nLOMenuSize == 0 )
-g_lo_menu_new_section( pLOMenu, 0, NULL );
-
-sal_Int32 nSection = 0;
-sal_Int32 nItemPos = 0;
-sal_Int32 validItems = 0;
-sal_Int32 nItem;
-
-for ( nItem = 0; nItem ( sal_Int32 ) GetItemCount(); nItem++ ) {
-if ( IsItemVisible( nItem ) == sal_False )
-continue;
-
-GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem );
-sal_uInt16 nId = pSalMenuItem-mnId;
-
-if ( pSalMenuItem-mnType == MENUITEM_SEPARATOR )
-{
-// Delete extra items from current section.
-RemoveSpareItemsFromNativeMenu( pLOMenu, pOldCommandList,
nSection, validItems );
-
-nSection++;
-nItemPos = 0;
-validItems = 0;
-
-if ( nLOMenuSize = nSection )
+if ( bRecurse )
{
-g_lo_menu_new_section( pLOMenu, nSection, NULL );
-nLOMenuSize++;
-}
-
-continue;
-}
-
-if ( nItemPos = g_lo_menu_get_n_items_from_section( pLOMenu, nSection
) )
-g_lo_menu_insert_in_section( pLOMenu, nSection, nItemPos, EMPTY
STRING );
-
-// Get internal menu item values.
-String aText = pVCLMenu-GetItemText( nId );
-rtl::OUString aCommand( pVCLMenu-GetItemCommand( nId ) );
-sal_Bool itemEnabled = pVCLMenu-IsItemEnabled( nId );
-KeyCode nAccelKey = pVCLMenu-GetAccelKey( nId );
-sal_Bool itemChecked = pVCLMenu-IsItemChecked( nId );
-MenuItemBits itemBits = pVCLMenu-GetItemBits( nId );
-
-// Convert internal values to native values.
-gboolean bChecked = ( itemChecked == sal_True ) ? TRUE : FALSE;
-gboolean bEnabled = ( itemEnabled == sal_True ) ? TRUE : FALSE;
-//gchar* aNativeCommand = g_strdup( rtl::OUStringToOString( aCommand,
RTL_TEXTENCODING_UTF8 ).getStr() );
-gchar* aNativeCommand = GetCommandForSpecialItem( pSalMenuItem );
-
-// Store current item
[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - accessibility/bridge
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 622cca7e5b2f046c969a95a24ebd897c2d690474
Author: David Tardon dtar...@redhat.com
Date: Mon Oct 15 07:13:23 2012 +0200
export symbols after gbuildification
Change-Id: I5c8ef1009a65fa5a38174898f58f9146e1367aa9
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 9ee03eb..b1d8d61 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -83,12 +83,12 @@ jmethodID g_jmRevokeTopWindow = 0;
// functions
//
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
+SAL_DLLPUBLIC_EXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
{
return JNI_VERSION_1_2;
}
-JNIEXPORT jbyteArray JNICALL
+SAL_DLLPUBLIC_EXPORT jbyteArray JNICALL
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
*pJNIEnv, jclass clazz)
{
// Initialize global class and method references
@@ -124,7 +124,7 @@
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
return jbaProcessID;
}
-JNIEXPORT jboolean JNICALL
+SAL_DLLPUBLIC_EXPORT jboolean JNICALL
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv
*, jclass, jlong pointer)
{
uno_Environment * pJava_environment = NULL;
@@ -180,7 +180,7 @@
Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
return JNI_TRUE;
}
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
+SAL_DLLPUBLIC_EXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
{
::Application::RemoveEventListener(g_aEventListenerLink);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6-3] Windows Java Accessibility fix ...
On Mon, 2012-10-22 at 16:06 +0200, Stephan Bergmann wrote: On 10/22/2012 03:50 PM, Michael Meeks wrote: On Fri, 2012-10-19 at 09:48 +0200, David Tardon wrote: Nominated the fdo#53474 as a most annoying for 3.6. It is a regression from 3.5 and has been with us now for four build/QA reviews. Not sure of the etiquette but are you willing to take assignment of the bug? Provisionally, on the condition that the patch really fixes the problem I guess that would not be a problem (except to actually round someone to review the patch, because nearly everyone is at the conference). So - the patch looks rather sensible to me; I've back-ported it to -3-6 to avoid the win32 build issues it can't really hurt I think; it'd be great to have a confirmation that it helps though :-) I'd be happy to have that in -3-6-3 too if we can; anyone else want to give a +1 to: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=b3a49f990273c9fa6e2b90245c271a14b38280f0 You have my +1, but I'm not sure the fix actually helps on Windows, where JNIEXPORT likely expands to the same as SAL_DLLPUBLIC_EXPORT (namely __declspec(dllexport)), anyway. Let's give it a try. It should not harm = pushed into 3-6-3. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3][ fix for fdo#55712, ignore broadcaster cells to fill autofilter dialog
On Fri, 2012-10-19 at 16:41 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 10:20 +0200, David Tardon wrote: Hi, On Wed, Oct 17, 2012 at 04:26:22PM +0200, Markus Mohrhard wrote: Hey, [1] fixes the problem that cells referenced in a formula where added to the autofilter dialog. Pushed with my sign-off. The commit in the 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=637096b75f2989640967e72aee41e48b07a5a602 It looks quite safe and works well = +1 We need one more approval for 3-6-3 branch. Approved and pushed by Eike. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3] fdo#53870, write sort list information into the item set
On Fri, 2012-10-19 at 15:59 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 11:06 +0200, David Tardon wrote: Hi, On Wed, Oct 17, 2012 at 04:30:50PM +0200, Markus Mohrhard wrote: Hey, [1] writes the custom sort list information into the SfxItemSet. Otherwise the old information is lost and a new default custom sort list information is created. Cherry picked. The commit in 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=07cc274256ebff259e228e7285bc27e6ddc94fdc It looks fine and works well = +1 We need one more approval for 3-6-3 branch. Approved and pushed by Eike. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6-3] fix for fdo#54552, only use non blank cells in the visible data methods in ScColumn
On Fri, 2012-10-19 at 16:12 +0200, Petr Mladek wrote: On Fri, 2012-10-19 at 10:46 +0200, David Tardon wrote: Hi, On Wed, Oct 17, 2012 at 04:28:27PM +0200, Markus Mohrhard wrote: Hey, [1] fixes the problem that blank cells, like broadcaster, cells are considerend non empty for the visible methods. Pushed with my sign-off. The commit in 3-6 branch is http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=23e6bac62ef6482c287bb0f55c662ac2047ebb33 It looks reasonable and works fine = +1 One more approval is needed for 3-6-3. I would prefer if it is from a Calc expert :-) Approved and pushed by Eike. Correct me if I am mistaken, but shouldn't the same check be used in GetFirstVisDataPos and VisibleCount too? Marcus is working on it. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - boost/boost_1_44_0-clang-warnings.patch compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac
boost/boost_1_44_0-clang-warnings.patch | 224
compilerplugins/Makefile-clang.mk |2
config_host.mk.in |1
configure.ac|3
4 files changed, 228 insertions(+), 2 deletions(-)
New commits:
commit 9cabab002b1180650236f3d1f5fd32dfdd4bf79a
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 16:18:35 2012 +0200
CLANGPLUGIN_CPPFLAGS for building plugin for Clang in nonstandard location
(i.e., configure with CLANGPLUGIN_CPPFLAGS=-I.../clang-installation/include
-I.../clang-build/tools/clang/include)
Change-Id: Ic6d2973629103f71c32f44ebba2ac70d137d18e7
diff --git a/compilerplugins/Makefile-clang.mk
b/compilerplugins/Makefile-clang.mk
index 818015f..9b24df0 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -56,7 +56,7 @@ CLANGOBJS=
define clangbuildsrc
$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk
$(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
- $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES)
-DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF
$(CLANGOUTDIR)/$(1).d
+ $(CXX) $(CLANGPLUGIN_CPPFLAGS) $(CLANGCXXFLAGS) $(CLANGDEFS)
$(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF
$(CLANGOUTDIR)/$(1).d
-include $(CLANGOUTDIR)/$(1).d
diff --git a/config_host.mk.in b/config_host.mk.in
index 91acee5..e867c57 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -59,6 +59,7 @@ ifneq ($(strip @CFLAGS@),)
export CFLAGS=@CFLAGS@
endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
+export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
export CLASSPATH=@CLASSPATH@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@
diff --git a/configure.ac b/configure.ac
index c493a74..7b39f3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5102,7 +5102,7 @@ if test $COM_GCC_IS_CLANG = TRUE; then
if test $compiler_plugins != no; then
AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS
+CPPFLAGS=$CPPFLAGS $CLANGPLUGIN_CPPFLAGS -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
[COMPILER_PLUGINS=TRUE],
[
@@ -5122,6 +5122,7 @@ else
fi
fi
AC_SUBST(COMPILER_PLUGINS)
+AC_SUBST(CLANGPLUGIN_CPPFLAGS)
dnl ===
dnl Set the MinGW sys-root
commit d72f3d53e05223a97efed6103fbcbfca5244c246
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 16:17:28 2012 +0200
Work around some more Clang boost warnings
Change-Id: I819a36fb922b6fe96e9989ad438bed15875bf1b6
diff --git a/boost/boost_1_44_0-clang-warnings.patch
b/boost/boost_1_44_0-clang-warnings.patch
index c0c2206..c1b4f0a 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -9,6 +9,27 @@
{
typedef BOOST_STRING_TYPENAME
range_const_iteratorInputT::type input_iterator_type;
+--- misc/boost_1_44_0/boost/concept_check.hpp
misc/build/boost_1_44_0/boost/concept_check.hpp
+@@ -136,7 +136,18 @@ namespace boost
+ {
+ BOOST_CONCEPT_USAGE(Assignable) {
+ #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
++#if defined __clang__
++#if __clang_major__ == 3 __clang_minor__ = 2 || __clang_major__ 3
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored -Wself-assign-field
++#endif
++#endif
+ a = a; // require assignment operator
++#if defined __clang__
++#if __clang_major__ == 3 __clang_minor__ = 2 || __clang_major__ 3
++#pragma clang diagnostic pop
++#endif
++#endif
+ #endif
+ const_constraints(a);
+ }
--- misc/boost_1_44_0/boost/date_time/dst_rules.hpp2008-02-27
21:00:24.0 +0100
+++ misc/build/boost_1_44_0/boost/date_time/dst_rules.hpp 2012-06-06
23:11:03.0 +0200
@@ -371,7 +371,7 @@
@@ -48,6 +69,209 @@
{
m_period_separator;
m_period_start_delimeter;
+--- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp
misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp
+@@ -86,24 +86,24 @@ public:
+ num_elements_(other.num_elements_) { }
+
+ template typename ExtentList
+- explicit const_multi_array_ref(TPtr base, const ExtentList extents) :
++ explicit const_multi_array_ref(TPtr base, const ExtentList extentlist) :
+ base_(base), storage_(c_storage_order()) {
+ boost::function_requires
+ detail::multi_array::CollectionConceptExtentList ();
+
+ index_base_list_.assign(0);
+-init_multi_array_ref(extents.begin());
++init_multi_array_ref(extentlist.begin());
+ }
+
+ template typename ExtentList
+-
Re: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Winfried, On Monday, 2012-10-22 09:27:35 +0200, Winfried Donkers wrote: I noted that the patch for fdo50950 has been pushed to master whilst 'git pul --rebase'-ing this morning. However i did not see any mail that it has been checked. Is it correct that the patch has been pushed to master? I do not see anything related in master, probably it is just in your local branch? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpv92P5JFfGE.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is the lcl_LocalFunction naming convention useful?
Hi Stephan, On Monday, 2012-10-15 12:24:38 +0200, Stephan Bergmann wrote: symbols were matched against white/black-lists, and lcl_* was always black-listed. Long gone (and I have no idea why people didn't simply use static anyway). IIRC, by chance, not using static stems from times where there was a sort of code coverage run to reorder object files within libraries for better paging, there static functions interrupted the call chain. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgptBPRH9rDrh.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ATTENTION] the merge of the submodules feature has been done... now on master
Hi Norbert, On Tuesday, 2012-10-16 11:32:31 -0500, Norbert Thiebaud wrote: see http://wiki.documentfoundation.org/Development/Submodules for details On a (~2 weeks old) clone I tried ./g pull -r that left me with all ./clone/*/* symlinked to ./ and in submodule directories only a ./.git subdirectory each. This apparentyly solved it for me: rm $(find . -maxdepth 1 -type l -ls | grep /clone/ | sed -e 's#.* \./#./#;s# -.*##') cd dictionaries ; git reset --hard cd helpcontent2 ; git reset --hard cd binfilter ; git reset --hard Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgprxbk70AYMZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: bf_sfx2/source
bf_sfx2/source/appl/sfx2_namecont.cxx | 32 ++--
bf_sfx2/source/appl/sfx2_scriptcont.cxx | 17 ++---
2 files changed, 16 insertions(+), 33 deletions(-)
New commits:
commit ab3e0975e1bf8d662e7d154de9313a491dc02b31
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 16:59:03 2012 +0200
fdo#46808: Adapt to core css.xml.sax.Writer changes
Change-Id: Ic1f0e96bbf8f3f9ea0d5ab9678f6efd0a92f
diff --git a/bf_sfx2/source/appl/sfx2_namecont.cxx
b/bf_sfx2/source/appl/sfx2_namecont.cxx
index ee5162c..312bd84 100644
--- a/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -28,10 +28,12 @@
#include bf_svtools/ehdl.hxx
#include bf_basic/basmgr.hxx
+#include com/sun/star/xml/sax/Writer.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/io/XActiveDataSource.hpp
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/uno/DeploymentException.hpp
+#include comphelper/processfactory.hxx
#include legacysmgr/legacy_binfilters_smgr.hxx
@@ -840,14 +842,8 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile(
SfxLibrary_Impl* pLib,
const ::xmlscript::LibDescriptor rLib, SotStorageRef xStorage )
{
// Create sax writer
-Reference XExtendedDocumentHandler xHandler(
-mxMSF-createInstance(
-OUString(
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.xml.sax.Writer) ) ), UNO_QUERY );
-if( !xHandler.is() )
-{
-OSL_FAIL( ### couldn't create sax-writer component\n );
-return;
-}
+Reference XWriter xWriter(
+Writer::create( comphelper::getComponentContext( mxMSF ) ) );
sal_Bool bLink = pLib-mbLink;
sal_Bool bStorage = xStorage.Is() !bLink;
@@ -905,10 +901,9 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile(
SfxLibrary_Impl* pLib,
return;
}
-Reference XActiveDataSource xSource( xHandler, UNO_QUERY );
-xSource-setOutputStream( xOut );
+xWriter-setOutputStream( xOut );
-xmlscript::exportLibrary( xHandler, rLib );
+xmlscript::exportLibrary( xWriter, rLib );
if( xInfoStream.Is() )
xInfoStream-Commit();
@@ -1157,14 +1152,8 @@ void
SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/
/*N*/ // Write library container info
/*N*/ // Create sax writer
-/*N*/ Reference XExtendedDocumentHandler xHandler(
-/*N*/ mxMSF-createInstance(
-/*N*/ OUString(
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.xml.sax.Writer) ) ), UNO_QUERY );
-/*N*/ if( !xHandler.is() )
-/*N*/ {
-/*N*/ OSL_FAIL( ### couldn't create sax-writer component\n );
-/*N*/ return;
-/*N*/ }
+Reference XWriter xWriter(
+Writer::create( comphelper::getComponentContext( mxMSF ) ) );
/*N*/
/*N*/ // Write info file
/*N*/ Reference XOutputStream xOut;
@@ -1222,10 +1211,9 @@ void
SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ return;
/*N*/ }
/*N*/
-/*N*/ Reference XActiveDataSource xSource( xHandler, UNO_QUERY );
-/*N*/ xSource-setOutputStream( xOut );
+/*N*/ xWriter-setOutputStream( xOut );
/*N*/
-/*N*/ xmlscript::exportLibraryContainer( xHandler, pLibArray );
+/*N*/ xmlscript::exportLibraryContainer( xWriter, pLibArray );
/*N*/ if( xInfoStream.Is() )
/*?*/ xInfoStream-Commit();
/*N*/ if( xLibrariesStor.Is() )
diff --git a/bf_sfx2/source/appl/sfx2_scriptcont.cxx
b/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 6453a76..70a197b 100644
--- a/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -17,9 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include com/sun/star/xml/sax/Writer.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/io/XActiveDataSource.hpp
+#include comphelper/processfactory.hxx
#include bf_sfx2/sfxuno.hxx
@@ -172,23 +174,16 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*?*/ throw(Exception)
/*?*/ {
// Create sax writer
-Reference XExtendedDocumentHandler xHandler(
-mxMSF-createInstance(
-OUString(
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.xml.sax.Writer) ) ), UNO_QUERY );
-if( !xHandler.is() )
-{
-OSL_FAIL( ### couldn't create sax-writer component\n );
-return;
-}
+Reference XWriter xWriter(
+Writer::create( comphelper::getComponentContext( mxMSF ) ) );
-Reference XActiveDataSource xSource( xHandler, UNO_QUERY );
-xSource-setOutputStream( xOutput );
+xWriter-setOutputStream( xOutput );
xmlscript::ModuleDescriptor aMod;
aMod.aName = aElementName;
aMod.aLanguage = maScriptLanguage;
aElement = aMod.aCode;
-xmlscript::exportScriptModule( xHandler, aMod );
+xmlscript::exportScriptModule( xWriter, aMod );
/*?*/ }
[Libreoffice-commits] .:
0 files changed New commits: commit b7a3a186cb9698d019dfec4ca7510ac056eb4e99 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 22 16:59:03 2012 +0200 Updated core Project: binfilter ab3e0975e1bf8d662e7d154de9313a491dc02b31 fdo#46808: Adapt to core css.xml.sax.Writer changes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.ac
configure.ac | 222 +-- 1 file changed, 111 insertions(+), 111 deletions(-) New commits: commit ed24328debac297170a9bd761174ab0babacc760 Author: Andras Timar ati...@suse.com Date: Mon Oct 22 17:26:46 2012 +0200 make a configure message less confusing Change-Id: I99b6fde467384aca690cdd0bd5b08e327c926f10 diff --git a/configure.ac b/configure.ac index 4971df9..29804ec 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,7 +3224,7 @@ if test $_os = WINNT; then LINK_X64_BINARY= LIBMGR_X64_BINARY= -AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component]) +AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) if test $BITNESS_OVERRIDE = -a -f $with_cl_home/atlmfc/lib/amd64/atls.lib; then # Prefer native x64 compiler to cross-compiler, in case we are running # the build on a 64-bit OS. @@ -3244,7 +3244,7 @@ if test $_os = WINNT; then AC_MSG_RESULT([found]) else AC_MSG_RESULT([not found]) -AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension]) +AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) fi AC_SUBST(BUILD_X64) commit 1a90251fd23f6a25518cefe31af57880808bf482 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Oct 22 17:25:40 2012 +0200 move the ENABLE_DBGUTIL block higher in configure the cpu/arch/gui/whatever block that follows it uses at least PROEXT diff --git a/configure.ac b/configure.ac index 7b39f3e..4971df9 100644 --- a/configure.ac +++ b/configure.ac @@ -3307,6 +3307,115 @@ if test $CCACHE != ; then AC_LANG_POP([C]) fi +dnl Set the ENABLE_DBGUTIL variable +dnl === +AC_MSG_CHECKING([whether to build with additional debug utilities]) +if test -n $enable_dbgutil -a $enable_dbgutil != no; then +ENABLE_DBGUTIL=TRUE +PROEXT= +PRODUCT= + +AC_MSG_RESULT([yes]) +# cppunit and graphite expose STL in public headers +if test $with_system_cppunit = yes; then +AC_MSG_ERROR([--with-system-cppunit conflicts with --enable-dbgutil]) +else +with_system_cppunit=no +fi +if test $with_system_graphite = yes; then +AC_MSG_ERROR([--with-system-graphite conflicts with --enable-dbgutil]) +else +with_system_graphite=no +fi +if test $with_system_mysql_cppconn = yes; then +AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with --enable-dbgutil]) +else +with_system_mysql_cppconn=no +fi +else +ENABLE_DBGUTIL= +# PRODUCT is old concept, still used by build.pl . +PRODUCT=full +PROEXT=.pro +AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_DBGUTIL) +AC_SUBST(PRODUCT) +AC_SUBST(PROEXT) + +dnl Set the ENABLE_DEBUG variable. +dnl === +AC_MSG_CHECKING([whether to do a debug build]) +if test -n $enable_debug test $enable_debug != yes test $enable_debug != no; then +AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) +fi +if test -n $ENABLE_DBGUTIL; then +if test $enable_debug = no; then +AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) +fi +ENABLE_DEBUG=TRUE +AC_MSG_RESULT([yes (dbgutil)]) +elif test -n $enable_debug test $enable_debug != no; then +ENABLE_DEBUG=TRUE +AC_MSG_RESULT([yes]) +else +ENABLE_DEBUG= +AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_DEBUG) + +dnl Selective debuginfo +ENABLE_DEBUGINFO_FOR= +if test -n $ENABLE_DEBUG; then +AC_MSG_CHECKING([whether to use selective debuginfo]) +if test -n $enable_selective_debuginfo -a $enable_selective_debuginfo != no; then +ENABLE_DEBUGINFO_FOR=$enable_selective_debuginfo +AC_MSG_RESULT([for $enable_selective_debuginfo]) +else +ENABLE_DEBUGINFO_FOR=all +AC_MSG_RESULT([no, for all]) +fi +fi +AC_SUBST(ENABLE_DEBUGINFO_FOR) + +dnl Check for explicit C/CXX/OBJC/OBJCXX/LDFLAGS. We by default use the ones specified +dnl by our build system, but explicit override is possible. +AC_MSG_CHECKING(for explicit CFLAGS) +if test -n $CFLAGS; then +AC_MSG_RESULT([$CFLAGS]) +else +AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit CXXFLAGS) +if test -n $CXXFLAGS; then +AC_MSG_RESULT([$CXXFLAGS]) +else +AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit OBJCFLAGS) +if test -n $OBJCFLAGS; then +AC_MSG_RESULT([$OBJCFLAGS]) +else +AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit OBJCXXFLAGS) +if test -n $OBJCXXFLAGS; then +AC_MSG_RESULT([$OBJCXXFLAGS]) +else +AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(for explicit LDFLAGS) +if test -n $LDFLAGS; then +AC_MSG_RESULT([$LDFLAGS]) +else +AC_MSG_RESULT(no) +fi +AC_SUBST(CFLAGS)
Re: [PUSHED] fdo#53482 UI: Option 'Range contains column headings' ignored
Hi, On Monday, 2012-10-15 07:31:24 +0200, Rainer Bielefeld wrote: We have a patch for https://bugs.freedesktop.org/show_bug.cgi?id=53482, Found pushed, see bug, marking thread. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpKLwW0Vsqu2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/control/button.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 47a8db922ee6980c540c2223be5452bc6b2b2bbb
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 13:31:38 2012 +0100
Resolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translations
We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if
string already contains those.
Though its an open question if the presence of ~ is a bad thing
for the Windows case. i.e. if we should have tooling to not
allow the OK/Cancel translations to contain ~ in the first place,
of if we should drop the ifdef UNX and do it globally now
Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 99e1724..baa5c64 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -152,12 +152,15 @@ XubString Button::GetStandardText( StandardButtonType
eButton )
sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
aText = ResId(nResId, *pResMgr).toString();
-// Windows (apparently) has some magic auto-accelerator evil around
-// ok / cancel so add this only for Unix
-#ifdef UNX
-if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL )
-aText.Insert( String::CreateFromAscii(~), 0 );
+if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
+{
+#ifndef WNT
+// Windows (apparently) has some magic auto-accelerator evil around
+// ok / cancel so add accelerators only for Unix
+if (aText.Search('~') == STRING_NOTFOUND)
+aText.Insert(String::CreateFromAscii(~), 0);
#endif
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Tinderbox failure, Win-x86@6, MASTER, last success: 2012-10-20 18:35:26
Hi, On Mon, Oct 22, 2012 at 03:25:20PM +0200, Lubos Lunak wrote: On Monday 22 of October 2012 14:32:47 David Tardon wrote: Hi, On Mon, Oct 22, 2012 at 12:07:49PM +, Tinderbox wrote: Hi folks, One of you broke the build of LibreOffice with your commit :-( Please commit and push a fix ASAP! Full log available at http://tinderbox.libreoffice.org/MASTER/status.html Tinderbox info: Box name: Win-x86@6 ... /usr/bin/cp: cannot stat `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/workdir/wntm sci12.pro/UnpackedTarball/postgresql/src/interfaces/libpq//postgresql-sdbc -impl.uno.dll': No such file or directory make[2]: *** [C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntms ci12.pro/lib/libpq.lib] Error 1 make[2]: *** Deleting file `C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/solver/wntms ci12.pro/lib/libpq.lib' make[2]: *** Waiting for unfinished jobs ERROR: error 512 occurred while making /home/tinderbox/tinderbox-master-build-libreoffice/tail_build/prj This is most unusual. I cannot imagine how it could happen. Could someone on Windows run cd tail_build; make -pqr and send the output to me? http://ge.tt/2zraAzP/v/0 . It's from this tinderbox right after the tinderbox build failed. It seems something went wrong. All I am getting is: This file is not available, because the upload was interrupted. You will not be able to download the file. Contact the owner if you need the file. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/control/button.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 1141d04daea3a0091c2d7533018dbe17e5b5a8bd
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 13:31:38 2012 +0100
Resolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translations
We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if
string already contains those.
Though its an open question if the presence of ~ is a bad thing
for the Windows case. i.e. if we should have tooling to not
allow the OK/Cancel translations to contain ~ in the first place,
of if we should drop the ifdef UNX and do it globally now
Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ac88195..4647490 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -153,12 +153,15 @@ XubString Button::GetStandardText( StandardButtonType
eButton )
ResId aResId( nResId, *pResMgr );
aText = String( aResId );
-// Windows (apparently) has some magic auto-accelerator evil around
-// ok / cancel so add this only for Unix
-#ifdef UNX
-if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL )
-aText.Insert( String::CreateFromAscii(~), 0 );
+if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
+{
+#ifndef WNT
+// Windows (apparently) has some magic auto-accelerator evil around
+// ok / cancel so add accelerators only for Unix
+if (aText.Search('~') == STRING_NOTFOUND)
+aText.Insert(String::CreateFromAscii(~), 0);
#endif
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gradient data structure
On Sun, 2012-10-21 at 21:43 +0200, Regina Henschel wrote: That rises the question: Should I extend the existing data structure or add a SvgGradient data structure? I think, that you should ask Michael whether it is possible to integrate the solutions from Armin from AOO 3.4.1. Suitable classes are already defined there, because they are needed for the svg-rendering. I have put Michael in CC. Thanks for that ! :-) I'll work with Christina on that next week - when I've got this openSUSE conference completed. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6-3 1/3] ~ appears in German unix OK/Cancel translations
On Mon, 2012-10-22 at 13:54 +0100, Caolán McNamara wrote: In 3.5.7 the German unix OK/Cancel translations visually have ~ in them. ~ is our accelerator code, and in the last update of the 3.5.7 .de translations ~ appears in the .de translations, but we have some unix specific code which prepends ~ to the OK/Cancel translations, resulting in a double ~ https://bugs.freedesktop.org/show_bug.cgi?id=56281 proposing 920807d4491834cd88e545fdb930c9105d58c4cd for 3-6 and 3-5 to protect against this. It should avoid the problems on Linux and it looks more safe than the previous code = put back the String-OUString conversion and pushed into both 3-5 and 3-6 branches: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=1141d04daea3a0091c2d7533018dbe17e5b5a8bd http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=47a8db922ee6980c540c2223be5452bc6b2b2bbb It would be great to get this into 3-6-3 release. Two more approvals are needed. I'm unsure, reading the comments in the weird vcl code, if there might be an additional problem under windows. If someone could check the windows German 3.5.7 for problems in OK/Cancel that'd be good, to know if we need tooling to disallow ~ in OK/Cancel translations. Or if we can remove the platform conditionality. I hope that Andras will check it once he is back from the SUSE conference. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit a40f08c1ac97078fa501da7c6dc456aa12146f25 Author: Lior Kaplan kaplanl...@gmail.com Date: Thu Oct 18 18:56:06 2012 +0200 fdo#55034 Update default Hebrew font from Lucida Sans to Lucida Sans Unicode Change-Id: Ia2204dda0cb452a4ce38a44db61d17d6802b5a38 diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index ff631c4..32b24d2 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -187,19 +187,19 @@ valueTahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif/value /prop prop oor:name=CTL_DISPLAY oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS/value /prop prop oor:name=CTL_HEADING oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS/value /prop prop oor:name=CTL_PRESENTATION oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS/value /prop prop oor:name=CTL_SPREADSHEET oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS/value /prop prop oor:name=CTL_TEXT oor:type=xs:string oor:op=replace -valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS/value +valueNachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS/value /prop /node node oor:name=th oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/colorpicker.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8545bf9afc3d4adfd3e7d33c5063a3ee259327a6
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 22 20:23:18 2012 +0400
fdo#55800: fix hex color conversion
Change-Id: I705ff4c83f635fcfea383a00eec724110d2e4b45
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 5d19c61..e66403c 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1383,8 +1383,8 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
if( aColor != GetColor() )
{
mdRed = ((double)aColor.GetRed()) / 255.0;
-mdGreen = ((double)aColor.GetRed()) / 255.0;
-mdBlue = ((double)aColor.GetRed()) / 255.0;
+mdGreen = ((double)aColor.GetGreen()) / 255.0;
+mdBlue = ((double)aColor.GetBlue()) / 255.0;
RGBtoHSV( mdRed, mdGreen, mdBlue, mdHue, mdSat, mdBri );
RGBtoCMYK( mdRed, mdGreen, mdBlue, mdCyan, mdMagenta,
mdYellow, mdKey );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#55034 Update default Hebrew font from Lucida Sans to Luc...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/883 -- To view, visit https://gerrit.libreoffice.org/883 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2204dda0cb452a4ce38a44db61d17d6802b5a38 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED]Change in core[master]: fdo#55034 Update default Hebrew font from Lucida Sans to Luc...
On Fri, 2012-10-19 at 17:51 +0200, Lior Kaplan wrote: On Fri, Oct 19, 2012 at 5:25 PM, Petr Mladek pmla...@suse.cz wrote: On Fri, 2012-10-19 at 15:27 +0200, Lior Kaplan wrote: I see the following: $ grep lucidasansunicode officecfg/registry/data/org/openoffice/VCL.xcu | wc -l 3 $ grep Lucida Sans Unicode officecfg/registry/data/org/openoffice/VCL.xcu | wc -l 68 = Lucida Sans Unicode is used many times and lucidasansunicode only 3 times. But lucidasans is used 100 times. It is in the second part of the VCL.xcu. We define there fallbacks for different fonts and use the lovercase-condensed font names there. I do not see lucidasans in the first part of VCL.xcu where we define default fonts for languages. OK, I removed lucidasansunicode; from the patch and pushed. I am pretty sure that Lucida Sans Unicode; is enough. I am pretty sure that this part of the change fixed the bug. I am sorry for nitpicking. I should have done this immediately. In fact, I just wanted to make you aware of the difference. Well, I was ill and less confident last week :-) Thanks for nailing this down. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/baside2b.cxx |2 -
basctl/source/basicide/basides2.cxx |2 -
basctl/source/basicide/tbxctl.cxx |6 ++--
basctl/source/basicide/unomodel.cxx |1
basctl/source/dlged/dlged.cxx | 52 +---
5 files changed, 30 insertions(+), 33 deletions(-)
New commits:
commit 41145f51c9efa81e55db9a6e928d422c252ccc4c
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Fri Oct 19 22:51:36 2012 -0300
OUString cleanup in basctl
Change-Id: I9644427f6d3bb4b2f488325eb520b365115a8e82
Reviewed-on: https://gerrit.libreoffice.org/892
Reviewed-by: Ivan Timofeev timofeev@gmail.com
Tested-by: Ivan Timofeev timofeev@gmail.com
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index b7b644f..2986b82 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -106,7 +106,7 @@ OUString getTextEngineText (ExtTextEngine rEngine)
void setTextEngineText (ExtTextEngine rEngine, OUString const aStr)
{
rEngine.SetText(String());
-OString aUTF8Str = ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 );
+OString aUTF8Str = OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 );
SvMemoryStream aMemStream( (void*)aUTF8Str.getStr(), aUTF8Str.getLength(),
STREAM_READ | STREAM_SEEK_TO_BEGIN );
aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index 410d3a7..fe91e70 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -108,7 +108,7 @@ sal_uInt16 Shell::SetPrinter( SfxPrinter *pNewPrinter,
sal_uInt16 nDiffFlags, bo
void Shell::SetMDITitle()
{
-::rtl::OUStringBuffer aTitleBuf;
+OUStringBuffer aTitleBuf;
if ( !m_aCurLibName.isEmpty() )
{
LibraryLocation eLocation = m_aCurDocument.getLibraryLocation(
m_aCurLibName );
diff --git a/basctl/source/basicide/tbxctl.cxx
b/basctl/source/basicide/tbxctl.cxx
index 11d8068..1396e22 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
namespace
{
-rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM(
private:resource/toolbar/insertcontrolsbar ) );
+OUString aSubToolBarResName( private:resource/toolbar/insertcontrolsbar
);
}
SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
@@ -107,8 +107,8 @@ void TbxControls::StateChanged( sal_uInt16 nSID,
SfxItemState eState,
}
if( nTemp )
{
-rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( slot:
));
-aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
+OUString aSlotURL( slot: );
+aSlotURL += OUString::valueOf( sal_Int32( nTemp ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
hasBigImages()
diff --git a/basctl/source/basicide/unomodel.cxx
b/basctl/source/basicide/unomodel.cxx
index 6825aa2..0ee8f3a 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -31,7 +31,6 @@
namespace basctl
{
-using ::rtl::OUString;
using namespace ::cppu;
using namespace ::std;
using namespace ::com::sun::star;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index d4b8c5f..d56814f 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -53,11 +53,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::io;
-using ::rtl::OUString;
-static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM(
ResourceResolver ));
-static ::rtl::OUString aDecorationPropName( RTL_CONSTASCII_USTRINGPARAM(
Decoration ));
-static ::rtl::OUString aTitlePropName( RTL_CONSTASCII_USTRINGPARAM( Title ));
+static OUString aResourceResolverPropName( ResourceResolver );
+static OUString aDecorationPropName( Decoration );
+static OUString aTitlePropName( Title );
//
@@ -90,7 +89,7 @@ void DlgEditor::ShowDialog()
uno::Reference lang::XMultiServiceFactory xMSF =
getProcessServiceFactory();
// create a dialog
-uno::Reference awt::XControl xDlg( xMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.awt.UnoControlDialog ) ) ), uno::UNO_QUERY );
+uno::Reference awt::XControl xDlg( xMSF-createInstance(
com.sun.star.awt.UnoControlDialog ), uno::UNO_QUERY );
// clone the dialog model
uno::Reference util::XCloneable xC( m_xUnoControlDialogModel,
uno::UNO_QUERY );
@@ -123,7 +122,7 @@ void DlgEditor::ShowDialog()
if( !bDecoration )
{
[PUSHED] OUString cleanup in basctl
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/892 Approvals: Ivan Timofeev: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/892 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9644427f6d3bb4b2f488325eb520b365115a8e82 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6-3 2/3] ~ appears in German unix OK/Cancel translations
Hi, On Monday, 2012-10-22 18:07:10 +0200, Petr Mladek wrote: On Mon, 2012-10-22 at 13:54 +0100, Caolán McNamara wrote: In 3.5.7 the German unix OK/Cancel translations visually have ~ in them. ~ is our accelerator code, and in the last update of the 3.5.7 .de translations ~ appears in the .de translations, but we have some unix specific code which prepends ~ to the OK/Cancel translations, resulting in a double ~ https://bugs.freedesktop.org/show_bug.cgi?id=56281 proposing 920807d4491834cd88e545fdb930c9105d58c4cd for 3-6 and 3-5 to protect against this. It should avoid the problems on Linux and it looks more safe than the previous code = put back the String-OUString conversion and pushed into both 3-5 and 3-6 branches: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=1141d04daea3a0091c2d7533018dbe17e5b5a8bd http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=47a8db922ee6980c540c2223be5452bc6b2b2bbb It would be great to get this into 3-6-3 release. Two more approvals are needed. Should fix the problem and doesn't look worse than before.. have my sign-off. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpWKawDhgOnZ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source
svtools/source/contnr/treelist.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit eda255b38d871bb7d20432e5730cc8c68b3e2942
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 22 20:17:01 2012 +0200
SvTreeList: fix singular iterator compare assertions
... which will be introduced tomorrow by 3fa955d7
Change-Id: I5d74a1c018fab69102382d6ea0b2739dd102e5bc
diff --git a/svtools/source/contnr/treelist.cxx
b/svtools/source/contnr/treelist.cxx
index 48e6df7..8f15941 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1444,7 +1444,8 @@
std::pairSvTreeEntryList::const_iterator,SvTreeEntryList::const_iterator
{
typedef
std::pairSvTreeEntryList::const_iterator,SvTreeEntryList::const_iterator
IteratorPair;
-IteratorPair aRet;
+static const SvTreeEntryList dummy; // prevent singular iterator asserts
+IteratorPair aRet(dummy.begin(), dummy.end());
if (!pParent)
pParent = pRootItem;
@@ -1464,7 +1465,8 @@
std::pairSvTreeEntryList::iterator,SvTreeEntryList::iterator
{
typedef std::pairSvTreeEntryList::iterator,SvTreeEntryList::iterator
IteratorPair;
-IteratorPair aRet;
+static SvTreeEntryList dummy; // prevent singular iterator asserts
+IteratorPair aRet(dummy.begin(), dummy.end());
if (!pParent)
pParent = pRootItem;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: BSA + New Wiki = No Good
Hi All, I resend this message so Florian will also receive it. I did say that yesterday on the IRC. Since a little while I have been working a bit on the BSA. I seems that with the change of the wiki that the HTML-output of the BugReport_Details has been changed. After the conference I want to look at it. I can run a diff on the old and the new output and see what has changed. For now the BSA on the website still works. But we can't update it at the moment so It will have to be fixed but it can be done a little later. -- Greetings, Rob Snelders Op 19-10-12 11:24, Florian Effenberger schreef: Hi, I am not subscribed to the FDO list, so please keep me in Cc for your replies. Joel Madero wrote on 2012-10-19 07:48: Now it's confirmed, here is the error: I have no idea what the script does, so I probably cannot be of too much help here. :( I guess it's a parsing error. All previously installed extensions should be available again, but the page template changed a bit. Maybe that causes the error and the parser needs some adjustments? Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gradient data structure
Hi Christina, Christina Roßmanith schrieb: Hi, there is some progress in svg:linearGradient import. But that gradient type is more flexible than the existing draw:gradient. That rises the question: Should I extend the existing data structure or add a SvgGradient data structure? I think, that you should ask Michael whether it is possible to integrate the solutions from Armin from AOO 3.4.1. Suitable classes are already defined there, because they are needed for the svg-rendering. I have put Michael in CC. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PATCH: For Bug 55732 made available under the MPL/LGPLv3+
Hello,I've submitted a patchmade available under the MPL/LGPLv3+for bug 55732 (https://bugs.freedesktop.org/show_bug.cgi?id=55732).It looks like the issue was simply that for the upper case greek letters, the characters being displayed were the lower case greek letters ("S_GR_A" vs. "C_GR_A", where C denotes capital). I've built this on my local system and it corrects the issue.Cheers,-Lester Kakoldiff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 4cb947c..e0ef03a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -934,8 +934,8 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ,
S_CYR_B , .., S_CYR_A S_CYR_A , S_CYR_B S_CYR_B , ... (sr), LANG_ALL},
{style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
{style::NumberingType::CHARS_PERSIAN_WORD, NULL, LANG_CTL},
-{style::NumberingType::CHARS_GREEK_LOWER_LETTER, C_GR_A , C_GR_B
, ... (gr), LANG_ALL},
-{style::NumberingType::CHARS_GREEK_UPPER_LETTER, S_GR_A , S_GR_B
, ... (gr), LANG_ALL},
+{style::NumberingType::CHARS_GREEK_UPPER_LETTER, C_GR_A , C_GR_B
, ... (gr), LANG_ALL},
+{style::NumberingType::CHARS_GREEK_LOWER_LETTER, S_GR_A , S_GR_B
, ... (gr), LANG_ALL},
};
static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) /
sizeof(Supported_NumberingType);
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: framework/source sw/source tools/source
framework/source/dispatch/dispatchprovider.cxx | 35 ++---
sw/source/core/bastyp/swcache.cxx | 16 +--
sw/source/core/graphic/ndgrf.cxx |2 -
tools/source/inet/inetstrm.cxx |2 -
4 files changed, 24 insertions(+), 31 deletions(-)
New commits:
commit c348df5635c45fd446fa9a7e831581164e55be71
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 22 20:18:50 2012 +0100
loplugin: various warnings
Change-Id: I605bffb518d804ee69edda5e7641e13e4c14ef01
diff --git a/framework/source/dispatch/dispatchprovider.cxx
b/framework/source/dispatch/dispatchprovider.cxx
index f570dd2..1fb6019 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -246,12 +246,11 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryDeskt
// Why is top here handled too? Because the desktop is the topest
frame. Normaly it's superflous
// to use this target - but we can handle it in the same manner then
_self.
//-
-else
-if (
-(sTargetFrameName==SPECIALTARGET_SELF) ||
-(sTargetFrameName==SPECIALTARGET_TOP ) ||
-(sTargetFrameName.isEmpty())
- )
+else if (
+ (sTargetFrameName==SPECIALTARGET_SELF) ||
+ (sTargetFrameName==SPECIALTARGET_TOP ) ||
+ (sTargetFrameName.isEmpty())
+)
{
xDispatcher = implts_searchProtocolHandler(aURL);
}
@@ -274,10 +273,9 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryDeskt
css::uno::Reference css::frame::XDispatchProvider xProvider(
xFoundFrame, css::uno::UNO_QUERY );
xDispatcher = xProvider-queryDispatch(aURL,SPECIALTARGET_SELF,0);
}
-else
// if it couldn't be found - but creation was allowed
// use special dispatcher for creatio or froward it to the browser
-if (nSearchFlags css::frame::FrameSearchFlag::CREATE)
+else if (nSearchFlags css::frame::FrameSearchFlag::CREATE)
xDispatcher = implts_getOrCreateDispatchHelper(
E_CREATEDISPATCHER, xDesktop, sTargetFrameName, nSearchFlags );
}
@@ -324,8 +322,7 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryFrame
// I.II) _menubar
// Special mode on frame or task to receive the local menu. Not supported
by findFrame()
//-
-else
-if (sTargetName==SPECIALTARGET_MENUBAR)
+else if (sTargetName==SPECIALTARGET_MENUBAR)
{
xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER,
xFrame );
}
@@ -335,8 +332,7 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryFrame
// Special sub frame of a top frame only. Search or create it. ... OK
it's currently a little bit HACKI.
// Only the sfx (means the controller) can create it it.
//-
-else
-if (sTargetName==SPECIALTARGET_BEAMER)
+else if (sTargetName==SPECIALTARGET_BEAMER)
{
css::uno::Reference css::frame::XDispatchProvider xBeamer(
xFrame-findFrame( SPECIALTARGET_BEAMER, css::frame::FrameSearchFlag::CHILDREN
| css::frame::FrameSearchFlag::SELF ), css::uno::UNO_QUERY );
if (xBeamer.is())
@@ -357,8 +353,7 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryFrame
// I.V) _parent
// Our parent frame (if it exist) should handle this URL.
//-
-else
-if (sTargetName==SPECIALTARGET_PARENT)
+else if (sTargetName==SPECIALTARGET_PARENT)
{
css::uno::Reference css::frame::XDispatchProvider xParent(
xFrame-getCreator(), css::uno::UNO_QUERY );
if (xParent.is())
@@ -371,8 +366,7 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryFrame
// This request must be forwarded to any parent frame, till we reach a
top frame.
// If no parent exist, we can handle itself.
//-
-else
-if (sTargetName==SPECIALTARGET_TOP)
+else if (sTargetName==SPECIALTARGET_TOP)
{
if (xFrame-isTop())
{
@@ -398,11 +392,10 @@ css::uno::Reference css::frame::XDispatch
DispatchProvider::implts_queryFrame
// protocol handler. If this failed too - we check for a loadable content
and in case of true
// we load it into the frame by returning specilized dispatch object.
[PATCH] Some ::rtl::OUString to OUString in basctl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/896 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/896/1 Some ::rtl::OUString to OUString in basctl Change-Id: Ifbc60c2e6f2906cc0b7a3ea3fb9dfa1a8421d6a2 --- M basctl/source/dlged/dlgedclip.cxx M basctl/source/dlged/dlgedfac.cxx 2 files changed, 34 insertions(+), 34 deletions(-) -- To view, visit https://gerrit.libreoffice.org/896 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbc60c2e6f2906cc0b7a3ea3fb9dfa1a8421d6a2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Markus Mohrhard markus.mohrh...@googlemail.com changed: What|Removed |Added Depends on||56291 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/colorpicker.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 66446668dad9dfb8394fe3e6afcff78662efc63a
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 22 20:23:18 2012 +0400
fdo#55800: fix hex color conversion
Change-Id: I705ff4c83f635fcfea383a00eec724110d2e4b45
Reviewed-on: https://gerrit.libreoffice.org/895
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 40f7302..9753a2c 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1407,8 +1407,8 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
if( aColor != GetColor() )
{
mdRed = ((double)aColor.GetRed()) / 255.0;
-mdGreen = ((double)aColor.GetRed()) / 255.0;
-mdBlue = ((double)aColor.GetRed()) / 255.0;
+mdGreen = ((double)aColor.GetGreen()) / 255.0;
+mdBlue = ((double)aColor.GetBlue()) / 255.0;
RGBtoHSV( mdRed, mdGreen, mdBlue, mdHue, mdSat, mdBri );
RGBtoCMYK( mdRed, mdGreen, mdBlue, mdCyan, mdMagenta,
mdYellow, mdKey );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#55800: fix hex color conversion
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/895 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/895 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I705ff4c83f635fcfea383a00eec724110d2e4b45 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PhD Candidate Asking for New (2 years) Developers for Survey on LibO
Hi All, This is a tad bit off base, so I'll apologize for that in advance. We have a user who is a PhD candidate and is doing several papers on FLOSS. Currently he's collecting data and is on LibreOffice development. He's looking for volunteers to fill out a survey (hoping for at least 20-30). The survey takes about 20 minutes, is quite straight forward and the only requirement is that you have contributed for 2 years counting both LibO and OOo time. If you're interested please just respond to this and I'll pass on your info to the person running the survey. If you want to just directly do the survey you can find it here: https://limesurvey.sim.vuw.ac.nz/index.php?sid=14153lang=en I think that this would be really good for us, when he starts publishing he'll keep us informed and it could go in some of our press releases. Regards, Joel -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6-3]: fdo#55800: fix hex color conversion
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/897 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/897/1 fdo#55800: fix hex color conversion Reviewed-on: https://gerrit.libreoffice.org/895 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit 66446668dad9dfb8394fe3e6afcff78662efc63a) Change-Id: I4e60837b3cc557e1df3d7e1312ed083f2b267dde --- M cui/source/dialogs/colorpicker.cxx 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/897 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e60837b3cc557e1df3d7e1312ed083f2b267dde Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-3 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source
basctl/source/dlged/dlgedclip.cxx |6 +--
basctl/source/dlged/dlgedfac.cxx | 62 +++---
2 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 0397c4b02d894259cd86280185f52ec84a67b16a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Mon Oct 22 17:20:26 2012 -0200
Some ::rtl::OUString to OUString in basctl
Change-Id: Ifbc60c2e6f2906cc0b7a3ea3fb9dfa1a8421d6a2
Reviewed-on: https://gerrit.libreoffice.org/896
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/basctl/source/dlged/dlgedclip.cxx
b/basctl/source/dlged/dlgedclip.cxx
index 5473516..54cd68b 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -58,7 +58,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const
DataFlavor lFlavor, c
// compare mime content types
Reference lang::XMultiServiceFactory xMSF = getProcessServiceFactory();
Reference datatransfer::XMimeContentTypeFactory
-xMCntTypeFactory( xMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.datatransfer.MimeContentTypeFactory ) ) ), UNO_QUERY );
+xMCntTypeFactory( xMSF-createInstance(
com.sun.star.datatransfer.MimeContentTypeFactory ), UNO_QUERY );
if ( xMCntTypeFactory.is( ) )
{
@@ -66,8 +66,8 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const
DataFlavor lFlavor, c
Reference datatransfer::XMimeContentType xLType =
xMCntTypeFactory-createMimeContentType( lFlavor.MimeType );
Reference datatransfer::XMimeContentType xRType =
xMCntTypeFactory-createMimeContentType( rFlavor.MimeType );
-::rtl::OUString aLFullMediaType = xLType-getFullMediaType();
-::rtl::OUString aRFullMediaType = xRType-getFullMediaType();
+OUString aLFullMediaType = xLType-getFullMediaType();
+OUString aRFullMediaType = xRType-getFullMediaType();
bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
}
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 781d96b..9c117eb 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -51,7 +51,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *,
pObjFactory )
if( bNeedsInit )
{
uno::Reference lang::XMultiServiceFactory xMSF =
::comphelper::getProcessServiceFactory();
-uno::Reference container::XNameContainer xC( xMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.awt.UnoControlDialogModel ) ) ), uno::UNO_QUERY );
+uno::Reference container::XNameContainer xC( xMSF-createInstance(
com.sun.star.awt.UnoControlDialogModel ), uno::UNO_QUERY );
if( xC.is() )
{
uno::Reference lang::XMultiServiceFactory xModFact( xC,
uno::UNO_QUERY );
@@ -67,33 +67,33 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *,
pObjFactory )
switch( pObjFactory-nIdentifier )
{
case OBJ_DLG_PUSHBUTTON:
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlButtonModel )) ,
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(
com.sun.star.awt.UnoControlButtonModel, xDialogSFact );
break;
case OBJ_DLG_FORMRADIO:
case OBJ_DLG_RADIOBUTTON:
if ( pObjFactory-nIdentifier == OBJ_DLG_RADIOBUTTON )
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlRadioButtonModel )) ,
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(
com.sun.star.awt.UnoControlRadioButtonModel, xDialogSFact );
else
{
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.form.component.RadioButton )) ,
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(
com.sun.star.form.component.RadioButton, xDialogSFact );
static_cast DlgEdObj* ( pObjFactory-pNewObj
)-MakeDataAware( mxModel );
}
break;
case OBJ_DLG_FORMCHECK:
case OBJ_DLG_CHECKBOX:
if ( pObjFactory-nIdentifier == OBJ_DLG_CHECKBOX )
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlCheckBoxModel )) ,
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(
com.sun.star.awt.UnoControlCheckBoxModel, xDialogSFact );
else
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.form.component.CheckBox )) ,
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(
[PUSHED] Some ::rtl::OUString to OUString in basctl
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/896 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/896 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbc60c2e6f2906cc0b7a3ea3fb9dfa1a8421d6a2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: BSA + New Wiki = No Good
Rob Snelders schrieb: For now the BSA on the website still works. But we can't update it Hi all, Please submit a bug for this problem and put me to CC. Thx. Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: can we drop rdbmaker ?
On 22 October 2012 13:17, Stephan Bergmann sberg...@redhat.com wrote: On 10/22/2012 09:53 AM, Miklos Vajna wrote: On Sun, Oct 21, 2012 at 06:00:08PM +0200, David Tardon dtar...@redhat.com wrote: I assumed it is a part of URE, but that turns out not to be true. As far as I can see, it is not even part of any installation set. Drop it, I say! Stephan mentioned on the conference that it's still used somewhere, probably worthy to check with him before killing it. :) Looks like I was confusing what rdbmaker is actually good for, and that it can apparently go for good indeed. Done as http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c6276a312a3dd88d7469be3187bf8d9d077f0d8 Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - RepositoryFixes.mk solenv/gbuild
RepositoryFixes.mk |2 ++ solenv/gbuild/CliAssembly.mk |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 2589505cc299950a2d41aa65e0100fb0c6f0a7a6 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 22 23:02:38 2012 +0200 fdo#55290: CliAssembly: fix cbd9dddb: s/NAME/OUTFILE/ Change-Id: I9339dee42ed564521f3d6bd4d269184e79e2303c diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index b6e216a..82e2f50 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -74,7 +74,7 @@ $(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir : $(call gb_CliAssemblyTarget_get_target,%) : $(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set)) $(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set)) - $(if $(strip $(CLI_ASSEMBLY_NAME)),,$(call gb_Output_error,assembly name not set)) + $(if $(strip $(CLI_ASSEMBLY_OUTFILE)),,$(call gb_Output_error,assembly name not set)) $(call gb_CliAssemblyTarget__command,$@,$*,$) $(call gb_CliAssemblyTarget_get_assembly_target,%) : commit 8de04aaf23492fb0c188b063ecd806b2e6d9d213 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 22 22:35:49 2012 +0200 mozilla import libraries have no i prefix ... how the heck did that ever work? Change-Id: Idfaf4d617f48427b144837ea44bee49ae8e3f0ff diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 74f7acb..5eb00eb 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -146,6 +146,8 @@ gb_Library_NOILIBFILENAMES := \ lcms2 \ pango-1.0 \ pangocairo-1.0 \ + xpcom \ + xpcom_core \ nspr4 \ nss3 \ smime3 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] warn free build of dmake, concat-deps and lpsolve
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/898 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/898/1 warn free build of dmake, concat-deps and lpsolve I've added if test to silence compiler warnings like this: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result to make the compiler think we care about the return value of those function calls. they work like this: if( function_call(...) ) ; meaning if true do a nop false just continue on your marry way. Also in lpsolve moved from fprintf(output, (char* variable)) to fputs((char* variable), output) because of a compiler warning that it couldn't varify the format string because it wasn't a string literal. Change-Id: I72dae83b47c2021cea7c339d5f397a82ee043346 --- M lpsolve/lp_solve-fixed-warn.patch 1 file changed, 11 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/898 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72dae83b47c2021cea7c339d5f397a82ee043346 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: René Kjellerup rk.katana.st...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: ure/Zip_uretest.mk
ure/Zip_uretest.mk |1 - 1 file changed, 1 deletion(-) New commits: commit bd1c6446d3fec046c8cd6d275412036f19198d3d Author: Peter Foley pefol...@verizon.net Date: Mon Oct 22 18:43:36 2012 -0400 remove nonexistant file from Zip_uretest Change-Id: Iad0c1694a896f58bf2075b5997aa29942e5ffd87 diff --git a/ure/Zip_uretest.mk b/ure/Zip_uretest.mk index 2c2bbb1..e3d0b67 100644 --- a/ure/Zip_uretest.mk +++ b/ure/Zip_uretest.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Zip_add_files,uretest,\ uretest/tester.mf.template \ uretest/types.idl \ uretest/types.mf.template \ -uretest/version.map \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Translate German comments
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/899 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/899/1 Translate German comments Change-Id: I91e6fe51e6fb15cda90a6fab029d19c12cb3d251 --- M sw/source/core/docnode/ndsect.cxx 1 file changed, 88 insertions(+), 115 deletions(-) -- To view, visit https://gerrit.libreoffice.org/899 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91e6fe51e6fb15cda90a6fab029d19c12cb3d251 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher p.weissenbac...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
submodules issue on cygwin
Hello When I try to build master since submodules were introduced, I got a failure with this message: Entering /cygdrive/d/src/libo/tail_build/prj gbuild module /cygdrive/d/src/libo/tail_build: /opt/lo/bin/make -f Makefile -j4 -rs all slowcheck gb_PARTIALBUILD=T D:/src/libo/Module_tail_build.mk:27: /cygdrive/d/src/libo//translations/Module_translations.mk: No such file or directory Makefile:17: *** Corrupted module target stack! . Stop. I don't know where the double / comes from. When I check: - libo/translations is a directory containing 2 files: .git .gitignore - libo/core/translations contains the git repo with its workdir What could be missing here ? git version is 1.7.9 mm@FAUCON /cygdrive/d/src/libo/clone/translations $ git log -n 1 --decorate --oneline 2548be5 (HEAD, origin/master, origin/feature/submodules, origin/HEAD, master) add a README to the translations module mm@FAUCON /cygdrive/d/src/libo $ git log -n 1 --decorate --oneline bd1c644 (HEAD, origin/master, origin/HEAD, master) remove nonexistant file from Zip_uretest I can provide more logs if needed. just ask. Regards -- Mathias ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
